diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 54009a4c04..3812afb71a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -202,7 +202,7 @@ function this.IsGongMing(did) end -- body end - +--初始化选人列表的长度 function this:SetInitList() local heroDataList = HeroManager.GetAllHeroDatas(1) local list = {} @@ -558,16 +558,17 @@ end function this.RefreshEnvoyPoint() -- body - if this.hongmengAdditions[1] then + local data = this.GetSingleAdditionsData(HarmonyAddType.AddLv) + if data then -- body - if this.hongmengAdditions[1].heroTid == 0 then + if data.heroTid == 0 then -- body local sum = this:HongMengTowerUpLimit() - if this.hongmengAdditions[1].value <= sum then + if data.value <= sum then -- body for i = 1, #this.hongmengGuards do -- body - if this.hongmengGuards[i].heroId == "" and this.hongmengGuards[i].time == 0 then + if data.heroId == "" and data.time == 0 then -- body return true end @@ -583,21 +584,25 @@ end function this.RefreshUpTowerPoint() -- body - if this.hongmengAdditions[1] then + local data = this.GetSingleAdditionsData(HarmonyAddType.AddLv) + if data then -- body - if this.hongmengAdditions[1].heroTid == 0 then + if data.heroTid == 0 then -- body local sum = this:HongMengTowerUpLimit() - if this.hongmengAdditions[1].value >= sum then + print(sum,data.value) + if data.value >= sum then -- body + print("false") return false else - local data = this.GetHongMengUpData() + local prop = this.GetHongMengUpData() -- LogGreen(data.LevelUp[1][2].." "..data.LevelUp[2][2]) -- LogYellow(BagManager.GetTotalItemNum(UpViewRechargeType.Gold)) - if data and BagManager.GetTotalItemNum(UpViewRechargeType.Gold) >= data.LevelUp[1][2] then + if prop and BagManager.GetTotalItemNum(UpViewRechargeType.Gold) >= prop.LevelUp[1][2] then -- body - if BagManager.GetTotalItemNum(UpViewRechargeType.GrowthAmulet) >= data.LevelUp[2][2] then + if BagManager.GetTotalItemNum(UpViewRechargeType.GrowthAmulet) >= prop.LevelUp[2][2] then + print("true") return true end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index bbeca88f09..b3df64adad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -110,8 +110,8 @@ function HongMengEnvoyPanel:BindEvent() self.UpBtn, function() --二级共鸣弹窗 - local sum = HarmonyManager:HongMengTowerUpLimit() - if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then + + if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= HarmonyManager:HongMengTowerUpLimit() then -- body PopupTipPanel.ShowTip("鸿蒙碑等级已达上限!") else @@ -132,7 +132,7 @@ function HongMengEnvoyPanel:BindEvent() NetManager.UpHongMengGrade( function() -- body - + local sum = HarmonyManager:HongMengTowerUpLimit() HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value + 1 if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then -- body @@ -143,7 +143,7 @@ function HongMengEnvoyPanel:BindEvent() self.UpBtnRedPoint:SetActive(false) end - local sum = HarmonyManager:HongMengTowerUpLimit() + self.GradeText.text = string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum) --检测红点 UpdateGongMingLv @@ -208,6 +208,7 @@ function HongMengEnvoyPanel:IsUpBtnGray() self.imageGame:SetActive(false) self.TextGame:SetActive(false) self.UnShowText:SetActive(true) + -- self.UpBtnRedPoint:SetActive(false) else Util.SetGray(self.UpBtn, false) self.imageGame:SetActive(true)