diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index e528ad7044..0788673a25 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -490,6 +490,7 @@ function this.SetTeamInfo(_go,teamData,type) local go = Util.GetGameObject(_go,"defendbox"..index) local data = teamData[index] local fightTxt=Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text") + fightTxt.text=tostring(data.totalForce) local teamList ={} for i = 1, 6 do local aa=Util.GetGameObject(go,"Demons/heroPro ("..i..")") diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index bbdd33da86..efd4afddc1 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -77,7 +77,7 @@ function WorldArenaMainPanel:BindEvent() for i, enemy in ipairs(this.Enemys) do local challengeBtn = Util.GetGameObject(enemy, "challenge") Util.AddClick(challengeBtn, function() - if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then + if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then PopupTipPanel.ShowTip(Language[10075]) return end @@ -424,6 +424,10 @@ end --界面销毁时调用(用于子类重写) function WorldArenaMainPanel:OnDestroy() SubUIManager.Close(this.UpView) + if titleLive then + destroy(titleLive) + titleLive=nil + end -- 清除红点 -- ClearRedPointObject(RedPointType.Arena_Shop) this.spLoader:Destroy()