From 66d0984349717f7e5b2543d808c7028bfe5923d5 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期三, 12 九月 2018 17:08:06 +0800 Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15 --- db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 6 +++--- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 3 +++ db/PyMongoDataServer/PySysDB/tagHorse.txt | 1 + CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 4 ++-- db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 +++- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 6 +++--- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 2fe4b5f..f3ef05a 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -232,11 +232,11 @@ 10804011 鲸吞真人 350 10804012 鹏之魂 350 10804013 神秘老人 350 -10804014 后裔之魂 350 +10804014 后羿之魂 350 10804015 无涯老人 350 10804103 神机子 350 10904001 五行之魂 300 -10904002 琉璃公主 300 +10904002 琉璃仙子 300 10904003 两仪村长 310 10904004 大牛 310 10904005 陈可衣 320 diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt index f3bb126..f28c72f 100644 --- a/db/PyMongoDataServer/PySysDB/tagHorse.txt +++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt @@ -10,3 +10,4 @@ 402 287 257 1 1 50 1 5 31996 GetMount10 305 290 260 1 1 40 1 4 13968 GetMount7 306 288 258 1 1 50 1 5 21168 GetMount8 +307 291 261 1 1 30 1 3 2116 GetMount11 diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt index 2ab5ea1..257b233 100644 --- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt +++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt @@ -432,13 +432,13 @@ 307 1 431 6|7|23 1058|52|40 0 307 2 468 6|7|23 1749|87|40 0 307 3 509 6|7|23 2476|123|40 0 -307 4 552 6|7|23 3239|161|40 49150 +307 4 552 6|7|23 3239|161|40 49180 307 5 598 6|7|23 4040|202|40 0 307 6 647 6|7|23 4878|243|40 0 307 7 699 6|7|23 5775|288|40 0 307 8 755 6|7|23 6735|336|40 0 307 9 813 6|7|23 7761|388|40 0 -307 10 875 6|7|23 8854|442|40 49155 +307 10 875 6|7|23 8854|442|40 49185 307 11 939 6|7|23 10018|500|40 0 307 12 1007 6|7|23 11237|561|40 0 307 13 1077 6|7|23 12510|625|40 0 @@ -448,7 +448,7 @@ 307 17 1391 6|7|23 18129|906|40 0 307 18 1477 6|7|23 19658|982|40 0 307 19 1566 6|7|23 21233|1061|40 0 -307 20 1658 6|7|23 22851|1142|40 49160 MountUpLv10 +307 20 1658 6|7|23 22851|1142|40 49190 307 21 1753 6|7|23 24509|1225|40 0 307 22 1851 6|7|23 26219|1310|40 0 307 23 1953 6|7|23 27978|1398|40 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 201387b..0d50f70 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -110,6 +110,7 @@ 257 1 0 坐骑：百鸟之主 41 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 8888 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 258 1 0 坐骑：八宝葫芦 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 260 1 0 坐骑：地狱冥虎 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +261 1 0 坐骑：小黄鸭 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 588 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 289 1 0 追风 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 288 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 280 1 0 觉灵鹿 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 0 0 0 0 281 1 0 皓月狼 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 588 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -119,8 +120,9 @@ 285 1 0 龙驹 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 970 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 286 1 0 深海之王 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1588 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 287 1 0 百鸟之主 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 8888 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -288 1 0 八宝葫芦 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +288 1 0 八宝葫芦 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 290 1 0 地狱冥虎 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +291 1 0 小黄鸭 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 600 1 0 时装1 91 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 601 1 0 时装2 92 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 220 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 602 1 0 时装3 93 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index a0b68ab..f44b265 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -232,11 +232,11 @@ 10804011 0 1 鲸吞真人 350 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 10804012 0 1 鹏之魂 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 10804013 0 1 神秘老人 350 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 -10804014 0 1 后裔之魂 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 +10804014 0 1 后羿之魂 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 10804015 0 1 无涯老人 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 10804103 0 1 神机子 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 10904001 0 1 五行之魂 300 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 -10904002 0 1 琉璃公主 300 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 +10904002 0 1 琉璃仙子 300 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 10904003 0 1 两仪村长 310 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 10904004 0 1 大牛 310 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 10904005 0 1 陈可衣 320 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 @@ -766,7 +766,7 @@ 61103001 2 0 境界·个人 110 2 1881 1881 531 2 0 0 10000 735 0 0 0 0 0 0 97301 0 2500 390039 16 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 193528 0 0 0 0 3 0 8 186 1 1 61103002 2 0 境界·个人 140 2 4047 4047 1888 4 0 0 10000 1550 0 0 0 0 0 0 319964 0 2500 582685 21 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1251688 0 0 0 0 3 0 9 186 1 1 61103003 2 0 境界·个人 160 2 5392 5392 2439 5 0 0 10000 2057 0 0 0 0 0 0 429383 0 2500 685177 24 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 2049890 0 0 0 0 3 0 10 186 1 1 -61103004 2 0 境界·个人 205 2 10668 10668 1408 7 0 0 10000 3731 0 0 0 0 0 0 1132621 0 2500 951846 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 9281187 0 0 0 0 3 0 11 186 1 1 +61103004 2 0 境界·个人 205 2 9237 9237 1531 7 0 0 10000 3359 0 0 0 0 0 0 1132621 0 2500 852201 27 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 7170370 0 0 0 0 3 0 11 186 1 1 61103005 2 0 境界·个人 230 2 14452 14452 2128 9 0 0 10000 4790 0 0 0 0 0 0 1825117 0 2500 1188148 32 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 21824876 0 0 0 0 3 0 12 186 1 1 61103006 2 0 境界·个人 260 2 22483 22483 3167 11 0 0 10000 7083 0 0 0 0 0 0 3076461 0 2500 1353274 34 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 45790147 0 0 0 0 3 0 13 186 1 1 61103007 2 0 境界·个人 270 2 25322 25322 3529 12 0 0 10000 7899 0 0 0 0 0 0 3861992 0 2500 1435837 35 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 61922664 0 0 0 0 3 0 14 186 1 1 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index d6ac262..803d95d 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -756,6 +756,9 @@ 49165 坚韧 49165 1 1 0 5 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 2000 0 13 5000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 7239 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49170 健体 49170 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 304 6 1500 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 18097 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49175 潜心 49175 1 1 0 5 0 7 3 0 0 0 0 0 0 0 0 0 0 0 0 4002 2000 3000 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 63339 0 0 0 0 0 0 0 4 0 0 0 0 0 0 +49180 旺盛 49180 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 307 6 1000 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 3656 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +49185 强攻 49185 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 4 6 500 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 9140 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +49190 必杀 49190 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4007 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 0 0 0 0 0 0 0 0 0 0 0 2 31990 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50000 金箍幻灭 50000 1 1 2 1 0 1 0 0 2 8 40 4 0 8000 0 0 0 0 0 1010 25000 0 0 1200 4 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 692 0 0 0 0 0 0 0 2 0 0 0 0 0 0 50100 皓月腾空 50100 1 1 2 1 0 1 0 0 2 6 41 10 0 16000 0 0 0 0 0 1010 30000 0 0 1200 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 50101 0 0 0 0 0 0 0 0 0 0 2 879 0 0 0 0 0 0 0 2 0 0 0 0 0 0 50101 加速 50101 1 1 0 0 0 5 0 0 0 0 10 0 0 0 0 0 0 0 0 16 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 50100 0 0 0 0 -- Gitblit v1.8.0