From 6fe23391539b7143756bfad00b331c2944ba1191 Mon Sep 17 00:00:00 2001 From: guowei Date: Mon, 4 Jan 2021 16:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua | 9 +++++++-- Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua | 10 +++++++++- .../ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua index 08f9e80eee..60ba3fd0c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua @@ -103,8 +103,13 @@ function EnvoyItem:SetItem(go,data) self.Empty:SetActive(false) self.RedPoint:SetActive(false) Util.GetGameObject(go.transform, "GameObject/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroSingleData.heroConfig.Quality,heroSingleData.star)) - - Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",heroSingleData.lv) + if heroSingleData.lv == HarmonyManager.hongmengAdditions[1].value then + -- body + Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",heroSingleData.lv) + else + Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",heroSingleData.lv) + end + --Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",HarmonyManager.hongmengAdditions[1].value) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua index d6987e45f9..b04011b30d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua @@ -36,7 +36,15 @@ HeroData.__get__.lv = function(self) elseif HarmonyManager.hongmengAdditions[1] and HarmonyManager:IsEnvoy(self.dynamicId) then if HarmonyManager.hongmengAdditions[1].heroTid == 0 then -- body - return HarmonyManager.hongmengAdditions[1].value + local temp_lv = 0 + if HeroManager.IsTenTalent(self._id) then + -- body + temp_lv = HarmonyManager.hongmengAdditions[1].value + else + temp_lv = HeroManager.heroLvEnd[self.id] + end + + return temp_lv else return self._lv end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 30fc5443a1..e2ef63b669 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3416,7 +3416,7 @@ end function this.IsTenTalent(v) -- body --print(v," ")--,heroConfig[v].MaxRank) - if heroConfig[v].MaxRank == this.awakeNextStarIndex then + if heroConfig[v].MaxRank == this.awakeNextStarIndex or heroConfig[v].MaxRank == this.awakeStarIndex then return true else return false