From da665cc148818baed977515effdfca5bd43ebde8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 21 Oct 2021 10:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BC=96=E9=98=9F=E3=80=91=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=85=AC=E4=BC=9A=E6=88=98=E7=9B=B8=E5=85=B3=E7=BC=96?= =?UTF-8?q?=E9=98=9F=E5=88=A4=E6=96=AD=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=BC=96?= =?UTF-8?q?=E9=98=9F=E4=BF=A1=E6=81=AF=E6=97=B6=E4=B8=8D=E5=86=8D=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=85=AC=E4=BC=9A=E6=88=98=E9=98=B2=E5=AE=88=E7=BC=96?= =?UTF-8?q?=E9=98=9F=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationManager.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 49a09e5f4f..f3cf4324f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -115,7 +115,7 @@ function this.UpdateFormation(msg) end end -- 获取数据时检测一下公会战防守数据 - this.CheckGuildFightDefendFormation() + -- this.CheckGuildFightDefendFormation() end --刷新临时编队数据 function this.UpdateTemporaryFormation(teamId, TeamPosInfo) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 65b6a4338c..3a0ed7525d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -471,10 +471,10 @@ function this.GetHeroFormationStr2(teamId) return Language[11108], FormationTypeDef.FORMATION_ARENA_ATTACK elseif teamId == FormationTypeDef.FORMATION_ENDLESS_MAP then return Language[10692], FormationTypeDef.FORMATION_ENDLESS_MAP - elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND then - return Language[10682], FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND - elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK then - return Language[10683], FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK + -- elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND then + -- return Language[10682], FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND + -- elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK then + -- return Language[10683], FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK elseif teamId == FormationTypeDef.BLOODY_BATTLE_ATTACK then return Language[11109], FormationTypeDef.BLOODY_BATTLE_ATTACK elseif teamId == FormationTypeDef.EXPEDITION then