From 08657b4ffdcda6f5d216e7bdcf16a9128b565b9d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 18 Nov 2020 10:48:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E8=BD=A6=E8=BF=9F=20=E5=8D=81=E7=BB=9D=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Formation/View/GuildCarDeleayFormation.lua | 9 ++++++++- .../Modules/Formation/View/GuildDeathPosFormation.lua | 8 +++++++- .../Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua index 3ac235228d..7c6ce60403 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildCarDeleayFormation.lua @@ -14,7 +14,12 @@ function this.GetFormationIndex() return FormationTypeDef.GUILD_CAR_DELEAY end --- btn1点击回调事件 + function this.On_Btn1_Click() + this.root.SetOneKeyGo() +end + +function this.On_Btn2_Click() if not hadClick then hadClick = true if this.root.order>=1 then @@ -51,7 +56,9 @@ end -- 初始化界面显示 function this.InitView() this.root.btn_1:SetActive(true) - this.root.btn_1_lab.text = Language[10708] + this.root.btn_1_lab.text = Language[10743] + this.root.btn_2:SetActive(true) + this.root.btn_2_lab.text = Language[10708] MapManager.isCarbonEnter = false this.root.formTip:SetActive(false) local costTip = this.root.costTip diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua index 080d6d808f..72da928655 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua @@ -26,10 +26,16 @@ end function this.InitView() this.root.btn_1:SetActive(true) - this.root.btn_1_lab.text = Language[10512] + this.root.btn_1_lab.text = Language[10743] + this.root.btn_2:SetActive(true) + this.root.btn_2_lab.text = Language[10512] 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, diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index a82fafb6f8..c2ccfb5d91 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -94,6 +94,7 @@ function this.SingleInfoDataShow(go,data) sortNumTabs[i] = Util.GetGameObject(go, "SortNum/SortNum ("..i..")") sortNumTabs[i]:SetActive(false) end + LogRed("data.rank:"..data.rank) if data.rank < 4 then sortNumTabs[data.rank]:SetActive(true) else