From 2178a68cd8f1b1cad8c44e582f887a205f12ad08 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期六, 22 十二月 2018 14:45:59 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 3 ++- CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt | 3 +++ CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt | 7 +++++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt | 2 ++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt | 2 -- 9 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt new file mode 100644 index 0000000..04331f0 --- /dev/null +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt @@ -0,0 +1,7 @@ +ID ZoneID SeasonID StartDate EndDate EndTime +1 1 1 2018-12-1 2018-12-30 22:00 +2 1 2 2019-1-1 2019-1-30 22:00 +3 1 3 2019-2-1 2019-2-27 22:00 +4 2 1 2019-1-1 2019-1-30 22:00 +5 2 2 2019-2-1 2019-2-28 22:00 +6 2 3 2019-3-1 2019-3-30 22:00 diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt new file mode 100644 index 0000000..0328550 --- /dev/null +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt @@ -0,0 +1,3 @@ +ZoneID ServerGroupIDList +1 [(1, 100), (300, 500), 501, 502] +2 [(101, 200), (601, 700), 701, 702] diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index 142226a..7d7615e 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc index 76d457f..d6845f0 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt new file mode 100644 index 0000000..314c5cc --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt @@ -0,0 +1,2 @@ +Map135_Llxg 32010 跨服竞技场1 32010 0 0 0 50 1 +Map135_Llxg 32011 跨服竞技场2 32011 0 0 0 50 1 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt index 01432d4..7ca6d94 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt @@ -30,8 +30,6 @@ Map111_Lqrz 41110 法宝挑战 41110 0 0 0 100 1 Map601_Zmsl 60010 宗门试炼 60010 0 0 0 100 1 Map118_Hlyy 31180 混乱妖域 31180 0 0 0 100 1 -Map135_Llxg 32010 跨服竞技场1 32010 0 0 0 50 1 -Map135_Llxg 32011 跨服竞技场2 32011 0 0 0 50 1 Map116_Sgzc 31160 上古战场 31160 0 0 0 20 1 Map125_Shfb 31250 守护副本 31250 0 0 0 100 1 Map301_Fmt 52010 封魔坛 52010 0 0 0 20 1 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc index 3933d73..b529af4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc index 96e428c..c419ce5 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index 39b9826..51bcc49 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -666,7 +666,8 @@ 23046 冰晶矿脉沉默 23046 1 1 0 0 2000 1 0 0 2 5 41 6 0 30000 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 23050 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23050 沉默 23050 1 1 0 5 0 14 0 0 1 0 41 0 0 0 0 0 0 0 0 4012 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 8000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 23051 聚魂副本群攻 23051 1 1 0 0 0 1 0 0 2 5 40 5 0 800 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -23052 聚魂副本减速 23052 1 1 0 0 0 4 0 0 2 5 40 5 0 800 0 0 0 0 0 16 5000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +23052 聚魂副本减速 23052 1 1 0 0 0 1 0 0 2 5 40 5 0 800 0 0 0 0 0 1010 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 23053 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +23053 聚魂副本减速 23053 1 1 0 0 0 6 0 0 2 5 40 5 0 800 0 0 0 0 0 16 5000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23100 复仇之刃（1层） 23100 1 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 1000 3 0 10 1000 3 0 7 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0 23101 复仇之刃（2层） 23100 2 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 2000 3 0 10 2000 3 0 7 2000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0 23102 复仇之刃（3层） 23100 3 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 3000 3 0 10 3000 3 0 7 3000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0 -- Gitblit v1.8.0