From f8abe77d828365c3daa626366f042b413bb01215 Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Wed, 22 Jul 2020 19:07:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E5=85=83=E6=97=B6=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=E9=98=9F=E4=BC=8D=E7=9A=84?= =?UTF-8?q?=E7=A5=9E=E5=B0=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Formation/View/SaveFormation.lua | 20 +++++++++++-------- .../Modules/Resolve/View/Resolve_Recall.lua | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua index 5648993010..a0274e8286 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/SaveFormation.lua @@ -5,7 +5,7 @@ local this = SaveFormation this.IsNeedChangeFormation = true --- 逻辑初始化 -function this.Init(root) +function this.Init(root,...) this.root = root this.root.bg:SetActive(true) this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) @@ -13,10 +13,12 @@ function this.Init(root) this.root.btn_2:SetActive(true) this.root.btn_1_lab.text=Language[10743] this.root.btn_2_lab.text=Language[10726] + local temp = {...} + this.teamId = temp[1] end --- 获取需要显示的编队id function this.GetFormationIndex() - return FormationManager.curFormationIndex + return this.teamId and this.teamId or FormationManager.curFormationIndex end --- 关闭界面事件 @@ -30,12 +32,14 @@ function this.On_Btn1_Click() end function this.On_Btn2_Click() if this.root.order>=1 then - --保存编队 - FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, - FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) - Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnFormationChange) --主线保存编队显示战力变化 - PopupTipPanel.ShowTip(Language[10713]) - this.root:ClosePanel() + FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, + FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) + PopupTipPanel.ShowTip(Language[10713]) + this.root:ClosePanel() + if this.teamId and this.teamId == FormationTypeDef.EXPEDITION then + else + Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnFormationChange) --主线保存编队显示战力变化 + end else PopupTipPanel.ShowTip(string.format(Language[10701], 1)) end diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index a71b39f923..d01d54d539 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua @@ -210,6 +210,8 @@ function this.SingleHeroDataShow(go,_heroData) JumpManager.GoJump(8001) elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then JumpManager.GoJump(57001) + elseif heroData.isFormations[1] == FormationTypeDef.EXPEDITION then + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION,FormationTypeDef.EXPEDITION) end end end)