From 65d21adcb8f585c123fca5946270d36ff10280e4 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期四, 07 三月 2019 19:59:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MergeServer/MergeActionMapPos.txt |   62 +++++++++++++++---------------
 1 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MergeServer/MergeActionMapPos.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MergeServer/MergeActionMapPos.txt
index 3ff395e..1999b9d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MergeServer/MergeActionMapPos.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/MergeServer/MergeActionMapPos.txt
@@ -1,32 +1,32 @@
-# 跨服活动类型对应地图坐标
-# {类型:{(跨服服务器分配信息key):[(mapID,dataMapID,copyMapID,posX,posY),(mapID,dataMapID,copyMapID,posX,posY),...],
-#		...}, 
-# ...}
-#
-# 跨服服务器分配信息key 说明:
-# 支持区服区间或指定区服,多个区服区间或指定区服用英文逗号","隔开
-# 如: (1,3,5,(10,20)) 代表1、3、5服及10到20服
-# 【注】该区服ID对应的配置为ZoneServerGroup\rungate\InterfaceServer\MultiServerWarProxyServer\Config\Config.ini中的ServerID值
-#
-# 如无特殊分线需求情况,一般mapID=dataMapID, copyMapID=0;
-# 活动类型定义
-#	2-跨服boss;
-
-(
-
-{
-
-# 跨服boss
-2:{
-	#(1,(380,455),(1000,1032)) :[(10071,10071,0,129,121), (10071,10071,0,136,128), (10071,10071,0,119,128)],
-	#(88, (1040, 1058)) :[(10072,10072,0,129,121), (10072,10072,0,136,128), (10072,10072,0,119,128)],
-	#(188,(1060,2000)) :[(10073,10073,0,129,121), (10073,10073,0,136,128), (10073,10073,0,119,128)],
-	#(276, ) :[(10074,10074,0,129,121), (10074,10074,0,136,128), (10074,10074,0,119,128)],
-	(1,(2,1000)) :[(13000,13000,0,129,121), (13000,13000,0,136,128), (13000,13000,0,119,128)],
-},
-
-
-}
-
-
+# 跨服活动类型对应地图坐标
+# {类型:{(跨服服务器分配信息key):[(mapID,dataMapID,copyMapID,posX,posY),(mapID,dataMapID,copyMapID,posX,posY),...],
+#		...}, 
+# ...}
+#
+# 跨服服务器分配信息key 说明:
+# 支持区服区间或指定区服,多个区服区间或指定区服用英文逗号","隔开
+# 如: (1,3,5,(10,20)) 代表1、3、5服及10到20服
+# 【注】该区服ID对应的配置为ZoneServerGroup\rungate\InterfaceServer\MultiServerWarProxyServer\Config\Config.ini中的ServerID值
+#
+# 如无特殊分线需求情况,一般mapID=dataMapID, copyMapID=0;
+# 活动类型定义
+#	2-跨服boss;
+
+(
+
+{
+
+# 跨服boss
+2:{
+	#(1,(380,455),(1000,1032)) :[(10071,10071,0,129,121), (10071,10071,0,136,128), (10071,10071,0,119,128)],
+	#(88, (1040, 1058)) :[(10072,10072,0,129,121), (10072,10072,0,136,128), (10072,10072,0,119,128)],
+	#(188,(1060,2000)) :[(10073,10073,0,129,121), (10073,10073,0,136,128), (10073,10073,0,119,128)],
+	#(276, ) :[(10074,10074,0,129,121), (10074,10074,0,136,128), (10074,10074,0,119,128)],
+	(1,(2,1000)) :[(13000,13000,0,129,121), (13000,13000,0,136,128), (13000,13000,0,119,128)],
+},
+
+
+}
+
+
 )
\ No newline at end of file

--
Gitblit v1.8.0