From b3d085c552a834390eafdb67cc1a47eba301a5b9 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期三, 29 八月 2018 09:53:00 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 4 ++-- db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 40 ++++++++++++++++++++-------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt index 00ad924..ce8dc02 100644 --- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt @@ -10,5 +10,5 @@ 50106302 5 GetPet9 4207 1 1000 1 50 6 48305|48310|48315 4|10|20 ['PetUpLv','PetUpLv','PetUpLv5'] 31996 50106303 4 GetPet6 4209 1 1000 1 40 6 48335|48340|48345 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 13248 50106304 5 GetPet10 4210 1 1000 1 50 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv6'] 24796 -50106305 3 GetPet11 4211 1 1000 1 30 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 24796 -50106306 4 GetPet12 4212 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 24796 +50106305 3 GetPet11 4213 1 1000 1 30 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 24796 +50106306 4 GetPet12 4214 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 24796 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 4fc33cd..b372523 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -527,7 +527,7 @@ 4302 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 150 0 10 0 1 0 0 0 420 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 4303 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 210 0 20 0 1 0 0 0 790 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 4304 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 240 0 50 0 1 0 0 0 1590 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 -4305 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 300 0 100 0 1 0 0 0 2660 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 +4305 1 0 符印精华 31 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 300 0 100 0 1 0 0 0 5320 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 4306 1 0 符印碎片 32 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1 0 5 0 1 0 0 0 100 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 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4307 1 0 符印融合石 57 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1 0 10 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 4308 1 0 随机符印 15 0 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 100 0 10 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 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index e07ed00..59816c5 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -450,25 +450,25 @@ 30102011 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 1 15 2 100 0 0 0 0 1 0 0 180 1 1 30102012 2 0 迷惑之狸 50 0 100 100 0 0 0 0 10000 0 0 0 0 1 0 0 0 0 5000 100 0 0 750 2 6 0 0 0 0 0 0 0 0 1 15 2 100 0 0 0 0 1 0 0 197 1 1 30201000 2 0 剧毒峰 60 0 239 239 0 0 0 0 10000 120 0 0 0 0 0 0 0 0 2000 209729 9 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 3091 0 0 0 0 1 0 0 5 1 1 -30201001 2 0 剧毒峰 100 0 402 402 0 0 0 0 10000 160 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 11358 0 0 0 0 1 0 0 5 1 1 -30201002 2 0 剧毒峰 150 0 952 952 0 4 0 0 10000 400 0 0 0 0 0 0 0 0 2000 582685 21 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 68235 0 0 0 0 1 0 0 5 1 1 -30201003 2 0 剧毒峰 210 0 1632 1632 0 7 0 0 10000 533 0 0 0 0 0 0 0 0 2000 880671 27 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 202138 0 0 0 0 1 0 0 5 1 1 -30201004 2 0 剧毒峰 260 0 2654 2654 0 10 0 0 10000 703 0 0 0 0 0 0 0 0 2000 1270711 33 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 968431 0 0 0 0 1 0 0 5 1 1 -30201005 2 0 剧毒峰 310 0 5990 5990 0 14 0 0 10000 887 0 0 0 0 0 0 0 0 2000 1683526 39 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 5824540 0 0 0 0 1 0 0 5 1 1 +30201001 2 0 剧毒峰 100 0 402 402 0 1 0 0 10000 160 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 11358 0 0 0 0 1 0 0 5 1 1 +30201002 2 0 剧毒峰 150 0 952 952 0 5 0 0 10000 400 0 0 0 0 0 0 0 0 2000 582685 21 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 68235 0 0 0 0 1 0 0 5 1 1 +30201003 2 0 剧毒峰 210 0 1632 1632 0 8 0 0 10000 533 0 0 0 0 0 0 0 0 2000 880671 27 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 202138 0 0 0 0 1 0 0 5 1 1 +30201004 2 0 剧毒峰 260 0 2654 2654 0 11 0 0 10000 703 0 0 0 0 0 0 0 0 2000 1270711 33 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 968431 0 0 0 0 1 0 0 5 1 1 +30201005 2 0 剧毒峰 310 0 5990 5990 0 15 0 0 10000 887 0 0 0 0 0 0 0 0 2000 1683526 39 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 5824540 0 0 0 0 1 0 0 5 1 1 30201010 2 0 灵翅狐 60 0 108 108 0 0 0 0 10000 30 0 0 0 0 0 0 0 0 2000 353028 14 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 3944 0 0 0 0 1 0 0 5 1 1 -30201011 2 0 灵翅狐 100 0 402 402 0 0 0 0 10000 160 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 11358 0 0 0 0 1 0 0 5 1 1 -30201012 2 0 灵翅狐 150 0 952 952 0 4 0 0 10000 400 0 0 0 0 0 0 0 0 2000 582685 21 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 68235 0 0 0 0 1 0 0 5 1 1 -30201013 2 0 灵翅狐 210 0 1632 1632 0 7 0 0 10000 533 0 0 0 0 0 0 0 0 2000 880671 27 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 202138 0 0 0 0 1 0 0 5 1 1 -30201014 2 0 灵翅狐 260 0 2654 2654 0 10 0 0 10000 703 0 0 0 0 0 0 0 0 2000 1270711 33 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 968431 0 0 0 0 1 0 0 5 1 1 -30201015 2 0 灵翅狐 310 0 5990 5990 0 14 0 0 10000 887 0 0 0 0 0 0 0 0 2000 1683526 39 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 5824540 0 0 0 0 1 0 0 5 1 1 +30201011 2 0 灵翅狐 100 0 402 402 0 1 0 0 10000 160 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 11358 0 0 0 0 1 0 0 5 1 1 +30201012 2 0 灵翅狐 150 0 952 952 0 5 0 0 10000 400 0 0 0 0 0 0 0 0 2000 582685 21 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 68235 0 0 0 0 1 0 0 5 1 1 +30201013 2 0 灵翅狐 210 0 1632 1632 0 8 0 0 10000 533 0 0 0 0 0 0 0 0 2000 880671 27 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 202138 0 0 0 0 1 0 0 5 1 1 +30201014 2 0 灵翅狐 260 0 2654 2654 0 11 0 0 10000 703 0 0 0 0 0 0 0 0 2000 1270711 33 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 968431 0 0 0 0 1 0 0 5 1 1 +30201015 2 0 灵翅狐 310 0 5990 5990 0 15 0 0 10000 887 0 0 0 0 0 0 0 0 2000 1683526 39 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 5824540 0 0 0 0 1 0 0 5 1 1 30201020 2 0 灵翅狐 60 0 108 108 0 0 0 0 10000 30 0 0 0 0 0 0 0 0 2000 353028 14 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 3944 0 0 0 0 1 0 0 5 1 1 -30201021 2 0 灵翅狐 100 0 402 402 0 0 0 0 10000 160 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 21951 0 0 0 0 1 0 0 5 1 1 -30201022 2 0 灵翅狐 150 0 952 952 0 4 0 0 10000 400 0 0 0 0 0 0 0 0 2000 582685 21 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 102042 0 0 0 0 1 0 0 5 1 1 -30201023 2 0 灵翅狐 210 0 1633 1633 0 7 0 0 10000 533 0 0 0 0 0 0 0 0 2000 880671 27 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 253115 0 0 0 0 1 0 0 5 1 1 -30201024 2 0 灵翅狐 260 0 2655 2655 0 10 0 0 10000 703 0 0 0 0 0 0 0 0 2000 1270711 33 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 1110165 0 0 0 0 1 0 0 5 1 1 -30201025 2 0 灵翅狐 310 0 5996 5996 0 14 0 0 10000 887 0 0 0 0 0 0 0 0 2000 1683526 39 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 4309225 0 0 0 0 1 0 0 5 1 1 +30201021 2 0 灵翅狐 100 0 402 402 0 1 0 0 10000 160 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 21951 0 0 0 0 1 0 0 5 1 1 +30201022 2 0 灵翅狐 150 0 952 952 0 5 0 0 10000 400 0 0 0 0 0 0 0 0 2000 582685 21 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 102042 0 0 0 0 1 0 0 5 1 1 +30201023 2 0 灵翅狐 210 0 1633 1633 0 8 0 0 10000 533 0 0 0 0 0 0 0 0 2000 880671 27 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 253115 0 0 0 0 1 0 0 5 1 1 +30201024 2 0 灵翅狐 260 0 2655 2655 0 11 0 0 10000 703 0 0 0 0 0 0 0 0 2000 1270711 33 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 1110165 0 0 0 0 1 0 0 5 1 1 +30201025 2 0 灵翅狐 310 0 5996 5996 0 15 0 0 10000 887 0 0 0 0 0 0 0 0 2000 1683526 39 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 4309225 0 0 0 0 1 0 0 5 1 1 30203000 2 0 麒麟之魂 60 0 526 526 0 0 0 0 10000 693 0 0 0 0 0 0 0 0 2000 209729 9 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 12365 0 0 0 0 3 0 0 1 1 1 -30203001 2 0 麒麟之魂 100 0 1097 1097 0 2 0 0 10000 1513 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 45437 0 0 0 0 3 0 0 1 1 1 +30203001 2 0 麒麟之魂 100 0 1097 1097 0 1 0 0 10000 1513 0 0 0 0 0 0 0 0 2000 355875 15 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 45437 0 0 0 0 3 0 0 1 1 1 30203002 2 0 麒麟之魂 150 0 3567 3567 0 5 0 0 10000 5302 0 0 0 0 0 0 0 0 2000 582685 21 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 272942 0 0 0 0 3 0 0 1 1 1 30203003 2 0 麒麟之魂 210 0 12735 12735 0 8 0 0 10000 18616 0 0 0 0 0 0 0 0 2000 880671 27 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 808557 0 0 0 0 3 0 0 1 1 1 30203004 2 0 麒麟之魂 260 0 27664 27664 0 11 0 0 10000 34828 0 0 0 0 0 0 0 0 2000 1270711 33 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 3873728 0 0 0 0 3 0 0 1 1 1 @@ -515,7 +515,7 @@ 30909017 9 0 水晶 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1000 0 0 0 0 0 0 0 214 0 1 30909018 9 0 水晶 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1000 0 0 0 0 0 0 0 214 0 1 30909019 9 0 敌方水晶无主化 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 22213 0 0 0 0 0 0 0 0 10 2 1000 0 0 0 0 0 0 0 214 0 1 -31003001 2 0 阵殿古猿 160 0 7026 7026 0 5 0 0 0 5895 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 23010 23012 0 0 0 0 0 0 0 100 2 840145 0 0 0 0 5 0 0 186 1 1 +31003001 2 0 阵殿古猿 160 0 7026 7026 0 4 0 0 0 5895 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 23010 23012 0 0 0 0 0 0 0 100 2 840145 0 0 0 0 5 0 0 186 1 1 31003002 2 0 遗迹残魂 210 0 6699 6699 0 8 0 0 0 4091 0 0 0 0 0 0 0 0 2500 97853 29 0 300 2 6 23014 23015 23010 0 0 0 0 0 0 100 2 11790969 0 0 0 0 5 0 0 186 1 1 31003003 2 0 遗迹残魂 210 0 6699 6699 0 8 0 0 0 4091 0 0 0 0 0 0 0 0 2500 97853 29 0 300 2 6 23016 23015 23010 0 0 0 0 0 0 100 2 11790969 0 0 0 0 5 0 0 186 1 1 31003004 2 0 遗迹古妖 235 0 17520 17520 0 10 0 0 0 11737 0 0 0 0 0 0 0 0 2500 109510 31 0 300 2 6 23010 23017 23030 0 0 0 0 0 0 100 2 25933382 0 0 0 0 5 0 0 186 1 1 @@ -526,11 +526,11 @@ 31001001 2 0 镇守妖兵 160 0 1154 1154 0 4 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 48007 0 0 0 0 1 0 0 180 1 1 31001002 2 0 阵守蛮兽 160 0 1154 1154 0 4 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 84013 0 0 0 0 1 0 0 180 1 1 31001003 2 0 雪山巨猿 160 0 1154 1154 0 4 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 108017 0 0 0 0 1 0 0 180 1 1 -31001004 2 0 遗迹炎兽 180 0 1517 1517 0 5 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 95289 0 0 0 0 1 0 0 180 1 1 -31001005 2 0 遗迹巨鳄 180 0 1517 1517 0 5 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 166756 0 0 0 0 1 0 0 180 1 1 +31001004 2 0 遗迹炎兽 180 0 1517 1517 0 6 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 95289 0 0 0 0 1 0 0 180 1 1 +31001005 2 0 遗迹巨鳄 180 0 1517 1517 0 6 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 166756 0 0 0 0 1 0 0 180 1 1 31001006 2 0 遗迹剑魔 180 0 1517 1517 0 6 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 214401 0 0 0 0 1 0 0 180 1 1 31001007 2 0 遗迹炎龙 180 0 1517 1517 0 6 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 357336 0 0 0 0 1 0 0 180 1 1 -31001008 2 0 遗迹树妖 235 0 2307 2307 0 8 0 0 0 436 0 0 0 0 0 0 0 0 2500 109510 31 0 0 2 6 23024 0 0 0 0 0 0 0 0 100 2 1728891 0 0 0 0 1 0 0 180 1 1 +31001008 2 0 遗迹树妖 235 0 2307 2307 0 9 0 0 0 436 0 0 0 0 0 0 0 0 2500 109510 31 0 0 2 6 23024 0 0 0 0 0 0 0 0 100 2 1728891 0 0 0 0 1 0 0 180 1 1 31001009 2 0 潮汐巨兽 280 0 6228 6228 0 14 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 0 0 0 0 0 0 0 0 1 100 2 35713762 0 0 0 0 1 0 0 186 1 1 31001010 2 0 潮汐巨兽 280 0 6228 6228 0 14 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 0 0 0 0 0 0 0 0 0 100 1 17856881 0 0 0 0 1 0 0 186 1 1 31001011 2 0 毁灭石像 265 0 10048 10048 0 11 0 0 0 5305 0 0 0 0 0 0 0 0 2500 142222 35 0 0 2 6 23020 0 0 0 0 0 0 0 0 100 0 4447786 0 0 0 0 1 0 0 180 1 1 -- Gitblit v1.8.0