From 0a24fd23f03ff727cf5b65e2fa02d1e201816961 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 26 十一月 2018 17:39:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0
db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt | 204 +++++++++++++++++++++++++-------------------------
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 2
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1
db/PyMongoDataServer/SysDB/tagChinItem.txt | 10 +-
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
10 files changed, 113 insertions(+), 111 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index b0771da..cf6ec18 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -154,7 +154,7 @@
10304015 子龙师兄 63
10304016 武天师叔 64
10304017 庄主女儿 66
-10404100 雄鹰之羽 1
+10404100 幽尘之羽 1
10404101 落英缤纷 1
10404001 商铺老板 67
10404002 鹿毅师兄 70
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 3379e48..48f5113 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -100,3 +100,4 @@
148 205 0 0
149 280 0 0
150 75 0 0
+151 105 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 9ccba4f..68a3092 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
index bc7170d..9142736 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index 30b30b5..685488e 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -20,7 +20,7 @@
19 1 11 80 1 15 0
21 1 13 80 1 10 0
22 1 14 0 1 20 0
-23 1 15 151 1 0 0
+23 1 15 151 1 10 10
24 1 16 23 1 20 40
25 2 31240 22 1 30 0
26 2 31150 92 1 30 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 7a6d395..5c2f6c4 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -102,7 +102,7 @@
GodWeapon4 110|111|112 0 0 0 0
GodWeaponActive 1 {"2":[[1,100]], "4":[[2,100]]} 0 0 0
GodWeaponSys {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}
-GodMagicExp {"1":[10,10],"2":[15,15],"4":[25,25]}
+GodMagicExp {"1":[10,10],"2":[10,10],"4":[10,10]}
MagicExterior {"1":0,"2":0,"3":0,"4":100386} 0 2000
WorldLvExpRate int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000) 0 0 0 0
EquipSuitLimit 4 2 3 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index c8ad544..a474a27 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -100,3 +100,4 @@
148 205 0 0 0 0
149 280 0 0 0 0
150 75 0 0 0 0
+151 105 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
index 21f8559..7389444 100644
--- a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
@@ -3,105 +3,105 @@
202 10 1 [[102,31203002,1,1,1,1,0]] {"6":3925}
202 10 2 [[102,31203003,1,1,1,1,0]] {"6":9159}
202 10 3 [[102,31203004,1,1,1,1,0]] {"6":9159}
-203 11 1 [[102,31203005,1,1,1,1,0]] {"6":13799}
-203 11 2 [[102,31203006,1,1,1,1,0]] {"6":19367}
-203 11 3 [[102,31203007,1,1,1,1,0]] {"6":26048}
-203 11 4 [[102,31203008,1,1,1,1,0]] {"6":34028}
-203 11 5 [[102,31203009,1,1,1,1,0]] {"6":34028}
-204 12 1 [[102,31203010,1,1,1,1,0]] {"6":39077}
-204 12 2 [[102,31203011,1,1,1,1,0]] {"6":44883}
-204 12 3 [[102,31203012,1,1,1,1,0]] {"6":51699}
-204 12 4 [[102,31203013,1,1,1,1,0]] {"6":59777}
-204 12 5 [[102,31203014,1,1,1,1,0]] {"6":69118}
-204 12 6 [[102,31203015,1,1,1,1,0]] {"6":80100}
-204 12 7 [[102,31203016,1,1,1,1,0]] {"6":80100}
-205 13 1 [[102,31203017,1,1,1,1,0]] {"6":85357}
-205 13 2 [[102,31203018,1,1,1,1,0]] {"6":91365}
-205 13 3 [[102,31203019,1,1,1,1,0]] {"6":98275}
-205 13 4 [[102,31203020,1,1,1,1,0]] {"6":106236}
-205 13 5 [[102,31203021,1,1,1,1,0]] {"6":115399}
-205 13 6 [[102,31203022,1,1,1,1,0]] {"6":125914}
-205 13 7 [[102,31203023,1,1,1,1,0]] {"6":137931}
-205 13 8 [[102,31203024,1,1,1,1,0]] {"6":151901}
-205 13 9 [[102,31203025,1,1,1,1,0]] {"6":151901}
-206 14 1 [[102,31203026,1,1,1,1,0]] {"6":158561}
-206 14 2 [[102,31203027,1,1,1,1,0]] {"6":166173}
-206 14 3 [[102,31203028,1,1,1,1,0]] {"6":174926}
-206 14 4 [[102,31203029,1,1,1,1,0]] {"6":185011}
-206 14 5 [[102,31203030,1,1,1,1,0]] {"6":196619}
-206 14 6 [[102,31203031,1,1,1,1,0]] {"6":209940}
-206 14 7 [[102,31203032,1,1,1,1,0]] {"6":225164}
-206 14 8 [[102,31203033,1,1,1,1,0]] {"6":242861}
-206 14 9 [[102,31203034,1,1,1,1,0]] {"6":242861}
-207 15 1 [[102,31203035,1,1,1,1,0]] {"6":251149}
-207 15 2 [[102,31203036,1,1,1,1,0]] {"6":260621}
-207 15 3 [[102,31203037,1,1,1,1,0]] {"6":271514}
-207 15 4 [[102,31203038,1,1,1,1,0]] {"6":284064}
-207 15 5 [[102,31203039,1,1,1,1,0]] {"6":298509}
-207 15 6 [[102,31203040,1,1,1,1,0]] {"6":315085}
-207 15 7 [[102,31203041,1,1,1,1,0]] {"6":334029}
-207 15 8 [[102,31203042,1,1,1,1,0]] {"6":356052}
-207 15 9 [[102,31203043,1,1,1,1,0]] {"6":356052}
-208 16 1 [[102,31203044,1,1,1,1,0]] {"6":365582}
-208 16 2 [[102,31203045,1,1,1,1,0]] {"6":376474}
-208 16 3 [[102,31203046,1,1,1,1,0]] {"6":388999}
-208 16 4 [[102,31203047,1,1,1,1,0]] {"6":403430}
-208 16 5 [[102,31203048,1,1,1,1,0]] {"6":420040}
-208 16 6 [[102,31203049,1,1,1,1,0]] {"6":439101}
-208 16 7 [[102,31203050,1,1,1,1,0]] {"6":460885}
-208 16 8 [[102,31203051,1,1,1,1,0]] {"6":486208}
-208 16 9 [[102,31203052,1,1,1,1,0]] {"6":486208}
-209 17 1 [[102,31203053,1,1,1,1,0]] {"6":497050}
-209 17 2 [[102,31203054,1,1,1,1,0]] {"6":509441}
-209 17 3 [[102,31203055,1,1,1,1,0]] {"6":523691}
-209 17 4 [[102,31203056,1,1,1,1,0]] {"6":540109}
-209 17 5 [[102,31203057,1,1,1,1,0]] {"6":559006}
-209 17 6 [[102,31203058,1,1,1,1,0]] {"6":580691}
-209 17 7 [[102,31203059,1,1,1,1,0]] {"6":605474}
-209 17 8 [[102,31203060,1,1,1,1,0]] {"6":634284}
-209 17 9 [[102,31203061,1,1,1,1,0]] {"6":634284}
-210 18 1 [[102,31203062,1,1,1,1,0]] {"6":646548}
-210 18 2 [[102,31203063,1,1,1,1,0]] {"6":660564}
-210 18 3 [[102,31203064,1,1,1,1,0]] {"6":676682}
-210 18 4 [[102,31203065,1,1,1,1,0]] {"6":695253}
-210 18 5 [[102,31203066,1,1,1,1,0]] {"6":716628}
-210 18 6 [[102,31203067,1,1,1,1,0]] {"6":741156}
-210 18 7 [[102,31203068,1,1,1,1,0]] {"6":769188}
-210 18 8 [[102,31203069,1,1,1,1,0]] {"6":801776}
-210 18 9 [[102,31203070,1,1,1,1,0]] {"6":801776}
-211 19 1 [[102,31203071,1,1,1,1,0]] {"6":815836}
-211 19 2 [[102,31203072,1,1,1,1,0]] {"6":831905}
-211 19 3 [[102,31203073,1,1,1,1,0]] {"6":850385}
-211 19 4 [[102,31203074,1,1,1,1,0]] {"6":871677}
-211 19 5 [[102,31203075,1,1,1,1,0]] {"6":896183}
-211 19 6 [[102,31203076,1,1,1,1,0]] {"6":924304}
-211 19 7 [[102,31203077,1,1,1,1,0]] {"6":956443}
-211 19 8 [[102,31203078,1,1,1,1,0]] {"6":993804}
-211 19 9 [[102,31203079,1,1,1,1,0]] {"6":993804}
-212 20 1 [[102,31203080,1,1,1,1,0]] {"6":1010616}
-212 20 2 [[102,31203081,1,1,1,1,0]] {"6":1029830}
-212 20 3 [[102,31203082,1,1,1,1,0]] {"6":1051927}
-212 20 4 [[102,31203083,1,1,1,1,0]] {"6":1077386}
-212 20 5 [[102,31203084,1,1,1,1,0]] {"6":1106688}
-212 20 6 [[102,31203085,1,1,1,1,0]] {"6":1140313}
-212 20 7 [[102,31203086,1,1,1,1,0]] {"6":1178742}
-212 20 8 [[102,31203087,1,1,1,1,0]] {"6":1223416}
-212 20 9 [[102,31203088,1,1,1,1,0]] {"6":1223416}
-213 21 1 [[102,31203089,1,1,1,1,0]] {"6":1243016}
-213 21 2 [[102,31203090,1,1,1,1,0]] {"6":1265416}
-213 21 3 [[102,31203091,1,1,1,1,0]] {"6":1291176}
-213 21 4 [[102,31203092,1,1,1,1,0]] {"6":1320856}
-213 21 5 [[102,31203093,1,1,1,1,0]] {"6":1355016}
-213 21 6 [[102,31203094,1,1,1,1,0]] {"6":1394216}
-213 21 7 [[102,31203095,1,1,1,1,0]] {"6":1439016}
-213 21 8 [[102,31203096,1,1,1,1,0]] {"6":1491096}
-213 21 9 [[102,31203097,1,1,1,1,0]] {"6":1491096}
-214 22 1 [[102,31203098,1,1,1,1,0]] {"6":1513895}
-214 22 2 [[102,31203099,1,1,1,1,0]] {"6":1539951}
-214 22 3 [[102,31203100,1,1,1,1,0]] {"6":1569916}
-214 22 4 [[102,31203101,1,1,1,1,0]] {"6":1604441}
-214 22 5 [[102,31203102,1,1,1,1,0]] {"6":1644177}
-214 22 6 [[102,31203103,1,1,1,1,0]] {"6":1689776}
-214 22 7 [[102,31203104,1,1,1,1,0]] {"6":1741889}
-214 22 8 [[102,31203105,1,1,1,1,0]] {"6":1802471}
-214 22 9 [[102,31203106,1,1,1,1,0]] {"6":1802471}
+203 11 1 [[102,31203005,1,1,1,1,0]] {"6":4640}
+203 11 2 [[102,31203006,1,1,1,1,0]] {"6":10208}
+203 11 3 [[102,31203007,1,1,1,1,0]] {"6":16889}
+203 11 4 [[102,31203008,1,1,1,1,0]] {"6":24869}
+203 11 5 [[102,31203009,1,1,1,1,0]] {"6":24869}
+204 12 1 [[102,31203010,1,1,1,1,0]] {"6":5049}
+204 12 2 [[102,31203011,1,1,1,1,0]] {"6":10855}
+204 12 3 [[102,31203012,1,1,1,1,0]] {"6":17671}
+204 12 4 [[102,31203013,1,1,1,1,0]] {"6":25749}
+204 12 5 [[102,31203014,1,1,1,1,0]] {"6":35090}
+204 12 6 [[102,31203015,1,1,1,1,0]] {"6":46072}
+204 12 7 [[102,31203016,1,1,1,1,0]] {"6":46072}
+205 13 1 [[102,31203017,1,1,1,1,0]] {"6":5257}
+205 13 2 [[102,31203018,1,1,1,1,0]] {"6":11265}
+205 13 3 [[102,31203019,1,1,1,1,0]] {"6":18175}
+205 13 4 [[102,31203020,1,1,1,1,0]] {"6":26136}
+205 13 5 [[102,31203021,1,1,1,1,0]] {"6":35299}
+205 13 6 [[102,31203022,1,1,1,1,0]] {"6":45814}
+205 13 7 [[102,31203023,1,1,1,1,0]] {"6":57831}
+205 13 8 [[102,31203024,1,1,1,1,0]] {"6":71801}
+205 13 9 [[102,31203025,1,1,1,1,0]] {"6":71801}
+206 14 1 [[102,31203026,1,1,1,1,0]] {"6":6660}
+206 14 2 [[102,31203027,1,1,1,1,0]] {"6":14272}
+206 14 3 [[102,31203028,1,1,1,1,0]] {"6":23025}
+206 14 4 [[102,31203029,1,1,1,1,0]] {"6":33110}
+206 14 5 [[102,31203030,1,1,1,1,0]] {"6":44718}
+206 14 6 [[102,31203031,1,1,1,1,0]] {"6":58039}
+206 14 7 [[102,31203032,1,1,1,1,0]] {"6":73263}
+206 14 8 [[102,31203033,1,1,1,1,0]] {"6":90960}
+206 14 9 [[102,31203034,1,1,1,1,0]] {"6":90960}
+207 15 1 [[102,31203035,1,1,1,1,0]] {"6":8288}
+207 15 2 [[102,31203036,1,1,1,1,0]] {"6":17760}
+207 15 3 [[102,31203037,1,1,1,1,0]] {"6":28653}
+207 15 4 [[102,31203038,1,1,1,1,0]] {"6":41203}
+207 15 5 [[102,31203039,1,1,1,1,0]] {"6":55648}
+207 15 6 [[102,31203040,1,1,1,1,0]] {"6":72224}
+207 15 7 [[102,31203041,1,1,1,1,0]] {"6":91168}
+207 15 8 [[102,31203042,1,1,1,1,0]] {"6":113191}
+207 15 9 [[102,31203043,1,1,1,1,0]] {"6":113191}
+208 16 1 [[102,31203044,1,1,1,1,0]] {"6":9530}
+208 16 2 [[102,31203045,1,1,1,1,0]] {"6":20422}
+208 16 3 [[102,31203046,1,1,1,1,0]] {"6":32947}
+208 16 4 [[102,31203047,1,1,1,1,0]] {"6":47378}
+208 16 5 [[102,31203048,1,1,1,1,0]] {"6":63988}
+208 16 6 [[102,31203049,1,1,1,1,0]] {"6":83049}
+208 16 7 [[102,31203050,1,1,1,1,0]] {"6":104833}
+208 16 8 [[102,31203051,1,1,1,1,0]] {"6":130156}
+208 16 9 [[102,31203052,1,1,1,1,0]] {"6":130156}
+209 17 1 [[102,31203053,1,1,1,1,0]] {"6":10842}
+209 17 2 [[102,31203054,1,1,1,1,0]] {"6":23233}
+209 17 3 [[102,31203055,1,1,1,1,0]] {"6":37483}
+209 17 4 [[102,31203056,1,1,1,1,0]] {"6":53901}
+209 17 5 [[102,31203057,1,1,1,1,0]] {"6":72798}
+209 17 6 [[102,31203058,1,1,1,1,0]] {"6":94483}
+209 17 7 [[102,31203059,1,1,1,1,0]] {"6":119266}
+209 17 8 [[102,31203060,1,1,1,1,0]] {"6":148076}
+209 17 9 [[102,31203061,1,1,1,1,0]] {"6":148076}
+210 18 1 [[102,31203062,1,1,1,1,0]] {"6":12264}
+210 18 2 [[102,31203063,1,1,1,1,0]] {"6":26280}
+210 18 3 [[102,31203064,1,1,1,1,0]] {"6":42398}
+210 18 4 [[102,31203065,1,1,1,1,0]] {"6":60969}
+210 18 5 [[102,31203066,1,1,1,1,0]] {"6":82344}
+210 18 6 [[102,31203067,1,1,1,1,0]] {"6":106872}
+210 18 7 [[102,31203068,1,1,1,1,0]] {"6":134904}
+210 18 8 [[102,31203069,1,1,1,1,0]] {"6":167492}
+210 18 9 [[102,31203070,1,1,1,1,0]] {"6":167492}
+211 19 1 [[102,31203071,1,1,1,1,0]] {"6":14060}
+211 19 2 [[102,31203072,1,1,1,1,0]] {"6":30129}
+211 19 3 [[102,31203073,1,1,1,1,0]] {"6":48609}
+211 19 4 [[102,31203074,1,1,1,1,0]] {"6":69901}
+211 19 5 [[102,31203075,1,1,1,1,0]] {"6":94407}
+211 19 6 [[102,31203076,1,1,1,1,0]] {"6":122528}
+211 19 7 [[102,31203077,1,1,1,1,0]] {"6":154667}
+211 19 8 [[102,31203078,1,1,1,1,0]] {"6":192028}
+211 19 9 [[102,31203079,1,1,1,1,0]] {"6":192028}
+212 20 1 [[102,31203080,1,1,1,1,0]] {"6":16812}
+212 20 2 [[102,31203081,1,1,1,1,0]] {"6":36026}
+212 20 3 [[102,31203082,1,1,1,1,0]] {"6":58123}
+212 20 4 [[102,31203083,1,1,1,1,0]] {"6":83582}
+212 20 5 [[102,31203084,1,1,1,1,0]] {"6":112884}
+212 20 6 [[102,31203085,1,1,1,1,0]] {"6":146509}
+212 20 7 [[102,31203086,1,1,1,1,0]] {"6":184938}
+212 20 8 [[102,31203087,1,1,1,1,0]] {"6":229612}
+212 20 9 [[102,31203088,1,1,1,1,0]] {"6":229612}
+213 21 1 [[102,31203089,1,1,1,1,0]] {"6":19600}
+213 21 2 [[102,31203090,1,1,1,1,0]] {"6":42000}
+213 21 3 [[102,31203091,1,1,1,1,0]] {"6":67760}
+213 21 4 [[102,31203092,1,1,1,1,0]] {"6":97440}
+213 21 5 [[102,31203093,1,1,1,1,0]] {"6":131600}
+213 21 6 [[102,31203094,1,1,1,1,0]] {"6":170800}
+213 21 7 [[102,31203095,1,1,1,1,0]] {"6":215600}
+213 21 8 [[102,31203096,1,1,1,1,0]] {"6":267680}
+213 21 9 [[102,31203097,1,1,1,1,0]] {"6":267680}
+214 22 1 [[102,31203098,1,1,1,1,0]] {"6":22799}
+214 22 2 [[102,31203099,1,1,1,1,0]] {"6":48855}
+214 22 3 [[102,31203100,1,1,1,1,0]] {"6":78820}
+214 22 4 [[102,31203101,1,1,1,1,0]] {"6":113345}
+214 22 5 [[102,31203102,1,1,1,1,0]] {"6":153081}
+214 22 6 [[102,31203103,1,1,1,1,0]] {"6":198680}
+214 22 7 [[102,31203104,1,1,1,1,0]] {"6":250793}
+214 22 8 [[102,31203105,1,1,1,1,0]] {"6":311375}
+214 22 9 [[102,31203106,1,1,1,1,0]] {"6":311375}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 72bd535..8e9e6fb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -299,7 +299,7 @@
1600 1 0 后羿之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 236 111 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1650 1 0 贵族气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1651 1 0 至尊气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-2050 1 0 世界喇叭 48 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 50 0 5 0 0 0 0 2700 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2050 1 0 世界喇叭 48 0 0 0 0 999 100 1 1 0 1 0 0 1 0 0 1 50 0 5 0 1 0 0 2700 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2100 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2101 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2102 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -560,8 +560,8 @@
3516 1 0 6级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 2 6 3517 7 500 0 0 13 325 0 0 12 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3517 1 0 7级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 100 0 0 0 1 225 2 7 3518 7 1000 0 0 13 650 0 0 12 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3518 1 0 8级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 100 0 0 0 1 225 2 8 0 7 2000 0 0 13 1300 0 0 12 150 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-3710 5 0 雄鹰之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 2000 0 0 19 1500 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 3 0 0 0 0 0 0 3600 0 0 0 0 0 0 0
-3711 5 0 雄鹰之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 50000 0 0 19 800 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 2 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+3710 5 0 幽尘之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 2000 0 0 19 1500 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 3 0 0 0 0 0 0 3600 0 0 0 0 0 0 0
+3711 5 0 幽尘之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 50000 0 0 19 800 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 2 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3712 6 0 风炎之翼 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 4680 0 10 0 0 0 0 6 120000 0 0 19 2500 0 0 23 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 6 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3713 8 0 魔龙之魂 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 13500 0 20 0 0 0 0 6 280000 0 0 19 4000 0 0 23 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 13 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3714 10 0 枪系4代翅膀 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 24500 0 20 0 0 0 0 6 500000 0 0 19 6000 0 0 23 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 22 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -572,11 +572,11 @@
3723 8 0 百鸟朝凤 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 13500 0 20 0 0 0 0 6 280000 0 0 19 4000 0 0 23 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 13 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3724 10 0 杖系4代翅膀 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 24500 0 20 0 0 0 0 6 500000 0 0 19 6000 0 0 23 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 22 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3725 12 0 杖系5代翅膀 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 83500 0 20 0 0 0 0 6 1000000 0 0 19 8000 0 0 23 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 22 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-3792 5 0 雄鹰之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 70000 0 0 19 1300 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+3792 5 0 幽尘之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 70000 0 0 19 1300 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3793 5 0 落英缤纷 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 70000 0 0 19 1300 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3794 6 0 风炎之翼 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 4680 0 10 0 0 0 0 6 100000 0 0 19 2500 0 0 23 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3795 6 0 蝶舞流光 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 4680 0 10 0 0 0 0 6 100000 0 0 19 2500 0 0 23 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-3796 5 0 雄鹰之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 220 3792 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+3796 5 0 幽尘之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 220 3792 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3797 5 0 落英缤纷 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 220 3793 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3798 6 0 蝶舞流光 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 4680 0 10 0 0 0 0 220 3795 0 0 0 0 0 0 23 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 201 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3799 6 0 风炎之翼 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 4680 0 10 0 0 0 0 220 3794 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index f6c7791..2a57639 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -154,7 +154,7 @@
10304015 0 1 子龙师兄 63 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
10304016 0 1 武天师叔 64 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
10304017 0 1 庄主女儿 66 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
-10404100 14 0 雄鹰之羽 1 0 1 1 1 0 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 10 2 3000 0 0 0 0 0 0 0 214 0 1
+10404100 14 0 幽尘之羽 1 0 1 1 1 0 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 10 2 3000 0 0 0 0 0 0 0 214 0 1
10404101 14 0 落英缤纷 1 0 1 1 1 0 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 10 2 3000 0 0 0 0 0 0 0 214 0 1
10404001 0 1 商铺老板 67 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
10404002 0 1 鹿毅师兄 70 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
--
Gitblit v1.8.0