From d7398967937c14611b4ae802adc66ec48b9a18cd Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 13 Nov 2020 16:10:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E5=AE=9D?= =?UTF-8?q?=E9=98=81=E3=80=91=E5=80=92=E8=AE=A1=E6=97=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index 5eb3f271fe..2b2ed574a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -181,6 +181,7 @@ function LingShouBaoGe:refreshBtnShow() redPot.gameObject:SetActive(isFree) icon.gameObject:SetActive(not isFree) num.gameObject:SetActive(not isFree) + this.tip1.gameObject:SetActive(freeTime == 0) local itemId=0 local itemNum=0 @@ -271,7 +272,7 @@ function LingShouBaoGe:TimeCountDown() if timeDown < 1 then this.timer:Stop() this.timer = nil - parent:ClosePanel() + this:Refresh() return end timeDown = timeDown - 1 From 933f2d476859dbd53183c6afbfb75d650d2f875c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 13 Nov 2020 16:25:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E5=AE=9D?= =?UTF-8?q?=E9=98=81=E3=80=91=E5=A2=9E=E5=8A=A0=E5=81=87=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index 2b2ed574a5..e4913a26bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -78,12 +78,12 @@ function LingShouBaoGe:BindEvent() end) Util.AddClick(this.preview, function() - local fb = ConfigManager.GetConfigData(ConfigName.FakeBattle, 1006) + local fdata, fseed = BattleManager.GetFakeBattleData(1006) local testFightData = { - fightData = loadstring("return "..fb.FightData)(), - fightSeed = fb.TimeSeed, - fightType = 0, - maxRound = 20 + fightData = fdata, + fightSeed = fseed, + fightType = 0, + maxRound = 20 } UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test) end)