From 8cb68ceaa434c5d177e2cf2971b65f1f96fae77f Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 20 Oct 2020 18:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=8D=E9=81=A5=E6=B8=B8=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=9A1.=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B8=B8=E5=8E=86=E8=BF=94=E5=9B=9E=E6=97=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BA=8C=E7=BA=A7=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=20=202.=E8=AE=B0=E5=BD=95=E8=87=AA=E5=8A=A8=E6=B8=B8=E5=8E=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua | 2 +- .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 1 + .../~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua | 14 ++++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua index 9bb8908ac7..b8e2a25e8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua @@ -19,7 +19,7 @@ function this:BindEvent() Util.AddClick(this.btnBack, function() this:ClosePanel() if triggertype==0 then - XiaoYaoManager.OpenMapList() + UIManager.ClosePanel(UIName.XiaoYaoMapPanel) end end) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index 65e4c5bb2b..fa923b58f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -11,6 +11,7 @@ this.GetHeroIndex = 0 this.luckyTurnTableRewards={} this.luckyluckyTurnTableTimes = 0 this.luckyluckyTurnTableRemainTime = 0 +this.isAutoYouli=false --逍遥游自动游历开关 --打开逍遥游地图列表界面 function this.OpenMapList() diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index 00acffe1e3..ad05e37481 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -84,7 +84,12 @@ function this:BindEvent() end) Util.AddClick(this.btnBack, function () - -- XiaoYaoManager.OpenMapList() + if isAutoRun then + MsgPanel.ShowTwo("退出后将停止自动游历,确定离开?", nil, function() + self:ClosePanel() + end) + return + end self:ClosePanel() end) --商店点击 @@ -118,6 +123,7 @@ function this:BindEvent() else isAuto=true end + XiaoYaoManager.isAutoYouli=isAuto this.toggle.gameObject:SetActive(isAuto) end) --开始游历 @@ -128,7 +134,7 @@ function this:BindEvent() end if curGridIndex>=#allGridData then MsgPanel.ShowTwo("已到达终点,是否重新云游!", nil, function() - XiaoYaoManager.OpenMapList() + self:ClosePanel() end) return end @@ -290,10 +296,8 @@ end --取消自动游历 function this.StopAuto() - isAuto=false isAutoRun=false this.youliTag:SetActive(false) - this.toggle.gameObject:SetActive(false) end --事件触发处理 function this.EventTrigger(_data) @@ -599,6 +603,8 @@ function this:OnShow() isAutoRun=false isPlayMove=0 this.startBtn:GetComponent("Button").enabled=true + isAuto=XiaoYaoManager.isAutoYouli + this.toggle.gameObject:SetActive(isAuto) end function this:OnSortingOrderChange()