From 579f2806c31ac566411902401b3f9fbe3a810831 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 12 Mar 2021 16:35:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=AE=88=E5=8D=AB=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d3efa809d8115c7976fc1d7a55465e1b7120cb45) --- .../ManagedResources/~Lua/Modules/Arena/ArenaManager.lua | 7 +++++-- .../~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index 2b9193c1ef..0565c1f77d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -159,13 +159,13 @@ function this.RequestArenaChallenge(index, isSkip, func) arg.result = msg.fightResult arg.blue = {} arg.blue.uid = PlayerManager.uid - arg.blue.name = PlayerManager.nickName + arg.blue.name = JingJiShouWeiToEn(PlayerManager.nickName) arg.blue.head = PlayerManager.head arg.blue.frame = HeadManager.GetCurFrameId() arg.blue.deltaScore = msg.myScoreChange arg.red= {} arg.red.uid = enemy.personInfo.uid - arg.red.name =JingJiShouWeiToEn(enemy.personInfo.name) + arg.red.name = JingJiShouWeiToEn(enemy.personInfo.name) arg.red.head = enemy.personInfo.head arg.red.frame = enemy.personInfo.headFrame arg.red.deltaScore = msg.defScoreChange @@ -226,6 +226,9 @@ function this.RequestArenaRecord() -- 请求刷新数据,并刷新显示 NetManager.RequestArenaRecord(function(msg) this.ArenaRecords = msg.arenaRecordInfo + for k,v in ipairs(this.ArenaRecords) do + v.attackInfo.name = JingJiShouWeiToEn(v.attackInfo.name) + end table.sort(this.ArenaRecords, function(a,b) return a.attackTime > b.attackTime end) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index f968708e02..7dda413171 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -88,6 +88,8 @@ function this.RequestTopMatchBaseInfo(func) this.baseInfo.loser = msg.loser--是否被淘汰 this.myBattleInfo = msg.championBattleInfo + this.myBattleInfo.myInfo.name = JingJiShouWeiToEn(this.myBattleInfo.myInfo.name) + this.myBattleInfo.enemyInfo.name = JingJiShouWeiToEn(this.myBattleInfo.enemyInfo.name) isChange = false this.BaseDataEndTimeCountDown() this.RefreshBaseInfo() @@ -147,6 +149,10 @@ function this.RequestBattleHistory(func) -- 获取巅峰赛战斗记录 NetManager.GetTopMatchHistoryBattle(function(msg) this.battleHistoryInfo = msg.enemyPairInfo + for k,v in ipairs(this.battleHistoryInfo) do + v.blueEnemy.personInfo.name = JingJiShouWeiToEn(v.blueEnemy.personInfo.name) + v.redEnemy.personInfo.name = JingJiShouWeiToEn(v.redEnemy.personInfo.name) + end -- 对历史记录排序 table.sort(this.battleHistoryInfo, function(a, b) return a.roundTimes > b.roundTimes @@ -246,6 +252,8 @@ function this.RequestBetBaseInfo(func,isPlayBattle) -- 获取巅峰战信息 NetManager.GetBetMatchInfo(0, function(msg) this.betBattleInfo = msg.championBattleInfo + this.betBattleInfo.myInfo.name = JingJiShouWeiToEn(this.betBattleInfo.myInfo.name) + this.betBattleInfo.enemyInfo.name = JingJiShouWeiToEn(this.betBattleInfo.enemyInfo.name) isChange = false -- LogGreen("竞猜双方uid "..msg.championBattleInfo.myInfo.uid.." "..msg.championBattleInfo.enemyInfo.uid) this.betRateInfo = msg.championBetInfo