From da7ad94f2dd917d59bbbe55d01eaf1d8f635cb72 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期六, 16 二月 2019 10:49:07 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt | 4 ++-- CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt | 2 +- CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt | 4 ++-- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt index 17d32b0..0f6513f 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt @@ -9,8 +9,8 @@ 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)] +android_qudao 3 [(40011,40020),(50007,50010),(60001,60004)] +android_qudao 4 [(40021,40030),(50011,50015),(60005,60010)] ios 1 [] ios 2 [] test 1 [(121, 150)] diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt index 6c19ea9..c2ae60c 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt @@ -2,7 +2,7 @@ android_ziyou 1 赛区1 [(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7021)] 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)] +android_qudao 2 赛区2 [(40011,40030),(50004,50012),(60001,60010)] ios 1 赛区1 [] ios 2 赛区2 [] test 1 赛区1 [(101, 200)] diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc index e61d950..36ba081 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc index 20dde73..938c45c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc index 1a64c89..e7b74ee 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt index 17d32b0..0f6513f 100644 --- a/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt +++ b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt @@ -9,8 +9,8 @@ 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)] +android_qudao 3 [(40011,40020),(50007,50010),(60001,60004)] +android_qudao 4 [(40021,40030),(50011,50015),(60005,60010)] ios 1 [] ios 2 [] test 1 [(121, 150)] -- Gitblit v1.8.0