From 5a00dc4d340b95a074444b13778cf93c3cfb3aeb Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期六, 29 十二月 2018 04:52:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagEffectRefresh.txt | 3 +++
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt | 3 +++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt | 3 +++
4 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
index 314c5cc..928f88d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
@@ -1,2 +1,5 @@
Map135_Llxg 32010 跨服竞技场1 32010 0 0 0 50 1
Map135_Llxg 32011 跨服竞技场2 32011 0 0 0 50 1
+Map135_Llxg 32012 跨服竞技场3 32012 0 0 0 50 1
+Map135_Llxg 32013 跨服竞技场4 32013 0 0 0 50 1
+Map135_Llxg 32014 跨服竞技场5 32014 0 0 0 50 1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
index cf874a6..ce5b958 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
@@ -40,4 +40,7 @@
Map134_Yams_31340 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 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
Map135_Llxg_32010 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 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
Map135_Llxg_32011 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 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
+Map135_Llxg_32012 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 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
+Map135_Llxg_32013 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 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
+Map135_Llxg_32014 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 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
Map133_Bzjsc_31031 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 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/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index d6b00e3..6ff8e78 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -53,7 +53,7 @@
31190 4 31190 200 500 0 0 0 0 120 0 0 [24,3] [3,480,10,5,15] [[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]] [(4151,8,9),(1142,1,1)]
31190 5 31190 230 500 0 0 0 0 120 0 0 [24,3] [3,480,10,5,15] [[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]] [(4151,10,11),(1142,1,1)]
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
-31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
+31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [1200,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [3,1800,15,101]
51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [3,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,40,40,20,20] [793536, [141,45]]
51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [3,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,40,40,20,20] [831840, [141,36], [142,6]]
diff --git a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
index 79b607e..744d6e0 100644
--- a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
@@ -105,3 +105,6 @@
110951 40000 88 150 10 20008 0
111323 32010 23 23 25 20010 0
111324 32011 24 23 30 20010 0
+111340 32012 23 23 25 20010 0
+111344 32013 23 23 25 20010 0
+111348 32014 23 23 25 20010 0
--
Gitblit v1.8.0