From 6f22d81a5e115dda29f04975d9b2a351802988c6 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期一, 25 二月 2019 14:40:50 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 24 ++++++++++++------------ CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 db/PyMongoDataServer/Collections/DataServerPlayerData.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 24 ++++++++++++------------ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc | 0 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 991a823..8d6f3bb 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -493,20 +493,20 @@ 20303005 金甲蛮狮 335 20303006 麒麟瑞兽 355 20303007 金色战神 375 -20402001 精英鬼蛛 405 -20402002 精英鱼妖 440 -20402003 精英海石精 450 -20402004 精英海牛 490 -20402005 精英海斗士 500 +20402001 符石之魂 405 +20402002 古舰斥候 440 +20402003 古舰枪兵 450 +20402004 浮空之蟒 490 +20402005 钢铁防线 500 20402006 精英地龙 540 20402007 精英冰骨妖 550 -20403001 猩红女王 410 -20403002 忘川鬼鲨 445 -20403003 幽冥石鬼 455 -20403004 炎魔巨兽 495 -20403005 上古裂妖 505 -20403006 战场魔龙 545 -20403007 戮仙鬼王 555 +20403001 符石先锋 410 +20403002 守舰兵长 445 +20403003 御舰法师 455 +20403004 赤舰上将 495 +20403005 古舰之隼 505 +20403006 神力巨人 545 +20403007 舰首之龙 555 30102001 凶狼 50 30102002 巨虎 50 30102003 幼龙 50 diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc index d676d07..a81cd59 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc b/CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc index b784e0c..80b1cdf 100644 --- a/CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc +++ b/CoreServerGroup/GameServer/Script/PyGameDataStruct.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 19eac90..9187754 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/Collections/DataServerPlayerData.pyc b/db/PyMongoDataServer/Collections/DataServerPlayerData.pyc index 1f0f8f0..56129a5 100644 --- a/db/PyMongoDataServer/Collections/DataServerPlayerData.pyc +++ b/db/PyMongoDataServer/Collections/DataServerPlayerData.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 95f24d4..d63eaa4 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -493,20 +493,20 @@ 20303005 2 0 金甲蛮狮 335 0 34641 34641 0 16 0 0 10000 33439 0 1 0 0 0 0 0 3 3000 4008354 252 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 2691253 5 10000 0 0 5 0 0 186 1 1 20303006 2 0 麒麟瑞兽 355 0 45112 45112 0 17 0 0 10000 44723 0 1 0 0 0 0 0 3 3000 4554422 285 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 33143382 9 10000 0 0 5 0 0 186 1 1 20303007 2 0 金色战神 375 0 58234 58234 0 18 0 0 10000 57175 0 1 0 0 0 0 0 3 3000 4861408 305 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 15324762 15 10000 0 0 5 0 0 186 1 1 -20402001 2 0 精英鬼蛛 405 0 25533 25533 0 20 0 0 0 4394 0 0 0 0 0 0 0 3 3000 5196577 326 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 76986274 0 0 0 0 1 34798563 0 1 1 1 -20402002 2 0 精英鱼妖 440 0 29839 29839 0 23 0 0 0 7741 0 0 0 0 0 0 0 3 3000 5734071 360 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 27518996 1 0 0 0 1 52367876 0 1 1 1 -20402003 2 0 精英海石精 450 0 31450 31450 0 24 0 0 0 8115 0 0 0 0 0 0 0 3 3000 5921443 372 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 43395937 1 0 0 0 1 60436129 0 1 1 1 -20402004 2 0 精英海牛 490 0 36998 36998 0 26 0 0 0 10097 0 0 0 0 0 0 0 3 3000 6661390 418 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 92691731 1 0 0 0 1 109294469 0 1 1 1 -20402005 2 0 精英海斗士 500 0 39084 39084 0 29 0 0 0 10537 0 0 0 0 0 0 0 3 3000 6851040 430 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 7253266 2 0 0 0 1 127053886 0 1 1 1 +20402001 2 0 符石之魂 405 0 25533 25533 0 20 0 0 0 4394 0 0 0 0 0 0 0 3 3000 5196577 326 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 76986274 0 0 0 0 1 34798563 0 1 1 1 +20402002 2 0 古舰斥候 440 0 29839 29839 0 23 0 0 0 7741 0 0 0 0 0 0 0 3 3000 5734071 360 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 27518996 1 0 0 0 1 52367876 0 1 1 1 +20402003 2 0 古舰枪兵 450 0 31450 31450 0 24 0 0 0 8115 0 0 0 0 0 0 0 3 3000 5921443 372 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 43395937 1 0 0 0 1 60436129 0 1 1 1 +20402004 2 0 浮空之蟒 490 0 36998 36998 0 26 0 0 0 10097 0 0 0 0 0 0 0 3 3000 6661390 418 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 92691731 1 0 0 0 1 109294469 0 1 1 1 +20402005 2 0 钢铁防线 500 0 39084 39084 0 29 0 0 0 10537 0 0 0 0 0 0 0 3 3000 6851040 430 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 7253266 2 0 0 0 1 127053886 0 1 1 1 20402006 2 0 精英地龙 540 0 45948 45948 0 33 0 0 0 12765 0 0 0 0 0 0 0 3 3000 7864938 492 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 85782899 2 0 0 0 1 231950199 0 1 1 1 20402007 2 0 精英冰骨妖 550 0 48174 48174 0 38 0 0 0 13253 0 0 0 0 0 0 0 3 3000 8123391 508 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 9426047 3 0 0 0 1 269289020 0 1 1 1 -20403001 2 0 猩红女王 410 0 110889 110889 0 23 0 0 10000 114272 0 1 0 0 0 0 0 3 3000 5921443 372 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 79864653 47 10000 0 0 5 0 0 186 1 1 -20403002 2 0 忘川鬼鲨 445 0 132498 132498 0 24 0 0 10000 140284 0 1 0 0 0 0 0 3 3000 6763516 425 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 28195606 83 10000 0 0 5 0 0 186 1 1 -20403003 2 0 幽冥石鬼 455 0 146677 146677 0 25 0 0 10000 155703 0 1 0 0 0 0 0 3 3000 7228636 453 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10258546 115 10000 0 0 5 0 0 186 1 1 -20403004 2 0 炎魔巨兽 495 0 174032 174032 0 29 0 0 10000 186395 0 1 0 0 0 0 0 3 3000 8260931 517 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 29717300 160 10000 0 0 5 0 0 186 1 1 -20403005 2 0 上古裂妖 505 0 181582 181582 0 30 0 0 10000 195581 0 1 0 0 0 0 0 3 3000 8557220 534 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 60796610 201 10000 0 0 5 0 0 186 1 1 -20403006 2 0 战场魔龙 545 0 205267 205267 0 34 0 0 10000 222189 0 1 0 0 0 0 0 3 3000 9658212 601 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 27966702 314 10000 0 0 5 0 0 186 1 1 -20403007 2 0 戮仙鬼王 555 0 253946 253946 0 35 0 0 10000 266418 0 1 0 0 0 0 0 3 3000 9798411 609 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 82515120 361 10000 0 0 5 0 0 186 1 1 +20403001 2 0 符石先锋 410 0 110889 110889 0 23 0 0 10000 114272 0 1 0 0 0 0 0 3 3000 5921443 372 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 79864653 47 10000 0 0 5 0 0 186 1 1 +20403002 2 0 守舰兵长 445 0 132498 132498 0 24 0 0 10000 140284 0 1 0 0 0 0 0 3 3000 6763516 425 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 28195606 83 10000 0 0 5 0 0 186 1 1 +20403003 2 0 御舰法师 455 0 146677 146677 0 25 0 0 10000 155703 0 1 0 0 0 0 0 3 3000 7228636 453 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10258546 115 10000 0 0 5 0 0 186 1 1 +20403004 2 0 赤舰上将 495 0 174032 174032 0 29 0 0 10000 186395 0 1 0 0 0 0 0 3 3000 8260931 517 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 29717300 160 10000 0 0 5 0 0 186 1 1 +20403005 2 0 古舰之隼 505 0 181582 181582 0 30 0 0 10000 195581 0 1 0 0 0 0 0 3 3000 8557220 534 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 60796610 201 10000 0 0 5 0 0 186 1 1 +20403006 2 0 神力巨人 545 0 205267 205267 0 34 0 0 10000 222189 0 1 0 0 0 0 0 3 3000 9658212 601 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 27966702 314 10000 0 0 5 0 0 186 1 1 +20403007 2 0 舰首之龙 555 0 253946 253946 0 35 0 0 10000 266418 0 1 0 0 0 0 0 3 3000 9798411 609 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 82515120 361 10000 0 0 5 0 0 186 1 1 30102001 2 0 凶狼 50 0 100 100 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 3000 100 0 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 1 1 1 30102002 2 0 巨虎 50 0 100 100 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 3000 100 0 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 1 1 1 30102003 2 0 幼龙 50 0 100 100 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 3000 100 0 0 300 2 6 10005 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 198 1 1 -- Gitblit v1.8.0