From 9b9f006d8a74ed36d2f56dcbadf07263bf5df1a1 Mon Sep 17 00:00:00 2001 From: guowei Date: Sat, 26 Dec 2020 15:58:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Harmony/Panel/GongMingResultPanel.lua | 16 ++++++++-- .../Harmony/Panel/GongMingResultTips.lua | 8 ++++- .../Harmony/Panel/HongMengUnLoadPanel.lua | 23 ++++++++++---- .../~Lua/Modules/Hero/HeroData.lua | 30 ++++++++++++------- 4 files changed, 58 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua index 73db2ed811..d1fe840a96 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua @@ -157,7 +157,13 @@ function GongMingResultTips:OnOpen(flag) HunDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv end end - Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.talismanList) + if herodata.talismanList > 0 then + -- body + Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.talismanList) + else + Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("无") + end + local data = HarmonyManager:GetAdditions() for i = 1, #data do @@ -192,7 +198,13 @@ function GongMingResultTips:OnOpen(flag) end -- body else - Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("%d",data[i].value) + if data[i].value > 0 then + -- body + Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("%d",data[i].value) + else + Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("无") + end + end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua index d4fa8812d7..f130a8288f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua @@ -169,7 +169,13 @@ function GongMingResultTips:OnOpen(skinId) -- body else - Util.GetGameObject(this.TextAll,"textFa"):GetComponent("Text").text =string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) + if data[i].value > 0 then + -- body + Util.GetGameObject(this.TextAll,"textFa"):GetComponent("Text").text =string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) + else + Util.GetGameObject(this.TextAll,"textFa"):GetComponent("Text").text =string.format("无") + end + end end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua index 3870a99504..4cf2abbec0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua @@ -109,9 +109,14 @@ function HongMengUnLoadPanel:SetTextTwo(go,data) else Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无") end - + if data.talismanList > 0 then + -- body + Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList) + else + Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("无") + end - Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList) + -- Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList) end function HongMengUnLoadPanel:SetText(go,_data) @@ -136,7 +141,7 @@ function HongMengUnLoadPanel:SetText(go,_data) -- body elseif data[i].additionType == 3 then - if data[i].value ~= 0 then + if data[i].value > 0 then -- body if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then -- body @@ -159,7 +164,7 @@ function HongMengUnLoadPanel:SetText(go,_data) -- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",data[i].value) -- body elseif data[i].additionType == 4 then - if data[i].value ~= 0 then + if data[i].value > 0 then if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then -- body local grade = data[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv and data[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv @@ -169,7 +174,7 @@ function HongMengUnLoadPanel:SetText(go,_data) end -- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",data[i].value) else - if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then + if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then -- body local grade = data[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv and data[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",grade) @@ -181,7 +186,13 @@ function HongMengUnLoadPanel:SetText(go,_data) -- body else - Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data[i].value) + if data[i].value > 0 then + -- body + Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data[i].value) + else + Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("无") + end + end end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua index 95754648de..34ffb36344 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua @@ -2,10 +2,11 @@ require("misc.GSetClass") local HeroData = GSetClass("Person") HeroData.onCreate = function(self,_msgHeroData, isFindHandBook) + self._id = _msgHeroData.heroId self._lv = _msgHeroData.level self._equipIdList = _msgHeroData.equipIdList - self._especialEquipLevel = self.especialEquipLevel - self.star = _msgHeroData.star + self._talismanList = self.especialEquipLevel + self._star = _msgHeroData.star -- self._breakId = _msgHeroData. end --等级 @@ -65,23 +66,32 @@ HeroData.__set__.equipIdList = function(self, value) self._equipIdList = value end --法宝 -HeroData.__get__.especialEquipLevel = function(self) +HeroData.__get__.talismanList = function(self) + -- EquipTalismana + --LogPink("法宝1 `````````` ") + local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,self._id) + + --LogPink("法宝2 `````````` "..self._id) + if heroConfig and not heroConfig.EquipTalismana then + self.harmonyGongMing = false + -- LogPink("法宝3 `````````` "..self._talismanList) + return 0 + end local Equip = HarmonyManager.GetSingleAdditions(HarmonyAddType.FaBao) - --LogPink("self._equipIdList "..#self._equipIdList ) if Equip > 0 and HarmonyManager.IsInfo(self.dynamicId) then - - --print(curlvEen," "..self.heroConfig.ReadingName) - local endLv = Equip > self._lv and Equip or self._lv + local endLv = Equip > self._talismanList and Equip or self._talismanList self.harmonyGongMing = true + --LogPink("法宝4 `````````` "..endLv) return endLv else self.harmonyGongMing = false - return self._lv + --LogPink("法宝5 `````````` "..self._talismanList) + return self._talismanList end end -HeroData.__set__.especialEquipLevel = function(self, value) - self._especialEquipLevel = value +HeroData.__set__.talismanList = function(self, value) + self._talismanList = value end HeroData.__get__.oriLv= function (self)