diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab index 9dee5f4b75..1d64fa90f3 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab @@ -17194,7 +17194,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7389\u865A\u8BBA\u9053\u7F16\u961F" + m_Text: "\u73A9\u5BB6\u4FE1\u606F" LanguageIndex: 0 --- !u!1 &8674199856426531033 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab index 710ee8ece9..fe3d642c68 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab @@ -1119,7 +1119,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224554849999382432 RectTransform: m_ObjectHideFlags: 0 @@ -1566,9 +1566,9 @@ RectTransform: m_Father: {fileID: 224554849999382432} m_RootOrder: 7 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: -50, y: -41.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 400, y: 48.5} m_SizeDelta: {x: 658.3, y: 102.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2546401682415148537 @@ -1888,9 +1888,9 @@ RectTransform: m_Father: {fileID: 224554849999382432} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 252, y: -134} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 252, y: 46} m_SizeDelta: {x: 218, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7474440629963233091 diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua index 87c1836646..4392a87387 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua @@ -216,7 +216,9 @@ function this.ShowRewardInfo() if tabNum==1 then this.rankTitle.text="段位" for _, configInfo in ConfigPairs(ConfigList[tabNum]) do - table.insert(RewardList,configInfo) + if configInfo.Id~=1 then + table.insert(RewardList,configInfo) + end end table.sort(RewardList,function(a,b) return a.RankId>b.RankId diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua index 0cce24118c..893233c14d 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua @@ -73,10 +73,9 @@ function this.RankNodeAdapter(node, data) local time = Util.GetGameObject(node, "time"):GetComponent("Text") local deltaScore = Util.GetGameObject(node, "deltaScore"):GetComponent("Text") --local deltaScoreGo = Util.GetGameObject(node, "deltaScore") - - lv_name.text = "lv"..data.level.." "..data.userName + lv_name.text = PracticeManager.SetNameColor(data.serverName.." "..data.userName,data.practiceLevel) --integral.text = data.attackInfo.score - power.text = Language[10082]..data.power + power.text = data.power time.text = GetDeltaTimeStr(data.time) if not _PlayerHeadList[node] then _PlayerHeadList[node] = SubUIManager.Open(SubUIConfig.PlayerHeadView, head.transform) @@ -85,6 +84,7 @@ function this.RankNodeAdapter(node, data) _PlayerHeadList[node]:SetScale(Vector3.one * 0.8) _PlayerHeadList[node]:SetHead(data.head) _PlayerHeadList[node]:SetFrame(data.headFrame) + _PlayerHeadList[node]:SetLevel(data.level) _PlayerHeadList[node]:SetLayer(this.sortingOrder) _PlayerHeadList[node]:SetEffectScale(0.85)