From 78ab8c7871970531fd79aeb826da6ee4e6258848 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期二, 18 十二月 2018 21:16:30 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt | 26 ++++++++++++++++++++++++++ CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0 db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt | 26 ++++++++++++++++++++++++++ CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 8 files changed, 54 insertions(+), 2 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt new file mode 100644 index 0000000..85b388e --- /dev/null +++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt @@ -0,0 +1,26 @@ +DanLV LVUpScore +0 20 +1 50 +2 100 +3 200 +4 300 +5 400 +6 500 +7 600 +8 700 +9 800 +10 900 +11 1000 +12 1100 +13 1200 +14 1300 +15 1400 +16 1500 +17 1600 +18 1700 +19 1800 +20 1900 +21 2000 +22 2100 +23 2200 +24 0 diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index bfbdd5b..105502e 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 d2f9cf8..84d4348 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc index 015cd6b..855ae7f 100644 --- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc +++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc index 8492cb3..7e6c8e0 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 d3936eb..2ce4e2f 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/PySysDB/tagCrossRealmPKDan.txt b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt new file mode 100644 index 0000000..9ceb30a --- /dev/null +++ b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt @@ -0,0 +1,26 @@ +DanLV LVUpScore DanLVAwardList SeasonAwardList +0 20 [[1024,1,1]] [[1024,1,1]] +1 50 [[1024,1,1]] [[1024,1,1]] +2 100 [[1024,1,1]] [[1024,1,1]] +3 200 [[1024,1,1]] [[1024,1,1]] +4 300 [[1024,1,1]] [[1024,1,1]] +5 400 [[1024,1,1]] [[1024,1,1]] +6 500 [[1024,1,1]] [[1024,1,1]] +7 600 [[1024,1,1]] [[1024,1,1]] +8 700 [[1024,1,1]] [[1024,1,1]] +9 800 [[1024,1,1]] [[1024,1,1]] +10 900 [[1024,1,1]] [[1024,1,1]] +11 1000 [[1024,1,1]] [[1024,1,1]] +12 1100 [[1024,1,1]] [[1024,1,1]] +13 1200 [[1024,1,1]] [[1024,1,1]] +14 1300 [[1024,1,1]] [[1024,1,1]] +15 1400 [[1024,1,1]] [[1024,1,1]] +16 1500 [[1024,1,1]] [[1024,1,1]] +17 1600 [[1024,1,1]] [[1024,1,1]] +18 1700 [[1024,1,1]] [[1024,1,1]] +19 1800 [[1024,1,1]] [[1024,1,1]] +20 1900 [[1024,1,1]] [[1024,1,1]] +21 2000 [[1024,1,1]] [[1024,1,1]] +22 2100 [[1024,1,1]] [[1024,1,1]] +23 2200 [[1024,1,1]] [[1024,1,1]] +24 0 [[1024,1,1]] [[1024,1,1]] diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 71a0695..4259fe0 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -770,8 +770,8 @@ 33409001 2 0 普通守卫1 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1 33409002 2 0 普通守卫2 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 3000 5733 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 578 0 0 0 0 1 295 0 49 1 1 33409003 9 0 建造点 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1 -33402001 2 0 小怪 1 0 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 750 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 -33403001 2 0 BOSS 1 0 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 750 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 +33402001 2 0 小怪 1 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 750 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 +33403001 2 0 BOSS 1 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 750 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 60103001 2 0 妖兵 30 0 71 71 0 0 0 0 0 48 0 0 0 0 0 0 19888 101 800 19888 8 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 10640 0 0 0 0 3 0 0 180 1 1 60103002 2 0 机关幻兽 40 0 89 89 0 0 0 0 0 52 0 0 0 0 0 0 20112 101 800 20112 10 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 13300 0 0 0 0 3 0 0 180 1 1 60103003 2 0 符塔狂豹 50 0 103 103 0 0 0 0 0 83 0 0 0 0 0 0 22454 101 800 22454 11 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 14069 0 0 0 0 3 0 0 180 1 1 -- Gitblit v1.8.0