From 8508ed456fbe7590ffa79e4be269fdb9f100c45e Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 29 八月 2018 10:58:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 44 ++++++++++++++++++++++----------------------
CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt | 4 ++--
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
index f6af150..2d4358f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
@@ -24,11 +24,11 @@
123 {'SpecialItemID':[3801]}
124 {'SpecialItemID':[3802]}
125 {'SpecialItemID':[3803]}
-130 {'ItemType':[6,8,12,15,20,31,33,36,37,38,40,44,48,49,51,57,59,81]}
+130 {'ItemType':[4,6,8,10,11,12,13,14,15,16,17,18,19,20,24,29,31,33,36,37,38,40,44,48,49,51,57,59,60,76,81,119,120,121,122,123]}
131 {'ItemType':[34,35]}
132 {'ItemType':[21,22,41,124]}
133 {'SpecialItemID':[3807.3808]}
134 {'ItemType':[26,27,28,125,21,22,41,124]}
135 {'ItemType':[25]}
136 {'ItemType':[45]}
-137 {'ItemType':[9,58]}
+137 {'ItemType':[9,58,54]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 59816c5..82eb963 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -475,18 +475,18 @@
30203005 2 0 麒麟之魂 310 0 91646 91646 0 15 0 0 10000 99164 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 23298166 0 0 0 0 3 0 0 1 1 1
30301001 2 0 精英护卫 160 0 1252 1252 0 4 0 0 0 200 0 0 0 0 0 0 0 3 3000 634880 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 87314 0 0 0 0 1 43995 0 1 1 1
30301002 2 0 精英护卫 180 0 1606 1606 0 5 0 0 0 260 0 0 0 0 0 0 0 3 3000 738321 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 126835 0 0 0 0 1 84669 0 1 1 1
-30303001 2 0 天枢 160 0 2980 2980 0 4 0 0 10000 4235 0 1 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5761000 0 10000 0 0 5 0 0 186 1 1
-30303002 2 0 天璇 180 0 3308 3308 0 5 0 0 10000 4326 0 1 0 0 0 0 0 3 3000 700361 24 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10433632 0 10000 0 0 5 0 0 186 1 1
-30303003 2 0 天玑 210 0 5434 5434 0 6 0 0 10000 6781 0 1 0 0 0 0 0 3 3000 888263 27 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 21636942 0 10000 0 0 5 0 0 186 1 1
-30303004 2 0 天权 235 0 6990 6990 0 7 0 0 10000 7913 0 1 0 0 0 0 0 3 3000 1130259 31 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 67138818 0 10000 0 0 5 0 0 186 1 1
-30303005 2 0 玉衡 260 0 10013 10013 0 11 0 0 10000 10678 0 1 0 0 0 0 0 3 3000 1336192 34 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 19057966 1 10000 0 0 5 0 0 186 1 1
-30303006 2 0 开阳 285 0 13489 13489 0 12 0 0 10000 13925 0 1 0 0 0 0 0 3 3000 1543074 37 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 44488304 2 10000 0 0 5 0 0 186 1 1
-30303007 2 0 瑶光 325 0 20225 20225 0 15 0 0 10000 19142 0 1 0 0 0 0 0 3 3000 1873326 41 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 25595950 5 10000 0 0 5 0 0 186 1 1
-30303008 2 0 逍遥城主 240 0 7263 7263 0 8 0 0 10000 8033 0 1 0 0 0 0 0 3 3000 1171066 32 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 76325702 0 10000 0 0 5 0 0 186 1 1
-30303009 2 0 极冰之心 250 0 8027 8027 0 9 0 0 10000 8629 0 1 0 0 0 0 0 3 3000 1253629 33 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 92984425 0 10000 0 0 5 0 0 186 1 1
-30303010 2 0 潮汐巨兽 300 0 15901 15901 0 13 0 0 10000 15592 0 1 0 0 0 0 0 3 3000 1666444 39 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10036107 3 10000 0 0 5 0 0 186 1 1
-30303011 2 0 极炎巨兽 350 0 25480 25480 0 17 0 0 10000 22755 0 1 0 0 0 0 0 3 3000 2079259 44 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 38844396 8 10000 0 0 5 0 0 186 1 1
-30303012 2 0 白泽 400 0 46704 46704 0 22 0 0 10000 30943 0 1 0 0 0 0 0 3 3000 2164669 49 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 59950525 15 10000 0 0 5 0 0 186 1 1
+30303001 2 0 天枢 160 0 2980 2980 0 4 0 0 10000 4205 0 1 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5761000 0 10000 0 0 5 0 0 186 1 1
+30303002 2 0 天璇 180 0 3308 3308 0 5 0 0 10000 4299 0 1 0 0 0 0 0 3 3000 700361 24 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10433632 0 10000 0 0 5 0 0 186 1 1
+30303003 2 0 天玑 210 0 5434 5434 0 6 0 0 10000 6757 0 1 0 0 0 0 0 3 3000 888263 27 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 21636942 0 10000 0 0 5 0 0 186 1 1
+30303004 2 0 天权 235 0 6990 6990 0 7 0 0 10000 7965 0 1 0 0 0 0 0 3 3000 1130259 31 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 67138818 0 10000 0 0 5 0 0 186 1 1
+30303005 2 0 玉衡 260 0 10013 10013 0 11 0 0 10000 10763 0 1 0 0 0 0 0 3 3000 1336192 34 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 19057966 1 10000 0 0 5 0 0 186 1 1
+30303006 2 0 开阳 285 0 13489 13489 0 12 0 0 10000 14009 0 1 0 0 0 0 0 3 3000 1543074 37 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 44488304 2 10000 0 0 5 0 0 186 1 1
+30303007 2 0 瑶光 325 0 20225 20225 0 15 0 0 10000 19169 0 1 0 0 0 0 0 3 3000 1873326 41 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 25595950 5 10000 0 0 5 0 0 186 1 1
+30303008 2 0 逍遥城主 240 0 7263 7263 0 8 0 0 10000 8100 0 1 0 0 0 0 0 3 3000 1171066 32 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 76325702 0 10000 0 0 5 0 0 186 1 1
+30303009 2 0 极冰之心 250 0 8027 8027 0 9 0 0 10000 8717 0 1 0 0 0 0 0 3 3000 1253629 33 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 92984425 0 10000 0 0 5 0 0 186 1 1
+30303010 2 0 潮汐巨兽 300 0 15901 15901 0 13 0 0 10000 15672 0 1 0 0 0 0 0 3 3000 1666444 39 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10036107 3 10000 0 0 5 0 0 186 1 1
+30303011 2 0 极炎巨兽 350 0 25480 25480 0 17 0 0 10000 22807 0 1 0 0 0 0 0 3 3000 2079259 44 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 38844396 8 10000 0 0 5 0 0 186 1 1
+30303012 2 0 白泽 400 0 46704 46704 0 22 0 0 10000 30387 0 1 0 0 0 0 0 3 3000 2164669 49 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 59950525 15 10000 0 0 5 0 0 186 1 1
30403001 2 0 仙魔之争NPC 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1
30403002 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1
30403003 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1
@@ -763,7 +763,7 @@
61103002 2 0 境界·个人 140 2 3776 3776 1540 4 0 0 10000 1463 0 0 0 0 0 0 229079 0 2500 505817 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 939107 0 0 0 0 3 0 9 186 1 1
61103003 2 0 境界·个人 160 2 5068 5068 2157 5 0 0 10000 1975 0 0 0 0 0 0 377626 0 2500 634880 22 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1631537 0 0 0 0 3 0 10 186 1 1
61103004 2 0 境界·个人 205 2 10109 10109 1300 7 0 0 10000 3582 0 0 0 0 0 0 1034753 0 2500 916733 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 7798849 0 0 0 0 3 0 11 186 1 1
-61103005 2 0 境界·个人 230 2 13205 13205 1914 9 0 0 10000 4529 0 0 0 0 0 0 1599712 0 2500 1105585 31 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 17033779 0 0 0 0 3 0 12 186 1 1
+61103005 2 0 境界·个人 230 2 14452 14452 2128 9 0 0 10000 4529 0 0 0 0 0 0 1599712 0 2500 1105585 31 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
61103008 2 0 境界·个人 300 2 36300 36300 4878 14 0 0 10000 10398 0 0 0 0 0 0 5905484 0 2500 1683526 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13434613 1 0 0 0 3 0 15 186 1 1
@@ -781,7 +781,7 @@
61103020 2 0 境界·个人 440 2 136985 136985 14572 22 0 0 10000 48922 0 0 0 0 0 0 27657569 0 2500 2224456 54 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 54896181 9 0 0 0 3 0 27 186 1 1
61203001 2 0 境界·组队 125 2 3151 3151 269 3 0 0 10000 1300 0 0 0 0 0 0 145814 0 2500 459316 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 605170 0 0 0 0 3 0 28 186 1 1
61203002 2 0 境界·组队 190 2 7395 7395 1039 6 0 0 10000 2617 0 0 0 0 0 0 746532 0 2500 809496 26 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 4487771 0 0 0 0 3 0 29 186 1 1
-61203003 2 0 境界·组队 220 2 11223 11223 1631 8 0 0 10000 3784 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13221460 0 0 0 0 3 0 30 186 1 1
+61203003 2 0 境界·组队 220 2 11749 11749 1758 8 0 0 10000 3784 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 15547798 0 0 0 0 3 0 30 186 1 1
61203004 2 0 境界·组队 250 2 16155 16155 2351 10 0 0 10000 5126 0 0 0 0 0 0 2179851 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 28363570 0 0 0 0 3 0 31 186 1 1
61203005 2 0 境界·组队 290 2 34494 34494 4372 13 0 0 10000 10339 0 0 0 0 0 0 5251783 0 2500 1600963 38 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3212140 1 0 0 0 3 0 32 186 1 1
61203006 2 0 境界·组队 320 2 46696 46696 5939 16 0 0 10000 14845 0 0 0 0 0 0 7805561 0 2500 1848652 41 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 88063227 1 0 0 0 3 0 33 186 1 1
@@ -791,14 +791,14 @@
30601001 2 0 暗影剑士 105 0 643 643 0 2 0 0 0 159 0 0 0 0 0 0 0 0 2500 38634 16 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 47423 0 0 0 0 1 0 0 1 1 1
30601002 2 0 剑魂 105 0 611 611 0 2 0 0 0 128 0 0 0 0 0 0 0 0 2500 38634 16 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 71135 0 0 0 0 1 0 0 1 1 1
30603001 2 0 御剑尊者 105 0 1864 1864 0 3 0 0 0 1332 0 0 0 0 0 0 0 0 2500 38634 16 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 474239 0 0 0 0 5 0 0 186 1 1
-30601003 2 0 魔化哨兵 150 0 1245 1245 0 5 0 0 0 424 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 168875 0 0 0 0 1 0 0 1 1 1
-30601004 2 0 狂暴妖兵 150 0 1154 1154 0 5 0 0 0 339 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 217127 0 0 0 0 1 0 0 1 1 1
-30601005 2 0 魔界冥魂 150 0 2995 2995 0 6 0 0 0 2054 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 965012 0 0 0 0 1 0 0 1 1 1
-30603002 2 0 逍遥城主 150 0 5201 5201 0 6 0 0 0 4108 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 6 10043 23030 10044 0 0 0 0 0 0 15 2 1688773 0 0 0 0 5 0 0 186 1 1
-30601006 2 0 冰霜巨蝎 200 0 2750 2750 0 7 0 0 0 867 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 716524 0 0 0 0 1 0 0 1 1 1
-30601007 2 0 冰川蛮兽 200 0 2879 2879 0 7 0 0 0 958 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 859829 0 0 0 0 1 0 0 1 1 1
-30601008 2 0 雪山巨猿 200 0 8451 8451 0 8 0 0 0 5324 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 3725930 0 0 0 0 1 0 0 1 1 1
-30603003 2 0 极寒冰心 200 0 13851 13851 0 8 0 0 0 9588 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 6 10045 23030 10046 0 0 0 0 0 0 15 2 8598302 0 0 0 0 5 0 0 186 1 1
+30601003 2 0 魔化哨兵 150 0 1240 1240 0 5 0 0 0 419 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 158536 0 0 0 0 1 0 0 1 1 1
+30601004 2 0 狂暴妖兵 150 0 1150 1150 0 5 0 0 0 335 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 203833 0 0 0 0 1 0 0 1 1 1
+30601005 2 0 魔界冥魂 150 0 2957 2957 0 6 0 0 0 2018 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 905928 0 0 0 0 1 0 0 1 1 1
+30603002 2 0 逍遥城主 150 0 5123 5123 0 6 0 0 0 4036 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 6 10043 23030 10044 0 0 0 0 0 0 15 2 1585376 0 0 0 0 5 0 0 186 1 1
+30601006 2 0 冰霜巨蝎 200 0 2461 2461 0 7 0 0 0 797 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 499190 0 0 0 0 1 0 0 1 1 1
+30601007 2 0 冰川蛮兽 200 0 2544 2544 0 7 0 0 0 856 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 599028 0 0 0 0 1 0 0 1 1 1
+30601008 2 0 雪山巨猿 200 0 7418 7418 0 8 0 0 0 4722 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2595792 0 0 0 0 1 0 0 1 1 1
+30603003 2 0 极寒冰心 200 0 12244 12244 0 8 0 0 0 8568 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 6 10045 23030 10046 0 0 0 0 0 0 15 2 8598302 0 0 0 0 5 0 0 186 1 1
30601009 2 0 海岛巨蟹 250 0 5132 5132 0 8 0 0 0 1381 0 0 0 0 0 0 0 0 2500 134044 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2487268 0 0 0 0 1 0 0 1 1 1
30601010 2 0 海妖 250 0 5631 5631 0 8 0 0 0 1681 0 0 0 0 0 0 0 0 2500 134044 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 4145448 0 0 0 0 1 0 0 1 1 1
30603004 2 0 潮汐巨兽 250 0 28962 28962 0 8 0 0 0 16811 0 0 0 0 0 0 0 0 2500 134044 34 0 300 2 6 10047 23030 10048 0 0 0 0 0 0 15 2 37309038 0 0 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0