From b3e7d027176a902cdb681d2d3e6317556c0e0556 Mon Sep 17 00:00:00 2001
From: gwj <123123@qq.com>
Date: 星期五, 10 七月 2026 19:42:22 +0800
Subject: [PATCH] 1111  对战测试

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/BatTestLineup.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/BatTestLineup.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/BatTestLineup.txt
index d8aca12..109a628 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/BatTestLineup.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/BatTestLineup.txt
@@ -2,7 +2,11 @@
 1	主公100官10祝12	100	10	12	{6:10000, 25:5000}	{9000041:2, 9000091:2}	0	520012002	520013001	520014001	520015001	520016001	520011001
 2	主公150官15祝17	150	15	17	{}	{}	1	520012002	520013001	0	520015001	0	520011001
 3	魏	400	20	30	{}	{9000021:3, 9000041:1}	1	510012001	510013001	510014001	510018001	510016001	510017001
+<<<<<<< master
 4	蜀	400	20	30	{}	{9000011:3, 9000041:1}	1	520012001	520013001	520014001	520015001	520016001	520017001
+=======
+4	蜀	400	20	30	{}	{9000011:3, 9000041:1}	1	520012001	520013001	520014001	520010001	520016001	520017001
+>>>>>>> local
 5	吴	400	20	30	{}	{9000031:3, 9000041:1}	1	530012001	530013001	530014001	530015001	530016001	530017001
 6	群	400	20	30	{}	{9000041:4}	1	540012001	540013001	540014001	540015001	540016001	540017001
 7	魏	400	20	30	{}	{9000021:3, 9000041:1}	1	510012001	510013001	510014001	510015001	510016001	510011001

--
Gitblit v1.8.0