From 92eee67f85cbd29feb1287ae5a15ad0c787e95cb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 21 二月 2019 10:47:15 +0800
Subject: [PATCH] Merge branch '1.5.200' of http://192.168.0.87:10010/r/snxx_server into 1.5.200
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 2
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 1
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 3
db/PyMongoDataServer/PySysDB/tagStore.txt | 3
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1
db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt | 42 +++++-----
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 6 +
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 1
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 63 +++++++++++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 2
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 3
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 38 ++++----
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 6 +
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 3
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 6 +
17 files changed, 142 insertions(+), 41 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 1642ba9..145a131 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -18,3 +18,4 @@
18 20190205 [] [] 2019-2-5 2019-2-8 1 {0:["BossFHOpen", []]} {} 110 1
19 20190212 [] [] 2019-2-12 2019-2-14 1 {0:["BossFHOpen", []]} {} 110 1
20 20190217 [] [] 2019-2-17 2019-2-20 1 {0:["BossFHOpen", []]} {} 110 1
+21 20190222 [] [] 2019-2-22 2019-2-24 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index f2db755..d2caab7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -18,3 +18,4 @@
17 20190205 [] [] 2019-2-5 2019-2-5 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 20000
18 20190207 [] [] 2019-2-7 2019-2-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
19 20190216 [] [] 2019-2-16 2019-2-16 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+20 20190224 [] [] 2019-2-24 2019-2-24 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index b833d17..2daf568 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -81,3 +81,9 @@
80 20190205 [] [] 2019-2-5 2019-2-8 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
81 20190209 [] [] 2019-2-9 2019-2-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
82 20190212 [] [] 2019-2-12 2019-2-12 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+83 20190220 [] [] 2019-2-20 2019-2-20 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+84 20190221 [] [] 2019-2-21 2019-2-21 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+85 20190222 [] [] 2019-2-22 2019-2-22 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+86 20190223 [] [] 2019-2-23 2019-2-23 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+87 20190224 [] [] 2019-2-24 2019-2-24 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+88 20190226 [] [] 2019-2-26 2019-2-26 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index a084505..296b36c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -61,3 +61,6 @@
60 20190207 [] [] 2019-2-7 2019-2-7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
61 20190215 [] [] 2019-2-15 2019-2-15 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
62 20190216 [] [] 2019-2-16 2019-2-16 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+63 20190221 [] [] 2019-2-21 2019-2-21 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+64 20190223 [] [] 2019-2-23 2019-2-23 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+65 20190224 [] [] 2019-2-24 2019-2-24 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 920e2a4..fcada79 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -24,3 +24,5 @@
23 20190202 [] [] 2019-2-2 2019-2-2 1 0 {0:["XYCOpen", []]} {} [] 110
24 20190204 [] [] 2019-2-4 2019-2-4 1 0 {0:["XYCOpen", []]} {} [] 110
25 20190214 [] [] 2019-2-14 2019-2-15 1 0 {0:["XYCOpen", []]} {} [] 110
+26 20190220 [] [] 2019-2-20 2019-2-21 1 0 {0:["XYCOpen", []]} {} [] 110
+28 20190225 [] [] 2019-2-25 2019-2-25 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 242a010..26c4aa1 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -245,6 +245,9 @@
1336 143 0 0
1337 143 0 0
1338 144 0 0
+1339 145 0 0
+1340 146 0 0
+1341 147 0 0
801 19 0 0
802 19 0 0
803 19 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index c96fdf7..b29c2d1 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -18,3 +18,4 @@
18 2019-2-5 2019-2-8 1 110 1
19 2019-2-12 2019-2-14 1 110 1
20 2019-2-17 2019-2-20 1 110 1
+21 2019-2-22 2019-2-24 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index de68efa..1232e71 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -18,3 +18,4 @@
17 110 20000
18 110 10000
19 110 10000
+20 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 20bebf5..0c69b4e 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -81,3 +81,9 @@
80 2019-2-5 2019-2-8 120 110 0 [[69]] SellMail4
81 2019-2-9 2019-2-11 120 110 0 [[70]] SellMail4
82 2019-2-12 2019-2-12 120 110 0 [[71]] SellMail4
+83 2019-2-20 2019-2-20 120 110 0 [[72]] SellMail4
+84 2019-2-21 2019-2-21 110 0 [[73]] SellMail4
+85 2019-2-22 2019-2-22 110 0 [[74]] SellMail4
+86 2019-2-23 2019-2-23 110 0 [[75]] SellMail4
+87 2019-2-24 2019-2-24 110 0 [[76]] SellMail4
+88 2019-2-26 2019-2-26 120 110 0 [[77]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 481f381..4ccf47e 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -61,3 +61,6 @@
60 2019-2-7 2019-2-7 110 0 [[141]] SellMail3
61 2019-2-15 2019-2-15 110 0 [[142]] SellMail3
62 2019-2-16 2019-2-16 110 0 [[143]] SellMail3
+63 2019-2-21 2019-2-21 110 0 [[145]] SellMail3
+64 2019-2-23 2019-2-23 110 0 [[146]] SellMail3
+65 2019-2-24 2019-2-24 110 0 [[147]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 6984ab1..35719c3 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -24,3 +24,5 @@
23 2019-2-2 2019-2-2 1 0 110 1
24 2019-2-4 2019-2-4 1 0 110 1
25 2019-2-14 2019-2-15 1 0 110 1
+26 2019-2-20 2019-2-21 1 0 110 1
+28 2019-2-25 2019-2-25 1 0 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
index e5500ee..f9d9887 100644
--- a/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
@@ -9,24 +9,24 @@
7 [[1150,1,1],[2141,50,1],[30,30,1],[4303,5,1]] []
8 [[1150,1,1],[2141,50,1],[30,30,1],[4303,5,1]] []
9 [[1150,1,1],[2141,50,1],[30,30,1],[4303,5,1]] []
-10 [[1151,1,1],[2141,100,1],[30,50,1],[4304,3,1],[5410,1,1]] [[2151,1,1],[30,80,1],[2141,400,1]]
-11 [[1151,1,1],[2141,100,1],[30,60,1],[4304,3,1]] [[2152,1,1],[30,80,1],[2141,400,1]]
-12 [[1151,1,1],[2141,100,1],[30,70,1],[4304,3,1]] [[2153,1,1],[30,80,1],[2141,400,1]]
-13 [[1151,1,1],[2141,100,1],[30,80,1],[4304,3,1]] [[2154,1,1],[30,80,1],[2141,400,1]]
-14 [[1151,1,1],[2141,100,1],[30,90,1],[4304,3,1]] [[2155,1,1],[30,80,1],[2141,400,1]]
-15 [[1152,1,1],[2141,200,1],[30,100,1],[4304,5,1],[5410,2,1]] [[2156,1,1],[30,100,1],[2141,500,1]]
-16 [[1152,1,1],[2141,200,1],[30,110,1],[4304,5,1]] [[2157,1,1],[30,100,1],[2141,500,1]]
-17 [[1152,1,1],[2141,200,1],[30,120,1],[4304,5,1]] [[2158,1,1],[30,100,1],[2141,500,1]]
-18 [[1152,1,1],[2141,200,1],[30,130,1],[4304,5,1]] [[2159,1,1],[30,100,1],[2141,500,1]]
-19 [[1152,1,1],[2141,200,1],[30,140,1],[4304,5,1]] [[2160,1,1],[30,100,1],[2141,500,1]]
-20 [[1153,1,1],[2141,300,1],[30,150,1],[4305,3,1],[5410,2,1]] [[2161,1,1],[30,300,1],[2141,1500,1]]
-21 [[1153,1,1],[2141,300,1],[30,160,1],[4305,3,1]] [[2162,1,1],[30,300,1],[2141,1500,1]]
-22 [[1153,1,1],[2141,300,1],[30,170,1],[4305,3,1]] [[2163,1,1],[30,300,1],[2141,1500,1]]
-23 [[1153,1,1],[2141,300,1],[30,180,1],[4305,3,1]] [[2164,1,1],[30,300,1],[2141,1500,1]]
-24 [[1153,1,1],[2141,300,1],[30,190,1],[4305,3,1]] [[2165,1,1],[30,300,1],[2141,1500,1]]
-25 [[1154,1,1],[2141,500,1],[30,200,1],[4305,5,1],[5411,1,1]] [[2166,1,1],[30,500,1],[2141,2500,1]]
-26 [[1154,1,1],[2141,500,1],[30,210,1],[4305,5,1]] [[2167,1,1],[30,500,1],[2141,2500,1]]
-27 [[1154,1,1],[2141,500,1],[30,220,1],[4305,5,1]] [[2168,1,1],[30,500,1],[2141,2500,1]]
-28 [[1154,1,1],[2141,500,1],[30,230,1],[4305,5,1]] [[2169,1,1],[30,500,1],[2141,2500,1]]
-29 [[1154,1,1],[2141,500,1],[30,240,1],[4305,5,1]] [[2170,1,1],[30,500,1],[2141,2500,1]]
-30 [[1155,1,1],[2141,1000,1],[30,250,1],[4305,10,1],[5411,2,1]] [[2171,1,1],[4193,1,1],[30,800,1],[2141,4000,1]]
+10 [[1151,1,1],[2141,100,1],[30,50,1],[4304,3,1],[5410,1,1]] [[2175,1,1],[30,80,1],[2141,400,1]]
+11 [[1151,1,1],[2141,100,1],[30,60,1],[4304,3,1]] [[2176,1,1],[30,80,1],[2141,400,1]]
+12 [[1151,1,1],[2141,100,1],[30,70,1],[4304,3,1]] [[2177,1,1],[30,80,1],[2141,400,1]]
+13 [[1151,1,1],[2141,100,1],[30,80,1],[4304,3,1]] [[2178,1,1],[30,80,1],[2141,400,1]]
+14 [[1151,1,1],[2141,100,1],[30,90,1],[4304,3,1]] [[2179,1,1],[30,80,1],[2141,400,1]]
+15 [[1152,1,1],[2141,200,1],[30,100,1],[4304,5,1],[5410,2,1]] [[2180,1,1],[30,100,1],[2141,500,1]]
+16 [[1152,1,1],[2141,200,1],[30,110,1],[4304,5,1]] [[2181,1,1],[30,100,1],[2141,500,1]]
+17 [[1152,1,1],[2141,200,1],[30,120,1],[4304,5,1]] [[2182,1,1],[30,100,1],[2141,500,1]]
+18 [[1152,1,1],[2141,200,1],[30,130,1],[4304,5,1]] [[2183,1,1],[30,100,1],[2141,500,1]]
+19 [[1152,1,1],[2141,200,1],[30,140,1],[4304,5,1]] [[2184,1,1],[30,100,1],[2141,500,1]]
+20 [[1153,1,1],[2141,300,1],[30,150,1],[4305,3,1],[5410,2,1]] [[2185,1,1],[30,300,1],[2141,1500,1]]
+21 [[1153,1,1],[2141,300,1],[30,160,1],[4305,3,1]] [[2186,1,1],[30,300,1],[2141,1500,1]]
+22 [[1153,1,1],[2141,300,1],[30,170,1],[4305,3,1]] [[2187,1,1],[30,300,1],[2141,1500,1]]
+23 [[1153,1,1],[2141,300,1],[30,180,1],[4305,3,1]] [[2188,1,1],[30,300,1],[2141,1500,1]]
+24 [[1153,1,1],[2141,300,1],[30,190,1],[4305,3,1]] [[2189,1,1],[30,300,1],[2141,1500,1]]
+25 [[1154,1,1],[2141,500,1],[30,200,1],[4305,5,1],[5411,1,1]] [[2190,1,1],[30,500,1],[2141,2500,1]]
+26 [[1154,1,1],[2141,500,1],[30,210,1],[4305,5,1]] [[2191,1,1],[30,500,1],[2141,2500,1]]
+27 [[1154,1,1],[2141,500,1],[30,220,1],[4305,5,1]] [[2192,1,1],[30,500,1],[2141,2500,1]]
+28 [[1154,1,1],[2141,500,1],[30,230,1],[4305,5,1]] [[2193,1,1],[30,500,1],[2141,2500,1]]
+29 [[1154,1,1],[2141,500,1],[30,240,1],[4305,5,1]] [[2194,1,1],[30,500,1],[2141,2500,1]]
+30 [[1155,1,1],[2141,1000,1],[30,250,1],[4305,10,1],[5411,2,1]] [[2195,1,1],[4193,1,1],[30,800,1],[2141,4000,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 19360f2..ba84e40 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -70,3 +70,9 @@
8 69 400 1 [(266,1,1),(181,25,1)] 266 LimitGift3
5 70 180 1 [(4228,1,1),(4151,25,1)] 4228 LimitGift3
5 71 150 1 [(5809,1,1),(5810,1,1),(5811,1,1)] 5809 LimitGift3
+2 72 22 1 [(110,50,1),(112,2,1)] 112 LimitGift3
+5 73 150 1 [(5414,750,1)] 5414 LimitGift3
+4 74 175 1 [(4680,1,1),(5411,10,1)] 4680 LimitGift3
+5 75 150 1 [(5803,1,1),(5804,1,1),(5805,1,1)] 5803 LimitGift3
+4 76 150 1 [(913,1,1),(4694,10,1)] 913 LimitGift3
+4 77 130 1 [(4606,1,1),(2213,25,1)] 4606 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 64b39fe..15522d7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -337,7 +337,7 @@
CrossUseItem 901|902|903|904
CrossRealmCfg 4
CrossSyncPlayerData 5
-CrossRealmPKAward {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]} {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]} {"10":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}
+CrossRealmPKAward {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]} {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]} {"10":[[2198,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2197,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2196,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}
CrossRealmPKMatchCount 10 10 10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*10+min(max(todayBuyCount-5,0),1)*10+min(max(todayBuyCount-7,0),1)*10
CrossRealmPKFB [30, 3, 60,30,10] [[14,18,19,11,42], [30,33,36,28,50]] 2
GatherSoulHole 0_300|1_300|2_305|3_315|4_320|5_325|6_310 0_62|1_62|2_62|3_62|4_62|5_62|6_63
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index deed504..fa6c2d1 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -511,3 +511,66 @@
lbj.chlb.18 104021343 18 111 0
lbj.lclb.30 104021343 30 112 0
lbj.zqlb.98 104021343 98 113 0
+yyb2.18 yybgame2 18 101 0
+yyb2.1 yybgame2 10 102 0
+yyb2.3 yybgame2 30 103 0
+yyb2.98 yybgame2 98 104 0
+yyb2.128 yybgame2 128 105 0
+yyb2.198 yybgame2 198 106 0
+yyb2.328 yybgame2 328 107 0
+yyb2.648 yybgame2 648 108 0
+yyb2.3000 yybgame2 3000 109 0
+yyb2.test1 yybgame2 1 110 0
+yyb2.android.6 yybgame2 6 0 2
+yyb2.android.30 yybgame2 30 0 4
+yyb2.android.68 yybgame2 68 0 5
+yyb2.android.128 yybgame2 128 0 7
+yyb2.android.168 yybgame2 168 0 8
+yyb2.android.18 yybgame2 18 0 3
+yyb2.android.98 yybgame2 98 0 6
+yyb2.android.198 yybgame2 198 0 9
+yyb2.android.jbch yybgame2 18 111 0
+yyb2.android.ntlc yybgame2 30 112 0
+yyb2.android.jszq yybgame2 98 113 0
+xiaoniu.18 xngame 18 101 0
+xiaoniu.1 xngame 10 102 0
+xiaoniu.3 xngame 30 103 0
+xiaoniu.98 xngame 98 104 0
+xiaoniu.128 xngame 128 105 0
+xiaoniu.198 xngame 198 106 0
+xiaoniu.328 xngame 328 107 0
+xiaoniu.648 xngame 648 108 0
+xiaoniu.3000 xngame 3000 109 0
+xiaoniu.test1 xngame 1 110 0
+xiaoniu.android.6 xngame 6 0 2
+xiaoniu.android.30 xngame 30 0 4
+xiaoniu.android.68 xngame 68 0 5
+xiaoniu.android.128 xngame 128 0 7
+xiaoniu.android.168 xngame 168 0 8
+xiaoniu.android.18 xngame 18 0 3
+xiaoniu.android.98 xngame 98 0 6
+xiaoniu.android.198 xngame 198 0 9
+xiaoniu.android.jbch xngame 18 111 0
+xiaoniu.android.ntlc xngame 30 112 0
+xiaoniu.android.jszq xngame 98 113 0
+superd.18 sdgame 18 101 0
+superd.1 sdgame 10 102 0
+superd.3 sdgame 30 103 0
+superd.98 sdgame 98 104 0
+superd.128 sdgame 128 105 0
+superd.198 sdgame 198 106 0
+superd.328 sdgame 328 107 0
+superd.648 sdgame 648 108 0
+superd.3000 sdgame 3000 109 0
+superd.test1 sdgame 1 110 0
+superd.android.6 sdgame 6 0 2
+superd.android.30 sdgame 30 0 4
+superd.android.68 sdgame 68 0 5
+superd.android.128 sdgame 128 0 7
+superd.android.168 sdgame 168 0 8
+superd.android.18 sdgame 18 0 3
+superd.android.98 sdgame 98 0 6
+superd.android.198 sdgame 198 0 9
+superd.android.jbch sdgame 18 111 0
+superd.android.ntlc sdgame 30 112 0
+superd.android.jszq sdgame 98 113 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index b205401..3a66e4f 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -245,6 +245,9 @@
1336 143 1 912 2 1 [[2213,10,1]] 912 0 0 0 1 0 1 88 425 0 LimitGift6
1337 143 1 2450 1 1 [] 2450 0 0 0 1 0 1 1588 6000 0 LimitGift7
1338 144 1 5413 30 1 [] 5413 0 0 0 1 0 1 588 1000 0 LimitGift6
+1339 145 1 5413 50 1 [] 5413 0 0 0 1 0 1 688 1500 0 LimitGift6
+1340 146 1 912 2 1 [[3807,5,1]] 912 0 0 0 1 0 1 188 800 0 LimitGift7
+1341 147 1 5701 12 1 [] 5701 0 0 0 1 0 1 688 1500 0 LimitGift6
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
803 19 0 2395 1 0 [] 0 0 0 0 0 0 1 60 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index e4b27f7..95f24d4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -493,20 +493,20 @@
20303005 2 0 金甲蛮狮 335 0 34641 34641 0 16 0 0 10000 33439 0 1 0 0 0 0 0 3 3000 4008354 252 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 2691253 5 10000 0 0 5 0 0 186 1 1
20303006 2 0 麒麟瑞兽 355 0 45112 45112 0 17 0 0 10000 44723 0 1 0 0 0 0 0 3 3000 4554422 285 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 33143382 9 10000 0 0 5 0 0 186 1 1
20303007 2 0 金色战神 375 0 58234 58234 0 18 0 0 10000 57175 0 1 0 0 0 0 0 3 3000 4861408 305 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 15324762 15 10000 0 0 5 0 0 186 1 1
-20402001 2 0 精英鬼蛛 405 0 25533 25533 0 20 0 0 0 4394 0 0 0 0 0 0 0 0 3000 5196577 326 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 76986274 0 0 0 0 1 34798563 0 1 1 1
-20402002 2 0 精英鱼妖 440 0 29839 29839 0 23 0 0 0 7741 0 0 0 0 0 0 0 0 3000 5734071 360 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 27518996 1 0 0 0 1 52367876 0 1 1 1
-20402003 2 0 精英海石精 450 0 31450 31450 0 24 0 0 0 8115 0 0 0 0 0 0 0 0 3000 5921443 372 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 43395937 1 0 0 0 1 60436129 0 1 1 1
-20402004 2 0 精英海牛 490 0 36998 36998 0 26 0 0 0 10097 0 0 0 0 0 0 0 0 3000 6661390 418 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 92691731 1 0 0 0 1 109294469 0 1 1 1
-20402005 2 0 精英海斗士 500 0 39084 39084 0 29 0 0 0 10537 0 0 0 0 0 0 0 0 3000 6851040 430 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 7253266 2 0 0 0 1 127053886 0 1 1 1
-20402006 2 0 精英地龙 540 0 45948 45948 0 33 0 0 0 12765 0 0 0 0 0 0 0 0 3000 7864938 492 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 85782899 2 0 0 0 1 231950199 0 1 1 1
-20402007 2 0 精英冰骨妖 550 0 48174 48174 0 38 0 0 0 13253 0 0 0 0 0 0 0 0 3000 8123391 508 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 9426047 3 0 0 0 1 269289020 0 1 1 1
-20403001 2 0 猩红女王 410 0 110889 110889 0 23 0 0 10000 114272 0 1 0 0 0 0 0 0 3000 5921443 372 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 79864653 47 10000 0 0 5 0 0 186 1 1
-20403002 2 0 忘川鬼鲨 445 0 132498 132498 0 24 0 0 10000 140284 0 1 0 0 0 0 0 0 3000 6763516 425 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 28195606 83 10000 0 0 5 0 0 186 1 1
-20403003 2 0 幽冥石鬼 455 0 146677 146677 0 25 0 0 10000 155703 0 1 0 0 0 0 0 0 3000 7228636 453 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10258546 115 10000 0 0 5 0 0 186 1 1
-20403004 2 0 炎魔巨兽 495 0 174032 174032 0 29 0 0 10000 186395 0 1 0 0 0 0 0 0 3000 8260931 517 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 29717300 160 10000 0 0 5 0 0 186 1 1
-20403005 2 0 上古裂妖 505 0 181582 181582 0 30 0 0 10000 195581 0 1 0 0 0 0 0 0 3000 8557220 534 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 60796610 201 10000 0 0 5 0 0 186 1 1
-20403006 2 0 战场魔龙 545 0 205267 205267 0 34 0 0 10000 222189 0 1 0 0 0 0 0 0 3000 9658212 601 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 27966702 314 10000 0 0 5 0 0 186 1 1
-20403007 2 0 戮仙鬼王 555 0 253946 253946 0 35 0 0 10000 266418 0 1 0 0 0 0 0 0 3000 9798411 609 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 82515120 361 10000 0 0 5 0 0 186 1 1
+20402001 2 0 精英鬼蛛 405 0 25533 25533 0 20 0 0 0 4394 0 0 0 0 0 0 0 3 3000 5196577 326 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 76986274 0 0 0 0 1 34798563 0 1 1 1
+20402002 2 0 精英鱼妖 440 0 29839 29839 0 23 0 0 0 7741 0 0 0 0 0 0 0 3 3000 5734071 360 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 27518996 1 0 0 0 1 52367876 0 1 1 1
+20402003 2 0 精英海石精 450 0 31450 31450 0 24 0 0 0 8115 0 0 0 0 0 0 0 3 3000 5921443 372 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 43395937 1 0 0 0 1 60436129 0 1 1 1
+20402004 2 0 精英海牛 490 0 36998 36998 0 26 0 0 0 10097 0 0 0 0 0 0 0 3 3000 6661390 418 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 92691731 1 0 0 0 1 109294469 0 1 1 1
+20402005 2 0 精英海斗士 500 0 39084 39084 0 29 0 0 0 10537 0 0 0 0 0 0 0 3 3000 6851040 430 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 7253266 2 0 0 0 1 127053886 0 1 1 1
+20402006 2 0 精英地龙 540 0 45948 45948 0 33 0 0 0 12765 0 0 0 0 0 0 0 3 3000 7864938 492 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 85782899 2 0 0 0 1 231950199 0 1 1 1
+20402007 2 0 精英冰骨妖 550 0 48174 48174 0 38 0 0 0 13253 0 0 0 0 0 0 0 3 3000 8123391 508 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 9426047 3 0 0 0 1 269289020 0 1 1 1
+20403001 2 0 猩红女王 410 0 110889 110889 0 23 0 0 10000 114272 0 1 0 0 0 0 0 3 3000 5921443 372 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 79864653 47 10000 0 0 5 0 0 186 1 1
+20403002 2 0 忘川鬼鲨 445 0 132498 132498 0 24 0 0 10000 140284 0 1 0 0 0 0 0 3 3000 6763516 425 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 28195606 83 10000 0 0 5 0 0 186 1 1
+20403003 2 0 幽冥石鬼 455 0 146677 146677 0 25 0 0 10000 155703 0 1 0 0 0 0 0 3 3000 7228636 453 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 10258546 115 10000 0 0 5 0 0 186 1 1
+20403004 2 0 炎魔巨兽 495 0 174032 174032 0 29 0 0 10000 186395 0 1 0 0 0 0 0 3 3000 8260931 517 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 29717300 160 10000 0 0 5 0 0 186 1 1
+20403005 2 0 上古裂妖 505 0 181582 181582 0 30 0 0 10000 195581 0 1 0 0 0 0 0 3 3000 8557220 534 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 60796610 201 10000 0 0 5 0 0 186 1 1
+20403006 2 0 战场魔龙 545 0 205267 205267 0 34 0 0 10000 222189 0 1 0 0 0 0 0 3 3000 9658212 601 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 27966702 314 10000 0 0 5 0 0 186 1 1
+20403007 2 0 戮仙鬼王 555 0 253946 253946 0 35 0 0 10000 266418 0 1 0 0 0 0 0 3 3000 9798411 609 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 82515120 361 10000 0 0 5 0 0 186 1 1
30102001 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 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 1 1 1
30102002 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 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 1 1 1
30102003 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 0 15 2 100 0 0 0 0 1 0 0 198 1 1
@@ -546,7 +546,7 @@
30301001 2 0 精英护卫 200 0 1503 1503 0 6 0 0 10000 25 0 0 780 0 0 0 0 1 3000 634880 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 125457 0 0 0 0 1 44677 7 1 1 1
30301002 2 0 精英护卫 230 0 1839 1839 0 8 0 0 10000 55 0 0 780 0 0 0 0 1 3000 738321 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 243454 0 0 0 0 1 91068 13 1 1 1
30301003 2 0 精英护卫 300 0 6273 5324 0 13 0 0 10000 180 0 0 780 0 0 0 0 1 3000 1129082 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 672234 0 0 0 0 1 275695 26 1 1 1
-30301004 2 0 精英护卫 400 0 22079 22079 0 22 0 0 10000 2016 0 0 0 0 0 0 0 0 3000 4977758 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 10939612 0 0 0 0 1 1097010 30 1 1 1
+30301004 2 0 精英护卫 400 0 22079 22079 0 22 0 0 10000 2016 0 0 0 0 0 0 0 1 3000 4977758 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 10939612 0 0 0 0 1 1097010 30 1 1 1
30303001 2 0 天枢 160 0 2636 2636 0 4 0 0 10000 3215 0 1 0 0 0 0 0 3 3000 301782 16 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 6566154 0 10000 0 0 5 0 0 186 1 1
30303002 2 0 天璇 180 0 3897 3897 0 5 0 0 10000 5001 0 1 0 0 0 0 0 3 3000 339742 18 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9354177 0 10000 0 0 5 0 0 186 1 1
30303003 2 0 天玑 210 0 6392 6392 0 6 0 0 10000 8100 0 1 0 0 0 0 0 3 3000 409208 23 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 24105054 0 10000 0 0 5 0 0 186 1 1
@@ -563,10 +563,10 @@
30303014 2 0 巨木石人 380 0 73225 73225 0 18 0 0 10000 63789 0 1 0 0 0 0 0 3 3000 5222534 327 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 50382622 22 10000 0 0 5 0 0 186 1 1
30303015 2 0 剧毒蛇王 450 0 105622 105622 0 22 0 0 10000 114307 0 1 0 0 0 0 0 3 3000 6521555 410 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9673073 66 10000 0 0 5 0 0 186 1 1
30303016 2 0 古森之灵 485 0 127530 127530 0 25 0 0 10000 141920 0 1 0 0 0 0 0 3 3000 7719538 484 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 86957073 135 10000 0 0 5 0 0 186 1 1
-30303017 2 0 麒麟瑞兽 390 0 84573 84573 0 22 0 0 10000 89892 0 1 0 0 0 0 0 0 3000 5734071 360 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 50633273 42 10000 0 0 5 0 0 186 1 1
-30303018 2 0 秘境石人 420 0 99720 99720 0 23 0 0 10000 107125 0 1 0 0 0 0 0 0 3000 6297705 396 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 24215454 59 10000 0 0 5 0 0 186 1 1
-30303019 2 0 图腾蛇王 450 0 109347 109347 0 30 0 0 10000 119982 0 1 0 0 0 0 0 0 3000 6851040 430 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 62663383 103 10000 0 0 5 0 0 186 1 1
-30303020 2 0 秘境之主 500 0 133086 133086 0 31 0 0 10000 148347 0 1 0 0 0 0 0 0 3000 8002098 501 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 43992870 198 10000 0 0 5 0 0 186 1 1
+30303017 2 0 麒麟瑞兽 390 0 84573 84573 0 22 0 0 10000 89892 0 1 0 0 0 0 0 3 3000 5734071 360 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 50633273 42 10000 0 0 5 0 0 186 1 1
+30303018 2 0 秘境石人 420 0 99720 99720 0 23 0 0 10000 107125 0 1 0 0 0 0 0 3 3000 6297705 396 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 24215454 59 10000 0 0 5 0 0 186 1 1
+30303019 2 0 图腾蛇王 450 0 109347 109347 0 30 0 0 10000 119982 0 1 0 0 0 0 0 3 3000 6851040 430 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 62663383 103 10000 0 0 5 0 0 186 1 1
+30303020 2 0 秘境之主 500 0 133086 133086 0 31 0 0 10000 148347 0 1 0 0 0 0 0 3 3000 8002098 501 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 43992870 198 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
--
Gitblit v1.8.0