From 0ff8adbb1168ccac17a1d341f167b6d512a0f1ad Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期五, 17 八月 2018 10:24:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagSealDemon.txt | 1
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2
db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt | 150 ++++++++++++++++++------------------
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 10 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 10 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 5
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt | 14 ++-
9 files changed, 101 insertions(+), 93 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 67e0f7b..cc116ef 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -232,8 +232,8 @@
10804011 鲸吞真人 350
10804012 鹏之魂 350
10804013 神秘老人 350
-10804101 不闻之魂 350
-10804102 搬山匠士 350
+10804014 后裔之魂 350
+10804015 搬山匠士 350
10804103 神机子 350
10904001 五行之魂 300
10904002 琉璃公主 300
@@ -738,9 +738,9 @@
60204012 战神浅夏 25
60203001 魔坛巨熊 20
60203002 魔坛巨猿 40
-60203003 魔坛左翼 70
-60203004 魔坛右翼 85
-60203005 魔坛牙刃 85
+60203003 魔坛牙刃 70
+60203004 魔坛左翼 85
+60203005 魔坛右翼 85
60203006 魔坛龙王 110
60203007 魔坛秘影 130
60203008 魔坛帝皇 155
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index be58d2f..34ca33b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 433f421..e55bde3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -45,7 +45,7 @@
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [5,1800,15,101]
-51010 0 51010 190 500 0 0 0 0 0 0 0 [24,20,3] [10,1800,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [424500, [141,5]]
+51010 0 51010 190 500 0 0 0 0 0 0 0 [24,20,3] [10,1800,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [424500, [141,10]]
51010 1 51010 190 500 0 0 0 0 0 0 0 [70,19,3] [10,1800,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [135,33,33,33,33] [536000, [141,10]]
51010 2 51010 190 500 0 0 0 0 0 0 0 [126,9,3] [10,1800,10] [{5101031:1, 5101032:1}] [152,38,38,38,38] [665000, [141,15]]
51010 3 51010 190 500 0 0 0 0 0 0 0 [30,62,3] [10,1800,10] [{5101041:0, 5101042:1}] [155,38,38,38,38] [812000, [142,10]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 3710ad5..9832e40 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -231,6 +231,7 @@
SealDemonDoubleDrop 0 1|2|3|4|5|6|7 2
SealDemonFirstPos [20,16]
UnblockTreasure 101|102|103
+MWSignDayAttr {"7":100} 304
DiceReward {"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,0]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,1]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"4":{"exp":"360*reExp","gold":500000,"item":[2211,3]},"5":{"exp":"360*reExp","gold":500000,"item":[2211,4]},"6":{"exp":"720*reExp","gold":1000000,"item":[2211,8]}}
DiceFreeNum 5
DiceRandomList {0:[[1600,1],[3200,2],[4800,3],[6400,4],[8000,5],[10000,6]],1:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],2:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],3:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],4:[[1200,1],[2400,2],[3600,3],[4800,4],[6000,5],[10000,6]],5:[[1000,1],[2000,2],[3000,3],[4000,4],[5000,5],[10000,6]]}
@@ -255,9 +256,9 @@
GoldInvestLVLimit 300
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
TreasureSet 10 {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
-TreasureSet11 [1, 10] [248, 1984] [1000, 1001] [0, 0] [10, 100]
+TreasureSet11 [1, 10] [248, 1984] [[1000,1], [1000, 8]] [0, 0] [10, 100]
TreasureSet21 int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0))) [1, 10] 300
-TreasureSet12 [1, 10] [98, 784] [1003, 1004] [1440, 0] [5, 50]
+TreasureSet12 [1, 10] [98, 784] [[1001,1], [1001, 8]] [1440, 0] [5, 50]
TreasureSet22 int(min(100,baseRate+curLuck/300.0*max(100-baseRate,0))) [1, 10] 300
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
index f506718..b59dbdb 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -1,7 +1,13 @@
RangListType Condition Gift
-2 10 {"1":[[181,15],[3,2]],"2":[[181,15],[3,2]],"3":[[181,15],[3,2]]}
-1 160 {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
-3 8 {"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
-4 180 {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
+2 15 {"1":[[181,15],[3,2]],"2":[[181,15],[3,2]],"3":[[181,15],[3,2]]}
+2 10 {"1":[[181,10],[3,1]],"2":[[181,10],[3,1]],"3":[[181,10],[3,1]]}
+1 180 {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
+1 160 {"1":[[3502,1],[3512,2]],"2":[[3502,1],[3512,2]],"3":[[3502,1],[3512,2]]}
+3 9 {"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
+3 6 {"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}
+4 190 {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
+4 180 {"1":[[105,3],[102,3]],"2":[[105,3],[102,3]],"3":[[105,3],[102,3]]}
5 5 {"1":[[3513,2],[3503,2]],"2":[[3513,2],[3503,2]],"3":[[3513,2],[3503,2]]}
+5 4 {"1":[[3513,1],[3503,1]],"2":[[3513,1],[3503,1]],"3":[[3513,1],[3503,1]]}
6 1000000 {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
+6 800000 {"1":[[105,3],[102,3]],"2":[[105,3],[102,3]],"3":[[105,3],[102,3]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 989a5bd..4f9524b 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -10,5 +10,5 @@
9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"4"}]}
10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]}
11 11 0 15 0 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*424500+max(min(2,extraData)-1,0)*536000+max(min(3,extraData)-2,0)*665000+max(min(4,extraData)-3,0)*812000+max(min(5,extraData)-4,0)*975500+max(min(6,extraData)-5,0)*1157000+max(min(7,extraData)-6,0)*1356500+max(min(8,extraData)-7,0)*1573500"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*5+max(min(2,extraData)-1,0)*10+max(min(3,extraData)-2,0)*15"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*10+max(min(5,extraData)-4,0)*15"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*10+max(min(extraData,7)-6,0)*15"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*15"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*254700+max(min(2,extraData)-1,0)*321600+max(min(3,extraData)-2,0)*399000+max(min(4,extraData)-3,0)*487200+max(min(5,extraData)-4,0)*585300+max(min(6,extraData)-5,0)*694200+max(min(7,extraData)-6,0)*813900+max(min(8,extraData)-7,0)*944100"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*3+max(min(2,extraData)-1,0)*6+max(min(3,extraData)-2,0)*9"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*6+max(min(5,extraData)-4,0)*9"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*6+max(min(extraData,7)-6,0)*9"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*6"}]}
-12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
+12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
13 12 0 20 0 {"exp":"3000*reExp", "item":[{"ItemID":2211,"ItemCount":"6"}], "money":"500000"} 200000 {"exp":"1650*reExp", "item":[{"ItemID":2211,"ItemCount":"3"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagSealDemon.txt b/db/PyMongoDataServer/PySysDB/tagSealDemon.txt
index a0fa549..41f3795 100644
--- a/db/PyMongoDataServer/PySysDB/tagSealDemon.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSealDemon.txt
@@ -16,3 +16,4 @@
60203015 14 88
60203016 15 91
60203017 16 94
+
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
index 35a335c..69eb0dd 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
@@ -1,76 +1,76 @@
SkillType SkillLv MeterialNum1 InitialRate Meterial2ID MeterialNum2 Rate
-1 1 36287 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
-1 2 50823 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
-1 3 59988 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
-1 4 78376 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
-1 5 122972 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
-1 6 198799 1500 141|142|143|144 1|1|1|1 8000|8000|8000|8000
-1 7 215280 1500 141|142|143|144 2|2|2|2 8000|8000|8000|8000
-1 8 254902 1500 141|142|143|144 3|3|3|3 8000|8000|8000|8000
-1 9 274572 1500 141|142|143|144 4|4|4|4 8000|8000|8000|8000
-1 10 319546 1500 141|142|143|144 5|5|5|5 8000|8000|8000|8000
-1 11 341196 1500 141|142|143|144 6|6|6|6 8000|8000|8000|8000
-1 12 639863 1500 141|142|143|144 7|7|7|7 8000|8000|8000|8000
-1 13 719649 1500 141|142|143|144 9|9|9|9 8000|8000|8000|8000
-1 14 804249 1500 141|142|143|144 10|10|10|10 8000|8000|8000|8000
-1 15 1002642 1500 141|142|143|144 11|11|11|11 8000|8000|8000|8000
-1 16 1519587 1000 141|142|143|144 15|15|15|15 1100|6000|6000|6000
-1 17 1630883 1000 141|142|143|144 16|16|16|16 1100|6000|6000|6000
-1 18 1669867 1000 141|142|143|144 18|18|18|18 1100|6000|6000|6000
-1 19 1787163 1000 141|142|143|144 20|20|20|20 1100|6000|6000|6000
-1 20 2082382 1000 141|142|143|144 20|20|20|20 1100|6000|6000|6000
-1 21 2108725 500 141|142|143|144 18|18|18|18 600|800|6000|6000
-1 22 2292888 500 141|142|143|144 21|21|21|21 600|800|6000|6000
-1 23 2373400 500 141|142|143|144 22|22|22|22 600|800|6000|6000
-1 24 2570889 500 141|142|143|144 29|29|29|29 600|800|6000|6000
-1 25 2662921 500 141|142|143|144 33|33|33|33 600|800|6000|6000
-2 1 865070 1000 141|142|143|144 2|2|2|2 1100|8000|8000|8000
-2 2 912493 1000 141|142|143|144 3|3|3|3 1100|8000|8000|8000
-2 3 960592 1000 141|142|143|144 4|4|4|4 1100|8000|8000|8000
-2 4 1066466 1000 141|142|143|144 7|7|7|7 1100|8000|8000|8000
-2 5 1118527 1000 141|142|143|144 10|10|10|10 1100|8000|8000|8000
-2 6 1231684 1000 141|142|143|144 18|18|18|18 1100|8000|8000|8000
-2 7 1287743 1000 141|142|143|144 23|23|23|23 1100|8000|8000|8000
-2 8 1558742 1000 141|142|143|144 26|26|26|26 1100|8000|8000|8000
-2 9 2045997 500 141|142|143|144 17|17|17|17 600|800|8000|8000
-2 10 2117516 500 141|142|143|144 21|21|21|21 600|800|8000|8000
-2 11 2477833 500 141|142|143|144 25|25|25|25 600|800|8000|8000
-2 12 2552788 500 141|142|143|144 28|28|28|28 600|800|8000|8000
-2 13 2632850 500 141|142|143|144 32|32|32|32 600|800|8000|8000
-2 14 2836934 500 141|142|143|144 35|35|35|35 600|800|8000|8000
-2 15 2923382 500 141|142|143|144 38|38|38|38 600|800|8000|8000
-2 16 4055540 300 141|142|143|144 12|12|12|12 400|600|800|6000
-2 17 5130081 300 141|142|143|144 15|15|15|15 400|600|800|6000
-2 18 6412964 300 141|142|143|144 17|17|17|17 400|600|800|6000
-2 19 7448472 300 141|142|143|144 21|21|21|21 400|600|800|6000
-2 20 8516961 300 141|142|143|144 22|22|22|22 400|600|800|6000
-2 21 9649795 300 141|142|143|144 27|27|27|27 400|600|800|6000
-2 22 10718879 300 141|142|143|144 29|29|29|29 400|600|800|6000
-2 23 11681382 300 141|142|143|144 34|34|34|34 400|600|800|6000
-2 24 12643886 300 141|142|143|144 36|36|36|36 400|600|800|6000
-2 25 13606389 300 141|142|143|144 43|43|43|43 400|600|800|6000
-3 1 864657 500 141|142|143|144 11|11|11|11 600|800|8000|8000
-3 2 926723 500 141|142|143|144 14|14|14|14 600|800|8000|8000
-3 3 1037439 500 141|142|143|144 19|19|19|19 600|800|8000|8000
-3 4 1103982 500 141|142|143|144 24|24|24|24 600|800|8000|8000
-3 5 1171432 500 141|142|143|144 30|30|30|30 600|800|8000|8000
-3 6 2309586 500 141|142|143|144 34|34|34|34 600|800|8000|8000
-3 7 2344577 500 141|142|143|144 40|40|40|40 600|800|8000|8000
-3 8 2383913 500 141|142|143|144 48|48|48|48 600|800|8000|8000
-3 9 3334366 300 141|142|143|144 13|13|13|13 400|600|800|8000
-3 10 4039997 300 141|142|143|144 17|17|17|17 400|600|800|8000
-3 11 4615239 300 141|142|143|144 20|20|20|20 400|600|800|8000
-3 12 5412314 300 141|142|143|144 23|23|23|23 400|600|800|8000
-3 13 6028445 300 141|142|143|144 25|25|25|25 400|600|800|8000
-3 14 7045129 300 141|142|143|144 31|31|31|31 400|600|800|8000
-3 15 7734606 300 141|142|143|144 34|34|34|34 400|600|800|8000
-3 16 8442215 300 141|142|143|144 37|37|37|37 400|600|800|6000
-3 17 9153301 300 141|142|143|144 42|42|42|42 400|600|800|6000
-3 18 9898854 300 141|142|143|144 52|52|52|52 400|600|800|6000
-3 19 10666074 300 141|142|143|144 56|56|56|56 400|600|800|6000
-3 20 11327523 300 141|142|143|144 59|59|59|59 400|600|800|6000
-3 21 11969192 300 141|142|143|144 64|64|64|64 400|600|800|6000
-3 22 12610861 300 141|142|143|144 80|80|80|80 400|600|800|6000
-3 23 13252531 300 141|142|143|144 84|84|84|84 400|600|800|6000
-3 24 13894200 300 141|142|143|144 89|89|89|89 400|600|800|6000
-3 25 14535869 300 141|142|143|144 95|95|95|95 400|600|800|6000
+1 1 63758 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
+1 2 82467 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
+1 3 91540 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
+1 4 132743 1500 141|142|143|144 1|1|1|1 8000|8000|8000|8000
+1 5 147433 1500 141|142|143|144 2|2|2|2 8000|8000|8000|8000
+1 6 178404 1500 141|142|143|144 3|3|3|3 8000|8000|8000|8000
+1 7 195833 1500 141|142|143|144 4|4|4|4 8000|8000|8000|8000
+1 8 231712 1500 141|142|143|144 5|5|5|5 8000|8000|8000|8000
+1 9 251056 1500 141|142|143|144 6|6|6|6 8000|8000|8000|8000
+1 10 476989 1500 141|142|143|144 7|7|7|7 8000|8000|8000|8000
+1 11 542763 1500 141|142|143|144 8|8|8|8 8000|8000|8000|8000
+1 12 612981 1500 141|142|143|144 10|10|10|10 8000|8000|8000|8000
+1 13 771508 1500 141|142|143|144 11|11|11|11 8000|8000|8000|8000
+1 14 816951 1500 141|142|143|144 13|13|13|13 8000|8000|8000|8000
+1 15 910762 1500 141|142|143|144 15|15|15|15 8000|8000|8000|8000
+1 16 1550566 1000 141|142|143|144 14|14|14|14 1100|6000|6000|6000
+1 17 1609365 1000 141|142|143|144 16|16|16|16 1100|6000|6000|6000
+1 18 1745801 1000 141|142|143|144 18|18|18|18 1100|6000|6000|6000
+1 19 2062482 1000 141|142|143|144 19|19|19|19 1100|6000|6000|6000
+1 20 2135722 1000 141|142|143|144 21|21|21|21 1100|6000|6000|6000
+1 21 1904484 500 141|142|143|144 19|19|19|19 600|800|6000|6000
+1 22 2072683 500 141|142|143|144 21|21|21|21 600|800|6000|6000
+1 23 2245319 500 141|142|143|144 22|22|22|22 600|800|6000|6000
+1 24 2327870 500 141|142|143|144 29|29|29|29 600|800|6000|6000
+1 25 2747496 500 141|142|143|144 37|37|37|37 600|800|6000|6000
+2 1 803495 1000 141|142|143|144 3|3|3|3 1100|8000|8000|8000
+2 2 847767 1000 141|142|143|144 4|4|4|4 1100|8000|8000|8000
+2 3 892670 1000 141|142|143|144 5|5|5|5 1100|8000|8000|8000
+2 4 991277 1000 141|142|143|144 8|8|8|8 1100|8000|8000|8000
+2 5 1039879 1000 141|142|143|144 11|11|11|11 1100|8000|8000|8000
+2 6 1145293 1000 141|142|143|144 18|18|18|18 1100|8000|8000|8000
+2 7 1197627 1000 141|142|143|144 22|22|22|22 1100|8000|8000|8000
+2 8 1449894 1000 141|142|143|144 26|26|26|26 1100|8000|8000|8000
+2 9 1899311 500 141|142|143|144 17|17|17|17 600|800|8000|8000
+2 10 2061449 500 141|142|143|144 20|20|20|20 600|800|8000|8000
+2 11 2301941 500 141|142|143|144 25|25|25|25 600|800|8000|8000
+2 12 2480309 500 141|142|143|144 28|28|28|28 600|800|8000|8000
+2 13 2557604 500 141|142|143|144 35|35|35|35 600|800|8000|8000
+2 14 3004686 500 141|142|143|144 37|37|37|37 600|800|8000|8000
+2 15 3093765 500 141|142|143|144 43|43|43|43 600|800|8000|8000
+2 16 4716180 300 141|142|143|144 13|13|13|13 400|600|800|6000
+2 17 5522535 300 141|142|143|144 15|15|15|15 400|600|800|6000
+2 18 6408240 300 141|142|143|144 21|21|21|21 400|600|800|6000
+2 19 7492371 300 141|142|143|144 22|22|22|22 400|600|800|6000
+2 20 8255671 300 141|142|143|144 24|24|24|24 400|600|800|6000
+2 21 9045411 300 141|142|143|144 26|26|26|26 400|600|800|6000
+2 22 9840252 300 141|142|143|144 28|28|28|28 400|600|800|6000
+2 23 10469602 300 141|142|143|144 34|34|34|34 400|600|800|6000
+2 24 11098953 300 141|142|143|144 36|36|36|36 400|600|800|6000
+2 25 11728303 300 141|142|143|144 43|43|43|43 400|600|800|6000
+3 1 802119 500 141|142|143|144 13|13|13|13 600|800|8000|8000
+3 2 860064 500 141|142|143|144 15|15|15|15 600|800|8000|8000
+3 3 963181 500 141|142|143|144 20|20|20|20 600|800|8000|8000
+3 4 1025306 500 141|142|143|144 25|25|25|25 600|800|8000|8000
+3 5 1137881 500 141|142|143|144 31|31|31|31 600|800|8000|8000
+3 6 2279028 500 141|142|143|144 35|35|35|35 600|800|8000|8000
+3 7 2635314 500 141|142|143|144 40|40|40|40 600|800|8000|8000
+3 8 2675787 500 141|142|143|144 55|55|55|55 600|800|8000|8000
+3 9 3471023 300 141|142|143|144 15|15|15|15 400|600|800|8000
+3 10 4192194 300 141|142|143|144 18|18|18|18 400|600|800|8000
+3 11 4775059 300 141|142|143|144 21|21|21|21 400|600|800|8000
+3 12 5596778 300 141|142|143|144 28|28|28|28 400|600|800|8000
+3 13 6231171 300 141|142|143|144 31|31|31|31 400|600|800|8000
+3 14 7273559 300 141|142|143|144 33|33|33|33 400|600|800|8000
+3 15 7986140 300 141|142|143|144 36|36|36|36 400|600|800|8000
+3 16 8705921 300 141|142|143|144 40|40|40|40 400|600|800|6000
+3 17 9444990 300 141|142|143|144 45|45|45|45 400|600|800|6000
+3 18 10204581 300 141|142|143|144 48|48|48|48 400|600|800|6000
+3 19 11005956 300 141|142|143|144 53|53|53|53 400|600|800|6000
+3 20 11746557 300 141|142|143|144 61|61|61|61 400|600|800|6000
+3 21 12405877 300 141|142|143|144 69|69|69|69 400|600|800|6000
+3 22 13065197 300 141|142|143|144 73|73|73|73 400|600|800|6000
+3 23 13724516 300 141|142|143|144 78|78|78|78 400|600|800|6000
+3 24 14383836 300 141|142|143|144 82|82|82|82 400|600|800|6000
+3 25 15043156 300 141|142|143|144 97|97|97|97 400|600|800|6000
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 8c6a61d..fd982a6 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -232,8 +232,8 @@
10804011 0 1 鲸吞真人 350 0 607 742 1264 12 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10804012 0 1 鹏之魂 350 0 272 283 555 13 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10804013 0 1 神秘老人 350 0 607 742 1264 19 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
-10804101 0 1 不闻之魂 350 0 272 283 555 14 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
-10804102 0 1 搬山匠士 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
+10804014 0 1 后裔之魂 350 0 272 283 555 14 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
+10804015 0 1 搬山匠士 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10804103 0 1 神机子 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10904001 0 1 五行之魂 300 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10904002 0 1 琉璃公主 300 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
@@ -738,9 +738,9 @@
60204012 8 0 战神浅夏 25 1 877 888 0 0 0 0 7500 51 0 0 0 0 0 0 0 0 1200 63582 7 0 300 0 6 0 0 0 0 0 0 0 0 0 10 2 100000 100 0 0 0 0 0 0 186 1 1
60203001 18 0 魔坛巨熊 20 2 54 54 0 0 0 0 10000 63 0 0 0 0 0 0 0 0 2500 87307 3 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 31000000 41 0 0 0 5 0 0 186 1 1
60203002 18 0 魔坛巨猿 40 2 200 200 0 0 0 0 10000 67 0 0 0 0 0 0 0 0 2500 147095 6 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 68850000 82 0 0 0 5 0 0 186 1 1
-60203003 18 0 魔坛左翼 70 2 330 330 0 0 0 0 10000 130 0 0 0 0 0 0 0 0 2500 209729 9 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 7892980 234 0 0 0 5 0 0 186 1 1
-60203004 18 0 魔坛右翼 85 2 489 489 0 1 0 0 10000 143 0 0 0 0 0 0 0 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 47626349 517 0 0 0 5 0 0 186 1 1
-60203005 18 0 魔坛牙刃 85 2 565 565 0 1 0 0 10000 208 0 0 0 0 0 0 0 0 2500 353028 14 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 21584929 672 0 0 0 5 0 0 186 1 1
+60203003 18 0 魔坛牙刃 70 2 330 330 0 0 0 0 10000 130 0 0 0 0 0 0 0 0 2500 209729 9 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 7892980 234 0 0 0 5 0 0 186 1 1
+60203004 18 0 魔坛左翼 85 2 489 489 0 1 0 0 10000 143 0 0 0 0 0 0 0 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 47626349 517 0 0 0 5 0 0 186 1 1
+60203005 18 0 魔坛右翼 85 2 565 565 0 1 0 0 10000 208 0 0 0 0 0 0 0 0 2500 353028 14 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 21584929 672 0 0 0 5 0 0 186 1 1
60203006 18 0 魔坛龙王 110 2 1400 1400 0 1 0 0 10000 242 0 0 0 0 0 0 0 0 2500 453622 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 63565856 1025 0 0 0 5 0 0 186 1 1
60203007 18 0 魔坛秘影 130 2 1687 1687 0 2 0 0 10000 363 0 0 0 0 0 0 0 0 2500 582685 21 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 78291474 1465 0 0 0 5 0 0 186 1 1
60203008 18 0 魔坛帝皇 155 2 4014 4014 0 3 0 0 10000 572 0 0 0 0 0 0 0 0 2500 710800 24 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 76601484 2454 0 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0