From 38bbb808b4f5d8de58a9134f22ac65fc1a9f5a98 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 23 Jul 2021 19:05:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E3=80=91=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 2 +- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 4 ++-- Assets/ManagedResources/~Lua/View/ShopViewNew.lua | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c476c718e5..576edbd81c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1239,6 +1239,7 @@ ActivityTypeDef = { ChaoFanRuSheng = 500, --超凡入圣 JourneyWithWind = 72, --缥缈之旅 FifteenDayGiftNotice = 80,--15日登陆预告 + DynamicActShop = 81,--主题活动商店 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 442ce80b4f..16f53c01c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -141,7 +141,7 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - --LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + -- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) for n, m in ipairs(v.mission) do --LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 391cef24ec..a2d4816621 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -70,7 +70,7 @@ function ActivityMainPanel:CheckActOpen(_index) local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType) if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then - if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero then + if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[_index].ActiveType == ActivityTypeDef.DynamicActShop then _CurPageIndex = _index elseif GlobalActConfig[id].ShowArt == this.activityType then _CurPageIndex = _index @@ -216,7 +216,7 @@ function this.PageTabAdapter(tab, index, status) local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActiveType) if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) then if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then - if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero then + if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[index].ActiveType == ActivityTypeDef.DynamicActShop then isshow = true elseif GlobalActConfig[id].ShowArt == this.activityType then isshow = true diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index ec029357a1..aa4bcd95d6 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -156,6 +156,7 @@ function ShopViewNew:OnShow(_sortingOrder) end end self.ShopType = self.actConfig.ShopData[1][1] + -- LogYellow("self.ShopType:"..tostring(self.ShopType)) if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then self.parent.tabbox.gameObject:SetActive(false) else