Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
251a91b7fc
|
@ -74,7 +74,7 @@ end
|
|||
function this:OnShow(_openThisPanel)
|
||||
curSelectSoulPrint = {}
|
||||
this.OnShowData()
|
||||
this.StartCompoundSoulPrint(curSelectSoulPrint)
|
||||
this.StartCompoundSoulPrint(curSelectSoulPrint, true)
|
||||
openThisPanel = _openThisPanel
|
||||
end
|
||||
|
||||
|
@ -171,16 +171,18 @@ function this.SingleItemDataShow(_go,_curequipSign)
|
|||
Util.GetGameObject(curSelectGO.transform, "choosed"):SetActive(false)
|
||||
curSelectGO = _go
|
||||
end
|
||||
this.StartCompoundSoulPrint(curequipSign)
|
||||
this.StartCompoundSoulPrint(curequipSign, false)
|
||||
end
|
||||
end)
|
||||
end
|
||||
function this.StartCompoundSoulPrint(curequipSign)
|
||||
materialState = {}
|
||||
this.ShowTitleEquipData(this.compoundSoulPrint,curequipSign)
|
||||
function this.StartCompoundSoulPrint(curequipSign, isClearSelect)
|
||||
this.ShowTitleEquipData(this.compoundSoulPrint, curequipSign)
|
||||
this.ShowGoldNum(curequipSign)
|
||||
for i = 1, 3 do
|
||||
this.ShowTitleEquipData(needSoulPrint[i],nil,i)
|
||||
if isClearSelect then
|
||||
materialState = {}
|
||||
for i = 1, 3 do
|
||||
this.ShowTitleEquipData(needSoulPrint[i],nil,i)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -207,13 +209,13 @@ function this.Compound()
|
|||
SoundManager.PlaySound(SoundConfig.UI_Baoqi)
|
||||
--删除魂印
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
|
||||
this.StartCompoundSoulPrint(curSelectSoulPrint)
|
||||
this.StartCompoundSoulPrint(curSelectSoulPrint, true)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
function this.AutoSelectSoulPrint()
|
||||
this.StartCompoundSoulPrint(curSelectSoulPrint)
|
||||
this.StartCompoundSoulPrint(curSelectSoulPrint, true)
|
||||
--local isShowUpHero = SoulPrintManager.GetIsShowUpHeroSoulPrintPlayerPrefs()
|
||||
local datas = SoulPrintManager.GetAllSoulPrint(false,nil)
|
||||
--LogError("datas "..#datas)
|
||||
|
|
Loading…
Reference in New Issue