diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab index 0710b914fc..a5513de866 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab @@ -997,10 +997,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 50 + m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 30 + m_BestFit: 0 + m_MinSize: 0 m_MaxSize: 50 m_Alignment: 3 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua index 78ec4a9112..7c5421fb06 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua @@ -167,25 +167,25 @@ function this.RefreshMyInfo() itemList2[i].gameObject:SetActive(false) end - - for k,value in ConfigPairs(arenaLevel) do - if baseData.lvScore>=value.ArenaLevelIntegral[1] then - rewardList =value.ArenaLevelReward - break - end + LogError("baseData.lvScore==="..baseData.lvScore) + for k,value in ConfigPairs(arenaLevel) do + if baseData.lvScore0 and type(rewardList[1][1])~="userdata" then - --显示奖励 - for i = 1, #rewardList do - if itemList2[i] then - itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting) - else - itemList2[i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.myInfo, "content").transform) - itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting) - end - itemList2[i].gameObject:SetActive(true) + end + if rewardList and #rewardList>0 and type(rewardList[1][1])~="userdata" then + --显示奖励 + for i = 1, #rewardList do + if itemList2[i] then + itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting) + else + itemList2[i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.myInfo, "content").transform) + itemList2[i]:OnOpen(false, rewardList[i], 0.75,false,false,false,sorting) end + itemList2[i].gameObject:SetActive(true) end + end end