From 15f2a8e424ee6e9c9d43d8db3d552a628343f8fa Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 2 Nov 2021 17:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1010610=E3=80=91=E3=80=90=E9=AD=82?= =?UTF-8?q?=E5=8D=B0=E5=90=88=E6=88=90=E4=BC=98=E5=8C=96=E3=80=91=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E6=9D=90=E6=96=99=E5=90=8E=EF=BC=8C=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=90=88=E6=88=90=E7=9B=AE=E6=A0=87=E4=B8=8D=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Compound/view/CompoundPanel_SoulPrint.lua | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua index 7e5d85b8f3..961ecd0a94 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua @@ -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)