diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 69a5077130..f349ac4e1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -203,6 +203,7 @@ function this:OnSortingOrderChange() end function this:OnOpen(_panelType,...) + Log("panelType:".._panelType) panelType = _panelType if panelType == FORMATION_TYPE.EXPEDITION or panelType == FORMATION_TYPE.CARBON then for k,v in pairs(bgListGo) do diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua index 160891cf8a..a9250ee416 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua @@ -17,6 +17,10 @@ function this.GetFormationIndex() end --- 提交按钮点击事件 function this.On_Btn1_Click() + this.root.SetOneKeyGo() +end +--- +function this.On_Btn2_Click() if this.root.order>=1 then --保存编队 FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, @@ -58,7 +62,9 @@ end function this.InitView() this.root.bg:SetActive(true) this.root.btn_1:SetActive(true) - this.root.btn_1_lab.text = Language[10742] + this.root.btn_1_lab.text = Language[10743] + this.root.btn_2:SetActive(true) + this.root.btn_2_lab.text = Language[10742] end