From a06e4abf5640ad5d17b4e5eff4bf55f4e93bbe5f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 10 Sep 2020 14:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=BE=E5=9D=A4=E5=AE=9D=E7=9B=92=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/ActivityDetail.lua | 2 +- .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua index 9774b21ac2..12175ced4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua @@ -46,7 +46,7 @@ function ActivityDetail:OnShow() self.content.text= str local str2 --判断抽取的类型 - if panelType == 1 then--破阵诛仙 + if panelType == 1 then--限时召唤 self:ReFreshUpHero() self:RefreshHeroRate() str2=ActivityGiftManager.GetTimeStartToEnd(ActivityTypeDef.FindFairy) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index ca09c5bfbb..77823298b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -77,7 +77,7 @@ function QianKunBox:BindEvent() self.effect:SetActive(false) ActivityDetail.new(self.detail,2,self.effect) end) - Util.AddClick(self.btnStore,function() + Util.AddClick(self.btnStore,function() self.effect:SetActive(false) self.shop:SetActive(true) self.btnBack:SetActive(false) @@ -85,6 +85,7 @@ function QianKunBox:BindEvent() self.bottomBar:SetActive(false) self.livename = "live2d_ui_h_52_xx_pf1" self.liveNode = poolManager:LoadLive(self.livename, self.live.transform, Vector3.New(0.25,0.25,0.25), Vector3.New(123,214,0)) + self:storeShow()--商店 end) Util.AddClick(self.shopBack,function() self.effect:SetActive(true) @@ -111,7 +112,6 @@ function QianKunBox:OnShow(sortingOrder) self:refreshBtnShow()--刷新按钮显示 self:contentShow()--五个魂印头像 - self:storeShow()--商店 self:timeCountDown()--时间 end @@ -239,7 +239,6 @@ function QianKunBox:storeShow() self.shopView = SubUIManager.Open(SubUIConfig.ShopView, self.content.transform) end self.shopView:ShowShop(SHOP_TYPE.QIANKUNBOX_SHOP,orginLayer) - end --时间