From da34a5834ba13d9930243770da84e9306b9f2929 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Jul 2021 14:36:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E4=B8=BB=E9=A2=98=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E3=80=91=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index b9ec8dd2f6..d45aee765d 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -226,7 +226,7 @@ function CommonActPage:RefreshTime() local freshTime if self.actType == ActivityTypeDef.AccumulativeRechargeExper then freshTime = CalculateSecondsNowTo_N_OClock(24) - elseif self.actConfig.ActiveType == ActivityTypeDef.DynamicAct then + elseif self.actConfig.ActiveType == ActivityTypeDef.DynamicAct and self.actConfig.Sort == 2 then if (self.ActData.endTime - GetTimeStamp()) <= 86280 then freshTime = CalculateSecondsNowTo_N_OClock(24) - 120 else From 07de90eb458696b6e1122d0f82fe59b723f3c4c5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Jul 2021 15:07:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E6=8F=90=E4=BA=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/NewActivity/CommonActPageManager.lua | 2 +- .../ManagedResources/~Lua/View/ShopViewNew.lua | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 53c479840e..0aa3ed48c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -224,7 +224,7 @@ end function this.InitTaskData(curData,taskType,configName) local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId) local allMissionData = TaskManager.GetTypeTaskList(taskType) - -- LogGreen("this.DynamicActType:"..this.DynamicActType) + Log("this.DynamicActType:"..this.DynamicActType) for i=1,#allListData do for j=1,#allMissionData do -- LogGreen("this.DynamicActType:"..this.DynamicActType) diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 692e68541f..3751bf12e7 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -1,5 +1,6 @@  local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig) +local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) -- 通用得商店逻辑 local ShopViewNew = {} local sortingOrder = 0 @@ -148,15 +149,19 @@ function ShopViewNew:OnShow(_sortingOrder) LogGreen("id:"..id) if id and id > 0 then self.actId = id - local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id) - if config then - self.actConfig = config + local actConfig + local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + if not actConfig then + actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + end + if actConfig then + self.actConfig = actConfig end end end - end + end self.ShopType = self.actConfig.ShopData[1][1] - -- LogYellow("self.ShopType:"..tostring(self.ShopType)) + LogYellow("self.ShopType:"..tostring(self.ShopType)) if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then self.parent.tabbox.gameObject:SetActive(false) else @@ -172,6 +177,7 @@ function ShopViewNew:ShowShop() end) -- 红点销毁 self.refreshRedpot:SetActive(false) + LogYellow("self.ShopType:"..tostring(self.ShopType)) self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id self.ShopConfig = _ShopTypeConfig[self.ShopId] -- 显示帮助按钮 From 825c38fc0dd78588d7430fd01fb21b1d8ac6bbed Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 26 Jul 2021 15:18:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c546710d1fab2bb2dae71405f62b90518a36864e) --- .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 16f53c01c1..d09614e732 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1375,7 +1375,8 @@ function this.CheckRedpointUpperMonthCard(red) if not actInfo then return false end - if actInfo.value ~= 1 then + LogGreen("actInfo.value:"..actInfo.value) + if actInfo.value ~= 2 then return false end for i = 1,#actInfo.mission do From efc0f62cc5c9802b43b68201d556c9987735b47a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 26 Jul 2021 11:23:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90ID1017708=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC=E3=80=91=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E7=A7=98=E5=AE=9D=E5=90=8E=E7=AD=89=E5=BE=85=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E6=9C=9F=E7=A7=98=E5=AE=9D=E5=88=B7=E6=96=B0=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E6=9C=9F=E8=B4=AD=E4=B9=B0=E7=A7=98=E5=AE=9D=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E7=9A=84=E7=A7=AF=E5=88=86=E4=B8=8D=E6=B8=85=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=B8=8B=E6=9C=9F=E7=A7=98=E5=AE=9D=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E9=A2=86=E5=8F=96=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 76fad397de390ee9bb30a02a6256b1ccc57f22cd) --- Assets/ManagedResources/~Lua/Logic/GameEvent.lua | 1 + .../~Lua/Modules/Map/View/EndLessMapView.lua | 3 +-- .../~Lua/Modules/Net/IndicationManager.lua | 3 +++ .../TreasureOfHeaven/EndLessTreasurePanel.lua | 12 ++++++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 9a0036bafc..f665d9cf5e 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -471,6 +471,7 @@ GameEvent = { RechargeQinglongSerectSuccess = "EndLess.RechargeQinglongSerectSuccess", RefreshHeroData = "EndLess.RefreshHeroData", GuidePanel = "EndLess.GuidePanel", + QinglongSerectRefresh = "EndLess.QinglongSerectRefresh", }, --山河社稷图 FightLevel={ diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index f5b64b5a4b..345879405f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -227,8 +227,7 @@ function EndLessMapView:BindEvent() return end if not this:CanClick() then return end - local data = EndLessMapManager.treasureData - UIManager.OpenPanel(UIName.EndLessTreasurePanel,data) + UIManager.OpenPanel(UIName.EndLessTreasurePanel) end) Util.AddClick(this.btnFormat, function () diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index efe97dfd60..40077e508f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -145,7 +145,10 @@ function this.EenlessTreasureRefreshIndication(buffer) local data = buffer:DataByte() local msg = MapInfoProto_pb.EndlessTreasureInfoResponse() msg:ParseFromString(data) + local num = BagManager.GetItemCountById(EndLessMapManager.scoreValueId) + BagManager.HeroLvUpUpdateItemsNum(EndLessMapManager.scoreValueId, num) EndLessMapManager.InitTreasureData(msg) + Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.QinglongSerectRefresh) end --后端推送福利红包数据 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua index aeb2dfca04..47ba857f96 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua @@ -44,21 +44,23 @@ end --添加事件监听(用于子类重写) function EndLessTreasurePanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.EndLess.RechargeQinglongSerectSuccess, self.refresh,self) + Game.GlobalEvent:AddEvent(GameEvent.EndLess.QinglongSerectRefresh, self.OnShow,self) end --移除事件监听(用于子类重写) function EndLessTreasurePanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.EndLess.RechargeQinglongSerectSuccess, self.refresh,self) + Game.GlobalEvent:AddEvent(GameEvent.EndLess.QinglongSerectRefresh, self.OnShow,self) end --界面打开时调用(用于子类重写) function EndLessTreasurePanel:OnOpen(...) - local args = {...} - self.treasureData = args[1] + end -- 打开,重新打开时回调 function EndLessTreasurePanel:OnShow() + self.treasureData = EndLessMapManager.treasureData self.tips.text = self.treasureData.tip --self.time.gameObject:SetActive(false) self.time.text = "重置时间:"..TimeToDHMS(self.treasureData.resetTime - GetTimeStamp()) @@ -243,8 +245,10 @@ function EndLessTreasurePanel:ShowTime() self.localTimer = Timer.New(function() time = time - 1 if time <= 0 then - self.treasureState = 0 - self.ScrollView:SetIndex(1) + self.time.text = "重置时间:"..TimeToDHMS(0) + self.localTimer:Stop() + self.localTimer = nil + return end self.time.text = "重置时间:"..TimeToDHMS(time) end,1,-1,true)