diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
index 9bb1817ac2..39996fbea4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
@@ -143,20 +143,22 @@ function HongMengEnvoyPanel:BindEvent()
end
local data = HarmonyManager:GetHongMengUpData()
-
+ Gold = BagManager.GetTotalItemNum(UpViewRechargeType.Gold)
+ GrowthAmulet = BagManager.GetTotalItemNum(UpViewRechargeType.GrowthAmulet)
if Gold >= data.LevelUp[1][2] then
-- body
- self.TextGold.text = string.format("%d",data.LevelUp[1][2])
+ self.TextGold.text = string.format("%d",data.LevelUp[1][2])
if GrowthAmulet >= data.LevelUp[2][2] then
- self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
+ self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
else
self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
end
else
self.TextGold.text = string.format("%d",data.LevelUp[1][2])
+ LogGreen("变色!!!!!!!!!!!! "..data.LevelUp[1][2])
if GrowthAmulet >= data.LevelUp[2][2] then
- self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
+ self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
else
self.TextGrowthAmulet.text = string.format("%d",data.LevelUp[2][2])
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
index c3cfc0a6f0..f47e70d5de 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
@@ -216,7 +216,7 @@ function this.SingleBoxDataShow(go,boxData,index)
if HarmonyManager.RefreshOpenBoxPoint() then
-- body
CheckRedPointStatus(RedPointType.HongMeng_OpenBox)
- print(Gold.."!@@@@@@"..boxData.PropPrice[2])
+ --print(Gold.."!@@@@@@"..boxData.PropPrice[2])
if Gold > boxData.PropPrice[2] then
-- body
redPoint:SetActive(true)
@@ -271,14 +271,15 @@ function this.SingleBoxDataShow(go,boxData,index)
if HarmonyManager.hongmengHeroInfos[i].gridId ==boxData.Id then
HarmonyManager.hongmengHeroInfos[i].time = 0
print("清除数据")
+ break
end
end
AddImage:SetActive(true)
TimerText.text = ""
-
- end,"取消","确认")
-
-
+
+ end,"取消","确认")
+ this.RunTimerFun()
+
end)
end
end
@@ -424,7 +425,7 @@ function this:UpdateHero(Herodata)
HarmonyManager.hongmengHeroInfos[i].heroId = Herodata.dynamicId
HarmonyManager.hongmengHeroInfos[i].time = 0
-
+
break
end
end
@@ -517,7 +518,7 @@ function this:OnlyRefeshHeroLv()
end,true,true)
-
+
end
--界面关闭时调用(用于子类重写)
function this:OnClose()