diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index abf5270d4a..81ddab627a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -267,13 +267,15 @@ function this.RefreshReward() this.DailyReward.text = Language[10094]..GetLanguageStrById(itemConfig[arenaReward[myRank].DailyReward[1][1]].Name).."+"..arenaReward[myRank].DailyReward[1][2].."".. GetLanguageStrById(itemConfig[arenaReward[myRank].DailyReward[2][1]].Name).."+"..arenaReward[myRank].DailyReward[2][2].."" this.SeasonReward.text = Language[10095]..GetLanguageStrById(itemConfig[arenaReward[myRank].SeasonReward[1][1]].Name).."+"..arenaReward[myRank].SeasonReward[1][2].."".. - GetLanguageStrById(itemConfig[arenaReward[myRank].SeasonReward[2][1]].Name).."+"..arenaReward[myRank].SeasonReward[2][2].."" + GetLanguageStrById(itemConfig[arenaReward[myRank].SeasonReward[2][1]].Name).."+"..arenaReward[myRank].SeasonReward[2][2].."".. + GetLanguageStrById(itemConfig[arenaReward[myRank].SeasonReward[3][1]].Name).."+"..arenaReward[myRank].SeasonReward[3][2].."" break else -- LogRed("myrank:"..myRank.." value.MinRank:"..tostring(value.MinRank).." value.MinRank:"..tostring(value.MaxRank)) if myRank>=value.MinRank and myRank <= value.MaxRank then this.DailyReward.text = Language[10094]..GetLanguageStrById(itemConfig[value.DailyReward[1][1]].Name).."+"..value.DailyReward[1][2]..""..GetLanguageStrById(itemConfig[value.DailyReward[2][1]].Name).."+"..value.DailyReward[2][2].."" this.SeasonReward.text = Language[10095]..GetLanguageStrById(itemConfig[value.SeasonReward[1][1]].Name).."+"..value.SeasonReward[1][2]..""..GetLanguageStrById(itemConfig[value.SeasonReward[2][1]].Name).."+"..value.SeasonReward[2][2].."" + ..GetLanguageStrById(itemConfig[value.SeasonReward[3][1]].Name).."+"..value.SeasonReward[3][2].."" end break end diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 2c9b23d256..69900ceaad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -679,7 +679,6 @@ function this.ExecuteLoading() --[[[10] =]]function() NetManager.GetAllMailData(LoadingPanel.OnStep) end, -- 邮件 --[[[11] =]]function() NetManager.GetAllFightDataRequest(LoadingPanel.OnStep) end, -- 关卡信息 --[[[12] =]]function() NetManager.GetActivityAllRewardRequest(LoadingPanel.OnStep) end, -- 活动奖励 - --[[[13] =]]function() NetManager.GetNewArenaInfoRequest(LoadingPanel.OnStep) end, -- 竞技场 --[[[14] =]]function() ShopManager.InitData(LoadingPanel.OnStep) end, -- 商店 --function() NetManager.GetWorkShopInfoRequest(LoadingPanel.OnStep) end, -- 工坊? --[[[15] =]]function() ChatManager.InitData(LoadingPanel.OnStep) end, -- 聊天 @@ -732,6 +731,8 @@ function this.ExecuteLoading() --[[[59] =]]function() NetManager.GemNewInfoRequest(LoadingPanel.OnStep) end, --新命石 --[[[60] =]]function() NetManager.BaublesAllInfoRequest(LoadingPanel.OnStep) end, --新法宝 --[[[61] =]]function() NetManager.TrainingArchitectureInfoRequest(LoadingPanel.OnStep) end, --特训信息 + ----[[[62] =]]function() NetManager.NewArenaResetRequest(LoadingPanel.OnStep) end, -- 竞技场 + --[[[63] =]]function() NetManager.GetNewArenaInfoRequest(LoadingPanel.OnStep) end, -- 竞技场 function() -- 登录请求最终接口,所有请求放在此接口之前 -- 登录成功确认 NetManager.LoginConfimRequest() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 20789fba2c..249a87909b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -7878,9 +7878,9 @@ function NetManager.NewArenaResetRequest(_func) if msg.isFirst==1 or #msg.drop>0 then UIManager.OpenPanel(UIName.ArenaNewUpRankPanel,msg) - if _func then - _func() - end + end + if _func then + _func() end end) end