From 2e401204524bd200ca2a9c65ffc38e73f402c526 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 19 十一月 2018 15:56:38 +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 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc       |    0 
 db/PyMongoDataServer/PySysDB/tagStore.txt                                    |   27 +++++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc          |    0 
 db/PyMongoDataServer/PySysDB/tagRefineStove.txt                              |    4 
 CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc                    |    0 
 db/PyMongoDataServer/PySysDB/tagEquipWash.txt                                |   60 ++++++------
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                               |    2 
 db/PyMongoDataServer/PySysDB/tagGodWeapon.txt                                |  134 +++++++++++++-------------
 CoreServerGroup/GameServer/PySysDB/tagStore.txt                              |   27 +++++
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                            |    0 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                              |    5 +
 12 files changed, 159 insertions(+), 100 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index cb8c564..75dd4c5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -45,6 +45,7 @@
 113	3	0	0
 114	3	0	0
 115	3	0	0
+116	3	0	0
 151	4	0	0
 152	4	0	0
 153	4	0	0
@@ -216,3 +217,29 @@
 1027	203	0	10
 1028	203	0	999
 1029	203	0	999
+1030	204	0	1
+1031	204	0	3
+1032	204	0	10
+1033	204	0	999
+1034	204	0	999
+1035	204	0	999
+1036	205	0	1
+1037	205	0	2
+1038	205	0	3
+1039	205	0	5
+1040	205	0	5
+1041	205	0	999
+1042	205	0	999
+1043	205	0	999
+1044	206	0	2
+1045	206	0	3
+1046	206	0	5
+1047	206	0	999
+1048	206	0	999
+1049	207	0	1
+1050	207	0	1
+1051	207	0	5
+1052	207	0	10
+1053	207	0	999
+1054	207	0	999
+1055	207	0	999
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc
index 27059e5..3b9ff89 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 8097b56..7b7c097 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 43fd860..4091225 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
index 999ac62..a3f7696 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 518803c..61ff938 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipWash.txt b/db/PyMongoDataServer/PySysDB/tagEquipWash.txt
index 060fa32..44db10b 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipWash.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipWash.txt
@@ -1,31 +1,31 @@
 type	level	attType1	attMax1	attRandomDic1	attCostMoneyMin1	attCostMoneyMax1	attType2	attMax2	attRandomDic2	attCostMoneyMin2	attCostMoneyMax2	attType3	attMax3	attRandomDic3	attCostMoneyMin3	attCostMoneyMax3	costItem	costCount	costMoneyList
-1	1	7	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	32	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	26	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	5303	2	5|15|50
-1	2	7	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	32	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	26	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	5303	4	5|15|50
-1	3	7	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	32	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	26	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	5303	6	10|30|100
-1	4	7	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	32	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	26	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	5303	8	15|45|150
-1	5	7	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	32	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	26	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	5303	12	20|60|200
-1	6	7	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	32	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	26	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	5303	15	20|60|200
-1	7	7	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	32	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	26	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	5303	15	25|75|250
-1	8	7	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	32	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	26	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	5303	15	25|75|250
-1	9	7	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	32	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	26	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	5303	20	30|90|300
-1	10	7	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	32	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	26	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	5303	20	40|120|400
-2	1	6	600	{(0,120):[0,200],(121,240):[-11,200],(241,360):[-18,200],(361,480):[-30,200],(481,600):[-36,200]}	200	200	27	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	26	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	5303	2	5|15|50
-2	2	6	1400	{(0,760):[0,200],(761,920):[-30,200],(921,1080):[-50,200],(1081,1240):[-86,200],(1241,1400):[-108,200]}	200	200	27	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	26	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	5303	4	5|15|50
-2	3	6	2400	{(0,1600):[0,200],(1601,1800):[-50,200],(1801,2000):[-73,200],(2001,2200):[-132,200],(2201,2400):[-226,200]}	200	200	27	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	26	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	5303	6	10|30|100
-2	4	6	3600	{(0,2640):[0,200],(2641,2880):[-57,200],(2881,3120):[-84,200],(3121,3360):[-159,200],(3361,3600):[-288,200]}	200	200	27	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	26	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	5303	8	15|45|150
-2	5	6	5000	{(0,3880):[0,200],(3881,4160):[-65,200],(4161,4440):[-97,200],(4441,4720):[-191,200],(4721,5000):[-372,200]}	200	200	27	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	26	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	5303	12	20|60|200
-2	6	6	7000	{(0,5400):[0,200],(5401,5800):[-72,200],(5801,6200):[-108,200],(6201,6600):[-222,200],(6601,7000):[-467,200]}	200	200	27	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	26	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	5303	15	20|60|200
-2	7	6	10500	{(0,7700):[0,200],(7701,8400):[-79,200],(8401,9100):[-121,200],(9101,9800):[-260,200],(9801,10500):[-609,200]}	200	200	27	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	26	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	5303	15	25|75|250
-2	8	6	15500	{(0,11500):[0,200],(11501,12500):[-83,200],(12501,13500):[-128,200],(13501,14500):[-282,200],(14501,15500):[-710,200]}	200	200	27	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	26	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	5303	15	25|75|250
-2	9	6	22000	{(0,16800):[0,200],(16801,18100):[-86,200],(18101,19400):[-134,200],(19401,20700):[-300,200],(20701,22000):[-800,200]}	200	200	27	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	26	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	5303	20	30|90|300
-2	10	6	30000	{(0,23600):[0,200],(23601,25200):[-86,200],(25201,26800):[-134,200],(26801,28400):[-300,200],(28401,30000):[-800,200]}	200	200	27	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	26	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	5303	20	40|120|400
-3	1	7	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	32	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	26	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	5303	2	5|15|50
-3	2	7	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	32	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	26	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	5303	4	5|15|50
-3	3	7	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	32	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	26	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	5303	6	10|30|100
-3	4	7	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	32	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	26	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	5303	8	15|45|150
-3	5	7	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	32	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	26	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	5303	12	20|60|200
-3	6	7	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	32	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	26	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	5303	15	20|60|200
-3	7	7	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	32	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	26	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	5303	15	25|75|250
-3	8	7	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	32	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	26	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	5303	15	25|75|250
-3	9	7	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	32	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	26	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	5303	20	30|90|300
-3	10	7	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	32	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	26	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	5303	20	40|120|400
+1	1	7	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	32	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	26	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	5303	2	1|3|10
+1	2	7	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	32	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	26	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	5303	4	1|3|10
+1	3	7	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	32	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	26	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	5303	6	2|6|20
+1	4	7	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	32	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	26	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	5303	8	3|9|30
+1	5	7	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	32	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	26	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	5303	12	4|12|40
+1	6	7	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	32	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	26	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	5303	15	4|12|40
+1	7	7	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	32	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	26	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	5303	15	5|15|50
+1	8	7	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	32	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	26	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	5303	15	5|15|50
+1	9	7	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	32	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	26	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	5303	20	6|18|60
+1	10	7	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	32	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	26	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	5303	20	8|24|80
+2	1	6	600	{(0,120):[0,200],(121,240):[-11,200],(241,360):[-18,200],(361,480):[-30,200],(481,600):[-36,200]}	200	200	27	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	26	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	5303	2	1|3|10
+2	2	6	1400	{(0,760):[0,200],(761,920):[-30,200],(921,1080):[-50,200],(1081,1240):[-86,200],(1241,1400):[-108,200]}	200	200	27	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	26	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	5303	4	1|3|10
+2	3	6	2400	{(0,1600):[0,200],(1601,1800):[-50,200],(1801,2000):[-73,200],(2001,2200):[-132,200],(2201,2400):[-226,200]}	200	200	27	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	26	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	5303	6	2|6|20
+2	4	6	3600	{(0,2640):[0,200],(2641,2880):[-57,200],(2881,3120):[-84,200],(3121,3360):[-159,200],(3361,3600):[-288,200]}	200	200	27	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	26	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	5303	8	3|9|30
+2	5	6	5000	{(0,3880):[0,200],(3881,4160):[-65,200],(4161,4440):[-97,200],(4441,4720):[-191,200],(4721,5000):[-372,200]}	200	200	27	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	26	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	5303	12	4|12|40
+2	6	6	7000	{(0,5400):[0,200],(5401,5800):[-72,200],(5801,6200):[-108,200],(6201,6600):[-222,200],(6601,7000):[-467,200]}	200	200	27	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	26	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	5303	15	4|12|40
+2	7	6	10500	{(0,7700):[0,200],(7701,8400):[-79,200],(8401,9100):[-121,200],(9101,9800):[-260,200],(9801,10500):[-609,200]}	200	200	27	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	26	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	5303	15	5|15|50
+2	8	6	15500	{(0,11500):[0,200],(11501,12500):[-83,200],(12501,13500):[-128,200],(13501,14500):[-282,200],(14501,15500):[-710,200]}	200	200	27	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	26	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	5303	15	5|15|50
+2	9	6	22000	{(0,16800):[0,200],(16801,18100):[-86,200],(18101,19400):[-134,200],(19401,20700):[-300,200],(20701,22000):[-800,200]}	200	200	27	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	26	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	5303	20	6|18|60
+2	10	6	30000	{(0,23600):[0,200],(23601,25200):[-86,200],(25201,26800):[-134,200],(26801,28400):[-300,200],(28401,30000):[-800,200]}	200	200	27	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	26	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	5303	20	8|24|80
+3	1	7	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	32	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	26	30	{(0,6):[0,10],(7,12):[-1,10],(13,18):[-1,10],(19,24):[-2,10],(25,30):[-2,10]}	10	10	5303	2	1|3|10
+3	2	7	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	32	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	26	70	{(0,38):[0,10],(39,46):[-1,10],(47,54):[-3,10],(55,62):[-5,10],(63,70):[-6,10]}	10	10	5303	4	1|3|10
+3	3	7	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	32	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	26	120	{(0,80):[0,10],(81,90):[-2,10],(91,100):[-4,10],(101,110):[-7,10],(111,120):[-12,10]}	10	10	5303	6	2|6|20
+3	4	7	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	32	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	26	180	{(0,132):[0,10],(133,144):[-3,10],(145,156):[-4,10],(157,168):[-8,10],(169,180):[-15,10]}	10	10	5303	8	3|9|30
+3	5	7	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	32	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	26	250	{(0,194):[0,10],(195,208):[-3,10],(209,222):[-5,10],(223,236):[-10,10],(237,250):[-19,10]}	10	10	5303	12	4|12|40
+3	6	7	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	32	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	26	350	{(0,270):[0,10],(271,290):[-4,10],(291,310):[-5,10],(311,330):[-12,10],(331,350):[-24,10]}	10	10	5303	15	4|12|40
+3	7	7	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	32	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	26	525	{(0,385):[0,10],(386,420):[-4,10],(421,455):[-6,10],(456,490):[-13,10],(491,525):[-31,10]}	10	10	5303	15	5|15|50
+3	8	7	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	32	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	26	775	{(0,575):[0,10],(576,625):[-4,10],(626,675):[-6,10],(676,725):[-15,10],(726,775):[-36,10]}	10	10	5303	15	5|15|50
+3	9	7	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	32	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	26	1100	{(0,840):[0,10],(841,905):[-4,10],(906,970):[-7,10],(971,1035):[-15,10],(1036,1100):[-40,10]}	10	10	5303	20	6|18|60
+3	10	7	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	32	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	26	1500	{(0,1180):[0,10],(1181,1260):[-4,10],(1261,1340):[-7,10],(1341,1420):[-15,10],(1421,1500):[-40,10]}	10	10	5303	20	8|24|80
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 775264e..1142778 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -124,7 +124,7 @@
 FamilyBOSSDropRule	6000+grade*800	min(2*playerCount,50)			
 FBGradeEquipDropRate	{}	{}	{30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,4]], 4:[[1016,1],[1131,6],[1134,6]], 5:[[1015,1],[1131,8],[1134,8]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,6]], 5:[[1015,1],[1132,8],[1135,8]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,6]], 5:[[1015,1],[1133,8],[1136,8]]}}		
 MutexDrop	[[3803,3802,3801],[4606,4608,4610,4609]]	0	0	0	0
-EquipWashMustID	954	0	0	0	0
+EquipWashMustID	5412	0	0	0	0
 EquipWashGroup1	1|2	1_2|2_2|3_2|4_2|5_4|6_6|7_9|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10	0	0	0
 EquipWashGroup2	3|4|5|6|7	1_2|2_2|3_2|4_2|5_4|6_6|7_9|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10	0	0	0
 EquipWashGroup3	8|9|10	1_2|2_2|3_4|4_6|5_8|6_10|7_10|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
index c9fa84e..dc82933 100644
--- a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
@@ -1700,8 +1700,8 @@
 3	398	13700	12|13	1590|716109	0	
 3	399	13820	12|13	1590|721504	0	
 3	400	0	12|13	1590|726935	0	
-4	1	13	73	401.0	0	
-4	2	13	73	408.0	0	
+4	1	13	73	401	0	
+4	2	13	73	408	0	
 4	3	13	73	416	0	
 4	4	14	73	424	0	
 4	5	14	73	432	0	
@@ -1713,7 +1713,7 @@
 4	11	16	73	483	0	
 4	12	16	73	492	0	
 4	13	17	73	501	0	
-4	14	17	73	510.0	0	
+4	14	17	73	510	0	
 4	15	17	73	519	0	
 4	16	18	73	528	0	
 4	17	18	73	538	0	
@@ -1730,7 +1730,7 @@
 4	28	22	73	649	0	
 4	29	22	73	660	0	
 4	30	22	73	670	0	
-4	31	23	73	681.0	0	
+4	31	23	73	681	0	
 4	32	23	73	692	0	
 4	33	23	73	703	0	
 4	34	23	73	714	0	
@@ -1742,21 +1742,21 @@
 4	40	25	73	782	0	
 4	41	26	73	793	0	
 4	42	26	73	805	0	
-4	43	26	73	816.0	0	
+4	43	26	73	816	0	
 4	44	27	73	828	0	
 4	45	27	73	840	0	
 4	46	27	73	851	0	
 4	47	28	73	863	0	
 4	48	28	73	875	0	
 4	49	28	73	887	0	
-4	50	28	73	899.0	0	
+4	50	28	73	899	0	
 4	51	29	73	910	0	
 4	52	29	73	922	0	
 4	53	29	73	934	0	
 4	54	29	73	946	0	
-4	55	30	73	957.0	0	
+4	55	30	73	957	0	
 4	56	30	73	969	0	
-4	57	30	73	981.0	0	
+4	57	30	73	981	0	
 4	58	30	73	993	0	
 4	59	31	73	1004	0	
 4	60	31	73	1016	0	
@@ -1785,7 +1785,7 @@
 4	83	36	73	1277	0	
 4	84	37	73	1287	0	
 4	85	37	73	1298	0	
-4	86	37	73	1309.0	0	
+4	86	37	73	1309	0	
 4	87	37	73	1320	0	
 4	88	38	73	1330	0	
 4	89	38	73	1341	0	
@@ -1848,13 +1848,13 @@
 4	146	52	73	1896	0	
 4	147	52	73	1906	0	
 4	148	52	73	1915	0	
-4	149	52	73	1924.0	0	
-4	150	52	73	1934.0	0	
+4	149	52	73	1924	0	
+4	150	52	73	1934	0	
 4	151	57	73	1943	0	
 4	152	61	73	1953	0	
 4	153	65	73	1964	0	
 4	154	69	73	1975	0	
-4	155	73	73	1987.0	0	
+4	155	73	73	1987	0	
 4	156	77	73	2000	0	
 4	157	81	73	2013	0	
 4	158	85	73	2027	0	
@@ -1884,15 +1884,15 @@
 4	182	184	73	2514	0	
 4	183	188	73	2540	0	
 4	184	192	73	2566	0	
-4	185	196	73	2593.0	0	
+4	185	196	73	2593	0	
 4	186	200	73	2620	0	
 4	187	204	73	2647	0	
-4	188	208	73	2674.0	0	
+4	188	208	73	2674	0	
 4	189	213	73	2702	0	
 4	190	217	73	2730	0	
 4	191	221	73	2758	0	
 4	192	225	73	2787	0	
-4	193	229	73	2815.0	0	
+4	193	229	73	2815	0	
 4	194	233	73	2844	0	
 4	195	237	73	2874	0	
 4	196	241	73	2903	0	
@@ -1909,7 +1909,7 @@
 4	207	283	73	3244	0	
 4	208	287	73	3277	0	
 4	209	292	73	3310	0	
-4	210	296	73	3344.0	0	
+4	210	296	73	3344	0	
 4	211	300	73	3378	0	
 4	212	304	73	3413	0	
 4	213	309	73	3447	0	
@@ -1953,26 +1953,26 @@
 4	251	465	73	5008	0	
 4	252	469	73	5054	0	
 4	253	473	73	5100	0	
-4	254	477	73	5147.0	0	
+4	254	477	73	5147	0	
 4	255	481	73	5193	0	
 4	256	485	73	5240	0	
-4	257	489	73	5287.0	0	
+4	257	489	73	5287	0	
 4	258	493	73	5334	0	
 4	259	497	73	5382	0	
-4	260	501	73	5429.0	0	
+4	260	501	73	5429	0	
 4	261	504	73	5477	0	
 4	262	508	73	5525	0	
 4	263	512	73	5573	0	
 4	264	516	73	5621	0	
-4	265	520	73	5670.0	0	
+4	265	520	73	5670	0	
 4	266	524	73	5718	0	
 4	267	528	73	5767	0	
 4	268	532	73	5816	0	
 4	269	536	73	5865	0	
 4	270	540	73	5915	0	
 4	271	544	73	5964	0	
-4	272	548	73	6013.0	0	
-4	273	552	73	6063.0	0	
+4	272	548	73	6013	0	
+4	273	552	73	6063	0	
 4	274	556	73	6113	0	
 4	275	560	73	6163	0	
 4	276	564	73	6213	0	
@@ -1982,9 +1982,9 @@
 4	280	580	73	6415	0	
 4	281	584	73	6465	0	
 4	282	588	73	6516	0	
-4	283	592	73	6567.0	0	
-4	284	596	73	6618.0	0	
-4	285	600	73	6669.0	0	
+4	283	592	73	6567	0	
+4	284	596	73	6618	0	
+4	285	600	73	6669	0	
 4	286	604	73	6721	0	
 4	287	608	73	6772	0	
 4	288	612	73	6823	0	
@@ -1992,28 +1992,28 @@
 4	290	620	73	6927	0	
 4	291	624	73	6978	0	
 4	292	628	73	7030	0	
-4	293	632	73	7082.0	0	
+4	293	632	73	7082	0	
 4	294	636	73	7134	0	
 4	295	640	73	7186	0	
 4	296	644	73	7238	0	
 4	297	648	73	7290	0	
-4	298	652	73	7343.0	0	
-4	299	656	73	7395.0	0	
+4	298	652	73	7343	0	
+4	299	656	73	7395	0	
 4	300	660	73	7447	0	
 4	301	664	73	7500	0	
 4	302	668	73	7552	0	
-4	303	672	73	7605.0	0	
+4	303	672	73	7605	0	
 4	304	676	73	7658	0	
 4	305	680	73	7711	0	
 4	306	684	73	7764	0	
-4	307	688	73	7817.0	0	
+4	307	688	73	7817	0	
 4	308	692	73	7870	0	
 4	309	696	73	7923	0	
 4	310	700	73	7976	0	
-4	311	704	73	8030.0	0	
+4	311	704	73	8030	0	
 4	312	708	73	8083	0	
 4	313	712	73	8137	0	
-4	314	716	73	8190.0	0	
+4	314	716	73	8190	0	
 4	315	720	73	8244	0	
 4	316	724	73	8298	0	
 4	317	728	73	8352	0	
@@ -2050,19 +2050,19 @@
 4	348	822	73	10015	0	
 4	349	825	73	10068	0	
 4	350	827	73	10120	0	
-4	351	830	73	10173.0	0	
+4	351	830	73	10173	0	
 4	352	833	73	10225	0	
 4	353	836	73	10278	0	
 4	354	839	73	10330	0	
 4	355	842	73	10382	0	
-4	356	845	73	10435.0	0	
+4	356	845	73	10435	0	
 4	357	848	73	10487	0	
 4	358	850	73	10539	0	
 4	359	853	73	10590	0	
 4	360	856	73	10642	0	
-4	361	859	73	10694.0	0	
+4	361	859	73	10694	0	
 4	362	862	73	10745	0	
-4	363	865	73	10797.0	0	
+4	363	865	73	10797	0	
 4	364	868	73	10848	0	
 4	365	871	73	10900	0	
 4	366	873	73	10951	0	
@@ -2080,17 +2080,17 @@
 4	378	908	73	11555	0	
 4	379	911	73	11605	0	
 4	380	914	73	11654	0	
-4	381	917	73	11704.0	0	
+4	381	917	73	11704	0	
 4	382	919	73	11753	0	
 4	383	922	73	11802	0	
 4	384	925	73	11851	0	
 4	385	928	73	11899	0	
 4	386	931	73	11948	0	
 4	387	934	73	11997	0	
-4	388	937	73	12045.0	0	
+4	388	937	73	12045	0	
 4	389	940	73	12093	0	
 4	390	942	73	12141	0	
-4	391	945	73	12189.0	0	
+4	391	945	73	12189	0	
 4	392	948	73	12237	0	
 4	393	951	73	12284	0	
 4	394	954	73	12331	0	
@@ -2099,28 +2099,28 @@
 4	397	963	73	12473	0	
 4	398	965	73	12519	0	
 4	399	968	73	12566	0	
-4	400	971	73	12612.0	0	
+4	400	971	73	12612	0	
 4	401	974	73	12659	0	
 4	402	977	73	12705	0	
-4	403	980	73	12752.0	0	
+4	403	980	73	12752	0	
 4	404	983	73	12799	0	
 4	405	986	73	12846	0	
-4	406	988	73	12893.0	0	
+4	406	988	73	12893	0	
 4	407	991	73	12941	0	
 4	408	994	73	12988	0	
-4	409	997	73	13036.0	0	
+4	409	997	73	13036	0	
 4	410	1000	73	13084	0	
 4	411	1003	73	13132	0	
 4	412	1006	73	13180	0	
 4	413	1009	73	13228	0	
-4	414	1011	73	13276.0	0	
+4	414	1011	73	13276	0	
 4	415	1014	73	13324	0	
 4	416	1017	73	13373	0	
 4	417	1020	73	13422	0	
 4	418	1023	73	13471	0	
 4	419	1026	73	13520	0	
 4	420	1029	73	13569	0	
-4	421	1032	73	13618.0	0	
+4	421	1032	73	13618	0	
 4	422	1035	73	13667	0	
 4	423	1037	73	13717	0	
 4	424	1040	73	13767	0	
@@ -2136,14 +2136,14 @@
 4	434	1069	73	14271	0	
 4	435	1072	73	14322	0	
 4	436	1075	73	14374	0	
-4	437	1078	73	14425.0	0	
+4	437	1078	73	14425	0	
 4	438	1081	73	14477	0	
 4	439	1083	73	14529	0	
 4	440	1086	73	14580	0	
 4	441	1089	73	14632	0	
 4	442	1092	73	14685	0	
 4	443	1095	73	14737	0	
-4	444	1098	73	14789.0	0	
+4	444	1098	73	14789	0	
 4	445	1101	73	14842	0	
 4	446	1104	73	14895	0	
 4	447	1106	73	14947	0	
@@ -2161,15 +2161,15 @@
 4	459	1141	73	15592	0	
 4	460	1144	73	15647	0	
 4	461	1147	73	15702	0	
-4	462	1150	73	15757.0	0	
+4	462	1150	73	15757	0	
 4	463	1152	73	15812	0	
 4	464	1155	73	15867	0	
 4	465	1158	73	15922	0	
-4	466	1161	73	15978.0	0	
+4	466	1161	73	15978	0	
 4	467	1164	73	16033	0	
 4	468	1167	73	16089	0	
 4	469	1170	73	16145	0	
-4	470	1173	73	16201.0	0	
+4	470	1173	73	16201	0	
 4	471	1175	73	16257	0	
 4	472	1178	73	16314	0	
 4	473	1181	73	16370	0	
@@ -2237,16 +2237,16 @@
 4	535	1454	73	20213	0	
 4	536	1460	73	20282	0	
 4	537	1465	73	20352	0	
-4	538	1471	73	20422.0	0	
+4	538	1471	73	20422	0	
 4	539	1477	73	20493	0	
 4	540	1482	73	20564	0	
 4	541	1488	73	20635	0	
-4	542	1494	73	20706.0	0	
+4	542	1494	73	20706	0	
 4	543	1499	73	20777	0	
-4	544	1505	73	20849.0	0	
+4	544	1505	73	20849	0	
 4	545	1511	73	20921	0	
 4	546	1516	73	20994	0	
-4	547	1522	73	21066.0	0	
+4	547	1522	73	21066	0	
 4	548	1528	73	21139	0	
 4	549	1533	73	21212	0	
 4	550	1539	73	21286	0	
@@ -2292,14 +2292,14 @@
 4	590	1766	73	24446	0	
 4	591	1771	73	24531	0	
 4	592	1777	73	24615	0	
-4	593	1783	73	24700.0	0	
+4	593	1783	73	24700	0	
 4	594	1788	73	24786	0	
 4	595	1794	73	24871	0	
-4	596	1800	73	24957.0	0	
+4	596	1800	73	24957	0	
 4	597	1805	73	25044	0	
 4	598	1811	73	25130	0	
 4	599	1817	73	25217	0	
-4	600	1822	73	25304.0	0	
+4	600	1822	73	25304	0	
 4	601	1828	73	25391	0	
 4	602	1834	73	25479	0	
 4	603	1839	73	25566	0	
@@ -2311,24 +2311,24 @@
 4	609	1873	73	26099	0	
 4	610	1879	73	26189	0	
 4	611	1885	73	26279	0	
-4	612	1890	73	26369.0	0	
+4	612	1890	73	26369	0	
 4	613	1896	73	26460	0	
-4	614	1902	73	26550.0	0	
+4	614	1902	73	26550	0	
 4	615	1907	73	26641	0	
-4	616	1913	73	26733.0	0	
+4	616	1913	73	26733	0	
 4	617	1919	73	26824	0	
-4	618	1924	73	26916.0	0	
+4	618	1924	73	26916	0	
 4	619	1930	73	27008	0	
 4	620	1936	73	27101	0	
-4	621	1941	73	27194.0	0	
+4	621	1941	73	27194	0	
 4	622	1947	73	27287	0	
 4	623	1953	73	27380	0	
 4	624	1958	73	27473	0	
 4	625	1964	73	27567	0	
-4	626	1970	73	27661.0	0	
+4	626	1970	73	27661	0	
 4	627	1975	73	27756	0	
 4	628	1981	73	27850	0	
-4	629	1987	73	27945.0	0	
+4	629	1987	73	27945	0	
 4	630	1992	73	28040	0	
 4	631	1998	73	28136	0	
 4	632	2003	73	28231	0	
@@ -2338,15 +2338,15 @@
 4	636	2026	73	28617	0	
 4	637	2032	73	28714	0	
 4	638	2037	73	28811	0	
-4	639	2043	73	28909.0	0	
+4	639	2043	73	28909	0	
 4	640	2049	73	29007	0	
 4	641	2054	73	29105	0	
 4	642	2060	73	29203	0	
 4	643	2066	73	29302	0	
 4	644	2071	73	29401	0	
 4	645	2077	73	29500	0	
-4	646	2083	73	29599.0	0	
+4	646	2083	73	29599	0	
 4	647	2088	73	29699	0	
-4	648	2094	73	29799.0	0	
+4	648	2094	73	29799	0	
 4	649	2100	73	29899	0	
 4	650	0	73	30000	0	
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 30aed68..e9efc1a 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -151,6 +151,10 @@
 30303010	1000	400	0	0	[(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]	30	{(6,4,107):1000000,(6,5,107):80000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:500,9073:6173,2320:50000}	{}	{}	{}	{}	20	800	1356	1824	[]	[1004]
 30303011	1000	450	0	0	[(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]	30	{(7,4,107):1000000,(7,5,107):50000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:600,9073:7330,2320:50000}	{}	{}	{}	{}	20	800	1588	1962	[]	[1004]
 30303012	1000	500	0	0	[(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):50000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,9073:7330,2320:50000}	{}	{}	{}	{}	20	800	1588	1962	[]	[1004]
+30303013	1000	430	0	0	[(410784,0),(554117,(7,2,107)),(1000000,(7,3,107))]	30	{(7,4,107):1000000,(7,5,107):50000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:600,9073:7330,2320:50000}	{}	{}	{}	{}	20	800	1123	1685	[]	[1004]
+30303014	1000	480	0	0	[(410784,0),(554117,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):50000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,9073:7330,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
+30303015	1000	550	0	0	[(406076,0),(549409,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):50000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,9073:7330,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
+30303016	1000	600	0	0	[(406076,0),(549409,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1000000,(8,5,107):50000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:80000,3802:10000,3803:700,9073:7330,2320:50000}	{}	{}	{}	{}	20	800	1129	1694	[]	[1004]
 31501001	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5301:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
 31501002	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5301:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
 31501003	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5301:1000000}	{}	{}	{}	{}	0	0	0	0	[]	[]
@@ -216,6 +220,7 @@
 31903006	0	0	0	0	[(716666,0),(783333,(8,2,107)),(1000000,(8,3,107)),(1000000,(8,2,108)),(1000000,(8,3,108))]	30	{(8,4,107):1000000,(8,5,107):5000,(8,2,108):0,(8,3,108):0,(8,4,108):0}	1	{4:2,5:1}	{3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:301724}	{4151:4,5202:1}	{2:915416}	{}	{2:15}	0	0	0	0	[]	[1006]
 30301001	0	280	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30301002	0	300	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
+30301003	0	320	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30603001	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30603002	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
 30603003	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{}	{}	{}	{}	{}	0	0	0	0	[]	[]
diff --git a/db/PyMongoDataServer/PySysDB/tagRefineStove.txt b/db/PyMongoDataServer/PySysDB/tagRefineStove.txt
index eda9ea4..9ff0edb 100644
--- a/db/PyMongoDataServer/PySysDB/tagRefineStove.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRefineStove.txt
@@ -4,7 +4,7 @@
 3	6480	6	13441
 4	20700	6	20537
 5	49950	6	29971
-6	134280	6	42393
-7	161100	6	58548
+6	67140	6	42393
+7	134250	6	58548
 8	193320	6	79273
 9	358000	6	105195
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index d959023..d4b64c5 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -45,6 +45,7 @@
 113	3	0	5306	1	0	[]	0		0	0	350	0	0	1	300	0	0		
 114	3	0	4219	1	1	[]	0		0	0	122	1	0	1	258	0	0		
 115	3	0	261	1	1	[]	0		0	0	132	1	0	1	258	0	0		
+116	3	0	5412	1	0	[]	0		0	0	180	0	0	1	5	0	0		
 151	4	0	181	1	1	[]	0		0	0	0	0	0	2	10	0	0		
 152	4	0	952	1	1	[]	0		0	0	0	0	0	2	25	0	0		
 153	4	0	4101	1	1	[]	0		0	0	0	0	0	2	688	0	0		
@@ -216,3 +217,29 @@
 1027	203	2	2213	100	1	[]	2213		0	0	0	1	10	1	500	1250	0	FlashRushToBuy2	FlashToSnapUp
 1028	203	2	4608	2	1	[]	4608		0	0	0	1	999	1	200	1000	0	FlashRushToBuy2	FlashToSnapUp
 1029	203	2	198	3	1	[]	198		0	0	0	1	999	1	88	900	0	FlashRushToBuy2	FlashToSnapUp
+1030	204	2	4606	3	1	[]	4606		0	0	0	1	1	1	666	3000	0	FlashRushToBuy2	FlashToSnapUp
+1031	204	2	4606	1	1	[]	4606		0	0	0	1	3	1	188	1000	0	FlashRushToBuy2	FlashToSnapUp
+1032	204	2	2213	50	1	[]	2213		0	0	0	1	10	1	150	625	0	FlashRushToBuy2	FlashToSnapUp
+1033	204	2	1503	2	1	[]	1503		0	0	0	1	999	1	20	100	0	FlashRushToBuy2	FlashToSnapUp
+1034	204	2	4007	3	1	[]	4007		0	0	0	1	999	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
+1035	204	2	4622	5	1	[]	4622		0	0	0	1	999	1	88	400	0	FlashRushToBuy2	FlashToSnapUp
+1036	205	2	3516	2	1	[]	3516		0	0	0	1	1	1	666	4860	0	FlashRushToBuy2	FlashToSnapUp
+1037	205	2	947	1	1	[]	947		0	0	0	1	2	1	188	1000	0	FlashRushToBuy2	FlashToSnapUp
+1038	205	2	2050	6	1	[]	2050		0	0	0	1	3	1	30	300	0	FlashRushToBuy2	FlashToSnapUp
+1039	205	2	953	1	1	[]	953		0	0	0	1	5	1	88	500	0	FlashRushToBuy2	FlashToSnapUp
+1040	205	2	4681	1	1	[]	4681		0	0	0	1	5	1	50	250	0	FlashRushToBuy2	FlashToSnapUp
+1041	205	2	4184	1	1	[]	4184		0	0	0	1	999	1	38	230	0	FlashRushToBuy2	FlashToSnapUp
+1042	205	2	4010	4	1	[]	4010		0	0	0	1	999	1	100	320	0	FlashRushToBuy2	FlashToSnapUp
+1043	205	2	4609	2	1	[]	4609		0	0	0	1	999	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
+1044	206	2	4607	2	1	[]	4607		0	0	0	1	2	1	666	4000	0	FlashRushToBuy2	FlashToSnapUp
+1045	206	2	196	1	1	[]	196		0	0	0	1	3	1	200	800	0	FlashRushToBuy2	FlashToSnapUp
+1046	206	2	195	5	1	[]	195		0	0	0	1	5	1	300	1500	0	FlashRushToBuy2	FlashToSnapUp
+1047	206	2	4610	1	1	[]	4610		0	0	0	1	999	1	60	200	0	FlashRushToBuy2	FlashToSnapUp
+1048	206	2	5410	3	1	[]	5410		0	0	0	1	999	1	88	150	0	FlashRushToBuy2	FlashToSnapUp
+1049	207	2	5409	2	1	[]	5409		0	0	0	1	1	1	8888	25000	0	FlashRushToBuy2	FlashToSnapUp
+1050	207	2	2389	5	1	[]	2390		0	0	0	1	1	1	150	900	0	FlashRushToBuy2	FlashToSnapUp
+1051	207	2	4680	1	1	[]	4680		0	0	0	1	5	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
+1052	207	2	2389	1	1	[]	2390		0	0	0	1	10	1	20	180	0	FlashRushToBuy2	FlashToSnapUp
+1053	207	2	2213	100	1	[]	2213		0	0	0	1	999	1	200	1250	0	FlashRushToBuy2	FlashToSnapUp
+1054	207	2	4608	2	1	[]	4608		0	0	0	1	999	1	200	1000	0	FlashRushToBuy2	FlashToSnapUp
+1055	207	2	198	3	1	[]	198		0	0	0	1	999	1	88	900	0	FlashRushToBuy2	FlashToSnapUp

--
Gitblit v1.8.0