From 48e84dc72d77a215835f06de3ae6397b5de16180 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期二, 15 一月 2019 14:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagNPCRefresh.txt | 101 ++++++++++++++++++++++++++------------------------
CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt | 3 -
2 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
index 9c2c32b..b864d04 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
@@ -33,5 +33,4 @@
135 {'ItemType':[25]}
136 {'ItemType':[45]}
137 {'ItemType':[9,58,54]}
-138 {'ItemType':[82]}
-139 {'ItemType':[83]}
+138 {'ItemType':[82,83]}
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index a631945..56c14c8 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -124,9 +124,9 @@
27890 10601002 10060 0 [51,15,1,15] 1 1 0 2500 0 0 1 5 5 0 0
27902 10601002 10060 0 [56,20,1,8] 1 1 0 2500 0 0 1 5 5 0 0
27904 10601002 10060 0 [55,25,1,12] 1 1 0 2500 0 0 1 5 5 0 0
-111384 40102001 32020 0 [156,333,6,12] 2 1 0 2500 0 0 1 5 5 0 0
-111387 40102005 32020 0 [78,261,6,12] 2 1 0 2500 0 0 1 5 5 0 0
-111425 40102001 32020 0 [162,333,6,15] 2 1 0 2500 0 0 1 5 5 0 0
+111384 40102001 32020 0 [156,333,0,12] 2 1 0 2500 0 0 1 5 5 0 0
+111473 0 32020 0 [81,337,0,15] 1 1 0 0 0 0 1 5 5 0 112
+111475 0 32020 0 [96,246,0,15] 1 1 0 0 0 0 1 5 5 0 106
76721 10301003 10030 0 [110,61,1,15] 1 1 0 1800 0 0 1 5 5 0 0
27850 10602001 10060 0 [91,142,1,15] 1 1 0 2500 0 0 1 5 5 0 0
18881 10701003 10070 0 [74,47,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -439,7 +439,7 @@
105337 11001001 10100 0 [67,53,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105339 11001001 10100 0 [65,55,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105341 11001001 10100 0 [64,52,1,15] 1 1 0 2500 0 0 1 5 5 0 0
-111429 40102003 32020 0 [191,267,6,15] 2 1 0 2500 0 0 1 5 5 0 0
+111387 40102005 32020 0 [78,261,1,12] 2 1 0 2500 0 0 1 5 5 0 0
34604 10801004 10080 0 [18,74,1,15] 1 1 0 2500 0 0 1 5 5 0 0
34605 10801004 10080 0 [16,76,1,15] 1 1 0 2500 0 0 1 5 5 0 0
80187 10901001 10090 0 [162,34,0,15] 1 1 0 3000 0 0 1 5 5 0 0
@@ -637,8 +637,6 @@
77134 10401004 10040 0 [202,157,1,15] 1 1 0 1800 0 0 1 5 5 0 0
777 0 31220 0 [113,131,1,15] 1 1 0 0 0 0 1 5 5 0 103
1060 30909005 31220 0 [58,17,1,15] 1 1 0 0 0 0 1 5 5 0 0
-111431 40102004 32020 0 [138,269,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-111434 40102006 32020 0 [135,307,6,15] 2 1 0 2500 0 0 1 5 5 0 0
77004 10401003 10040 0 [195,85,1,15] 1 1 0 1800 0 0 1 5 5 0 0
18955 10701004 10070 0 [76,99,1,15] 1 1 0 2500 0 0 1 5 5 0 0
18957 10701004 10070 0 [61,100,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -943,6 +941,8 @@
105421 11001003 10100 0 [109,88,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105433 11001003 10100 0 [116,91,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105443 11001004 10100 0 [113,119,1,12] 1 1 0 2500 0 0 1 5 5 0 0
+111425 40102001 32020 0 [161,333,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+111474 0 32020 0 [74,287,0,15] 1 1 0 0 0 0 1 5 5 0 114
105453 11001004 10100 0 [105,121,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105455 11001004 10100 0 [107,122,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105457 11001004 10100 0 [108,120,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -969,38 +969,43 @@
105569 11004009 10100 0 [84,136,0,15] 1 1 0 0 0 0 1 5 5 140 0
105571 11004010 10100 0 [51,142,0,15] 1 1 0 0 0 0 1 5 5 140 0
105573 11004011 10100 0 [27,92,0,15] 1 1 0 0 0 0 1 5 5 1 0
-111473 0 32020 0 [80,332,6,15] 1 1 0 0 0 0 1 5 5 0 101
-111474 0 32020 0 [71,295,6,15] 1 1 0 0 0 0 1 5 5 0 102
-111475 0 32020 0 [71,267,6,15] 1 1 0 0 0 0 1 5 5 0 103
-111476 0 32020 0 [106,267,6,15] 1 1 0 0 0 0 1 5 5 0 104
-111477 0 32020 0 [161,267,6,15] 1 1 0 0 0 0 1 5 5 0 105
-111478 0 32020 0 [201,308,6,15] 1 1 0 0 0 0 1 5 5 0 106
-111479 0 32020 0 [196,203,6,15] 1 1 0 0 0 0 1 5 5 0 107
-111480 0 32020 0 [210,174,6,15] 1 1 0 0 0 0 1 5 5 0 108
-111481 0 32020 0 [135,330,6,15] 1 1 0 0 0 0 1 5 5 0 109
-111482 0 32020 0 [135,285,6,15] 1 1 0 0 0 0 1 5 5 0 110
-111483 0 32020 0 [195,234,6,15] 1 1 0 0 0 0 1 5 5 0 111
-111484 0 32020 0 [202,298,6,15] 1 1 0 0 0 0 1 5 5 0 112
-111485 0 32020 0 [71,311,6,15] 1 1 0 0 0 0 1 5 5 0 113
-113962 40102001 32020 0 [158,334,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113963 40102001 32020 0 [158,330,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113964 40102002 32020 0 [106,332,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113965 40102002 32020 0 [106,335,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113966 40102002 32020 0 [102,336,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113967 40102002 32020 0 [108,338,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113968 40102007 32020 0 [201,330,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113969 40102007 32020 0 [200,327,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113970 40102007 32020 0 [200,334,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113971 40102003 32020 0 [194,270,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113972 40102003 32020 0 [194,263,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113973 40102003 32020 0 [191,272,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113974 40102004 32020 0 [133,264,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113975 40102004 32020 0 [133,269,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113976 40102004 32020 0 [132,273,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113977 40102006 32020 0 [133,303,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113978 40102006 32020 0 [136,303,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113979 40102006 32020 0 [136,301,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113980 40102005 32020 0 [80,264,6,15] 2 1 0 2500 0 0 1 5 5 0 0
+113971 40102003 32020 0 [194,270,1,15] 2 1 0 2500 0 0 1 5 5 0 0
+113972 40102003 32020 0 [193,267,1,15] 2 1 0 2500 0 0 1 5 5 0 0
+113973 40102003 32020 0 [191,274,1,15] 2 1 0 2500 0 0 1 5 5 0 0
+113974 40102004 32020 0 [133,264,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113975 40102004 32020 0 [133,269,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113980 40102005 32020 0 [79,267,1,15] 2 1 0 2500 0 0 1 5 5 0 0
+111476 0 32020 0 [146,329,0,15] 1 1 0 0 0 0 1 5 5 0 111
+111477 0 32020 0 [190,256,0,15] 1 1 0 0 0 0 1 5 5 0 109
+111478 0 32020 0 [217,316,0,15] 1 1 0 0 0 0 1 5 5 0 101
+111479 0 32020 0 [233,218,0,15] 1 1 0 0 0 0 1 5 5 0 107
+111480 0 32020 0 [206,143,0,15] 1 1 0 0 0 0 1 5 5 0 108
+111481 0 32020 0 [153,315,0,15] 1 1 0 0 0 0 1 5 5 0 102
+111482 0 32020 0 [93,293,0,15] 1 1 0 0 0 0 1 5 5 0 103
+111483 0 32020 0 [169,249,0,15] 1 1 0 0 0 0 1 5 5 0 105
+111484 0 32020 0 [213,281,0,15] 1 1 0 0 0 0 1 5 5 0 104
+111485 0 32020 0 [67,253,0,15] 1 1 0 0 0 0 1 5 5 0 113
+113962 40102001 32020 0 [158,334,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113963 40102001 32020 0 [158,330,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113964 40102002 32020 0 [106,332,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113965 40102002 32020 0 [106,335,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113966 40102002 32020 0 [102,336,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113967 40102002 32020 0 [108,338,0,15] 2 1 0 2500 0 0 1 5 5 0 0
+113981 40102005 32020 0 [80,263,1,15] 2 1 0 2500 0 0 1 5 5 0 0
+113982 40102005 32020 0 [75,264,1,15] 2 1 0 2500 0 0 1 5 5 0 0
+114017 40102003 32020 0 [190,270,1,15] 2 1 0 2500 0 0 1 5 5 0 0
+114019 0 32020 0 [127,282,0,15] 1 1 0 0 0 0 1 5 5 0 110
+114021 0 32020 0 [97,274,0,15] 1 1 0 0 0 0 1 5 5 0 115
+114022 0 32020 0 [85,251,0,15] 1 1 0 0 0 0 1 5 5 0 116
+114023 0 32020 0 [152,274,0,15] 1 1 0 0 0 0 1 5 5 0 117
+114024 0 32020 0 [181,276,0,15] 1 1 0 0 0 0 1 5 5 0 119
+114025 0 32020 0 [193,306,0,15] 1 1 0 0 0 0 1 5 5 0 118
+114026 0 32020 0 [198,241,0,15] 1 1 0 0 0 0 1 5 5 0 120
+114027 0 32020 0 [192,210,0,15] 1 1 0 0 0 0 1 5 5 0 121
+114028 0 32020 0 [210,179,0,15] 1 1 0 0 0 0 1 5 5 0 122
+114029 0 32020 0 [135,307,0,15] 1 1 0 0 0 0 1 5 5 0 123
+114030 0 32020 0 [185,334,0,15] 1 1 0 0 0 0 1 5 5 0 124
+114031 0 32020 0 [117,327,0,15] 1 1 0 0 0 0 1 5 5 0 125
105491 11001005 10100 0 [64,136,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105493 11001005 10100 0 [56,134,1,15] 1 1 0 2500 0 0 1 5 5 0 0
105495 11001005 10100 0 [58,134,1,15] 1 1 0 2500 0 0 1 5 5 0 0
@@ -1358,14 +1363,6 @@
89796 11101002 10110 0 [108,114,1,15] 1 1 0 3000 0 0 1 5 5 0 0
89798 11101002 10110 0 [107,116,1,15] 1 1 0 3000 0 0 1 5 5 0 0
89800 11101002 10110 0 [105,118,1,15] 1 1 0 3000 0 0 1 5 5 0 0
-111351 0 32020 0 [218,326,0,12] 1 1 0 0 0 0 1 5 5 0 180
-111353 0 32020 0 [165,303,0,16] 1 1 0 0 0 0 1 5 5 0 181
-111354 0 32020 0 [103,303,0,17] 1 1 0 0 0 0 1 5 5 0 182
-111355 0 32020 0 [220,271,0,13] 1 1 0 0 0 0 1 5 5 0 183
-111356 0 32020 0 [160,247,0,15] 1 1 0 0 0 0 1 5 5 0 184
-111357 0 32020 0 [107,247,0,15] 1 1 0 0 0 0 1 5 5 0 185
-111358 0 32020 0 [227,210,0,14] 1 1 0 0 0 0 1 5 5 0 186
-111359 0 32020 0 [213,135,0,15] 1 1 0 0 0 0 1 5 5 0 187
105423 11001003 10100 0 [109,90,1,15] 1 1 0 2500 0 0 1 5 5 0 0
80212 10901002 10090 0 [115,30,0,15] 1 1 0 3000 0 0 1 5 5 0 0
80317 10902001 10090 0 [59,184,0,15] 1 1 0 3000 0 0 1 5 5 0 0
@@ -1422,8 +1419,6 @@
105365 11001002 10100 0 [106,53,1,15] 1 1 0 2500 0 0 1 5 5 0 0
89940 11101005 10110 0 [26,66,1,15] 1 1 0 3000 0 0 1 5 5 0 0
89942 11101005 10110 0 [29,67,1,15] 1 1 0 3000 0 0 1 5 5 0 0
-113981 40102005 32020 0 [81,262,6,15] 2 1 0 2500 0 0 1 5 5 0 0
-113982 40102005 32020 0 [82,267,6,15] 2 1 0 2500 0 0 1 5 5 0 0
104832 0 21110 0 [122,30,0,15] 1 1 0 0 0 0 1 5 5 0 126
104833 0 21110 0 [136,39,0,15] 1 1 0 0 0 0 1 5 5 0 127
104834 0 21110 0 [137,59,0,15] 1 1 0 0 0 0 1 5 5 0 128
@@ -1464,6 +1459,14 @@
80141 0 21110 0 [52,37,0,10] 1 1 0 0 0 0 1 5 5 0 94
80142 0 21110 0 [17,92,0,14] 1 1 0 0 0 0 1 5 5 0 96
90379 0 21110 0 [83,98,0,15] 1 1 0 0 0 0 1 5 5 0 101
+111351 0 32020 0 [218,326,0,12] 1 1 0 0 0 0 1 5 5 0 180
+111353 0 32020 0 [165,303,0,16] 1 1 0 0 0 0 1 5 5 0 181
+111354 0 32020 0 [103,303,0,17] 1 1 0 0 0 0 1 5 5 0 182
+111355 0 32020 0 [220,271,0,13] 1 1 0 0 0 0 1 5 5 0 183
+111356 0 32020 0 [160,247,0,15] 1 1 0 0 0 0 1 5 5 0 184
+111357 0 32020 0 [107,247,0,15] 1 1 0 0 0 0 1 5 5 0 185
+111358 0 32020 0 [227,210,0,14] 1 1 0 0 0 0 1 5 5 0 186
+111359 0 32020 0 [213,135,0,15] 1 1 0 0 0 0 1 5 5 0 187
76319 10201001 10020 0 [187,23,1,15] 1 1 0 1800 0 0 1 5 5 0 0
76321 10201003 10020 0 [148,70,1,15] 1 1 0 1800 0 0 1 5 5 0 0
76323 10201005 10020 0 [116,144,1,15] 1 1 0 1800 0 0 1 5 5 0 0
@@ -2128,7 +2131,7 @@
68341 0 31110 0 [52,13,1,15] 1 1 0 0 0 0 1 5 5 0 102
68385 0 51010 0 [66,118,2,50] 1 1 0 0 0 0 1 5 5 0 115
76535 10301004 10030 0 [103,114,1,16] 1 1 0 1800 0 0 1 5 5 0 0
-111437 40102007 32020 0 [198,331,6,15] 2 1 0 2500 0 0 1 5 5 0 0
+111431 40102004 32020 0 [138,269,1,15] 2 1 0 2500 0 0 1 5 5 0 0
76509 10302001 10030 0 [21,108,1,15] 1 1 0 1800 0 0 1 5 5 0 0
76511 10301003 10030 0 [100,63,1,15] 1 1 0 1800 0 0 1 5 5 0 0
76513 10301001 10030 0 [51,22,1,15] 1 1 0 1800 0 0 1 5 5 0 0
--
Gitblit v1.8.0