From 7a77b968ad246f28ab9fb5fc120733260d346a4f Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 24 Sep 2020 12:52:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=EF=BC=9A=20=20=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=20=E6=8B=9B?= =?UTF-8?q?=E5=8B=9F=E8=8B=B1=E9=9B=84=E6=B3=95=E5=AE=9D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9C=89=E5=8F=AF=E8=83=BD=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/CompoundHero/CompoundHeroPanel.lua | 2 +- .../~Lua/Modules/Expedition/ExpeditionManager.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua index 1ae54238af..e8de49221b 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroPanel.lua @@ -115,7 +115,7 @@ function this.SwitchView(index) if index==2 then this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeroReplace}) elseif index==1 then - this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) + this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeroReplace}) end this.RefreshHelpBtn() --执行子模块初始化 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 3b05d9be74..e003616d9e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -100,12 +100,12 @@ function this.InitExpeditionData(msg) --if msg.removesHeroIds then -- this.DeleteHeroDatas(msg.removesHeroIds) --end - --招募的英雄 - this.InitHeroDatas(msg.heroList) --装备 this.InitEquipData(msg.equip) --宝器 this.InitBaoDatas(msg.soulEquip) + --招募的英雄 + this.InitHeroDatas(msg.heroList) --猎妖开启时间 this.startTime = msg.startTime