From 3594501654bc2417cfabfec55c0311f0d6b9be79 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 14 Sep 2020 14:23:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=20?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=97=B6=E6=8A=8A=E7=8E=A9=E5=AE=B6=E8=B8=A2?= =?UTF-8?q?=E5=87=BA=E5=A4=A9=E5=AE=AB=E5=AF=86=E4=BF=9D=20=E3=80=81?= =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9D=E5=88=B7=E6=96=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expedition/ExpeditionMainPanel.lua | 2 +- .../~Lua/Modules/Expedition/ExpeditionManager.lua | 2 +- .../View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua | 3 --- .../Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua | 6 ++++-- .../Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua | 9 +++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index 0ce9af02c1..687a1f1611 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -187,7 +187,7 @@ function ExpeditionMainPanel:OnShow() local endTime = 0 endTime = ExpeditionManager.startTime + tonumber(ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonEnd) - GetTimeStamp() + ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonInterval * 60 - self:RemainTimeDown(self.timeTextGo,self.timeText,endTime) + self:RemainTimeDown(self.timeTextGo,self.timeText,endTime-300) self:IsTreasureOpen() end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 8e91df49ef..3b05d9be74 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -476,7 +476,7 @@ function this.RemainTimeDown() end end function this.RefreshPanelShowByState() - if ExpeditionManager.ExpeditionPanelIsOpen == 1 and (UIManager.IsOpen(UIName.ExpeditionMainPanel) or UIManager.IsOpen(UIName.TreasureOfHeavenPanel)) then --not UIManager.IsOpen(UIName.BattlePanel) then + if(ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel)) or UIManager.IsOpen(UIName.TreasureOfHeavenPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then PlayerManager.carbonType = 1 if ExpeditionManager.ExpeditionState == 2 then UIManager.OpenPanel(UIName.CarbonTypePanelV2) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index 143d3596aa..13becc3c2c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -82,13 +82,10 @@ function this:showRewardTianGong() local indirect ={} local curScore = TreasureOfHeavenManger.curScore--当前分数 - LogPink("sssss"..#rewardData) - LogBlue("aaaaaa"..#rewardStateData) for i = 1, #rewardData do if curScore >= rewardData[i].Integral then if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的 -- body - LogRed("执行这里了么") local reward = rewardData[i] local k1 = reward.TreasureReward[1][1] local v1 = reward.TreasureReward[1][2] diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index 6f1e513d1a..c484829bb1 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -15,7 +15,7 @@ function this.UpdateData(msg) if msg.resetTime then this.resetTime = msg.resetTime end - if msg.treasureRewardState then + if msg.treasureRewardState and #msg.treasureRewardState == 1 then if #this.rewardStateData>0 then for i = 1, #this.rewardStateData do if this.rewardStateData[i].id == msg.treasureRewardState.id then @@ -25,8 +25,10 @@ function this.UpdateData(msg) else this.rewardStateData = msg.treasureRewardState end + elseif msg.treasureRewardState and #msg.treasureRewardState > 1 then + this.rewardStateData = msg.treasureRewardState end - this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) == 0 and msg.isBuy or OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) + this.TreasrueState = msg.isBuy end function this.SetTreasureState() diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua index c4010cfe17..00b6463d20 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua @@ -76,7 +76,7 @@ end function TreasureOfHeavenPanel:refresh() treasureState = TreasureOfHeavenManger.TreasrueState rewardData = TreasureOfHeavenManger.rewardStateData - LogGreen("#rewardData长度:"..#rewardData) + -- LogGreen("#rewardData长度:"..#rewardData) if #TreasureOfHeavenManger.rewardStateData <= 0 then TreasureOfHeavenPanel:topBar() TreasureOfHeavenPanel:showTaskList() @@ -237,7 +237,7 @@ function TreasureOfHeavenPanel:ShowTime() self.localTimer:Stop() self.localTimer = nil end - local t = TreasureOfHeavenManger.resetTime-300 + local t = TreasureOfHeavenManger.resetTime local time self.localTimer = Timer.New(function() time = t - GetTimeStamp() @@ -245,8 +245,9 @@ function TreasureOfHeavenPanel:ShowTime() time = 0 t = TreasureOfHeavenManger.resetTime treasureState = nil - -- TreasureOfHeavenPanel:refresh()-不刷新了,直接踢出去 - ExpeditionManager.RefreshPanelShowByState() + this.ScrollView:SetIndex(1) + TreasureOfHeavenPanel:refresh()--不刷新了,直接踢出去 + -- ExpeditionManager.RefreshPanelShowByState() end this.time.text=TimeToDHMS(time) end,1,-1,true) From 2d9643c12749ab31a851a5203cfbe512164e7b32 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 14 Sep 2020 14:39:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=87=E8=B1=A1?= =?UTF-8?q?=E5=A2=83=E5=90=8E=20=E7=82=B9=E5=87=BB=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=8D=A1=E6=AD=BB=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 8066105259..0ed1ded7f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -507,7 +507,9 @@ function CarbonTypePanelV2:OnDestroy() SubUIManager.Close(this.BtView) end carbons = {} - SubUIManager.Close(this.playerHead) + if this.playerHead then + SubUIManager.Close(this.playerHead) + end SubUIManager.Close(this.UpView) this.playerHead = nil this.UpView = nil