From fe6b09c8a6d20a371fa7c2edba124abdae656b23 Mon Sep 17 00:00:00 2001 From: guowei Date: Fri, 15 Jan 2021 10:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Harmony/Manager/HarmonyManager.lua | 1 + .../Harmony/Panel/HongMengEnvoyPanel.lua | 3 +++ .../Modules/RoleInfo/EquipTreasureData.lua | 21 ++++++++++--------- .../Modules/RoleInfo/EquipTreasureManager.lua | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 7afd2f6d1d..254d8eab4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -622,4 +622,5 @@ function this.WarPowerChangeNotify(did) end end end + return HarmonyManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index 60db6f8268..a55c9926b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -123,6 +123,7 @@ function HongMengEnvoyPanel:BindEvent() if GrowthAmulet >= data.LevelUp[2][2] then --print("升级成功") -- body + HarmonyManager.SetOldPowerNum() NetManager.UpHongMengGrade( function() -- body @@ -159,6 +160,8 @@ function HongMengEnvoyPanel:BindEvent() end Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.UpdateGongMingLv) CheckRedPointStatus(RedPointType.HongMeng_UpTower) + + HarmonyManager.WarPowerChangeNotify() end ) else diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua index 20872b612e..a247368c1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua @@ -3,37 +3,38 @@ local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig) local EquipTreasureData = GSetClass("EquipTreasureData") EquipTreasureData.onCreate = function(self,_singleData) self._lv = _singleData.lv + end --等级 EquipTreasureData.__get__.lv = function(self) - -- print(this._lv, " - 属性访问器:get lv") - if self.Location == 1 then + --print(self.Location .. " ---- Location") + if self.equipType == 1 then -- body local temp_lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) local isMing = HarmonyManager.IsInfo(self.upHeroDid) - -- LogPink("self.upHeroDid "..self.upHeroDid.." "..tostring(isMing)) + --LogPink("self.upHeroDid "..self.upHeroDid.." "..tostring(isMing)) if temp_lv > 0 and isMing then local curlvEen = jewelConfig[self.id].Max[1] local endLv = temp_lv > curlvEen and curlvEen or temp_lv - -- LogPink(" curlvEen "..endLv) + --LogPink(" curlvEen "..endLv) return endLv else - -- LogPink(" curlvEen "..self._lv) + --LogPink(" curlvEen "..self._lv) return self._lv end - else - + elseif self.equipType == 2 then local temp_lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) local isMing = HarmonyManager.IsInfo(self.upHeroDid) - -- LogPink("self.upHeroDid "..self.upHeroDid.." "..tostring(isMing)) + --LogPink("self.upHeroDid "..self.upHeroDid.." "..tostring(isMing)) if temp_lv > 0 and isMing then local curlvEen = jewelConfig[self.id].Max[1] + -- LogGreen("curlvEen "..curlvEen.." temp_lv "..temp_lv) local endLv = temp_lv > curlvEen and curlvEen or temp_lv - -- LogPink(" curlvEen "..endLv) + -- LogPink(" curlvEen "..endLv) return endLv else - -- LogPink(" curlvEen "..self._lv) + --LogPink(" curlvEen "..self._lv) return self._lv end end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 5e7b02841d..06389d362b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -26,6 +26,7 @@ function this.InitSingleTreasureData(_singleData) local staticId = _singleData.equipId local currJewel = jewelConfig[staticId] + single.equipType = currJewel.Location single.id = staticId single.idDyn = _singleData.id single.lv = _singleData.exp @@ -42,7 +43,6 @@ function this.InitSingleTreasureData(_singleData) single.levelPool = currJewel.LevelupPool single.proIcon = GetProStrImageByProNum(currJewel.Race) single.refinePool = currJewel.RankupPool - single.equipType = currJewel.Location if currJewel.Location == 1 then single.type = Language[10505] else