From 07b2be1002c4b7a2ac159069dab434b81f0bb26e Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期四, 14 二月 2019 11:48:46 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0 db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt | 10 ++++++---- CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt | 6 +++--- CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt | 10 ++++++---- CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt | 2 ++ 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt index ff37deb..04d9e6d 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt @@ -3,6 +3,8 @@ 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 +android_qudao 1 1 2019-1-28 2019-2-28 22:00 +android_qudao 2 1 2019-1-28 2019-2-28 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 diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt index 57d305b..17d32b0 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt @@ -5,10 +5,12 @@ 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 [] +android_ziyou 7 [(7029,7031),(30003,30004),(30005,30006)] +android_ziyou 8 [(7032,7040),(30007,30010)] +android_qudao 1 [(40001,40005),(50001,50002)] +android_qudao 2 [(40006,40010),(50003,50006)] +android_qudao 3 [(40011,40020),(50007,50010)] +android_qudao 4 [(40021,40030),(50011,50015)] ios 1 [] ios 2 [] test 1 [(121, 150)] diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt index 3977520..6c19ea9 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt @@ -1,8 +1,8 @@ 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 [] +android_ziyou 2 赛区2 [(7022, 7050),(30001, 30004),(30005, 30010)] +android_qudao 1 赛区1 [(40001,40010),(50001,50003)] +android_qudao 2 赛区2 [(40011,40030),(50004,50012)] ios 1 赛区1 [] ios 2 赛区2 [] test 1 赛区1 [(101, 200)] diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc index 21c0cfd..4a84316 100644 --- a/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc +++ b/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc index 7fd349f..2513e9b 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc index 0b35479..a2d41bf 100644 --- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc +++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt index 57d305b..17d32b0 100644 --- a/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt +++ b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt @@ -5,10 +5,12 @@ 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 [] +android_ziyou 7 [(7029,7031),(30003,30004),(30005,30006)] +android_ziyou 8 [(7032,7040),(30007,30010)] +android_qudao 1 [(40001,40005),(50001,50002)] +android_qudao 2 [(40006,40010),(50003,50006)] +android_qudao 3 [(40011,40020),(50007,50010)] +android_qudao 4 [(40021,40030),(50011,50015)] ios 1 [] ios 2 [] test 1 [(121, 150)] -- Gitblit v1.8.0