From 46857168c1302bfaca4ca2676e178d17eb2f92fa Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 28 Apr 2021 03:34:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?6=E6=98=9F=E7=8E=89=E5=B8=9D=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E6=B6=88=E5=A4=B1=E9=80=BB=E8=BE=91=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index e2fb786a9d..ff4db9f558 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -131,7 +131,7 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId) self.parent:RefreshData(nil,false,false) CheckRedPointStatus(RedPointType.DailyGift) CheckRedPointStatus(RedPointType.GrowthPackage) - if shopType==20 and itemId==1107 then + if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1112 )then PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666) end end) From 95b4b8197a39faf9cf768e4c220be6bc515fcb81 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 28 Apr 2021 05:10:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=9D=83=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E3=80=91=E7=89=B9=E6=95=88=E6=B6=88=E5=A4=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/DynamicActivityManager.lua | 12 +++++++++--- .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 2 +- .../~Lua/Modules/Recharge/View/GiftPre.lua | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 7e0dba5c37..c3dc8f4a6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -10,10 +10,16 @@ this.curLevel = 0--社稷大典的等级 this.curActivityType = 0 this.OpenUIList = {} this.selectIndex = {dataType = 0,goodsId = {}} +this.selectIndex2 = {dataType = 0,goodsId = {}} -function this.SetSelectIndex(dataType,goodsId) - this.selectIndex.dataType = dataType - this.selectIndex.goodsId = goodsId +function this.SetSelectIndex(dataType,goodsId,b) + this.selectIndex.dataType = dataType + this.selectIndex.goodsId = goodsId + if b and b == 1 then + else + this.selectIndex2.dataType = dataType + this.selectIndex2.goodsId = goodsId + end end function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 5fd36b9f7b..4a4ce7c1c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -164,7 +164,7 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then for j = 1 , #DynamicActivityManager.selectIndex.goodsId do if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then - DynamicActivityManager.SetSelectIndex(0,{}) + DynamicActivityManager.SetSelectIndex(0,{},1) curindex = i break end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index e2fb786a9d..903eb2afc5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -222,9 +222,9 @@ end function GiftPre:Effect() local isshow = false - if self.data.DataType == DynamicActivityManager.selectIndex.dataType then - for i = 1 , #DynamicActivityManager.selectIndex.goodsId do - if (self.data.data.shopData.id or self.data.data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[i] then + if self.data.DataType == DynamicActivityManager.selectIndex2.dataType then + for i = 1 , #DynamicActivityManager.selectIndex2.goodsId do + if (self.data.data.shopData.id or self.data.data.shopData.goodsId) == DynamicActivityManager.selectIndex2.goodsId[i] then isshow = true break end