bug修改提交
parent
2b5830b76a
commit
81122369c6
|
@ -93,7 +93,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &1004934361
|
--- !u!224 &1004934361
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -109,10 +109,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 5117868206164008583}
|
m_Father: {fileID: 5117868206164008583}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 790, y: -50}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 88}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1004934365
|
--- !u!222 &1004934365
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -69320,6 +69320,11 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 43
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
|
@ -69330,11 +69335,6 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 3285305655078153422, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 43
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 2320031819916146514, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
|
|
|
@ -2580,7 +2580,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 54.2, y: -90}
|
m_AnchoredPosition: {x: 0, y: -90}
|
||||||
m_SizeDelta: {x: 16.22, y: 33.59}
|
m_SizeDelta: {x: 16.22, y: 33.59}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1472422953
|
--- !u!222 &1472422953
|
||||||
|
@ -2618,7 +2618,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
m_MaxSize: 50
|
m_MaxSize: 50
|
||||||
m_Alignment: 8
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
|
@ -27884,7 +27884,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 54.2, y: -90}
|
m_AnchoredPosition: {x: 0, y: -90}
|
||||||
m_SizeDelta: {x: 16.22, y: 33.59}
|
m_SizeDelta: {x: 16.22, y: 33.59}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5920624837821711060
|
--- !u!222 &5920624837821711060
|
||||||
|
@ -27922,7 +27922,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
m_MaxSize: 50
|
m_MaxSize: 50
|
||||||
m_Alignment: 8
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
|
@ -31725,7 +31725,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
m_MaxSize: 50
|
m_MaxSize: 50
|
||||||
m_Alignment: 8
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
|
|
|
@ -490,6 +490,7 @@ PanelType = {
|
||||||
fagncunxunbao = {16,1288,1290},
|
fagncunxunbao = {16,1288,1290},
|
||||||
HomeLand = {14,16,12061,12062},
|
HomeLand = {14,16,12061,12062},
|
||||||
ExploreFun = { 14, 16, 12061 }, -- 体力 2
|
ExploreFun = { 14, 16, 12061 }, -- 体力 2
|
||||||
|
GodPrint = { 14, 16, 1294 }, -- 神印
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@ function BagPanel:BindEvent()
|
||||||
if not temp or #temp < 1 then
|
if not temp or #temp < 1 then
|
||||||
PopupTipPanel.ShowTip("无可分解神印")
|
PopupTipPanel.ShowTip("无可分解神印")
|
||||||
else
|
else
|
||||||
UIManager.OpenPanel(UIName.GodPrintResolvePanel, 4)--魂印
|
UIManager.OpenPanel(UIName.GodPrintResolvePanel,5)--魂印
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -98,9 +98,9 @@ function this:OnShow(_parent,_args)
|
||||||
end
|
end
|
||||||
if bagNum < list[i][2] then
|
if bagNum < list[i][2] then
|
||||||
isCan=false
|
isCan=false
|
||||||
numTxt.text=string.format("<color=#FF0000FF>%s/%s</color>",bagNum,list[i][2])
|
numTxt.text=string.format("<color=#FF0000FF>%s/%s</color>",PrintWanNum(bagNum),list[i][2])
|
||||||
else
|
else
|
||||||
numTxt.text=string.format("<color=#FFFFFFFF>%s/%s</color>",bagNum,list[i][2])
|
numTxt.text=string.format("<color=#FFFFFFFF>%s/%s</color>",PrintWanNum(bagNum),list[i][2])
|
||||||
end
|
end
|
||||||
Util.AddClick(btnObj,function()
|
Util.AddClick(btnObj,function()
|
||||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemConfig[list[i][1]].Id,nil)
|
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemConfig[list[i][1]].Id,nil)
|
||||||
|
|
|
@ -28,6 +28,7 @@ local _PanelType = {
|
||||||
[2] = PanelType.IronResource,
|
[2] = PanelType.IronResource,
|
||||||
[3] = PanelType.requiem,
|
[3] = PanelType.requiem,
|
||||||
[4] = PanelType.StarSoul,
|
[4] = PanelType.StarSoul,
|
||||||
|
[5] = PanelType.GodPrint,
|
||||||
}
|
}
|
||||||
|
|
||||||
local list={}
|
local list={}
|
||||||
|
@ -207,6 +208,7 @@ end
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function GodPrintResolvePanel:OnOpen(_tabType)
|
function GodPrintResolvePanel:OnOpen(_tabType)
|
||||||
tabType=_tabType
|
tabType=_tabType
|
||||||
|
LogError("tabtype=="..tabType)
|
||||||
isPlayanim = true
|
isPlayanim = true
|
||||||
isTop = true
|
isTop = true
|
||||||
end
|
end
|
||||||
|
@ -245,6 +247,11 @@ function this.GetTabTypeShoePanel(_tabType)
|
||||||
this.soulPrintScroll:SetActive(true)
|
this.soulPrintScroll:SetActive(true)
|
||||||
this.soulPrintObject:SetActive(true)
|
this.soulPrintObject:SetActive(true)
|
||||||
this.SortTypeClick(tabSortType,soulPrintEndBtns[1])
|
this.SortTypeClick(tabSortType,soulPrintEndBtns[1])
|
||||||
|
elseif _tabType==5 then
|
||||||
|
this.btnSoulPrintGrid:SetActive(true)
|
||||||
|
this.soulPrintScroll:SetActive(true)
|
||||||
|
this.soulPrintObject:SetActive(true)
|
||||||
|
this.SortTypeClick(tabSortType,soulPrintEndBtns[1])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--展示数据
|
--展示数据
|
||||||
|
@ -260,7 +267,7 @@ function this.SortTypeClick(_sortType,_btn)
|
||||||
this.EndTabBtnSelect(_btn)
|
this.EndTabBtnSelect(_btn)
|
||||||
|
|
||||||
this.CleanSelectList()
|
this.CleanSelectList()
|
||||||
if tabType == 4 then
|
if tabType == 5 then
|
||||||
list={}
|
list={}
|
||||||
soulPrintData= BagManager.GetAllGodPrintData(tabSortType)
|
soulPrintData= BagManager.GetAllGodPrintData(tabSortType)
|
||||||
table.sort(soulPrintData,function(a,b)
|
table.sort(soulPrintData,function(a,b)
|
||||||
|
@ -374,7 +381,7 @@ end
|
||||||
--计算奖励 和 已选择数量
|
--计算奖励 和 已选择数量
|
||||||
function this.UpdataPanelRewardAndSelectText()
|
function this.UpdataPanelRewardAndSelectText()
|
||||||
local allRewardData={}
|
local allRewardData={}
|
||||||
if tabType == 4 then
|
if tabType == 5 then
|
||||||
this.selectText.text = Language[11728]..LengthOfTable(chooseIdList).."/"..#soulPrintData
|
this.selectText.text = Language[11728]..LengthOfTable(chooseIdList).."/"..#soulPrintData
|
||||||
for i, v in pairs(chooseIdList) do
|
for i, v in pairs(chooseIdList) do
|
||||||
local rewardGroupId = tonumber(itemConfig[v].ResolveReward)
|
local rewardGroupId = tonumber(itemConfig[v].ResolveReward)
|
||||||
|
@ -429,7 +436,7 @@ end
|
||||||
|
|
||||||
--快速选择英雄 或者 装备
|
--快速选择英雄 或者 装备
|
||||||
function this.QuickSelectListData()
|
function this.QuickSelectListData()
|
||||||
if tabType == 4 then
|
if tabType == 5 then
|
||||||
chooseIdList={}
|
chooseIdList={}
|
||||||
local tempchooseIdList={}
|
local tempchooseIdList={}
|
||||||
for k, v in pairs(soulPrintData) do
|
for k, v in pairs(soulPrintData) do
|
||||||
|
@ -476,7 +483,7 @@ function this.SendBackResolveReCallBack(drop)
|
||||||
else
|
else
|
||||||
BagManager.OnShowTipDropNumZero(drop)
|
BagManager.OnShowTipDropNumZero(drop)
|
||||||
end
|
end
|
||||||
if tabType== 4 then
|
if tabType== 5 then
|
||||||
--移除魂印
|
--移除魂印
|
||||||
GodPrintManager.RemoveSoulPrint(chooseIdList)
|
GodPrintManager.RemoveSoulPrint(chooseIdList)
|
||||||
local soulPrint= GodPrintManager.GetSoulPrintQualityDataByType(this.soulPrintChooseType)
|
local soulPrint= GodPrintManager.GetSoulPrintQualityDataByType(this.soulPrintChooseType)
|
||||||
|
@ -494,7 +501,7 @@ function this.ResolveBtnClickEvent()
|
||||||
local curResolveAllItemList={}
|
local curResolveAllItemList={}
|
||||||
local isSoulPrintShowSure=false
|
local isSoulPrintShowSure=false
|
||||||
local type=-1
|
local type=-1
|
||||||
if tabType==4 then
|
if tabType==5 then
|
||||||
isSoulPrintShowSure=false
|
isSoulPrintShowSure=false
|
||||||
type=1
|
type=1
|
||||||
local temp = {}
|
local temp = {}
|
||||||
|
|
|
@ -356,6 +356,8 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
elseif isBagPanel and itemConfigData.ItemType == 32 then -- 挂机奖励
|
elseif isBagPanel and itemConfigData.ItemType == 32 then -- 挂机奖励
|
||||||
this.btnSure:SetActive(true)
|
this.btnSure:SetActive(true)
|
||||||
this.btnSureText.text = Language[10195]
|
this.btnSureText.text = Language[10195]
|
||||||
|
elseif isBagPanel and itemConfigData.ItemType == 34 then
|
||||||
|
this.btnSure:SetActive(false)
|
||||||
else
|
else
|
||||||
this.btnSure:SetActive(false)
|
this.btnSure:SetActive(false)
|
||||||
this.btnSureText.text = Language[10197]
|
this.btnSureText.text = Language[10197]
|
||||||
|
@ -463,10 +465,12 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
this.armorType.gameObject:SetActive(true)
|
this.armorType.gameObject:SetActive(true)
|
||||||
this.armorLanTuNum.gameObject:SetActive(true)
|
this.armorLanTuNum.gameObject:SetActive(true)
|
||||||
this.armorType.text = this.getType()--道具类型显示
|
this.armorType.text = this.getType()--道具类型显示
|
||||||
|
LogError("11111111111")
|
||||||
this.armorLanTuNum.text = Language[11516] .. BagManager.GetItemCountById(itemSid)
|
this.armorLanTuNum.text = Language[11516] .. BagManager.GetItemCountById(itemSid)
|
||||||
this.armorInfoText.text = string.gsub(GetLanguageStrById(itemConfigData.ItemDescribe), "\\n", "")
|
this.armorInfoText.text = string.gsub(GetLanguageStrById(itemConfigData.ItemDescribe), "\\n", "")
|
||||||
local jumpDataList = itemConfigData.Jump
|
local jumpDataList = itemConfigData.Jump
|
||||||
local jumpSortData = creatJumpData(jumpDataList)
|
local jumpSortData = creatJumpData(jumpDataList)
|
||||||
|
LogError("222222222")
|
||||||
for i = 1, #jumpSortData do
|
for i = 1, #jumpSortData do
|
||||||
if jumpSortData[i].id > 0 then
|
if jumpSortData[i].id > 0 then
|
||||||
-- type 大于 10000为活动 直接显示按钮,如果小于1000 为功能 开启才显示
|
-- type 大于 10000为活动 直接显示按钮,如果小于1000 为功能 开启才显示
|
||||||
|
@ -492,6 +496,7 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
LogError("33333333")
|
||||||
this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,600)
|
this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,600)
|
||||||
-- if jumpDataList and #jumpDataList then
|
-- if jumpDataList and #jumpDataList then
|
||||||
-- this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList))
|
-- this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList))
|
||||||
|
@ -513,7 +518,7 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
else
|
else
|
||||||
this.checkHero:SetActive(false)
|
this.checkHero:SetActive(false)
|
||||||
end
|
end
|
||||||
|
LogError("44444444444444")
|
||||||
-- 判断是否要显示等级限制
|
-- 判断是否要显示等级限制
|
||||||
this.armorLock.gameObject:SetActive(false)
|
this.armorLock.gameObject:SetActive(false)
|
||||||
if itemConfigData.UseLevel and itemConfigData.UseLevel > 0 and PlayerManager.level < itemConfigData.UseLevel then
|
if itemConfigData.UseLevel and itemConfigData.UseLevel > 0 and PlayerManager.level < itemConfigData.UseLevel then
|
||||||
|
@ -521,6 +526,7 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
this.armorLock.text = string.format("<color=%s>等级达%s后可以使用</color>", UIColorStr.RED, itemConfigData.UseLevel)
|
this.armorLock.text = string.format("<color=%s>等级达%s后可以使用</color>", UIColorStr.RED, itemConfigData.UseLevel)
|
||||||
end
|
end
|
||||||
ForceRebuildLayout(this.equipProGrid.transform)
|
ForceRebuildLayout(this.equipProGrid.transform)
|
||||||
|
LogError("5555555555")
|
||||||
end
|
end
|
||||||
|
|
||||||
--获取道具种类
|
--获取道具种类
|
||||||
|
|
Loading…
Reference in New Issue