From 1ac12b1721f76bc1bc49f8b33f415a54dbde99b7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 15 Aug 2020 23:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=96=E7=B2=BE=E5=8D=95=E6=8A=BD=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E9=87=8F=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/JumpManager.lua | 4 ++-- .../Popup/View/GeneralPopup_RecruitConfirm.lua | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 3c3da6b965..eee62e14a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -47,8 +47,8 @@ local jumpDic = { end end, [JumpType.Arena] = function(data)--竞技场 - -- local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) - local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK) + local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND) + -- local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK) --首次进入竞技场 将主线编队复制到竞技场防守、进攻编队 -- if #arenaAttack.teamHeroInfos==0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index 9169548c5f..863ea4890f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -46,22 +46,28 @@ function this:OnShow(_parent,...) local var if _args[1] == RecruitType.Single then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten - this.rootText.text = "确认花费200妖晶进行1次神将召唤?" + local d=RecruitManager.GetExpendData(RecruitType.Single) + this.rootText.text = string.format("确认花费%s妖晶进行1次神将召唤?",d[2]) elseif _args[1] == RecruitType.QianKunBoxSingle then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - this.rootText.text = "确认花费200妖晶抽取1次乾坤宝盒?" + local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle) + this.rootText.text = string.format("确认花费%s妖晶抽取1次乾坤宝盒?",d[2]) elseif _args[1] == RecruitType.TimeLimitSingle then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - this.rootText.text = "确认花费200妖晶进行1次限时召唤? " + local d=RecruitManager.GetExpendData(RecruitType.TimeLimitSingle) + this.rootText.text = string.format("确认花费%s妖晶进行1次限时召唤?",d[2]) elseif _args[1] == RecruitType.Ten then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten - this.rootText.text = "确认花费2000妖晶进行10次神将召唤?" + local d=RecruitManager.GetExpendData(RecruitType.Ten) + this.rootText.text = string.format("确认花费%s妖晶进行10次神将召唤?",d[2]) elseif _args[1] == RecruitType.QianKunBoxTen then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - this.rootText.text = "确认花费2000妖晶抽取10次乾坤宝盒?" + local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen) + this.rootText.text = string.format("确认花费%s妖晶抽取10次乾坤宝盒?",d[2]) elseif _args[1] == RecruitType.TimeLimitTen then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - this.rootText.text = "确认花费2000妖晶进行10次限时召唤?" + local d=RecruitManager.GetExpendData(RecruitType.TimeLimitTen) + this.rootText.text = string.format("确认花费%s妖晶进行10次限时召唤?",d[2]) end Util.AddOnceClick(this.btn,function()