From 662c3a007bdc0486fce691472c528f2e002b4962 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 03 二月 2019 16:51:57 +0800
Subject: [PATCH] 2906 【1.5.0】【1.5.100】跨服及子服启动未完成优化(启动优化、跨服分区配置优化)

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                               |    0 
 db/PyMongoDataServer/PySysDB/tagCrossPenglaiZoneMap.txt                                              |    9 ++++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc                      |    0 
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc                                   |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc                                             |    0 
 CoreServerGroup/GameServer/Script/PyGameData.pyc                                                     |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc                                              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc |    0 
 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc                                    |    0 
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc                                |    0 
 CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt                                              |   19 +++++++++
 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc                                   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc                 |    0 
 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc                                                  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                  |    0 
 db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt                                                    |   19 +++++++++
 CoreServerGroup/GameServer/Script/ChConfig.pyc                                                       |    0 
 CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZoneMap.txt                                        |    9 ++++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc                             |    0 
 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc                                        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc                                |    0 
 CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt                                                |    9 ++++
 CoreServerGroup/GameServer/Script/GameWorld.pyc                                                      |    0 
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                                    |    0 
 /dev/null                                                                                            |    9 ----
 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc                                       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc                          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc                   |    0 
 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt                                         |   14 ++++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc                                 |    0 
 31 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt
deleted file mode 100644
index 60bf01a..0000000
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ZoneID	ServerGroupIDList	MapID	DataMapID	CopyMapID
-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),(30005,30006)]	32021	32020	2
-8	[(7032,7035),(30007,30010)]	32021	32020	3
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZoneMap.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZoneMap.txt
new file mode 100644
index 0000000..db0afbc
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZoneMap.txt
@@ -0,0 +1,9 @@
+ZoneID	MapID	DataMapID	CopyMapID
+1	32020	32020	0
+2	32020	32020	1
+3	32020	32020	2
+4	32020	32020	3
+5	32021	32020	0
+6	32021	32020	1
+7	32021	32020	2
+8	32021	32020	3
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt
index b7b5a51..ff37deb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt
@@ -1,5 +1,9 @@
-ZoneID	SeasonID	StartDate	EndDate	EndTime
-1	1	2018-12-29	2019-1-18	22:00
-2	1	2018-12-29	2019-1-18	22:00
-1	2	2019-1-20	2019-2-20	22:00
-2	2	2019-1-20	2019-2-20	22:00
+CrossZoneName	ZoneID	SeasonID	StartDate	EndDate	EndTime
+android_ziyou	1	1	2018-12-29	2019-1-18	22:00
+android_ziyou	2	1	2018-12-29	2019-1-18	22:00
+android_ziyou	1	2	2019-1-20	2019-2-20	22:00
+android_ziyou	2	2	2019-1-20	2019-2-20	22:00
+test	1	1	2018-12-29	2019-1-18	22:00
+test	2	1	2018-12-29	2019-1-18	22:00
+test	1	2	2019-1-20	2019-2-20	22:00
+test	2	2	2019-1-20	2019-2-20	22:00
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt
deleted file mode 100644
index 5769f2e..0000000
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ZoneID	ZoneName	ServerGroupIDList
-1	赛区1	[(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7021)]
-2	赛区2	[(7022, 7050),(30001, 30004),(30005, 30010)]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt
new file mode 100644
index 0000000..57d305b
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt
@@ -0,0 +1,19 @@
+CrossZoneName	ZoneID	ServerGroupIDList
+android_ziyou	1	[(10001,10004),(20001,20003)]
+android_ziyou	2	[(8002,8004),(7001,7008)]
+android_ziyou	3	[(7009,7015)]
+android_ziyou	4	[(7016,7021)]
+android_ziyou	5	[(7022,7025)]
+android_ziyou	6	[(7026,7028),(30001,30002)]
+android_ziyou	7	[(7029,7031),(30003,30004)]
+android_ziyou	8	[(7032,7035),(30007,30010)]
+android_qudao	1	[]
+android_qudao	2	[]
+ios	1	[]
+ios	2	[]
+test	1	[(121, 150)]
+test	2	[(151, 200)]
+test	3	[(251, 300)]
+test	4	[(101, 120)]
+test	5	[(1, 50)]
+test	6	[(51, 100)]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt
new file mode 100644
index 0000000..3977520
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt
@@ -0,0 +1,9 @@
+CrossZoneName	ZoneID	ZoneName	ServerGroupIDList
+android_ziyou	1	赛区1	[(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7021)]
+android_ziyou	2	赛区2	[(7022, 7050),(30001, 30004)]
+android_qudao	1	赛区1	[]
+android_qudao	2	赛区2	[]
+ios	1	赛区1	[]
+ios	2	赛区2	[]
+test	1	赛区1	[(101, 200)]
+test	2	赛区2	[(1, 100)]
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index 961d1ea..e9a8193 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorld.pyc b/CoreServerGroup/GameServer/Script/GameWorld.pyc
index fc1b3ad..749d406 100644
--- a/CoreServerGroup/GameServer/Script/GameWorld.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorld.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc
index 7966cdc..6d4fc3f 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index dd4fa30..2fb2317 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index 47287e3..84df878 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index edfdb86..8bda69f 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index 4b621b6..5efe05d 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 6bb5cc8..ef15e62 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
index 36245ca..dddb5bb 100644
--- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index 1021627..84cb5d7 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
index b77b8d6..dc8808f 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index a86771c..8a5becc 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 0e92987..a1c8b59 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 2368b76..1493929 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc
index 079ab6f..144f91c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.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 836dea7..db81f51 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/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index f274f89..c56507a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 3ac1b1a..16739d0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
index 82f7c54..476834b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
index 70d3743..b399cd0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.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 7e83eb1..5d1ffa1 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/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc
index 848b8d9..a284e39 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.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 423aaeb..7894dbf 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/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index dcfbcef..3de859e 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/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt
deleted file mode 100644
index 1ccf7a8..0000000
--- a/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ZoneID	ServerGroupIDList	MapID	DataMapID	CopyMapID	PosX	PosY
-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),(30005,30006)]	32021	32020	2	199	380
-8	[(7032,7035),(30007,30010)]	32021	32020	3	199	380
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZoneMap.txt b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZoneMap.txt
new file mode 100644
index 0000000..ae7c916
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZoneMap.txt
@@ -0,0 +1,9 @@
+ZoneID	MapID	DataMapID	CopyMapID	PosX	PosY
+1	32020	32020	0	199	380
+2	32020	32020	1	199	380
+3	32020	32020	2	199	380
+4	32020	32020	3	199	380
+5	32021	32020	0	199	380
+6	32021	32020	1	199	380
+7	32021	32020	2	199	380
+8	32021	32020	3	199	380
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt
new file mode 100644
index 0000000..57d305b
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt
@@ -0,0 +1,19 @@
+CrossZoneName	ZoneID	ServerGroupIDList
+android_ziyou	1	[(10001,10004),(20001,20003)]
+android_ziyou	2	[(8002,8004),(7001,7008)]
+android_ziyou	3	[(7009,7015)]
+android_ziyou	4	[(7016,7021)]
+android_ziyou	5	[(7022,7025)]
+android_ziyou	6	[(7026,7028),(30001,30002)]
+android_ziyou	7	[(7029,7031),(30003,30004)]
+android_ziyou	8	[(7032,7035),(30007,30010)]
+android_qudao	1	[]
+android_qudao	2	[]
+ios	1	[]
+ios	2	[]
+test	1	[(121, 150)]
+test	2	[(151, 200)]
+test	3	[(251, 300)]
+test	4	[(101, 120)]
+test	5	[(1, 50)]
+test	6	[(51, 100)]

--
Gitblit v1.8.0