diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua index 654768ac6f..24b687ab23 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemPanel.lua @@ -149,7 +149,7 @@ function Gem:SetStones(_data,index) local data = _data self.gemName.text = typeName[index].."命格" for i = 1, #self.lightList do - self.lightList:SetActive(self.curType == index) + self.lightList[i]:SetActive(self.curType == index) end for i = 1, 3 do local stoneGo = Util.GetGameObject(self.stones,"Stone ("..i..")") @@ -209,6 +209,7 @@ function Gem:SetProperty(configData,data,parent,text) end function Gem:OnClose() + self.lightList = {} end function Gem:OnDestroy() @@ -223,6 +224,7 @@ function Gem:OnDestroy() end self.itemList = {} self.propertyList = {} + self.lightList = {} end return Gem \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GemMoreCom.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GemMoreCom.lua index 6f186a2e9c..c36d8fb0ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GemMoreCom.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GemMoreCom.lua @@ -82,8 +82,8 @@ function MoreGemCompound:Refresh() self.curGemObj = SubUIManager.Open(SubUIConfig.ItemView,self.curGem.transform) self.targetGemObj = SubUIManager.Open(SubUIConfig.ItemView,self.targetGem.transform) end - Util.GetGameObject(self.curGem,"Name"):GetComponent("Text").text = gemConfig[args[1]].Name - Util.GetGameObject(self.targetGem,"Name"):GetComponent("Text").text = gemConfig[args[1]+1].Name + Util.GetGameObject(self.curGem,"Name"):GetComponent("Text").text = GetStringByEquipQua(itemConfig[args[1]].Quantity1,gemConfig[args[1]].Name)--gemConfig[args[1]].Name + Util.GetGameObject(self.targetGem,"Name"):GetComponent("Text").text = GetStringByEquipQua(itemConfig[args[1]+1].Quantity1,gemConfig[args[1]+1].Name) self:SetCount(self.curComNum) end @@ -93,7 +93,7 @@ function MoreGemCompound:SetCount(value) self.num.text = value self.curGemObj:OnOpen(false, {args[1],value*gemConfig[args[1]].UpgradeNum}, 1.1, false,false,false,sortingOrder + 1) self.targetGemObj:OnOpen(false, {args[1] + 1,value}, 1.1, false,false,false,sortingOrder + 1) - self.money.text = self.curComNum*gemConfig[args[1]].UpgradeCost[2] + self.money.text = value*gemConfig[args[1]].UpgradeCost[2] if BagManager.GetTotalItemNum(gemConfig[args[1]].UpgradeCost[1]) < gemConfig[args[1]].UpgradeCost[2] then self.money.text = string.format("%s",value*gemConfig[args[1]].UpgradeCost[2]) end