竞技场修改

onepiece_demo_arena
wangzhenxing 2024-02-21 16:40:37 +08:00
parent 4d1ad37104
commit 2d7ea70959
6 changed files with 21 additions and 15 deletions

View File

@ -13,6 +13,7 @@ function this.Initialize()
this.GetArenaData()
-- 是否跳过战斗
this._IsSkipFight = nil
this.resetData = nil
-- 监听赛季结束事件
Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, function(openType)
if openType == FUNCTION_OPEN_TYPE.ARENA then
@ -175,6 +176,7 @@ function this.RequestArenaChallenge(index, isSkip, func)
--this.EnemyList = msg.arenaEnemys
-- 刷新界面
Game.GlobalEvent:DispatchEvent(GameEvent.Arena.OnBaseDataChange)
LogError("+++++++++++++++++++++++++++++++++++++++++++++++11111111111111111111111111")
--调用回调事件,关闭编队界面
if func then func(msg) end
@ -195,7 +197,7 @@ function this.RequestArenaChallenge(index, isSkip, func)
arg.red.deltaScore = msg.defScoreChange
arg.reward = msg.drop
Log("竞技场积分变化值:"..msg.myScoreChange)
LogError("difang竞技场积分变化值===================================="..msg.defScoreChange)
--- 判断是否要播放战斗回放
local fightData = msg.fightData

View File

@ -101,7 +101,14 @@ end
-- 打开,重新打开时回调
function ArenaTypePanel:OnShow()
-- 竞技场
NetManager.NewArenaResetRequest()
if ArenaManager.resetData==nil then
NetManager.NewArenaResetRequest()
end
LogError("ArenaManager.resetData.isFirst=="..ArenaManager.resetData.isFirst.." #ArenaManager.resetData.drop=="..#ArenaManager.resetData.drop)
if ArenaManager.resetData and (ArenaManager.resetData.isFirst==1 or #ArenaManager.resetData.drop>0) then
UIManager.OpenPanel(UIName.ArenaNewUpRankPanel,ArenaManager.resetData)
ArenaManager.resetData=nil
end
NetManager.GetNewArenaInfoRequest(function()
-- NetManager.RequestArenaRankData(1, function()
this.RefreshArenaShow()

View File

@ -264,11 +264,11 @@ function this.RefreshReward()
for k,value in ConfigPairs(arenaReward) do
if value.ArenaRoom==baseData.roomId then
if myRank <= 3 then
this.DailyReward.text = Language[10094]..GetLanguageStrById(itemConfig[arenaReward[myRank].DailyReward[1][1]].Name).."<color=green>+"..arenaReward[myRank].DailyReward[1][2].."</color>"..
GetLanguageStrById(itemConfig[arenaReward[myRank].DailyReward[2][1]].Name).."<color=green>+"..arenaReward[myRank].DailyReward[2][2].."</color>"
this.SeasonReward.text = Language[10095]..GetLanguageStrById(itemConfig[arenaReward[myRank].SeasonReward[1][1]].Name).."<color=green>+"..arenaReward[myRank].SeasonReward[1][2].."</color>"..
GetLanguageStrById(itemConfig[arenaReward[myRank].SeasonReward[2][1]].Name).."<color=green>+"..arenaReward[myRank].SeasonReward[2][2].."</color>"..
GetLanguageStrById(itemConfig[arenaReward[myRank].SeasonReward[3][1]].Name).."<color=green>+"..arenaReward[myRank].SeasonReward[3][2].."</color>"
this.DailyReward.text = Language[10094]..GetLanguageStrById(itemConfig[value.DailyReward[1][1]].Name).."<color=green>+"..value.DailyReward[1][2].."</color>"..
GetLanguageStrById(itemConfig[value.DailyReward[2][1]].Name).."<color=green>+"..value.DailyReward[2][2].."</color>"
this.SeasonReward.text = Language[10095]..GetLanguageStrById(itemConfig[value.SeasonReward[1][1]].Name).."<color=green>+"..value.SeasonReward[1][2].."</color>"..
GetLanguageStrById(itemConfig[value.SeasonReward[2][1]].Name).."<color=green>+"..value.SeasonReward[2][2].."</color>"..
GetLanguageStrById(itemConfig[value.SeasonReward[3][1]].Name).."<color=green>+"..value.SeasonReward[3][2].."</color>"
break
else
-- LogRed("myrank"..myRank.." value.MinRank:"..tostring(value.MinRank).." value.MinRank:"..tostring(value.MaxRank))

View File

@ -731,8 +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, -- 竞技场
--[[[62] =]]function() NetManager.NewArenaResetRequest(LoadingPanel.OnStep) end, -- 竞技场
--[[[63] =]]function() NetManager.GetNewArenaInfoRequest(LoadingPanel.OnStep) end, -- 竞技场
function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()

View File

@ -7875,12 +7875,9 @@ function NetManager.NewArenaResetRequest(_func)
-- data.drop.itemlist[2]=item2
-- table.insert(data.drop.itemlist,item1)
-- table.insert(data.drop.itemlist,item2)
ArenaManager.resetData=msg
if _func then
_func()
else
if msg.isFirst==1 or #msg.drop>0 then
UIManager.OpenPanel(UIName.ArenaNewUpRankPanel,msg)
end
end
end)
end

View File

@ -83,8 +83,8 @@ function ArenaNewUpRankPanel:OnOpen(data)
-- return
-- end
this.rankName.text=ArenaManager.GetArenaMyRankName() --rankData.RankName
this.scoreTxt.text=baseData.lvScore.."/"..baseData.ArenaLevelIntegral[2] --lastScore.."/"..rankData.ScoreUp
this.progress.fillAmount=(baseData.lvScore-baseData.ArenaLevelIntegral[1])/(baseData.ArenaLevelIntegral[2]-baseData.ArenaLevelIntegral[1]) --(lastScore-minScore)/(maxScore-minScore)
this.scoreTxt.text=baseData.lvScore.."/"..baseData.ArenaLevelIntegral[2]+1 --lastScore.."/"..rankData.ScoreUp
this.progress.fillAmount=(baseData.lvScore-baseData.ArenaLevelIntegral[1])/(baseData.ArenaLevelIntegral[2]-baseData.ArenaLevelIntegral[1]+1) --(lastScore-minScore)/(maxScore-minScore)
--currRank=rankData.RankGrade
local itemRandomDataList={}
aaa=data.drop