Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-07-24 15:22:30 +08:00
commit 7fb91910fd
4 changed files with 12 additions and 5 deletions

View File

@ -433,7 +433,7 @@ PanelType = {
ExChange = { 14, 16, 67}, -- 显示兑换
GoodFriend={14,16, 69}, --好友
SoulPritResolve = { 14, 16}, -- 魂印分解
TopMatch = { 14, 16, 86}, -- 巅峰赛界面
TopMatch = { 14, 16, 24}, -- 巅峰赛界面
FindFairy = { 87, 16, 15}, -- 东海寻仙
Talisman = {14}, -- 新法宝
Guild = {14, 16, 65}, -- 新法宝

View File

@ -113,9 +113,9 @@ function this.UpdateTopMatchStage(msg)
-- 刷新基础信息
this.RefreshBaseInfo()
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate)
--刷新排行信息
Game.GlobalEvent:DispatchEvent(GameEvent.ATM_RankView.OnRankChange)
-- Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate)
-- --刷新排行信息
-- Game.GlobalEvent:DispatchEvent(GameEvent.ATM_RankView.OnRankChange)
LogGreen("this.baseInfo.battleState "..this.baseInfo.battleState)
-- 切换到准备阶段刷新一遍数据
@ -134,6 +134,10 @@ function this.UpdateTopMatchStage(msg)
this.RequestTopMatchBaseInfo()
this.RequestBetBaseInfo(nil,true)
end
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate)
--刷新排行信息
Game.GlobalEvent:DispatchEvent(GameEvent.ATM_RankView.OnRankChange)
end
-- 获取战斗记录
@ -452,7 +456,7 @@ function this.RequestEliminationDataMerge(EliminationData)
if newEliminationDataV and #newEliminationDataV > 0 then
local singledata = newEliminationDataV[1]
-- singledata.dataList = newEliminationDataV
local fightResult = 0 ---1 无记录 0前两场负 1 前两场胜 2 胜 3 负 4 胜负 5 负胜
local fightResult = -1 ---1 无记录 0前两场负 1 前两场胜 2 胜 3 负 4 胜负 5 负胜
for i = 1, #newEliminationDataV do
if i == 1 and newEliminationDataV[i].fightResult == 0 then
fightResult = 3

View File

@ -91,6 +91,9 @@ function this.SetHead(curPre,data,isShowWinImage)
end
--设置战斗回放按钮
function this.SetPlayBack(fightResult, id, defInfo, attackInfo)
if fightResult == -1 then
return
end
-- playBackBtn:SetActive(_IsShowData and fightResult~=-1)
-- Util.AddOnceClick(playBackBtn,function()
ArenaTopMatchManager.RequestRecordFightData(fightResult,id, attackInfo.name.."|"..defInfo.name,function()