diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua index 0cf5fdb073..2c58a701dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua @@ -98,7 +98,12 @@ function this.RefreshPanel(isTop,isAni) actconfigs=ActivityGiftManager.GetActivityInfoByType(actId) --LogError("len================="..#actconfigs) table.sort(actconfigs.mission,function(a,b) - return a.missionId < b.missionId + if a.state==b.state then + return a.missionId < b.missionId + else + return a.state < b.state + end + end) scrollView:SetData(actconfigs.mission,function(index,root) this.SetScrollPre(root,actconfigs.mission[index]) @@ -133,6 +138,7 @@ function this.SetScrollPre(root,data) itemList[root][i]:OnOpen(false, wishData.Reward[i], 0.9,false,false,false,sortingOrder) itemList[root][i].gameObject:SetActive(true) end + LogError("data.state=="..data.state) if data.state==1 then goText.text="已领取" mask:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_slbz_yilingqu_zh")