diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab index f77c986c6a..9c34b827ab 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab @@ -1141,8 +1141,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 196.2, y: -59.4} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 198.1, y: -63.3} + m_SizeDelta: {x: 196.1, y: 57.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2091693181 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 98f0894ddd..3f2796e72a 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1870,4 +1870,14 @@ function GetCutOutStr(_str,_num) str = _str end return str +end + +function JingJiShouWeiToEn(_str) + if not _str or _str == "" then + return "" + end + if _str == "竞技守卫" then + return GetLanguageStrById(_str) + end + return _str end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index be6928047f..2b9193c1ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -165,7 +165,7 @@ function this.RequestArenaChallenge(index, isSkip, func) arg.blue.deltaScore = msg.myScoreChange arg.red= {} arg.red.uid = enemy.personInfo.uid - arg.red.name = 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 @@ -178,14 +178,14 @@ function this.RequestArenaChallenge(index, isSkip, func) if isSkip == 0 then -- 播放完成后,打开结果界面 this.RequestReplayRecord(msg.fightResult, fightData, nil,function() - BattleRecordManager.SetBattleBothNameStr(PlayerManager.nickName.."|"..enemy.personInfo.name) + BattleRecordManager.SetBattleBothNameStr(PlayerManager.nickName.."|"..JingJiShouWeiToEn(enemy.personInfo.name) ) UIManager.OpenPanel(UIName.ArenaResultPopup, arg) end,BATTLE_TYPE.ARENA) else -- 设置战斗数据用于统计战斗 local _fightData = BattleManager.GetBattleServerData({fightData = fightData}, 1) BattleRecordManager.SetBattleRecord(_fightData) - BattleRecordManager.SetBattleBothNameStr(PlayerManager.nickName.."|"..enemy.personInfo.name) + BattleRecordManager.SetBattleBothNameStr(PlayerManager.nickName.."|"..JingJiShouWeiToEn(enemy.personInfo.name) ) -- 不用回放直接显示结果 UIManager.OpenPanel(UIName.ArenaResultPopup, arg) end diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua index e29655c382..b993f1fab4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua @@ -98,7 +98,7 @@ function this.RefreshArenaShow() if myRank < 0 then myRank = Language[10036] end - this.Arena_Rank.text = myRank + this.Arena_Rank.text = myRank local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ARENA) local startDate = os.date("%m.%d", serData.startTime) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index 13992db5c7..6283c82ca5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -313,7 +313,7 @@ function this.RefreshEnemyData() local btnItem = Util.GetGameObject(node, "challenge/item"):GetComponent("Image") local btnItemNum = Util.GetGameObject(node, "challenge/item/num"):GetComponent("Text") - lv_name:GetComponent("Text").text = EnemyList[i].personInfo.name + lv_name:GetComponent("Text").text = JingJiShouWeiToEn(EnemyList[i].personInfo.name) integral:GetComponent("Text").text = Language[11693].. EnemyList[i].personInfo.score power:GetComponent("Text").text = Language[12179]..EnemyList[i].personInfo.totalForce btnText.gameObject:SetActive(leftTimes > 0) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua index 02f40917a7..0f1e31681e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/RankView.lua @@ -132,7 +132,7 @@ function this.RankNodeAdapter(node, data,myRank) _PlayerHeadList[node]:SetHead(data.personInfo.head) _PlayerHeadList[node]:SetFrame(data.personInfo.headFrame) _PlayerHeadList[node]:SetLayer(this.sortingOrder) - lv_name:GetComponent("Text").text = "lv"..data.personInfo.level.." "..data.personInfo.name + lv_name:GetComponent("Text").text = "lv"..data.personInfo.level.." "..JingJiShouWeiToEn(data.personInfo.name) integral:GetComponent("Text").text = data.personInfo.score power:GetComponent("Text").text = Language[10082]..data.personInfo.totalForce Util.AddOnceClick(bg, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index e0667b0e9a..d0b588dcb8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -153,9 +153,9 @@ function PlayerInfoPopup:OnShow() this.RefreshBtnShow() -- 请求数据 -- LogGreen(this._PlayerId.." "..this._Config.formationType) - NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType, function(msg) + NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType, function(msg) -- 如果是好友更新好友数据 - GoodFriendManager.UpdateFriendData(this._PlayerId, msg.teamInfo.level, msg.teamInfo.name, msg.teamInfo.head, msg.teamInfo.headFrame) + GoodFriendManager.UpdateFriendData(this._PlayerId, msg.teamInfo.level, JingJiShouWeiToEn(msg.teamInfo.name) , msg.teamInfo.head, msg.teamInfo.headFrame) this._PlayerData = msg.teamInfo this.RefreshPlayerInfo(msg.teamInfo) local teamInfo = msg.teamInfo.team diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua index ae9dbbb526..1df5f1c99a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListPanel.lua @@ -192,7 +192,7 @@ function this.SetArenaInfo() if index>3 then return end - this.SetHeadsInfo(arenaData[index].personInfo,root,index,arenaData[index].personInfo.name,arenaData[index].personInfo.level) + this.SetHeadsInfo(arenaData[index].personInfo,root,index,JingJiShouWeiToEn(arenaData[index].personInfo.name),arenaData[index].personInfo.level) end, not this.istop) this.CheckIsTop() end @@ -203,7 +203,7 @@ function this.ShowArenaInfo(root,data,myRankData) this.SetSelfBG(root,myRankData.myRank,data.personInfo.rank) this.SetRankingNum(root,data.personInfo.rank) this.SetHeadInfo(root,data.personInfo.head,data.personInfo.headFrame,data.personInfo.level) - this.SetShowInfo(info1,info2,data.personInfo.name,data.personInfo.score) + this.SetShowInfo(info1,info2,JingJiShouWeiToEn(data.personInfo.name),data.personInfo.score) --设置出战角色头像 --for i = 1, 5 do -- local heroHeadBg = Util.GetGameObject(root, "Demons/Head_"..i)