Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua-TT

2019-02-14 07b2be1002c4b7a2ac159069dab434b81f0bb26e

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 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


 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)]


 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)]


 CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc

Binary files differ

 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)]