From ce4aeeae4380af49bfd7fc1bcce15d97dc401235 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 15 一月 2019 22:19:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/rungate/GateServer/48fa3afb0eabe3ba8de4b7fd8ce76330 | 0
CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagCoat.txt | 6 +++---
db/PyMongoDataServer/SysDB/tagChinItem.txt | 18 +++++++++---------
CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt | 12 +++++++-----
db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt | 12 +++++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt | 4 ++--
7 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt
index d59713c..02dc752 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt
@@ -1,6 +1,8 @@
ZoneID ServerGroupIDList MapID DataMapID CopyMapID
-1 [(1,50)] 32020 32020 0
-2 [(151,200)] 32020 32020 1
-3 [(101,150)] 32021 32020 0
-4 [(51,100)] 32021 32020 1
-5 [(201,250)] 32021 32020 2
+1 [(10001,10004),(20001,20003)] 32020 32020 0
+2 [(8002,8004),(7001,7008)] 32020 32020 1
+3 [(7009,7015)] 32020 32020 2
+4 [(7016,7021)] 32020 32020 3
+5 [(7022,7025)] 32021 32020 0
+6 [(7026,7028),(30001,30002)] 32021 32020 1
+7 [(7029,7031),(30003,30004)] 32021 32020 2
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt
index 52d138d..79f7d92 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt
@@ -1,3 +1,3 @@
ZoneID ZoneName ServerGroupIDList
1 赛区1 [(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7021)]
-2 赛区2 [(7022, 7050)]
+2 赛区2 [(7022, 7050),(30001, 30004)]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
index c2aef3f..4788bc1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
@@ -3,5 +3,5 @@
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
-Map132_Plxj 32020 跨服BOSS 32020 0 0 0 50 1
-Map132_Plxj 32021 跨服BOSS 32020 0 0 0 50 1
\ No newline at end of file
+Map132_Plxj 32020 跨服BOSS 32020 0 0 0 5 1
+Map132_Plxj 32021 跨服BOSS 32020 0 0 0 5 1
\ No newline at end of file
diff --git a/ZoneServerGroup/rungate/GateServer/39323504a334a522b4360f2b78392e6b b/ZoneServerGroup/rungate/GateServer/48fa3afb0eabe3ba8de4b7fd8ce76330
similarity index 100%
rename from ZoneServerGroup/rungate/GateServer/39323504a334a522b4360f2b78392e6b
rename to ZoneServerGroup/rungate/GateServer/48fa3afb0eabe3ba8de4b7fd8ce76330
diff --git a/db/PyMongoDataServer/PySysDB/tagCoat.txt b/db/PyMongoDataServer/PySysDB/tagCoat.txt
index df27f51..665f0f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagCoat.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCoat.txt
@@ -5,6 +5,6 @@
4 6003|6203 5803 3 1|1|1 {"1":{"6":25300,"7":850},"2":{"6":50600,"7":1700},"3":{"6":75900,"7":2550}}
5 6004|6204 5804 3 1|1|1 {"1":{"6":20300,"7":680},"2":{"6":40600,"7":1360},"3":{"6":60900,"7":2040}}
6 6005|6205 5805 3 1|1|1 {"1":{"6":30400,"7":1020},"2":{"6":60800,"7":2040},"3":{"6":91200,"7":3060}}
-7 6006|6206 5806 3 1|1|1 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3006}}
-8 6007|6207 5807 3 1|1|1 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3007}}
-9 6008|6208 5808 3 1|1|1 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3008}}
+7 6006|6206 5806 3 1|1|1 {"1":{"6":5000,"7":170},"2":{"6":10000,"7":340},"3":{"6":15000,"7":510}}
+8 6007|6207 5807 3 1|1|1 {"1":{"6":4000,"7":140},"2":{"6":8000,"7":280},"3":{"6":12000,"7":420}}
+9 6008|6208 5808 3 1|1|1 {"1":{"6":6000,"7":200},"2":{"6":12000,"7":400},"3":{"6":18000,"7":600}}
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt
index d17f610..5a04772 100644
--- a/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt
@@ -1,6 +1,8 @@
ZoneID ServerGroupIDList MapID DataMapID CopyMapID PosX PosY
-1 [(1,50)] 32020 32020 0 199 380
-2 [(151,200)] 32020 32020 1 199 380
-3 [(101,150)] 32021 32020 0 199 380
-4 [(51,100)] 32021 32020 1 199 380
-5 [(201,250)] 32021 32020 2 199 380
+1 [(10001,10004),(20001,20003)] 32020 32020 0 199 380
+2 [(8002,8004),(7001,7008)] 32020 32020 1 199 380
+3 [(7009,7015)] 32020 32020 2 199 380
+4 [(7016,7021)] 32020 32020 3 199 380
+5 [(7022,7025)] 32021 32020 0 199 380
+6 [(7026,7028),(30001,30002)] 32021 32020 1 199 380
+7 [(7029,7031),(30003,30004)] 32021 32020 2 199 380
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b972e2a..3f1f07c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1074,27 +1074,27 @@
5803 1 0 魔幻大师：武器 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 243 4 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5804 1 0 魔幻大师：副手 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 243 5 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5805 1 0 魔幻大师：衣服 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 243 6 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5806 1 0 夏日狂欢：武器 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 7 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5807 1 0 夏日狂欢：副手 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 8 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5808 1 0 夏日狂欢：衣服 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 9 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5806 1 0 夏日狂欢：武器 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 243 7 2300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5807 1 0 夏日狂欢：副手 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 243 8 2300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5808 1 0 夏日狂欢：衣服 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 243 9 2300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6000 1 0 熊猫公仔：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6001 1 0 熊猫公仔：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6002 1 0 熊猫公仔：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6003 1 0 魔幻大师：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6004 1 0 魔幻大师：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6005 1 0 魔幻大师：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6006 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6007 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6008 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6006 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6007 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6008 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6200 1 0 熊猫公仔：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6201 1 0 熊猫公仔：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6202 1 0 熊猫公仔：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6203 1 0 魔幻大师：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6204 1 0 魔幻大师：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6205 1 0 魔幻大师：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6206 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6207 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6208 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6206 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6207 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6208 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6501 1 0 虬龙 102 2 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 1744 0 0 0 0 220 10142 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6502 5 0 奔雷铁鞋 107 7 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 11456 0 0 0 0 220 10587 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 3 0 0 0 0 0 0 0 0 0 0 0 0 105 0 0 0 0 0
6601 9 1 绝世龙枪 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 25560 0 1 0 0 0 0 220 9001 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0