From 1f7e26fd43fc830a50afa41f45f6990e3d9372bb Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 03 十二月 2025 20:04:23 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(战报优化、支持多地图战斗) 同步主干

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc                                  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinMap.txt                   |    2 ++
 ServersRoute/Config/ServersConfig.json                                                                      |    2 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.pyc        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBDataMgr.pyc                                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.pyc      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc                                  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt                 |    1 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/SysDB/tagChinMap.txt                   |    2 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc                           |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt                                        |    4 +++-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini                                       |    5 ++++-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt                 |    1 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt                                               |    2 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc                        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc                           |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc                                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc                                       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.pyc         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc                                 |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.pyc                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CommFunc.pyc                                         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc                                        |    0 
 27 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ServersRoute/Config/ServersConfig.json b/ServersRoute/Config/ServersConfig.json
index 2a27358..582b6b3 100644
--- a/ServersRoute/Config/ServersConfig.json
+++ b/ServersRoute/Config/ServersConfig.json
@@ -1 +1 @@
-{3:["severname",10010, 0], 5:["severname",10010, 0], 23:["severname",10010, 0], 1:["severname",10010, 0],2:["severname",10010, 0],6:["severname",10010, 0],7:["severname",10010, 0],8:["severname",10010, 0],15:["severname",10010, 0],37:["severname",10010, 0],86:["severname",10010, 0],99:["severname",10010, 0],102:["severname",10010, 0],502:["severname",10010, 1], 503:["severname",10020, 2], 100:["severname",10020, 0],9006:["severname",10090, 0], 504:["severname2",10010, 0], 505:["severname2",10010, 1], 506:["severname2",10020, 2], 507:["severname2",10090, 0]}
\ No newline at end of file
+{3:["severname",10010, 0], 5:["severname",10010, 0], 23:["severname",10010, 0], 1:["severname",10010, 0],2:["severname",10010, 0],6:["severname",10010, 0],7:["severname",10010, 0],8:["severname",10010, 0],15:["severname",10010, 0],37:["severname",10010, 0],86:["severname",10010, 0],99:["severname",10010, 0],102:["severname",10010, 0],502:["severname",10010, 1], 503:["severname",10020, 2], 100:["severname",10020, 0],9006:["severname",10090, 0], 504:["severname2",10010, 0], 505:["severname2",10010, 1], 506:["severname2",10020, 2], 507:["severname2",10090, 0], 6000001:["severname",60001, 3], 6000002:["severname",60002, 3]}
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
index 32edaec..4e4b7db 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
@@ -2,3 +2,5 @@
 Map001_Sjz	10020	地图2	10020	0	0	0	1	1
 Map001_Sjz	10030	地图3	10030	0	0	0	1	1
 Map001_Sjz	10090	地图4	10090	0	0	0	1	1
+Map001_Sjz	60001	战斗1	60001	0	0	0	1	1
+Map001_Sjz	60002	战斗2	60002	0	0	0	1	1
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
index 4068e07..c99488c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
@@ -2,4 +2,6 @@
 Map001_Sjz_10010	127.0.0.1	19001	1	500	500	250	500	30	1000	500	0	500	2000	1000	2000	1000	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
 Map001_Sjz_10020	127.0.0.1	19001	1	500	500	250	500	30	1000	500	0	500	2000	1000	2000	1000	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
 Map001_Sjz_10030	127.0.0.1	19001	1	500	500	250	500	30	1000	500	0	500	2000	1000	2000	1000	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
-Map001_Sjz_10090	127.0.0.1	19001	1	500	500	250	500	30	1000	500	0	500	2000	1000	2000	1000	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
\ No newline at end of file
+Map001_Sjz_10090	127.0.0.1	19001	1	500	500	250	500	30	1000	500	0	500	2000	1000	2000	1000	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
+Map001_Sjz_60001	127.0.0.1	19001	1	500	500	250	500	30	1000	500	0	500	2000	1000	2000	1000	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
+Map001_Sjz_60002	127.0.0.1	19001	1	500	500	250	500	30	1000	500	0	500	2000	1000	2000	1000	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini
index 396cdaa..5aa4c46 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini
@@ -7,10 +7,13 @@
 Writer = alee
 Releaser = alee
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
 
 
 PacketCMD_1=0xC2
 PacketSubCMD_1=0x01
 PacketCallFunc_1=OnTest
 
+PacketCMD_2=0xC2
+PacketSubCMD_2=0x02
+PacketCallFunc_2=OnSSCommMsg
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
index 4793c19..8ce1ce1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
index c483199..902539d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index aaa4fe5..c694ec7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc
index 0a2171c..94f88ee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CommFunc.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CommFunc.pyc
index cd9c376..5e269bc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CommFunc.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CommFunc.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.pyc
index 98c46a7..31d1bf0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBDataMgr.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBDataMgr.pyc
index b02aeb7..e87cd74 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBDataMgr.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/DBDataMgr.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
index 2703e56..00e5b08 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
index adaea4c..da10e04 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.pyc
index cff5e1b..cbaf731 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc
index 90e13e6..996a10a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.pyc
index be4a1e1..8482ce6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.pyc
index 0b10981..24b0d68 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.pyc
index 48fc4a9..6a88cf0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
index 6b3170f..ccb6e94 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
index 7334699..e8ac40e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc
index 78b3393..da50f22 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index fad757a..6d8c38b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
index 8f72b0e..4147d6b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index eeb2056..224bb19 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -412,6 +412,7 @@
 MainDropAppoint	{1:[100101,0,101],2:[100203,0,102],3:[100104,0,103],4:[100107,0,104],5:[100106,0,105],6:[100305,0,106],7:[100102,0,107],8:[100209,0,108],9:[100111,0,109],10:[100407,0,110],11:[100110,0,111],12:[100105,1,0],13:[100212,0,112],14:[100107,3,0],15:[100301,0,113],16:[100206,1,0],17:[100105,0,114],18:[100201,2,0],19:[100103,1,115],20:[100110,1,0],21:[100112,2,0],22:[100209,0,116],23:[100107,2,0],24:[100109,1,0],25:[100308,0,117]}				
 TreeLVUP	42	4|300			
 TreeEnergy	3	3	120	30	1|50
+TurnFightProcess	2				
 TurnFightCD	0	800			
 TurnMax	15	15	{}		
 AngerXP	50	100	50	5	{"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinMap.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinMap.txt
index 35e7556..1438943 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinMap.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/SysDB/tagChinMap.txt
@@ -3,3 +3,5 @@
 10020	两仪山间	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10020	163	73	1	1	1	0	1
 10130	封魔之地	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10030	152	81	1	1	2	0	1
 10090	玄梦幻界	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10090	121	45	1	1	3	0	1
+60001	战斗1	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10090	121	45	1	1	3	0	1
+60002	战斗2	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10090	121	45	1	1	3	0	1
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
index eeb2056..224bb19 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -412,6 +412,7 @@
 MainDropAppoint	{1:[100101,0,101],2:[100203,0,102],3:[100104,0,103],4:[100107,0,104],5:[100106,0,105],6:[100305,0,106],7:[100102,0,107],8:[100209,0,108],9:[100111,0,109],10:[100407,0,110],11:[100110,0,111],12:[100105,1,0],13:[100212,0,112],14:[100107,3,0],15:[100301,0,113],16:[100206,1,0],17:[100105,0,114],18:[100201,2,0],19:[100103,1,115],20:[100110,1,0],21:[100112,2,0],22:[100209,0,116],23:[100107,2,0],24:[100109,1,0],25:[100308,0,117]}				
 TreeLVUP	42	4|300			
 TreeEnergy	3	3	120	30	1|50
+TurnFightProcess	2				
 TurnFightCD	0	800			
 TurnMax	15	15	{}		
 AngerXP	50	100	50	5	{"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/SysDB/tagChinMap.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/SysDB/tagChinMap.txt
index 35e7556..1438943 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/SysDB/tagChinMap.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/SysDB/tagChinMap.txt
@@ -3,3 +3,5 @@
 10020	两仪山间	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10020	163	73	1	1	1	0	1
 10130	封魔之地	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10030	152	81	1	1	2	0	1
 10090	玄梦幻界	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10090	121	45	1	1	3	0	1
+60001	战斗1	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10090	121	45	1	1	3	0	1
+60002	战斗2	1	1	0	0	0	0	0	0	0	0	0	0	1	1	10090	121	45	1	1	3	0	1
\ No newline at end of file

--
Gitblit v1.8.0