From 2183e90f470721e91d39b571d130649002dd5b6d Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期四, 23 八月 2018 16:11:31 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 34 +++++++++++++++++----------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc index 0e65fde..bc83ecb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc index 1945e9e..16c5947 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 6051e7d..95e911d 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -329,7 +329,7 @@ 10201004 2 0 幽魂巫师 31 0 50 50 14 0 0 561 0 6 0 0 0 0 9484 0 0 0 4000 10058 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 311 0 0 0 0 0 16 0 1 1 1 10201005 2 0 魔物 35 0 62 62 19 0 0 613 0 7 0 0 0 0 12021 0 0 0 4000 10998 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 472 0 0 0 0 0 19 0 1 1 1 10202001 2 0 魂灵 37 0 77 77 22 0 0 667 0 7 0 0 0 0 12527 0 0 0 4000 12220 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 518 0 0 0 0 0 22 0 1 1 1 -10203001 2 0 狂躁巨猿 40 0 96 96 36 0 0 0 0 193 0 3 0 0 13136 0 0 0 3000 101543 4 0 200 0 6 0 0 0 0 0 0 0 0 1 10 1 7410 0 10000 0 0 5 0 0 186 1 1 +10203001 2 0 狂躁巨猿 40 0 96 96 36 1 0 0 0 193 0 3 0 0 13136 0 0 0 3000 101543 4 0 200 0 6 0 0 0 0 0 0 0 0 1 10 1 7410 0 10000 0 0 5 0 0 186 1 1 10301001 2 0 剑士 43 0 106 106 44 0 0 715 0 18 0 0 0 0 14566 0 0 0 4000 13066 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 693 0 0 0 0 0 44 0 1 1 1 10301002 2 0 巨剑士 48 0 132 132 46 0 0 770 0 18 0 0 0 0 15812 0 0 0 4000 13912 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 760 0 0 0 0 0 66 0 1 1 1 10301003 2 0 亡灵剑士 52 0 174 174 47 0 0 822 0 19 0 0 0 0 16662 0 0 0 4000 14852 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 832 0 0 0 0 0 99 0 1 1 1 @@ -736,22 +736,22 @@ 60204010 8 0 我是渣渣辉 25 1 905 922 0 21 0 0 7500 57 0 0 0 0 0 0 0 0 1200 63582 7 0 300 0 6 0 0 0 0 0 0 0 0 0 10 2 100000 100 0 0 0 0 0 0 186 1 1 60204011 8 0 电动小马达 25 1 964 972 0 21 0 0 7500 59 0 0 0 0 0 0 0 0 1200 63582 7 0 300 0 6 0 0 0 0 0 0 0 0 0 10 2 100000 100 0 0 0 0 0 0 186 1 1 60204012 8 0 战神浅夏 25 1 877 888 0 21 0 0 7500 51 0 0 0 0 0 0 0 0 1200 63582 7 0 300 0 6 0 0 0 0 0 0 0 0 0 10 2 100000 100 0 0 0 0 0 0 186 1 1 -60203001 18 0 魔坛巨熊 20 2 54 54 0 1 0 0 10000 63 0 0 0 0 0 0 0 0 2500 87307 3 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 31000000 41 0 0 0 5 0 0 186 1 1 -60203002 18 0 魔坛巨猿 40 2 200 200 0 1 0 0 10000 67 0 0 0 0 0 0 0 0 2500 147095 6 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 68850000 82 0 0 0 5 0 0 186 1 1 -60203003 18 0 魔坛牙刃 70 2 330 330 0 1 0 0 10000 130 0 0 0 0 0 0 0 0 2500 209729 9 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 7892980 234 0 0 0 5 0 0 186 1 1 -60203004 18 0 魔坛左翼 85 2 489 489 0 2 0 0 10000 143 0 0 0 0 0 0 0 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 47626349 517 0 0 0 5 0 0 186 1 1 -60203005 18 0 魔坛右翼 85 2 565 565 0 4 0 0 10000 208 0 0 0 0 0 0 0 0 2500 353028 14 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 21584929 672 0 0 0 5 0 0 186 1 1 -60203006 18 0 魔坛龙王 110 2 1400 1400 0 5 0 0 10000 242 0 0 0 0 0 0 0 0 2500 453622 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 63565856 1025 0 0 0 5 0 0 186 1 1 -60203007 18 0 魔坛秘影 130 2 1687 1687 0 6 0 0 10000 363 0 0 0 0 0 0 0 0 2500 582685 21 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 78291474 1465 0 0 0 5 0 0 186 1 1 -60203008 18 0 魔坛帝皇 155 2 4014 4014 0 8 0 0 10000 572 0 0 0 0 0 0 0 0 2500 710800 24 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 76601484 2454 0 0 0 5 0 0 186 1 1 -60203009 18 0 魔坛暗影 180 2 4745 4745 0 10 0 0 10000 845 0 0 0 0 0 0 0 0 2500 880671 27 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 90904815 4141 0 0 0 5 0 0 186 1 1 -60203010 18 0 魔坛麒麟 205 2 9209 9209 0 12 0 0 10000 1077 0 0 0 0 0 0 0 0 2500 1064778 30 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 44215040 7261 0 0 0 5 0 0 186 1 1 -60203011 18 0 魔坛石人 230 2 11979 11979 0 14 0 0 10000 1686 0 0 0 0 0 0 0 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 73316764 12131 0 0 0 5 0 0 186 1 1 -60203012 18 0 魔坛水怪 255 2 17680 17680 0 16 0 0 10000 2252 0 0 0 0 0 0 0 0 2500 1477593 36 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 290790 20397 0 0 0 5 0 0 186 1 1 -60203013 18 0 魔坛古妖 280 2 26816 26816 0 19 0 0 10000 3050 0 0 0 0 0 0 0 0 2500 1683526 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 96875345 37649 0 0 0 5 0 0 186 1 1 -60203014 18 0 魔坛妖龙 305 2 36495 36495 0 21 0 0 10000 3666 0 0 0 0 0 0 0 0 2500 1890408 42 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 28743399 57573 0 0 0 5 0 0 186 1 1 -60203015 18 0 魔坛海王 330 2 44892 44892 0 21 0 0 10000 5094 0 0 0 0 0 0 0 0 2500 2096341 45 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 71444839 91876 0 0 0 5 0 0 186 1 1 -60203016 18 0 魔坛冰魔 355 2 55895 55895 0 21 0 0 10000 5773 0 0 0 0 0 0 0 0 2500 2132403 47 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 62544180 142746 0 0 0 5 0 0 186 1 1 +60203001 18 0 魔坛巨熊 20 2 54 54 0 0 0 0 10000 63 0 0 0 0 0 0 0 0 2500 87307 3 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 31000000 41 0 0 0 5 0 0 186 1 1 +60203002 18 0 魔坛巨猿 40 2 200 200 0 0 0 0 10000 67 0 0 0 0 0 0 0 0 2500 147095 6 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 68850000 82 0 0 0 5 0 0 186 1 1 +60203003 18 0 魔坛牙刃 70 2 330 330 0 0 0 0 10000 130 0 0 0 0 0 0 0 0 2500 209729 9 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 7892980 234 0 0 0 5 0 0 186 1 1 +60203004 18 0 魔坛左翼 85 2 489 489 0 1 0 0 10000 143 0 0 0 0 0 0 0 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 47626349 517 0 0 0 5 0 0 186 1 1 +60203005 18 0 魔坛右翼 85 2 565 565 0 1 0 0 10000 208 0 0 0 0 0 0 0 0 2500 353028 14 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 21584929 672 0 0 0 5 0 0 186 1 1 +60203006 18 0 魔坛龙王 110 2 1400 1400 0 1 0 0 10000 242 0 0 0 0 0 0 0 0 2500 453622 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 63565856 1025 0 0 0 5 0 0 186 1 1 +60203007 18 0 魔坛秘影 130 2 1687 1687 0 2 0 0 10000 363 0 0 0 0 0 0 0 0 2500 582685 21 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 78291474 1465 0 0 0 5 0 0 186 1 1 +60203008 18 0 魔坛帝皇 155 2 4014 4014 0 4 0 0 10000 572 0 0 0 0 0 0 0 0 2500 710800 24 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 76601484 2454 0 0 0 5 0 0 186 1 1 +60203009 18 0 魔坛暗影 180 2 4745 4745 0 5 0 0 10000 845 0 0 0 0 0 0 0 0 2500 880671 27 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 90904815 4141 0 0 0 5 0 0 186 1 1 +60203010 18 0 魔坛麒麟 205 2 9209 9209 0 6 0 0 10000 1077 0 0 0 0 0 0 0 0 2500 1064778 30 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 44215040 7261 0 0 0 5 0 0 186 1 1 +60203011 18 0 魔坛石人 230 2 11979 11979 0 8 0 0 10000 1686 0 0 0 0 0 0 0 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 73316764 12131 0 0 0 5 0 0 186 1 1 +60203012 18 0 魔坛水怪 255 2 17680 17680 0 10 0 0 10000 2252 0 0 0 0 0 0 0 0 2500 1477593 36 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 290790 20397 0 0 0 5 0 0 186 1 1 +60203013 18 0 魔坛古妖 280 2 26816 26816 0 12 0 0 10000 3050 0 0 0 0 0 0 0 0 2500 1683526 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 96875345 37649 0 0 0 5 0 0 186 1 1 +60203014 18 0 魔坛妖龙 305 2 36495 36495 0 14 0 0 10000 3666 0 0 0 0 0 0 0 0 2500 1890408 42 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 28743399 57573 0 0 0 5 0 0 186 1 1 +60203015 18 0 魔坛海王 330 2 44892 44892 0 16 0 0 10000 5094 0 0 0 0 0 0 0 0 2500 2096341 45 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 71444839 91876 0 0 0 5 0 0 186 1 1 +60203016 18 0 魔坛冰魔 355 2 55895 55895 0 19 0 0 10000 5773 0 0 0 0 0 0 0 0 2500 2132403 47 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 62544180 142746 0 0 0 5 0 0 186 1 1 60203017 18 0 魔坛白泽 380 2 84671 84671 0 21 0 0 10000 7264 0 0 0 0 0 0 0 0 2500 2167516 50 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 42699321 202646 0 0 0 5 0 0 186 1 1 60203018 18 0 魔坛巨兽 405 2 111128 111128 0 21 0 0 10000 8142 0 0 0 0 0 0 0 0 2500 2203578 52 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 53075605 280626 0 0 0 5 0 0 186 1 1 60203019 18 0 魔坛炎兽 430 2 168371 168371 0 21 0 0 10000 9455 0 0 0 0 0 0 0 0 2500 2238691 55 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 80306981 391553 0 0 0 5 0 0 186 1 1 -- Gitblit v1.8.0