From 67dcecc548705f812b7e43cab28ce10dc04d07fd Mon Sep 17 00:00:00 2001 From: CeHua_TRX <526616766@qq.com> Date: 星期五, 21 十二月 2018 11:33:32 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 20 ++++++++++---------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0 CoreServerGroup/GameServer/Script/GameWorld.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 26 +++++++++++++------------- CoreServerGroup/GameServer/Script/ReadChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index 510dd92..142226a 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 43924cc..76d457f 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorld.pyc b/CoreServerGroup/GameServer/Script/GameWorld.pyc index 67242c7..420d148 100644 --- a/CoreServerGroup/GameServer/Script/GameWorld.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorld.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ReadChConfig.pyc b/CoreServerGroup/GameServer/Script/ReadChConfig.pyc index ecaebed..e11a16c 100644 --- a/CoreServerGroup/GameServer/Script/ReadChConfig.pyc +++ b/CoreServerGroup/GameServer/Script/ReadChConfig.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index 987f72e..b1e5dc0 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.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 140ef41..3933d73 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 e85fc60..96e428c 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc index 271036b..9b7e86d 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.pyc index 8e42cb8..ce06793 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ReadChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index fd43f52..46837d0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc index 45996c6..f4d8e1f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt index 627b15c..1353f50 100644 --- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt +++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt @@ -117,15 +117,15 @@ 31604001 0 4 0 800 10000 0 8000 1 9900 50 1 0 0 0 10000 33409001 0 2 0 800 10000 0 8000 1 9900 50 1 0 0 5 0 33409002 0 2 0 800 10000 0 8000 1 9900 50 1 0 0 0 0 -33402001 0 2 0 1000 10000 0 8000 1 9900 50 12 0 0 0 0 -33403001 0 2 0 3000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402001 0 2 0 800 10000 0 8000 1 9900 50 12 0 0 0 0 +33403001 0 2 0 2000 10000 0 8000 1 9900 50 1 0 0 0 0 33402002 0 2 0 1500 10000 0 8000 1 9900 50 12 0 0 0 0 33403002 0 2 0 5000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402003 0 2 0 1500 10000 0 8000 1 9900 50 12 0 0 0 0 -33403003 0 2 0 5000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402004 0 2 0 2000 10000 0 8000 1 9900 50 12 0 0 0 0 -33403004 0 2 0 6000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402005 0 2 0 3000 10000 0 8000 1 9900 50 12 0 0 0 0 -33403005 0 2 0 7000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402006 0 2 0 3500 10000 0 8000 1 9900 50 12 0 0 0 0 -33403006 0 2 0 8000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402003 0 2 0 300 10000 0 8000 1 9900 50 12 0 0 0 0 +33403003 0 2 0 1000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402004 0 2 0 1500 10000 0 8000 1 9900 50 12 0 0 0 0 +33403004 0 2 0 5000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402005 0 2 0 2000 10000 0 8000 1 9900 50 12 0 0 0 0 +33403005 0 2 0 6000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402006 0 2 0 3000 10000 0 8000 1 9900 50 12 0 0 0 0 +33403006 0 2 0 7000 10000 0 8000 1 9900 50 1 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index cac663c..bf4c282 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -771,19 +771,19 @@ 32504001 0 0 幼龙 100 0 119707 2542 59281 0 0 0 10000 39555 0 0 0 0 0 0 0 0 2000 1136803 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 10 0 0 0 0 0 0 0 200 1 1 33409001 2 0 普通守卫1攻击 41 1 173 173 82 0 0 0 40000 14 0 0 0 0 0 0 0 0 800 5733 0 0 300 2 6 23051 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 800 5733 0 0 300 2 6 23052 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 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 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 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 -33402002 2 0 小怪 1 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 -33403002 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 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 -33402003 2 0 小怪 1 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 150 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 -33403003 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 150 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 -33402004 2 0 小怪 1 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 -33403004 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 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 -33402005 2 0 小怪 1 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 -33403005 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 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 -33402006 2 0 小怪 1 2 3 3 3 1 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 -33403006 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 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 +33409003 9 0 建造点 1 0 3 3 3 0 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 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 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 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 +33402002 2 0 小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 +33403002 2 0 BOSS 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 +33402003 2 0 小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 150 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 +33403003 2 0 BOSS 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 150 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 +33402004 2 0 小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 +33403004 2 0 BOSS 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 +33402005 2 0 小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 +33403005 2 0 BOSS 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1 +33402006 2 0 小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1 +33403006 2 0 BOSS 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 300 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