diff --git a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab index 2c864e6afc..4840077fd5 100644 --- a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab @@ -116,8 +116,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: -356.24, y: 69.68} - m_SizeDelta: {x: 261.52, y: 72.02} + m_AnchoredPosition: {x: -319.3, y: 69.68} + m_SizeDelta: {x: 335.3, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1870615583 CanvasRenderer: @@ -2535,7 +2535,7 @@ 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: -127, y: 76.9} + m_AnchoredPosition: {x: -8, y: 76.9} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3515704499065432036 diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index f6f5c8a90c..531345b1aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -15,6 +15,7 @@ local _TabFontColor = { select = Color.New(123 / 255, 72 / 255, 34 / 255, 1), local _TabRedpot = {} local ranks = {} local proud = {} + this.playerScrollHead = {}--排行第一头像 --初始化组件(用于子类重写) function RankingListMainPanel:InitComponent() @@ -221,7 +222,7 @@ function this.SetInfoShow(go,data,rankType,nameText) if nameText then nameText:GetComponent("Text").text = data.userName end - Util.GetGameObject(go,"fight"):GetComponent("Text").text =string.format("第%s关",data.rankInfo.param1) --GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,).Name) + Util.GetGameObject(go,"fight"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name) elseif rankType == RANK_TYPE.FORCE_CURR_RANK or rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK then warPower:SetActive(true) if nameText then diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index bbcd61c0f4..71d2440a39 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -102,6 +102,7 @@ function RankingSingleListPanel:BindEvent() end end + --添加事件监听(用于子类重写) function RankingSingleListPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.RankingList.AllRankingList, this.SetRankingInfo) @@ -563,7 +564,7 @@ function this.SetInfoShow(go,data,rankType,Value0) if Value0 then Value0:GetComponent("Text").text = ""..data.userName.."" end - Util.GetGameObject(go,"fight"):GetComponent("Text").text = string.format("第%s关",data.rankInfo.param1) --GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,).Name) + Util.GetGameObject(go,"fight"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name) end elseif rankType == RANK_TYPE.FORCE_CURR_RANK or rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or rankType == RANK_TYPE.POWER_RICE then--战力排行 if data.rankInfo.param1 and data.rankInfo.param1 >0 then