From faf144a92b0e5930162cf7b240b6f66a01b504c6 Mon Sep 17 00:00:00 2001
From: CeHua_TRX <526616766@qq.com>
Date: 星期三, 28 十一月 2018 21:42:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc | 0
db/PyMongoDataServer/PySysDB/tagCTG.txt | 30 +++++++-------
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 20 +++++-----
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 4 +-
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 26 ++++++------
db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt | 10 ++--
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt | 10 ++--
8 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
index 18c2e07..381113f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
@@ -5,14 +5,14 @@
51010 3 3541349 7285497 155 [5, 1]
51010 4 4697877 11336856 155 [5, 1]
51010 5 7285497 0 155 [5, 1]
-60010 0 349488 0 105 [5, 0]
-60010 1 1097812 0 165 [5, 0]
-60010 2 1997875 0 200 [5, 0]
+60010 0 218160 0 105 [5, 0]
+60010 1 815427 0 165 [5, 0]
+60010 2 1809401 0 200 [5, 0]
31110 2 281011 0 125 [5, 0]
31110 5 1114154 0 180 [5, 0]
31110 7 2520808 0 215 [5, 0]
31110 9 4075186 0 240 [5, 0]
31110 12 7881199 0 285 [5, 0]
-31110 15 17274907 0 320 [5, 0]
-31110 18 25874924 0 350 [5, 0]
+31110 15 15920114 0 320 [5, 0]
+31110 18 24178039 0 350 [5, 0]
31110 21 34736689 0 380 [5, 0]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
index a3f7696..090249d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 455857e..28880a3 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,6 +1,6 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
1 1 2 120 50 0 [[22]] SellMail4
-2 3 4 50 0 [[16]] SellMail4
+2 3 4 50 0 [[19]] SellMail4
3 5 6 50 0 [[18]] SellMail4
4 9 10 120 50 0 [[15]] SellMail4
5 2018-9-1 2018-9-1 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 1abdd16..e68b64f 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -1,26 +1,26 @@
RecordID DailyBuyCount GainGold GainGoldPaper FirstGoldPaperPrize GainItemList NotifyMark
101 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-102 0 100 10 100 []
-103 0 300 30 300 []
-104 0 980 100 980 []
-105 0 1280 138 1280 []
-106 0 1980 248 1980 []
-107 0 3280 468 3280 []
-108 0 6480 1088 6480 []
+102 0 100 10 0 []
+103 0 300 30 0 []
+104 0 980 100 0 []
+105 0 1280 138 0 []
+106 0 1980 248 0 []
+107 0 3280 468 0 []
+108 0 6480 1088 0 []
109 0 30000 5888 0 []
110 0 10 1 0 []
111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
112 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]] Bargaingift2
113 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]] Bargaingift3
-2 0 60 6 60 []
+2 0 60 6 0 []
201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-202 0 60 6 60 []
-203 0 300 30 300 []
-204 0 980 100 980 []
-205 0 1280 138 1280 []
-206 0 1980 248 1980 []
-207 0 3280 468 3280 []
-208 0 6480 1088 6480 []
+202 0 60 6 0 []
+203 0 300 30 0 []
+204 0 980 100 0 []
+205 0 1280 138 0 []
+206 0 1980 248 0 []
+207 0 3280 468 0 []
+208 0 6480 1088 0 []
209 0 30000 5888 0 []
210 0 1 0 0 []
211 0 1 0 0 []
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 498126e..4b2baf3 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -174,14 +174,14 @@
2387 0 8353_1 [[1500,[8202,1]],[3000,[8215,1]],[4500,[8228,1]],[6000,[8241,1]],[7500,[8254,1]],[7800,[8203,1]],[8100,[8216,1]],[8400,[8229,1]],[8700,[8242,1]],[9000,[8255,1]],[9200,[8204,1]],[9400,[8217,1]],[9600,[8230,1]],[9800,[8243,1]],[10000,[8256,1]]] 4 [[740,[8354,1]],[2222,[8205,1]],[3703,[8218,1]],[5185,[8231,1]],[6666,[8244,1]],[8148,[8257,1]],[8481,[8206,1]],[8814,[8219,1]],[9148,[8232,1]],[9481,[8245,1]],[9814,[8258,1]],[9851,[8207,1]],[9888,[8220,1]],[9925,[8233,1]],[9962,[8246,1]],[10000,[8259,1]]] [[7300,0],[10000,1]] [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259]
2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1
2389 0 8353_2 [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]] 7 [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]] [[7750,0],[10000,1]] {2:[[2000,[8209,1]],[4000,[8222,1]],[6000,[8235,1]],[8000,[8248,1]],[10000,[8261,1]]]} [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
-2390 [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 1
+2390 [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 1 [8205,8206,8207,8218,8219,8220,8231,8232,8233,8244,8245,8246,8257,8258,8259]
2391 [[20,[3803,1]],[170,[3802,1]],[220,[4186,1]],[270,[199,1]],[320,[4606,1]],[370,[4608,1]],[570,[3504,1]],[770,[3514,1]],[1370,[4304,12]],[1570,[5303,60]],[3400,[2324,2]],[4700,[3503,1]],[6000,[3513,1]],[6300,[141,60]],[6600,[142,40]],[6900,[143,30]],[7200,[144,20]],[8600,[4151,8]],[10000,[181,8]]] 1 {2:[[10000,[4186,1]]],8:[[10000,[4608,1]]],20:[[10000,[3802,1]]]} [3803,3802,4186,199,4606,4608,3504,3514]
2392 4184_2|1145_15|952_3|913_1 [913]
2393 [[100,[3803,1]],[120,[8067,1]],[140,[4607,1]],[190,[5206,1]],[290,[4606,1]],[540,[5006,2]],[690,[3505,1]],[840,[3515,1]],[1440,[4305,5]],[1740,[5303,60]],[3000,[2324,2]],[4400,[3503,1]],[5800,[3513,1]],[6100,[142,40]],[6400,[143,30]],[6700,[144,20]],[7000,[153,10]],[8500,[4151,8]],[10000,[181,8]]] 1 {2:[[10000,[3515,1]]],8:[[10000,[4606,1]]],20:[[10000,[4607,1]]]} [3803,8067,4607,5206,4606,5006,3505,3515]
2394 4184_2|1146_15|952_3|913_1 [913]
2395 [[100,[3803,1]],[250,[5408,1]],[260,[5409,1]],[280,[4607,1]],[380,[4606,1]],[480,[4608,1]],[630,[3506,1]],[780,[3516,1]],[1380,[4305,5]],[1680,[5303,60]],[3180,[8353,6]],[4800,[2324,2]],[6200,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 {2:[[10000,[3516,1]]],8:[[10000,[4608,1]]],20:[[10000,[5408,1]]]} [3803,5408,5409,4607,4606,4608,3506,3516]
2396 4184_2|1147_15|952_3|913_1 [913]
-2397 [[11800,[8209,1]],[13600,[8222,1]],[15400,[8235,1]],[17200,[8248,1]],[19000,[8261,1]],[19200,[8210,1]],[19400,[8223,1]],[19600,[8236,1]],[19800,[8249,1]],[20000,[8262,1]]] 1
+2397 [[1800,[8209,1]],[3600,[8222,1]],[5400,[8235,1]],[7200,[8248,1]],[9000,[8261,1]],[9200,[8210,1]],[9400,[8223,1]],[9600,[8236,1]],[9800,[8249,1]],[10000,[8262,1]]] 1 [8209,8210,8222,8223,8235,8236,8248,8249,8261,8262]
2398 0 [[1600,[10453,1]],[3200,[10454,1]],[4800,[10455,1]],[6400,[10456,1]],[8000,[10457,1]],[8400,[10473,1]],[8800,[10474,1]],[9200,[10475,1]],[9600,[10476,1]],[10000,[10477,1]]] 1 [[10453,20453,30453],[10454,20454,30454],[10455,20455,30455],[10456,20456,30456],[10457,20457,30457],[10473,20473,30473],[10474,20474,30474],[10475,20475,30475],[10476,20476,30476],[10477,20477,30477]] [10453,20453,30453,10454,20454,30454,10455,20455,30455,10456,20456,30456,10457,20457,30457,10473,20473,30473,10474,20474,30474,10475,20475,30475,10476,20476,30476,10477,20477,30477]
2399 0 [[1600,[10553,1]],[3200,[10554,1]],[4800,[10555,1]],[6400,[10556,1]],[8000,[10557,1]],[8400,[10573,1]],[8800,[10574,1]],[9200,[10575,1]],[9600,[10576,1]],[10000,[10577,1]]] 1 [[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557],[10573,20573,30573],[10574,20574,30574],[10575,20575,30575],[10576,20576,30576],[10577,20577,30577]] [10553,20553,30553,10554,20554,30554,10555,20555,30555,10556,20556,30556,10557,20557,30557,10573,20573,30573,10574,20574,30574,10575,20575,30575,10576,20576,30576,10577,20577,30577]
2400 0 [[1600,[10653,1]],[3200,[10654,1]],[4800,[10655,1]],[6400,[10656,1]],[8000,[10657,1]],[8400,[10673,1]],[8800,[10674,1]],[9200,[10675,1]],[9600,[10676,1]],[10000,[10677,1]]] 1 [[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]] [10653,20653,30653,10654,20654,30654,10655,20655,30655,10656,20656,30656,10657,20657,30657,10673,20673,30673,10674,20674,30674,10675,20675,30675,10676,20676,30676,10677,20677,30677]
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index 75e9b4e..ba54e5e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -5,14 +5,14 @@
51010 3 3541349 3541349 235 277595 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
51010 4 4697877 4697877 255 366081 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
51010 5 7285497 7285497 275 698930 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
-60010 0 349488 349488 105 13325 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
-60010 1 1097812 1097812 165 51202 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
-60010 2 1997875 1997875 200 117496 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
+60010 0 218160 218160 105 7094 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
+60010 1 815427 815427 165 35603 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
+60010 2 1809401 1809401 200 106878 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
31110 2 281011 281011 125 3212 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
31110 5 1114154 1114154 180 18272 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
31110 7 2520808 2520808 215 68437 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:140}}
31110 9 4075186 4075186 240 147253 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:141}}
31110 12 7881199 7881199 285 326462 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:142}}
-31110 15 17274907 17274907 320 756805 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:143}}
-31110 18 25874924 25874924 350 1319310 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:144}}
+31110 15 15920114 15920114 320 697848 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:143}}
+31110 18 24178039 24178039 350 1203012 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:144}}
31110 21 34736689 34736689 380 1853123 50 {1:{(12500, 12501, 12502, 12503):1, 12511:7, 12512:15, 12513:30, 12514:80, 12515:140}, 2:{(12600, 12601, 12602, 12603):1, 12611:7, 12612:15, 12614:80, 12615:145}}
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 8ce5414..47111ba 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -8,16 +8,16 @@
7 0 3725 0 3724 1 3805|3806 2|2 0 2000 10000 0 5 WingComposeSuccess5 1
11 0 9065 0 9064|9064|9064 3 5304 20 0 10000 0 0 0 XianComposeSucces1 1
12 0 9067 0 9065|9065|9065 3 5304 2 0 10000 0 0 0 EquipComposeSuccess1 1
-13 0 10893 0 10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-14 0 10894 0 10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-15 0 10895 0 10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-16 0 10896 0 10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-17 0 10897 0 10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-18 0 20893 0 20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-19 0 20894 0 20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-20 0 20895 0 20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-21 0 20896 0 20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
-22 0 20897 0 20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+13 0 10893 0 10881|10882|10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+14 0 10894 0 10881|10882|10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+15 0 10895 0 10881|10882|10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+16 0 10896 0 10881|10882|10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+17 0 10897 0 10881|10882|10883|10884|10885|10886|10887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+18 0 20893 0 20881|20882|20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+19 0 20894 0 20881|20882|20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+20 0 20895 0 20881|20882|20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+21 0 20896 0 20881|20882|20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
+22 0 20897 0 20881|20882|20883|20884|20885|20886|20887 3 5408 1 0 10000 0 0 0 EquipComposeSuccess7 1
23 2 10571 0 10551|10552|10553|10554|10555|10556|10557 3 0 0 0 6000 0 5410|1|4000 0 EquipComposeSuccess1 1
24 2 10572 0 10551|10552|10553|10554|10555|10556|10557 3 0 0 0 6000 0 5410|1|4000 0 EquipComposeSuccess1 1
25 2 10573 0 10551|10552|10553|10554|10555|10556|10557 3 0 0 0 6000 0 5410|1|4000 0 EquipComposeSuccess1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index dfe09bc..183dc44 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -1081,21 +1081,21 @@
61203003 2 0 境界 220 2 12570 12570 1714 8 0 0 10000 4304 0 0 0 0 0 0 2520808 0 2500 713078 41 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 31586695 0 0 0 0 3 0 30 186 1 1
61203004 2 0 境界 250 2 17530 17530 2673 10 0 0 10000 5377 0 0 0 0 0 0 4075186 0 2500 887125 58 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 67963348 0 0 0 0 3 0 31 186 1 1
61203005 2 0 境界 290 2 30301 30301 4159 13 0 0 10000 8252 0 0 0 0 0 0 7881199 0 2500 1159867 85 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 50675127 1 0 0 0 3 0 32 186 1 1
-61203006 2 0 境界 320 2 51869 51869 6913 16 0 0 10000 14962 0 0 0 0 0 0 17274907 0 2500 1389089 106 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 49294775 3 0 0 0 3 0 33 186 1 1
-61203007 2 0 境界 350 2 66046 66046 9241 19 0 0 10000 20279 0 0 0 0 0 0 25874924 0 2500 1554082 118 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 8912744 6 0 0 0 3 0 34 186 1 1
+61203006 2 0 境界 320 2 50098 50098 6649 16 0 0 10000 14250 0 0 0 0 0 0 15920114 0 2500 1364737 104 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 22083823 3 0 0 0 3 0 33 186 1 1
+61203007 2 0 境界 350 2 62309 62309 8803 19 0 0 10000 18971 0 0 0 0 0 0 24178039 0 2500 1522262 116 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 55236581 5 0 0 0 3 0 34 186 1 1
61203008 2 0 境界 380 2 94746 94746 11694 22 0 0 10000 30639 0 0 0 0 0 0 34736689 0 2500 1729002 132 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 55287918 8 0 0 0 3 0 35 186 1 1
61303001 14 0 仙盟采集桌 1 0 1 1 1 13 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 15 2 3000 0 0 0 0 0 0 0 214 0 1
-30601001 2 0 暗影剑士 105 0 875 875 0 0 0 0 0 159 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 105997 0 0 0 0 1 0 0 1 1 1
-30601002 2 0 剑魂 105 0 840 840 0 0 0 0 0 127 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 116597 0 0 0 0 1 0 0 1 1 1
-30603001 2 0 御剑尊者 105 0 2296 2296 0 0 0 0 0 1465 0 0 0 0 0 0 0 0 2500 37788 19 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 1165982 0 0 0 0 5 0 0 186 1 1
-30601003 2 0 魔化哨兵 165 0 2315 2315 0 0 0 0 0 896 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 407294 0 0 0 0 1 0 0 1 1 1
-30601004 2 0 狂暴妖兵 165 0 2107 2107 0 0 0 0 0 717 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 448024 0 0 0 0 1 0 0 1 1 1
-30601005 2 0 魔界冥魂 165 0 5551 5551 0 0 0 0 0 3682 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 814590 0 0 0 0 1 0 0 1 1 1
-30603002 2 0 逍遥城主 165 0 10644 10644 0 0 0 0 0 8067 0 0 0 0 0 0 0 0 2500 52452 27 0 300 2 6 10043 23030 10044 0 0 0 0 0 0 15 2 4480257 0 0 0 0 5 0 0 186 1 1
-30601006 2 0 冰霜巨蝎 200 0 3280 3280 0 0 0 0 0 1227 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 934628 0 0 0 0 1 0 0 1 1 1
-30601007 2 0 冰川蛮兽 200 0 3115 3115 0 0 0 0 0 1089 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 1028090 0 0 0 0 1 0 0 1 1 1
-30601008 2 0 雪山巨猿 200 0 9634 9634 0 0 0 0 0 6526 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 3738513 0 0 0 0 1 0 0 1 1 1
-30603003 2 0 极寒冰心 200 0 17460 17460 0 0 0 0 0 13053 0 0 0 0 0 0 0 0 2500 63270 34 0 300 2 6 10045 23030 10046 0 0 0 0 0 0 15 2 11215545 0 0 0 0 5 0 0 186 1 1
+30601001 2 0 暗影剑士 105 0 742 742 0 0 0 0 0 146 0 0 0 0 0 0 0 0 2500 34122 17 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 56435 0 0 0 0 1 0 0 1 1 1
+30601002 2 0 剑魂 105 0 710 710 0 0 0 0 0 117 0 0 0 0 0 0 0 0 2500 34122 17 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 62078 0 0 0 0 1 0 0 1 1 1
+30603001 2 0 御剑尊者 105 0 1966 1966 0 0 0 0 0 1288 0 0 0 0 0 0 0 0 2500 34122 17 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 620795 0 0 0 0 5 0 0 186 1 1
+30601003 2 0 魔化哨兵 165 0 2006 2006 0 0 0 0 0 819 0 0 0 0 0 0 0 0 2500 48222 25 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 283210 0 0 0 0 1 0 0 1 1 1
+30601004 2 0 狂暴妖兵 165 0 1819 1819 0 0 0 0 0 655 0 0 0 0 0 0 0 0 2500 48222 25 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 311531 0 0 0 0 1 0 0 1 1 1
+30601005 2 0 魔界冥魂 165 0 4889 4889 0 0 0 0 0 3350 0 0 0 0 0 0 0 0 2500 48222 25 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 566420 0 0 0 0 1 0 0 1 1 1
+30603002 2 0 逍遥城主 165 0 9312 9312 0 0 0 0 0 7231 0 0 0 0 0 0 0 0 2500 48222 25 0 300 2 6 10043 23030 10044 0 0 0 0 0 0 15 2 3115316 0 0 0 0 5 0 0 186 1 1
+30601006 2 0 冰霜巨蝎 200 0 2928 2928 0 0 0 0 0 1039 0 0 0 0 0 0 0 0 2500 58672 30 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 779320 0 0 0 0 1 0 0 1 1 1
+30601007 2 0 冰川蛮兽 200 0 2796 2796 0 0 0 0 0 929 0 0 0 0 0 0 0 0 2500 58672 30 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 857252 0 0 0 0 1 0 0 1 1 1
+30601008 2 0 雪山巨猿 200 0 8391 8391 0 0 0 0 0 5620 0 0 0 0 0 0 0 0 2500 58672 30 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 3117283 0 0 0 0 1 0 0 1 1 1
+30603003 2 0 极寒冰心 200 0 15093 15093 0 0 0 0 0 11241 0 0 0 0 0 0 0 0 2500 58672 30 0 300 2 6 10045 23030 10046 0 0 0 0 0 0 15 2 9351852 0 0 0 0 5 0 0 186 1 1
30601009 2 0 海岛巨蟹 250 0 6670 6670 0 0 0 0 0 2084 0 0 0 0 0 0 0 0 2500 97399 67 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2343352 0 0 0 0 1 0 0 1 1 1
30601010 2 0 海妖 250 0 7093 7093 0 0 0 0 0 2363 0 0 0 0 0 0 0 0 2500 97399 67 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 3905588 0 0 0 0 1 0 0 1 1 1
30603004 2 0 潮汐巨兽 250 0 38096 38096 0 0 0 0 0 23638 0 0 0 0 0 0 0 0 2500 97399 67 0 300 2 6 10047 23030 10048 0 0 0 0 0 0 15 2 35150304 0 0 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0