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