diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_denglonganniu.png.meta b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_denglonganniu.png.meta index e02d46ef2e..355d238c3a 100644 --- a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_denglonganniu.png.meta +++ b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_denglonganniu.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 0, y: 232, z: 0, w: 141} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua index f0b02a83cb..7b756c3fad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua @@ -76,7 +76,7 @@ function GeneralRewardPopup:OnOpen(rewardType,activityType,activityId,_func) end function GeneralRewardPopup:OnShow() - this.RefreshPanel() + this.RefreshPanel(false,false) end function GeneralRewardPopup:OnClose() @@ -93,14 +93,14 @@ end --刷新 -function this.RefreshPanel() +function this.RefreshPanel(isTop,isAnim) local d={} if curRewardType == 1 then d = ActReward this.scrollView2:SetData(d,function(index,root) this.SetScrollPre2(root,d[index]) - end) + end,isTop,isAnim) this.scrollView2:SetIndex(1) elseif curRewardType == 2 then @@ -109,7 +109,7 @@ function this.RefreshPanel() end this.scrollView1:SetData(d,function(index,root) this.SetScrollPre1(root,d[index]) - end) + end,isTop,isAnim) this.scrollView1:SetIndex(1) end end @@ -174,10 +174,9 @@ function this.SetScrollPre2(root,data) PopupTipPanel.ShowTip(Language[11482]) end) Util.AddOnceClick(getBtn,function() - LogGreen("data.Id:"..data.Id) NetManager.GetActivityRewardRequest(data.Id, ActInfo.activityId, function(_drop) UIManager.OpenPanel(UIName.RewardItemPopup, _drop, 1,function() - this.RefreshPanel() + this.RefreshPanel(false,true) CheckRedPointStatus(RedPointType.Celebration) end) end) @@ -225,7 +224,7 @@ function this.SetScrollPre1(root,data) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() mask:SetActive(true) getBtn:SetActive(false) - this.RefreshPanel() + this.RefreshPanel(false,true) CheckRedPointStatus(RedPointType.TrialReward) CheckRedPointStatus(RedPointType.Trial) end)