From 233ff1b361373d2e7790b6ac9fdbead14bc3677d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 17 Nov 2020 17:12:52 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC=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 --- .../Formation/View/CarbonFormation.lua | 268 +++++++++--------- 1 file changed, 132 insertions(+), 136 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua index 74738e4a19..42aebfd41e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua @@ -15,17 +15,13 @@ this.IsNeedChangeFormation = true --- 逻辑初始化 function this.Init(root, curMapId) this.root = root - -- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then - this.curMapId = EndLessMapManager.openMapId - -- else - -- this.curMapId = curMapId - -- end + this.curMapId = EndLessMapManager.openMapId this.InitView() end --- 获取需要显示的编队id function this.GetFormationIndex() local index = 0 - if CarbonManager.difficulty == 4 then + if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then index = FormationTypeDef.FORMATION_ENDLESS_MAP else FormationManager.curFormationIndex = FormationTypeDef.FORMATION_NORMAL @@ -37,131 +33,131 @@ end -- 扫荡按钮 --- btn1点击回调事件 function this.On_Btn1_Click() - if CarbonManager.difficulty == 4 and MapManager.Mapping then - if this.root.order>=1 then - --保存编队 - FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, - FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) - PopupTipPanel.ShowTip(Language[10713]) - else - PopupTipPanel.ShowTip(Language[10714]) - end - return - end - -- 刷新扫荡数据 - this.root.ShowStartMopUpInfoData() - -- 显示扫荡界面 - this.root.mopUpGo:SetActive(true) - PlayUIAnim( this.root.mopUpGo) + this.root.SetOneKeyGo() + --以前的换成的一键上阵 + + -- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and MapManager.Mapping then + -- if this.root.order>=1 then + -- --保存编队 + -- FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, + -- FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) + -- PopupTipPanel.ShowTip(Language[10713]) + -- else + -- PopupTipPanel.ShowTip(Language[10714]) + -- end + -- return + -- end + -- 刷新扫荡数据--应该是没了 + -- this.root.ShowStartMopUpInfoData() + -- -- 显示扫荡界面 + -- this.root.mopUpGo:SetActive(true) + -- PlayUIAnim( this.root.mopUpGo) end --- btn2点击回调事 -local itemType = { - [1] = 27, - [3] = 28, -} +-- local itemType = { +-- [1] = 27, +-- [3] = 28, +-- } -- 进入地图 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) + this.root:ClosePanel() else - PopupTipPanel.ShowTip(string.format(Language[10701], 1)) + PopupTipPanel.ShowTip(Language[10714]) return end - -- 判断当前选择的副本类型 - local itemId = itemType[CarbonManager.difficulty] - -- 无尽副本 if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then - if #FormationManager.GetFormationByID(401).teamHeroInfos == 0 then - PopupTipPanel.ShowTip(Language[10714]) - return - end - else - if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then - Log(Language[10715]) - PopupTipPanel.ShowTip(Language[10714]) - return + if MapManager.Mapping then--在地图里 + if this.root.order>=1 then + FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, + FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) + PopupTipPanel.ShowTip(Language[10713]) + else + PopupTipPanel.ShowTip(Language[10714]) + end + else + Log("进入的副本difficulty:"..CarbonManager.difficulty) + this.EnterMapbyType(CarbonManager.difficulty)--, itemId) end end +--+======================================= + + + -- if this.root.order>=1 then + -- --保存编队 + -- FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, + -- FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) + -- else + -- PopupTipPanel.ShowTip(string.format(Language[10701], 1)) + -- return + -- end + -- -- 判断当前选择的副本类型 + -- local itemId = itemType[CarbonManager.difficulty] + + -- 无尽副本 + -- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS then + -- if #FormationManager.GetFormationByID(401).teamHeroInfos == 0 then + -- PopupTipPanel.ShowTip(Language[10714]) + -- return + -- end + -- else + -- if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then + -- Log(Language[10715]) + -- PopupTipPanel.ShowTip(Language[10714]) + -- return + -- end + -- end + -- 判断挑战次数 - if CarbonManager.difficulty == 1 then -- 普通副本 - if BagManager.GetItemCountById(itemId) <= 0 and CarbonManager.GetNormalState(this.curMapId)then - PopupTipPanel.ShowTip(Language[10716]) - return - end - elseif CarbonManager.difficulty == 3 then -- 英雄副本 - if BagManager.GetItemCountById(itemId) <= 0 then - PopupTipPanel.ShowTip(Language[10717]) - UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.EliteCarbonTicket }) - return - end - -- elseif CarbonManager.difficulty == 2 then -- 失恋副本 - -- Log("即将进入试炼副本!") - end - if CarbonManager.difficulty == 1 or CarbonManager.difficulty == 3 then - -- 战斗力判断 - if this.root.formationPower Date: Tue, 17 Nov 2020 17:41:06 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=BF=83=E9=AD=94=E8=AF=95=E7=82=BC=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E9=94=AE=E4=B8=8A=E9=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Formation/View/MonsterCampFormation.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua index 132fce6ed6..9a8d27ebd7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua @@ -17,7 +17,7 @@ function this.GetFormationIndex() end --- btn1点击回调事件 -- lEFT -function this.On_Btn1_Click() +function this.On_Btn2_Click() if this.root.order>=1 then --保存编队 FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, @@ -44,16 +44,17 @@ function this.On_Btn1_Click() this.StraightBattle() end --- btn2点击回调事件 --RIGHT -function this.On_Btn2_Click() - +function this.On_Btn1_Click() + this.root.SetOneKeyGo() end function this.InitView() this.root.bg:SetActive(true) this.root.btn_1:SetActive(true) - this.root.btn_2:SetActive(false) + this.root.btn_2:SetActive(true) -- this.root.failText:SetActive(true) - this.root.btn_1_lab.text = Language[10709] + this.root.btn_1_lab.text = Language[10743] + this.root.btn_2_lab.text = Language[10709] this.root.passBattle0.gameObject:SetActive(false) this.root.passBattle1.gameObject:SetActive(false) From cf34f4d37733e00e74975e7c9b6b8da04f49b186 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 17 Nov 2020 17:41:42 +0800 Subject: [PATCH 3/9] =?UTF-8?q?resourcePath=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResConfigs/ResourcePathConfig.asset | 45 ++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 4fda558400..f5857906b6 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -15758,6 +15758,30 @@ MonoBehaviour: extension: .mp3 resPathIndex: 103 resAbNameIndex: 434 + - resName: Audio_dhdj_skin01_attack01 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 434 + - resName: Audio_dhdj_skin01_attack02 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 434 + - resName: Audio_dhdj_skin01_attack03 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 434 + - resName: Audio_dhdj_skin01_exskill01 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 434 + - resName: Audio_dhdj_skin01_exskill02 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 434 + - resName: Audio_dhdj_skin01_exskill03 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 434 - resName: Audio_Effect_c_ab_00014_t3_attack01 extension: .mp3 resPathIndex: 103 @@ -16066,6 +16090,18 @@ MonoBehaviour: extension: .mp3 resPathIndex: 103 resAbNameIndex: 494 + - resName: Audio_swk_skin01_attack01 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 494 + - resName: Audio_swk_skin01_attack02 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 494 + - resName: Audio_swk_skin01_attack03 + extension: .mp3 + resPathIndex: 103 + resAbNameIndex: 494 - resName: Audio_s_jieling_dlg_3010_attack_01 extension: .mp3 resPathIndex: 103 @@ -30486,6 +30522,14 @@ MonoBehaviour: extension: .png resPathIndex: 229 resAbNameIndex: 1847 + - resName: juexing + extension: .png + resPathIndex: 230 + resAbNameIndex: 1848 + - resName: lingshoushan + extension: .png + resPathIndex: 230 + resAbNameIndex: 1848 - resName: r_guanka_sheji_bu_01 extension: .png resPathIndex: 230 @@ -54788,7 +54832,6 @@ MonoBehaviour: - lz4/atlas/tagbuttonatlas.unity3d - lz4/bg/battle/r_zhandou_changjing_1.unity3d - lz4/bg/jl-jinengkuang.unity3d - - lz4/bg/r_chouka_zhubeijing.unity3d - lz4/dynamicatlas/artfont/r_zhandou_zuijiabiaoti.unity3d - lz4/dynamicatlas/card/t_biandui_hong.unity3d - lz4/dynamicatlas/card/t_zhandoukuang_hong.unity3d From 188dc707a9cdc94ba2799b3592c457c765c524fe Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 17 Nov 2020 19:42:08 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=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 --- .../~Lua/Modules/Formation/View/ExpeditionFormation.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua index d7b5969aac..b57bf001c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExpeditionFormation.lua @@ -18,7 +18,12 @@ function this.GetFormationIndex() return FormationTypeDef.EXPEDITION 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 @@ -55,7 +60,9 @@ end -- 初始化界面显示 function this.InitView() this.root.btn_1:SetActive(true) - this.root.btn_1_lab.text = Language[10708] + this.root.btn_2:SetActive(true) + this.root.btn_1_lab.text = Language[10743] + this.root.btn_2_lab.text = Language[10708] MapManager.isCarbonEnter = false this.root.formTip:SetActive(true) this.root.formTip:GetComponent("Text").text = Language[10727] ..20 .. Language[10728] From c8aa6b59713712a43f78156577e0da8b74aa69f5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 17 Nov 2020 19:54:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=85=AC=E4=BC=9A=E5=89=AF=E6=9C=AC=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 --- .../View/GuildTranscriptFormation.lua | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua index 0ab8cab666..43d313f089 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildTranscriptFormation.lua @@ -17,7 +17,12 @@ function this.GetFormationIndex() return FormationTypeDef.GUILD_TRANSCRIPT 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 @@ -35,26 +40,16 @@ function this.On_Btn1_Click() hadClick = false return end - - -- 战斗力判断 - -- GetCurNodeInfo = ExpeditionManager.GetCurNodeInfo() - --if this.root.formationPower >= this.nodeData.bossTeaminfo.totalForce then - this.StartFight() - --else - -- MsgPanel.ShowTwo("当前队伍战力小于推荐战力,战斗可能会有失败风险。确定是否要继续战斗?", function() - -- hadClick = false - -- end, function() - -- this.StartFight() - -- end, "取消", "确定" - -- ) - --end + this.StartFight() end 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 From 462484db667eaa728f20e114892e94b72ccc82f4 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 17 Nov 2020 19:57:17 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E7=AB=9E=E6=8A=80=E5=9C=BA=E9=98=B2=E5=AE=88?= =?UTF-8?q?=E7=BC=96=E9=98=9F=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/View/ArenaDefendFormation.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua index a2dfb7152c..7779966309 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaDefendFormation.lua @@ -15,7 +15,12 @@ function this.GetFormationIndex() return FormationTypeDef.FORMATION_ARENA_DEFEND end --- 提交按钮点击事件 + function this.On_Btn1_Click() + this.root.SetOneKeyGo() +end + +function this.On_Btn2_Click() local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) if #formation.teamHeroInfos == 0 then PopupTipPanel.ShowTip(Language[10711]) @@ -39,7 +44,9 @@ end function this.InitView() this.root.bg:SetActive(true) this.root.btn_1:SetActive(true) - this.root.btn_1_lab.text = Language[10712] + this.root.btn_1_lab.text = Language[10743] + this.root.btn_2:SetActive(true) + this.root.btn_2_lab.text = Language[10712] this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Arena }) From a68a0687466aab76cec3eedf3eb4ee0be4df23d3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 17 Nov 2020 19:59:18 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=B7=85=E5=B3=B0=E8=B5=9B=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Formation/View/ArenaTopMatchFormation.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua index 908c512974..84415443fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ArenaTopMatchFormation.lua @@ -18,7 +18,12 @@ function this.GetFormationIndex() return FormationTypeDef.ARENA_TOM_MATCH end --- 提交按钮点击事件 +--- + function this.On_Btn1_Click() + this.root.SetOneKeyGo() +end +function this.On_Btn2_Click() --保存编队 if not hadClick then hadClick = true @@ -53,7 +58,9 @@ end function this.InitView() this.root.bg:SetActive(true) this.root.btn_1:SetActive(true) - this.root.btn_1_lab.text = Language[10508] + this.root.btn_1_lab.text = Language[10743] + this.root.btn_2:SetActive(true) + this.root.btn_2_lab.text = Language[10508] hadClick = false -- 没开启或者开启没参赛都属于未参赛 local isOpen = ArenaTopMatchManager.IsTopMatchActive() From 646e3e80616dd8f2dc85197d37d4ac25f454dd03 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 17 Nov 2020 20:01:13 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E8=BD=A9=E8=BE=95=E5=AE=9D=E9=95=9C=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 --- .../~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua index bb62644993..f2643e63a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua @@ -21,8 +21,9 @@ end -- 初始化界面显示 function this.InitView() this.root.bg:SetActive(true) - this.root.btn_1:SetActive(false) + this.root.btn_1:SetActive(true) this.root.btn_2:SetActive(true) + this.root.btn_1_lab.text = Language[10743] this.root.btn_2_lab.text = Language[10709] this.root.tip:SetActive(true) this.root.exampleBtn:SetActive(false) @@ -36,6 +37,7 @@ end --- btn1点击回调事件 function this.On_Btn1_Click() + this.root.SetOneKeyGo() end -- 进入地图 From 08657b4ffdcda6f5d216e7bdcf16a9128b565b9d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 18 Nov 2020 10:48:35 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E8=BD=A6=E8=BF=9F=20=E5=8D=81=E7=BB=9D=20?= =?UTF-8?q?=E5=A2=9E=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