From 34093942337118961a5fca68dee7c1cd4679dbc0 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 7 Nov 2022 16:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=81=E6=97=A0=E9=99=90=E6=8A=BD?= =?UTF-8?q?=E3=80=91=3D=3D=3D=3D=3D=3D=3D=E5=A5=96=E5=8A=B1=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityGift/OpenSeverWelfarePanel.lua | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua index 7d9defcfa6..829d462af1 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua @@ -4,6 +4,9 @@ local this = OpenSeverWelfarePanel local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) local sortingOrder = 0 local isPlayAnim = true +local firstData=nil +local isShowNeedGetUpTextId = 0 +local activityData = {} --初始化组件(用于子类重写) function OpenSeverWelfarePanel:InitComponent() this.spLoader = SpriteLoader.New() @@ -33,7 +36,18 @@ function OpenSeverWelfarePanel:BindEvent() self:ClosePanel() end) - + Util.AddClick(this.getBtn,function() + if firstData.state ==1 then + NetManager.GetActivityRewardRequest(firstData.missionId, activityData.activityId, function(drop) + --ActivityGiftManager.GetActivityRewardRequest(ActivityTypeDef.OpenSeverWelfare,rewardData.missionId, function(msg) + UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() + this.OnShowPanelData(false,false) + Game.GlobalEvent:DispatchEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint) + end) + end) + end + + end) end @@ -65,8 +79,7 @@ function OpenSeverWelfarePanel:OnSortingOrderChange() end sortingOrder = self.sortingOrder end -local isShowNeedGetUpTextId = 0 -local activityData = {} + function this.OnShowPanelData(isTop,isAni) this.titleText.text = "送无限抽" activityData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SongWuXianChou) @@ -112,6 +125,7 @@ function this.OnShowPanelData(isTop,isAni) end end local state = first.state + firstData=first local value = sConFigData.Values[2][1] --local isPass = FightPointPassManager.IsFightPointPass2(value) -- if state==0 and isPass then @@ -134,15 +148,7 @@ function this.OnShowPanelData(isTop,isAni) Util.SetGray(this.getBtn,false) this.getBtn:GetComponent("Button").interactable = true end - Util.AddClick(this.getBtn,function() - NetManager.GetActivityRewardRequest(first.missionId, activityData.activityId, function(drop) - --ActivityGiftManager.GetActivityRewardRequest(ActivityTypeDef.OpenSeverWelfare,rewardData.missionId, function(msg) - UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() - this.OnShowPanelData(false,false) - Game.GlobalEvent:DispatchEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint) - end) - end) - end) + Util.AddClick(this.goBtn,function() if sConFigData.Jump then JumpManager.GoJump(sConFigData.Jump[1])