From e73cf4533b41062b0d12fd6848ec76b444eda407 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 31 Mar 2021 19:07:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index e7d66e640a..ba91833ca9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -299,10 +299,10 @@ function GiftPre:SetTip() end elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 4003 then self.tip5:SetActive(true) - self.tip5.text = "轩辕宝境必备特权!每天增加2次免费次数,6次额外购买次数!" + self.tip5Text.text = "轩辕宝境必备特权!每天增加2次免费次数,6次额外购买次数!" elseif self.data.data.shopData.goodsId and self.data.data.shopData.goodsId == 7105 then self.tip5:SetActive(true) - self.tip5.text = "每日可额外增加3次免费的灵兽山招募机会,同时灵兽山妖晶招募价格变为8折!" + self.tip5Text.text = "每日可额外增加3次免费的灵兽山招募机会,同时灵兽山妖晶招募价格变为8折!" end end From 4698fc6dbfeab3f366cd40ad4b559c7961418938 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 31 Mar 2021 19:26:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E7=A6=8F=E5=88=A9=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E3=80=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/CumulativeSignInPage.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua index f96dd3cbd1..dc6abaf374 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -76,7 +76,7 @@ function CumulativeSignInPage:BindEvent() self.rewardPanel:GetComponent("RectTransform").localPosition = pos[i] end) else - Util.AddOnceClick(self.boxs[i],function() + Util.AddOnceClick(self.boxs[i].btnBox,function() NetManager.GetActivityRewardRequest(data.mission[i].missionId, data.activityId, function(drop) UIManager.OpenPanel(UIName.RewardItemPopup,drop,1) self:RefreshBox() From 104f52f61b0ca50cc869c0bbb63776cb84513f04 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 31 Mar 2021 19:30:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=B9=E6=9D=83=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E4=BD=8D=E7=BD=AE=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 268991da3f..b845d0433e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -153,7 +153,23 @@ function EveryDayGift:RefreshGiftData() local callBack = function(index, item) self:RefreshShowData(item, self.shopData[index],index) end + local curindex = 0 self.scrollView:SetData(self.shopData, callBack) + for i = 1 ,#self.shopData do + 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 + curindex = i + break + end + end + end + if curindex ~= 0 then + break + end + end + LogGreen("curindex:"..curindex) + self.scrollView:SetIndex(curindex) end function EveryDayGift:isBought() From 02fde882a89cc948577865333dd800b1077606ea Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 31 Mar 2021 19:33:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A6=96=E6=99=B6=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua b/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua index 4e652a30e1..da5a6816d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua @@ -4,7 +4,7 @@ local this = NotEnoughPopup -- 跳转商店购买窗口,物品id对应界面及参数 local _JumpConfig = { - [16] = 36010, + [16] = 36008, --[15] = {36010}, --[16] = {36010}, } From 56605c0ab7c0e586d8fd30548d1341247a0b6afd Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 31 Mar 2021 19:56:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=89=B9=E6=9D=83=20?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=A4=BC=E5=8C=85=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recharge/View/GiftPre.lua | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index ba91833ca9..4822e2cc87 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -82,16 +82,6 @@ function GiftPre:InitComponent() self.tip4_en = Util.GetGameObject(self.tipRoot,"tip4_en") self.tip5 = Util.GetGameObject(self.tipRoot,"tip5") self.tip5Text = Util.GetGameObject(self.tip5,"Text"):GetComponent("Text") - self.tipRoot:SetActive(false) - self.tip1:SetActive(false) - self.tip1_en:SetActive(false) - self.tip2:SetActive(false) - self.tip2_en:SetActive(false) - self.tip3:SetActive(false) - self.tip3_en:SetActive(false) - self.tip4:SetActive(false) - self.tip4_en:SetActive(false) - self.tip5:SetActive(false) end --绑定事件(用于子类重写) @@ -230,6 +220,16 @@ function GiftPre:SetContent1() self.grid:GetComponent("RectTransform").anchoredPosition = offSetX[0].scroll self.type1.gameObject:SetActive(false) self.type2.gameObject:SetActive(false) + self.tipRoot:SetActive(false) + self.tip1:SetActive(false) + self.tip1_en:SetActive(false) + self.tip2:SetActive(false) + self.tip2_en:SetActive(false) + self.tip3:SetActive(false) + self.tip3_en:SetActive(false) + self.tip4:SetActive(false) + self.tip4_en:SetActive(false) + self.tip5:SetActive(false) self.btnBuy:GetComponent("Image").sprite = Util.LoadSprite("s_slbz_1anniuhuangse") if self.data.DataType == DataType.Direct and self.data.buyType == DirectBuyType.DAILY_GIFT then self.type2.gameObject:SetActive(true)