From bb0cc1ef463ab4ee8c0e9584531161727d17d615 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 10 六月 2026 18:12:56 +0800
Subject: [PATCH] 588 公会攻防战 适配
---
Main/System/Battle/BattleFieldFactory.cs | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/Main/System/Battle/BattleFieldFactory.cs b/Main/System/Battle/BattleFieldFactory.cs
index 66a2056..df43786 100644
--- a/Main/System/Battle/BattleFieldFactory.cs
+++ b/Main/System/Battle/BattleFieldFactory.cs
@@ -38,15 +38,12 @@
case 32000:
battleField = new QYBattleField(guid);
break;
-<<<<<<< HEAD
-=======
case 100:
battleField = new ArenaBattleField(guid);
break;
case 33000:
battleField = new GuildAtkDefBatField(guid);
break;
->>>>>>> 0afbb8c1 (588 鍏細鏀婚槻鎴�)
default:
break;
}
--
Gitblit v1.8.0