From 3b24a668491573ee406059708e97dabcec7c5678 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期三, 05 十二月 2018 14:58:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                                  |    0 
 db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt                                                 |    2 
 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt                                                            |  142 +++++++-------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4068.pyc            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc                   |    0 
 db/PyMongoDataServer/PySysDB/tagActFlashSale.txt                                                          |    6 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc                         |    0 
 db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt                                                          |    1 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc                             |    0 
 db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt                                                       |   16 
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt                                                      |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc                              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc                       |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc                                             |    0 
 CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt                                                    |   35 ++-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2104.pyc            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_105.pyc                           |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                                 |   10 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.pyc        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc                               |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc                       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc                       |    0 
 db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt                                                      |   48 ++--
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                            |    3 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc                        |    0 
 db/PyMongoDataServer/PySysDB/tagAttrFruit.txt                                                             |  186 ++++++++++----------
 CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt                                                    |    6 
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                               |   18 +-
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                                                           |    6 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc                                      |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc                                                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc                              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2102.pyc            |    0 
 38 files changed, 242 insertions(+), 239 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index c3ec7d0..65ec0ae 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,4 +1,4 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset	ShopTypeList
-1	OpenServer	[]	[]	7	7	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	1440	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[200,201,202,203]]
-2	New1	[]	[]	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	1440	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[204,205,206,207]]
-3	December12	[]	[]	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	1440	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[204,205,206,207]]
+1	OpenServer	[]	[]	7	7	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	1	[[200,201,202,203]]
+2	New1	[]	[]	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[204,205,206,207]]
+3	December12	[]	[]	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	900	{0:["FlashRushToBuy3",[]]}	[]	[]	100	0	[[204,205,206,207]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
index 381113f..f6c4a8c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
@@ -1,18 +1,19 @@
 DataMapID	LineID	FightPowerMin	FightPowerMax	LVLimit	DayFreeHelpCount
-51010	0	457100	1997875	155	[5, 1]
-51010	1	869040	3541349	155	[5, 1]
-51010	2	1997875	4697877	155	[5, 1]
-51010	3	3541349	7285497	155	[5, 1]
-51010	4	4697877	11336856	155	[5, 1]
-51010	5	7285497	0	155	[5, 1]
-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	15920114	0	320	[5, 0]
-31110	18	24178039	0	350	[5, 0]
-31110	21	34736689	0	380	[5, 0]
+51010	0	457100	1997875	155	[12, 1]
+51010	1	869040	3541349	155	[12, 1]
+51010	2	1997875	4697877	155	[12, 1]
+51010	3	3541349	7285497	155	[12, 1]
+51010	4	4697877	11336856	155	[12, 1]
+51010	5	7285497	15256635	155	[12, 1]
+51010	6	11336856	0	155	[12, 1]
+60010	0	218160	0	105	[12, 0]
+60010	1	815427	0	165	[12, 0]
+60010	2	1809401	0	200	[12, 0]
+31110	2	281011	0	125	[3, 0]
+31110	5	1114154	0	180	[3, 0]
+31110	7	2520808	0	215	[3, 0]
+31110	9	4075186	0	240	[3, 0]
+31110	12	7881199	0	285	[3, 0]
+31110	15	15920114	0	320	[3, 0]
+31110	18	24178039	0	350	[3, 0]
+31110	21	34736689	0	380	[3, 0]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 3beefa9..f01bfe0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -22,7 +22,7 @@
 CreateFamilyNeedMoney	100	5	0	0	0
 FakeFamilyName	["情谊永恒","唯我独尊","横扫天下","第一仙盟","称霸全服","聚义仙侠","风云残卷","勇者联盟","皇族"]	3			
 FamilyBroadcast	3	5	0	0	0
-FamilyPurview	1|2|2|2|2|2|2|2	0	0	0	0
+FamilyPurview	1|2|2|1|2|2|2|2	0	0	0	0
 AutoChangeLeader	24	0	0	0	0
 AutoDelFamily	7	0	0	0	0
 FamilyRedPacketCnt	10	0	0	0	0
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
index 3633721..e200375 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc
index 2171c6b..e220c63 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 1faf533..2cba7ab 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
index fdac69e..a73e82a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.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 86c6970..7f39f4d 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/GM/Commands/ClearFruitAttr.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc
index a11ba19..f362377 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.pyc
index 6b0b93d..8e32882 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 108fc0b..7cdd4ec 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc
index b6051df..0494eaf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
index 5e8d7fb..e230ebb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_105.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_105.pyc
index 5185206..47deb64 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_105.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_105.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
index 66a786b..87fc526 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 9427c61..49e521d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
index 82083bc..9844b4e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
index 95b0a98..eafc6eb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index e99c9e5..c974613 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc
index 59114f8..646e735 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
index 5e363b6..3773f3c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc
new file mode 100644
index 0000000..672737c
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index 762fb4d..45996c6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2102.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2102.pyc
new file mode 100644
index 0000000..2516c2e
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2102.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2104.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2104.pyc
new file mode 100644
index 0000000..ea6a076
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_2104.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4068.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4068.pyc
new file mode 100644
index 0000000..8229a94
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4068.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index 49710e8..dcb7860 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 264fd46..438ebd3 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,4 +1,4 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	ShopTypeList	MailKey	MailItemPrize
-1	7	7	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	1440	100	1	[[200,201,202,203]]	SellMail5	
-2	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	1440	100	0	[[204,205,206,207]]	SellMail5	
-3	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	1440	100	0	[[204,205,206,207]]	SellMail5	
+1	7	7	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	900	100	1	[[200,201,202,203]]	SellMail5	
+2	2018-11-16	2018-11-16	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	900	100	0	[[204,205,206,207]]	SellMail5	
+3	2018-12-12	2018-12-12	12:00|16:00|20:00|22:00	13:00|17:00|21:00|23:00	900	100	0	[[204,205,206,207]]	SellMail5	
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index 5265e67..4eac50a 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -1,93 +1,93 @@
-ID	FuncID	MaxUseCnt	RecycleExp
-4181	0	500	100
-4182	0	300	100
-4183	0	20	500
-4184	0	200	100
-4185	0	20	500
-4186	0	60	100
-4187	0	15	100
-4188	0	15	100
-4189	0	1	100
-4190	0	1	100
-4191	0	1	100
-4192	0	1	100
-4699	0	1	100
-4700	0	1	100
-4701	0	1	100
-191	1	50	100
-192	1	50	100
-193	1	50	100
-194	1	60	100
-195	1	60	100
-196	1	10	100
-197	1	999	100
-198	1	300	100
-199	1	100	100
-200	1	10	500
-201	1	10	500
-204	1	1	100
-205	1	1	100
-206	1	1	100
-202	1	1	100
-203	1	1	100
-4696	1	1	100
-4697	1	1	100
-4698	1	1	100
-4702	1	1	100
-4703	1	1	100
-4704	1	1	100
-207	1	1	100
-208	1	1	100
-209	1	1	100
-4706	2	5	125
-4707	2	5	175
-4716	2	10	175
-4708	2	5	250
-4712	2	15	250
-4717	2	10	250
-4721	2	6	250
-4709	2	10	375
-4713	2	30	375
-4718	2	20	375
-4722	2	12	375
-4725	2	15	375
-4710	2	15	500
-4714	2	45	500
-4719	2	30	500
-4723	2	18	500
-4726	2	20	500
-4728	2	15	500
-4711	2	30	625
-4715	2	90	625
-4720	2	40	625
-4724	2	36	625
-4727	2	35	625
-4729	2	30	625
-4780	2	45	625
-4781	2	150	625
-4782	2	50	625
-4783	2	48	625
-4784	2	50	625
-4785	2	45	625
-4786	2	60	625
-4787	2	180	625
-4788	2	60	625
-4789	2	60	625
-4790	2	60	625
-4791	2	60	625
-4740	2	2	1000
-4730	2	2	1000
-4731	2	2	1000
-4732	2	5	1000
-4733	2	5	1000
-4742	2	5	1000
-4655	2	99	675
-4687	2	99	1250
-4688	2	99	10625
-4691	2	99	750
-4692	2	99	1375
-4660	2	50	2875
-4661	2	50	3000
-4676	2	5	10625
-4677	2	5	10625
-4741	2	50	100
+ID	FuncID	MaxUseCnt	RecycleExp	FightPowerEx
+4181	0	500	100	0
+4182	0	300	100	0
+4183	0	20	500	0
+4184	0	200	100	0
+4185	0	20	500	0
+4186	0	60	100	0
+4187	0	15	100	0
+4188	0	15	100	0
+4189	0	1	100	0
+4190	0	1	100	3000
+4191	0	1	100	0
+4192	0	1	100	0
+4699	0	1	100	5000
+4700	0	1	100	0
+4701	0	1	100	0
+191	1	50	100	0
+192	1	50	100	0
+193	1	50	100	0
+194	1	60	100	0
+195	1	60	100	0
+196	1	10	100	0
+197	1	999	100	0
+198	1	300	100	0
+199	1	100	100	0
+200	1	10	500	0
+201	1	10	500	0
+204	1	1	100	0
+205	1	1	100	0
+206	1	1	100	0
+202	1	1	100	0
+203	1	1	100	1000
+4696	1	1	100	4000
+4697	1	1	100	0
+4698	1	1	100	0
+4702	1	1	100	6000
+4703	1	1	100	0
+4704	1	1	100	0
+207	1	1	100	2000
+208	1	1	100	0
+209	1	1	100	0
+4706	2	5	125	0
+4707	2	5	175	0
+4716	2	10	175	0
+4708	2	5	250	0
+4712	2	15	250	0
+4717	2	10	250	0
+4721	2	6	250	0
+4709	2	10	375	0
+4713	2	30	375	0
+4718	2	20	375	0
+4722	2	12	375	0
+4725	2	15	375	0
+4710	2	15	500	0
+4714	2	45	500	0
+4719	2	30	500	0
+4723	2	18	500	0
+4726	2	20	500	0
+4728	2	15	500	0
+4711	2	30	625	0
+4715	2	90	625	0
+4720	2	40	625	0
+4724	2	36	625	0
+4727	2	35	625	0
+4729	2	30	625	0
+4780	2	45	625	0
+4781	2	150	625	0
+4782	2	50	625	0
+4783	2	48	625	0
+4784	2	50	625	0
+4785	2	45	625	0
+4786	2	60	625	0
+4787	2	180	625	0
+4788	2	60	625	0
+4789	2	60	625	0
+4790	2	60	625	0
+4791	2	60	625	0
+4740	2	2	1000	0
+4730	2	2	1000	0
+4731	2	2	1000	0
+4732	2	5	1000	0
+4733	2	5	1000	0
+4742	2	5	1000	0
+4655	2	99	675	0
+4687	2	99	1250	0
+4688	2	99	10625	0
+4691	2	99	750	0
+4692	2	99	1375	0
+4660	2	50	2875	0
+4661	2	50	3000	0
+4676	2	5	10625	0
+4677	2	5	10625	0
+4741	2	50	100	0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 13f622f..ac9ebc9 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -199,6 +199,6 @@
 4008			4011_5									
 4009			4011_5									
 2412				[[5000,[3503,1]],[10000,[3513,1]]]	1							
-2413			101_5|102_2									
-2414			104_5|105_3									
-2415			110_5|111_3									
+2413			101_6|102_4|103_1									
+2414			104_4|105_4									
+2415			110_5|111_5									
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index ba54e5e..8f73d4a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -5,6 +5,7 @@
 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}}
+51010	6	11336856	11336856	300	913525	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}}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 82eb36e..2585255 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -274,7 +274,7 @@
 XMZZRobotSkill	{1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}				
 XMZZPKAward	[0,10,20,30,40,50,60,70,80,90]	addPer+100 + int(math.ceil(HPPer/10.0))	50	reExp*216*(100+addPer)/100	reExp*108
 PayRMB	10				
-OSCBillboardOpen	{"2":[20,1,2],"7":[50,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}	10			
+OSCBillboardOpen	{"2":[20,1,2],"8":[50,3,3],"10":[20,4,4],"3":[30,5,5],"7":[50,6,6],"6":[1200000,7,7]}	10			
 OSCRankRedpackAward	{1:80,(2,5):81}				
 WeekResetSuccType	[]				
 InvestCost	{"1":[300],"2":[98],"3":[300,680,1280,1880]}				
@@ -293,6 +293,7 @@
 OpenServerRedPacketCfg	3	10	3600	50	5
 PotentialSkillLearn	{"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"51065":[15,47130],"51165":[15,47140],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290],"56065":[15,47330],"56165":[15,47340]}				
 FirstGold	{"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]}	{"1":388,"2":388}	1800		
+CTG	0				
 FirstGoldTryItem	1_6621|2_6622	1_10221|2_20221	9	100	
 ItemRecord	1	0			
 ItemRecordRule	{0:4,39:3,111:2,45:3,9:2,58:3,22:3,28:3,8:3}	[4,25,26,41,112]	[947,948,949,950,953,982,983,986,1128]	[]	[]
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
index 0f7fe7d..87806f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
@@ -5,30 +5,30 @@
 2	4	5	{"1":[[204,1,1],[181,30,1],[4304,6,1]],"2":[[204,1,1],[181,30,1],[4304,6,1]],"3":[[204,1,1],[181,30,1],[4304,6,1]]}
 2	6	10	{"1":[[204,1,1],[181,20,1],[4303,6,1]],"2":[[204,1,1],[181,20,1],[4303,6,1]],"3":[[204,1,1],[181,20,1],[4303,6,1]]}
 2	11	20	{"1":[[205,1,1],[181,15,1],[4303,4,1]],"2":[[205,1,1],[181,15,1],[4303,4,1]],"3":[[205,1,1],[181,15,1],[4303,4,1]]}
-7	1	1	{"1":[[4702,1,1],[6706,1,0],[3504,3,1],[3514,3,1]],"2":[[4702,1,1],[6806,1,0],[3504,3,1],[3514,3,1]],"3":[[4702,1,1],[6906,1,0],[3504,3,1],[3514,3,1]]}
-7	2	2	{"1":[[4702,1,1],[6707,1,0],[3504,2,1],[3514,2,1]],"2":[[4702,1,1],[6807,1,0],[3504,2,1],[3514,2,1]],"3":[[4702,1,1],[6907,1,0],[3504,2,1],[3514,2,1]]}
-7	3	3	{"1":[[4702,1,1],[6708,1,0],[3503,4,1],[3513,4,1]],"2":[[4702,1,1],[6808,1,0],[3503,4,1],[3513,4,1]],"3":[[4702,1,1],[6908,1,0],[3503,4,1],[3513,4,1]]}
-7	4	5	{"1":[[4703,1,1],[3503,3,1],[3513,3,1]],"2":[[4703,1,1],[3503,3,1],[3513,3,1]],"3":[[4703,1,1],[3503,3,1],[3513,3,1]]}
-7	6	10	{"1":[[4703,1,1],[3503,2,1],[3513,2,1]],"2":[[4703,1,1],[3503,2,1],[3513,2,1]],"3":[[4703,1,1],[3503,2,1],[3513,2,1]]}
-7	11	20	{"1":[[4704,1,1],[3503,1,1],[3513,1,1]],"2":[[4704,1,1],[3503,1,1],[3513,1,1]],"3":[[4704,1,1],[3503,1,1],[3513,1,1]]}
-3	1	1	{"1":[[4699,1,1],[6709,1,0],[4151,60,1],[6,1,1]],"2":[[4699,1,1],[6809,1,0],[4151,60,1],[6,1,1]],"3":[[4699,1,1],[6909,1,0],[4151,60,1],[6,1,1]]}
-3	2	2	{"1":[[4699,1,1],[6710,1,0],[4151,50,1],[9,1,1]],"2":[[4699,1,1],[6810,1,0],[4151,50,1],[9,1,1]],"3":[[4699,1,1],[6910,1,0],[4151,50,1],[9,1,1]]}
-3	3	3	{"1":[[4699,1,1],[6711,1,0],[4151,40,1],[7,1,1]],"2":[[4699,1,1],[6811,1,0],[4151,40,1],[7,1,1]],"3":[[4699,1,1],[6911,1,0],[4151,40,1],[7,1,1]]}
-3	4	5	{"1":[[4700,1,1],[4151,30,1],[8,1,1]],"2":[[4700,1,1],[4151,30,1],[8,1,1]],"3":[[4700,1,1],[4151,30,1],[8,1,1]]}
-3	6	10	{"1":[[4700,1,1],[4151,20,1],[5,1,1]],"2":[[4700,1,1],[4151,20,1],[5,1,1]],"3":[[4700,1,1],[4151,20,1],[5,1,1]]}
-3	11	20	{"1":[[4701,1,1],[4151,15,1],[4,1,1]],"2":[[4701,1,1],[4151,15,1],[4,1,1]],"3":[[4701,1,1],[4151,15,1],[4,1,1]]}
-4	1	1	{"1":[[4190,1,1],[6703,1,0],[181,60,1],[6,1,1]],"2":[[4190,1,1],[6803,1,0],[181,60,1],[6,1,1]],"3":[[4190,1,1],[6903,1,0],[181,60,1],[6,1,1]]}
-4	2	2	{"1":[[4190,1,1],[6704,1,0],[181,50,1],[9,1,1]],"2":[[4190,1,1],[6804,1,0],[181,50,1],[9,1,1]],"3":[[4190,1,1],[6904,1,0],[181,50,1],[9,1,1]]}
-4	3	3	{"1":[[4190,1,1],[6705,1,0],[181,40,1],[7,1,1]],"2":[[4190,1,1],[6805,1,0],[181,40,1],[7,1,1]],"3":[[4190,1,1],[6905,1,0],[181,40,1],[7,1,1]]}
-4	4	5	{"1":[[4191,1,1],[181,30,1],[8,1,1]],"2":[[4191,1,1],[181,30,1],[8,1,1]],"3":[[4191,1,1],[181,30,1],[8,1,1]]}
-4	6	10	{"1":[[4191,1,1],[181,20,1],[5,1,1]],"2":[[4191,1,1],[181,20,1],[5,1,1]],"3":[[4191,1,1],[181,20,1],[5,1,1]]}
-4	11	20	{"1":[[4192,1,1],[181,15,1],[4,1,1]],"2":[[4192,1,1],[181,15,1],[4,1,1]],"3":[[4192,1,1],[181,15,1],[4,1,1]]}
-5	1	1	{"1":[[4696,1,1],[6700,1,0],[3504,3,1],[3514,3,1]],"2":[[4696,1,1],[6800,1,0],[3504,3,1],[3514,3,1]],"3":[[4696,1,1],[6900,1,0],[3504,3,1],[3514,3,1]]}
-5	2	2	{"1":[[4696,1,1],[6701,1,0],[3504,2,1],[3514,2,1]],"2":[[4696,1,1],[6801,1,0],[3504,2,1],[3514,2,1]],"3":[[4696,1,1],[6901,1,0],[3504,2,1],[3514,2,1]]}
-5	3	3	{"1":[[4696,1,1],[6702,1,0],[3503,4,1],[3513,4,1]],"2":[[4696,1,1],[6802,1,0],[3503,4,1],[3513,4,1]],"3":[[4696,1,1],[6902,1,0],[3503,4,1],[3513,4,1]]}
-5	4	5	{"1":[[4697,1,1],[3503,3,1],[3513,3,1]],"2":[[4697,1,1],[3503,3,1],[3513,3,1]],"3":[[4697,1,1],[3503,3,1],[3513,3,1]]}
-5	6	10	{"1":[[4697,1,1],[3503,2,1],[3513,2,1]],"2":[[4697,1,1],[3503,2,1],[3513,2,1]],"3":[[4697,1,1],[3503,2,1],[3513,2,1]]}
-5	11	20	{"1":[[4698,1,1],[3503,1,1],[3513,1,1]],"2":[[4698,1,1],[3503,1,1],[3513,1,1]],"3":[[4698,1,1],[3503,1,1],[3513,1,1]]}
+8	1	1	{"1":[[4702,1,1],[6706,1,0],[3504,3,1],[3514,3,1]],"2":[[4702,1,1],[6806,1,0],[3504,3,1],[3514,3,1]],"3":[[4702,1,1],[6906,1,0],[3504,3,1],[3514,3,1]]}
+8	2	2	{"1":[[4702,1,1],[6707,1,0],[3504,2,1],[3514,2,1]],"2":[[4702,1,1],[6807,1,0],[3504,2,1],[3514,2,1]],"3":[[4702,1,1],[6907,1,0],[3504,2,1],[3514,2,1]]}
+8	3	3	{"1":[[4702,1,1],[6708,1,0],[3503,4,1],[3513,4,1]],"2":[[4702,1,1],[6808,1,0],[3503,4,1],[3513,4,1]],"3":[[4702,1,1],[6908,1,0],[3503,4,1],[3513,4,1]]}
+8	4	5	{"1":[[4703,1,1],[3503,3,1],[3513,3,1]],"2":[[4703,1,1],[3503,3,1],[3513,3,1]],"3":[[4703,1,1],[3503,3,1],[3513,3,1]]}
+8	6	10	{"1":[[4703,1,1],[3503,2,1],[3513,2,1]],"2":[[4703,1,1],[3503,2,1],[3513,2,1]],"3":[[4703,1,1],[3503,2,1],[3513,2,1]]}
+8	11	20	{"1":[[4704,1,1],[3503,1,1],[3513,1,1]],"2":[[4704,1,1],[3503,1,1],[3513,1,1]],"3":[[4704,1,1],[3503,1,1],[3513,1,1]]}
+10	1	1	{"1":[[4699,1,1],[6709,1,0],[4151,60,1],[6,1,1]],"2":[[4699,1,1],[6809,1,0],[4151,60,1],[6,1,1]],"3":[[4699,1,1],[6909,1,0],[4151,60,1],[6,1,1]]}
+10	2	2	{"1":[[4699,1,1],[6710,1,0],[4151,50,1],[9,1,1]],"2":[[4699,1,1],[6810,1,0],[4151,50,1],[9,1,1]],"3":[[4699,1,1],[6910,1,0],[4151,50,1],[9,1,1]]}
+10	3	3	{"1":[[4699,1,1],[6711,1,0],[4151,40,1],[7,1,1]],"2":[[4699,1,1],[6811,1,0],[4151,40,1],[7,1,1]],"3":[[4699,1,1],[6911,1,0],[4151,40,1],[7,1,1]]}
+10	4	5	{"1":[[4700,1,1],[4151,30,1],[8,1,1]],"2":[[4700,1,1],[4151,30,1],[8,1,1]],"3":[[4700,1,1],[4151,30,1],[8,1,1]]}
+10	6	10	{"1":[[4700,1,1],[4151,20,1],[5,1,1]],"2":[[4700,1,1],[4151,20,1],[5,1,1]],"3":[[4700,1,1],[4151,20,1],[5,1,1]]}
+10	11	20	{"1":[[4701,1,1],[4151,15,1],[4,1,1]],"2":[[4701,1,1],[4151,15,1],[4,1,1]],"3":[[4701,1,1],[4151,15,1],[4,1,1]]}
+3	1	1	{"1":[[4190,1,1],[6703,1,0],[181,60,1],[6,1,1]],"2":[[4190,1,1],[6803,1,0],[181,60,1],[6,1,1]],"3":[[4190,1,1],[6903,1,0],[181,60,1],[6,1,1]]}
+3	2	2	{"1":[[4190,1,1],[6704,1,0],[181,50,1],[9,1,1]],"2":[[4190,1,1],[6804,1,0],[181,50,1],[9,1,1]],"3":[[4190,1,1],[6904,1,0],[181,50,1],[9,1,1]]}
+3	3	3	{"1":[[4190,1,1],[6705,1,0],[181,40,1],[7,1,1]],"2":[[4190,1,1],[6805,1,0],[181,40,1],[7,1,1]],"3":[[4190,1,1],[6905,1,0],[181,40,1],[7,1,1]]}
+3	4	5	{"1":[[4191,1,1],[181,30,1],[8,1,1]],"2":[[4191,1,1],[181,30,1],[8,1,1]],"3":[[4191,1,1],[181,30,1],[8,1,1]]}
+3	6	10	{"1":[[4191,1,1],[181,20,1],[5,1,1]],"2":[[4191,1,1],[181,20,1],[5,1,1]],"3":[[4191,1,1],[181,20,1],[5,1,1]]}
+3	11	20	{"1":[[4192,1,1],[181,15,1],[4,1,1]],"2":[[4192,1,1],[181,15,1],[4,1,1]],"3":[[4192,1,1],[181,15,1],[4,1,1]]}
+7	1	1	{"1":[[4696,1,1],[6700,1,0],[3504,3,1],[3514,3,1]],"2":[[4696,1,1],[6800,1,0],[3504,3,1],[3514,3,1]],"3":[[4696,1,1],[6900,1,0],[3504,3,1],[3514,3,1]]}
+7	2	2	{"1":[[4696,1,1],[6701,1,0],[3504,2,1],[3514,2,1]],"2":[[4696,1,1],[6801,1,0],[3504,2,1],[3514,2,1]],"3":[[4696,1,1],[6901,1,0],[3504,2,1],[3514,2,1]]}
+7	3	3	{"1":[[4696,1,1],[6702,1,0],[3503,4,1],[3513,4,1]],"2":[[4696,1,1],[6802,1,0],[3503,4,1],[3513,4,1]],"3":[[4696,1,1],[6902,1,0],[3503,4,1],[3513,4,1]]}
+7	4	5	{"1":[[4697,1,1],[3503,3,1],[3513,3,1]],"2":[[4697,1,1],[3503,3,1],[3513,3,1]],"3":[[4697,1,1],[3503,3,1],[3513,3,1]]}
+7	6	10	{"1":[[4697,1,1],[3503,2,1],[3513,2,1]],"2":[[4697,1,1],[3503,2,1],[3513,2,1]],"3":[[4697,1,1],[3503,2,1],[3513,2,1]]}
+7	11	20	{"1":[[4698,1,1],[3503,1,1],[3513,1,1]],"2":[[4698,1,1],[3503,1,1],[3513,1,1]],"3":[[4698,1,1],[3503,1,1],[3513,1,1]]}
 6	1	1	{"1":[[207,1,1],[6723,1,0],[4151,60,1],[6,1,1]],"2":[[207,1,1],[6823,1,0],[4151,60,1],[6,1,1]],"3":[[207,1,1],[6923,1,0],[4151,60,1],[6,1,1]]}
 6	2	2	{"1":[[207,1,1],[6724,1,0],[4151,50,1],[9,1,1]],"2":[[207,1,1],[6824,1,0],[4151,50,1],[9,1,1]],"3":[[207,1,1],[6924,1,0],[4151,50,1],[9,1,1]]}
 6	3	3	{"1":[[207,1,1],[6725,1,0],[4151,40,1],[7,1,1]],"2":[[207,1,1],[6825,1,0],[4151,40,1],[7,1,1]],"3":[[207,1,1],[6925,1,0],[4151,40,1],[7,1,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
index 3e0cf5d..d2cb0b9 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -1,13 +1,13 @@
 RangListType	Condition	Gift
 2	15	{"1":[[181,15],[4303,2]],"2":[[181,15],[4303,2]],"3":[[181,15],[4303,2]]}
 2	10	{"1":[[181,10],[4303,1]],"2":[[181,10],[4303,1]],"3":[[181,10],[4303,1]]}
-7	40	{"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
-7	30	{"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
-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":[[181,15],[3,2]],"2":[[181,15],[3,2]],"3":[[181,15],[3,2]]}
-4	180	{"1":[[181,10],[3,1]],"2":[[181,10],[3,1]],"3":[[181,10],[3,1]]}
-5	6	{"1":[[3512,2],[3502,2]],"2":[[3512,2],[3502,2]],"3":[[3512,2],[3502,2]]}
-5	5	{"1":[[3512,1],[3502,1]],"2":[[3512,1],[3502,1]],"3":[[3512,1],[3502,1]]}
+8	40	{"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
+8	30	{"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
+10	9	{"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
+10	6	{"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}
+3	190	{"1":[[181,15],[3,2]],"2":[[181,15],[3,2]],"3":[[181,15],[3,2]]}
+3	180	{"1":[[181,10],[3,1]],"2":[[181,10],[3,1]],"3":[[181,10],[3,1]]}
+7	6	{"1":[[3512,2],[3502,2]],"2":[[3512,2],[3502,2]],"3":[[3512,2],[3502,2]]}
+7	5	{"1":[[3512,1],[3502,1]],"2":[[3512,1],[3502,1]],"3":[[3512,1],[3502,1]]}
 6	1000000	{"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
 6	800000	{"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 2d0a9b3..43e2b68 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -13,9 +13,9 @@
 13	1	0	4741	1	1	[]	0		7	1	125	1	0	1	30	0	0		
 14	1	0	2389	1	1	[]	0		7	0	260	2	0	1	100	0	0		
 15	1	0	1129	1	1	[]	0		7	3	110	3	0	1	99	0	0		
-16	1	0	2413	1	1	[]	0		7	0	110	2	0	1	90	0	0		
-17	1	0	2414	1	1	[]	0		7	0	250	2	0	1	150	0	0		
-18	1	0	2415	1	1	[]	0		7	0	320	2	0	1	200	0	0		
+16	1	0	2413	1	1	[]	0		7	0	110	2	0	1	60	0	0		
+17	1	0	2414	1	1	[]	0		7	0	250	2	0	1	70	0	0		
+18	1	0	2415	1	1	[]	0		7	0	320	2	0	1	175	0	0		
 51	2	0	3796	1	0	[]	0		0	0	0	0	0	1	280	0	0		
 52	2	0	3797	1	0	[]	0		0	0	0	0	0	1	280	0	0		
 53	2	0	4101	1	0	[]	0		0	0	0	0	0	1	380	0	0		
@@ -241,8 +241,8 @@
 1036	205	2	3516	2	1	[]	3516		0	0	0	1	3	1	888	4860	0	FlashRushToBuy2	FlashToSnapUp
 1037	205	2	4010	4	1	[]	4010		0	0	0	1	20	1	88	320	0	FlashRushToBuy2	FlashToSnapUp
 1038	205	2	1503	2	1	[]	1503		0	0	0	1	20	1	20	100	0	FlashRushToBuy2	FlashToSnapUp
-1039	205	2	4610	2	1	[]	4610		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
-1040	205	2	4611	1	1	[]	4611		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
+1039	205	2	4609	2	1	[]	4609		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
+1040	205	2	4610	1	1	[]	4610		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
 1041	206	2	4606	2	1	[]	4606		0	0	0	1	5	1	388	2000	0	FlashRushToBuy2	FlashToSnapUp
 1042	206	2	4608	2	1	[]	4608		0	0	0	1	10	1	200	1000	0	FlashRushToBuy2	FlashToSnapUp
 1043	206	2	4622	5	1	[]	4622		0	0	0	1	20	1	88	400	0	FlashRushToBuy2	FlashToSnapUp
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 13964b7..39fcee3 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -32,5 +32,5 @@
 11	30	1	{"1":[[4182,3,1],[923,5,1]],"2":[[4182,3,1],[923,5,1]],"3":[[4182,3,1],[923,5,1]]}	AccumulatedTopUp2
 12	6	0	{"1":[[4695,1,1],[912,1,1]],"2":[[4695,1,1],[912,1,1]],"3":[[4695,1,1],[912,1,1]]}	AccumulatedTopUp2
 12	30	1	{"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]}	AccumulatedTopUp2
-13	6	0	{"1":[[4007,2,1]],"2":[[4007,2,1]],"3":[[4007,2,1]]}	AccumulatedTopUp2
+13	6	0	{"1":[[4007,4,1]],"2":[[4007,4,1]],"3":[[4007,4,1]]}	AccumulatedTopUp2
 13	30	1	{"1":[[108,6,1],[109,2,1]],"2":[[108,6,1],[109,2,1]],"3":[[108,6,1],[109,2,1]]}	AccumulatedTopUp2
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 4669850..3eddb32 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -1,71 +1,71 @@
-MWID	LV	NeedExp	AddAttr	UnLockSkill	ActiveMWID	ItemAward	SoulID
-101	0	0		50000|55000|60000			
-102	0	0					
-102	1	20					
-102	2	20		50100|55100|60100			
-103	0	0					
-103	1	20					
-103	2	20		50400|55400|60400			
-104	0	0					
-104	1	20					
-104	2	20		150|250|350			
-105	0	0					
-105	1	20					
-105	2	20		50200|55200|60200			
-105	3	20	6_10000				
-106	0	0					
-106	1	20					
-106	2	50	7_300				
-106	3	80		50300|55300|60300			
-107	0	0					
-107	1	50					2
-107	2	100	6_15000				
-107	3	110					3
-107	4	120		50500|55500|60500			
-108	0	0					
-108	1	80	7_500				
-108	2	130					4
-108	3	150					6
-108	4	160		50600|55600|60600			
-109	0	0					
-109	1	90	6_20000				
-109	2	120					5
-109	3	150					7
-109	4	160		50700|55700|60700			
-110	0	0					
-110	1	70	7_500				
-110	2	150					8
-110	3	200					10
-110	4	260		50800|55800|60800			
-201	0	0		50900|55900|60900			
-202	0	0		50901|55901|60901			
-203	0	0		50902|55902|60902			
-204	0	0		50903|55903|60903			
-205	0	0		50904|55904|60904			
-206	0	0		50905|55905|60905			
-207	0	0		50906|55906|60906			
-208	0	0		50907|55907|60907			
-209	0	0		50908|55908|60908			
-210	0	0		50909|55909|60909			
-211	0	0		50910|55910|60910			
-212	0	0		50911|55911|60911			
-213	0	0		50912|55912|60912			
-214	0	0		50913|55913|60913			
-301	0	0					
-301	1	5					
-302	0	0		47100|47100|47100			
-304	0	0					
-305	0	0	46_3000				
-306	0	0	19_2000				
-307	0	0	60_3000				
-308	0	0	18_2000				
-111	0	0					
-111	1	50	6_20000				
-111	2	90					9
-111	3	110					1
-111	4	120		51000|56000|61000			
-112	0	0					
-112	1	80					
-112	2	170	7_1000				
-112	3	220					
-112	4	220		20049|20049|20049			
+MWID	LV	NeedExp	AddAttr	UnLockSkill	ActiveMWID	ItemAward	SoulID	PowerEx
+101	0	0		50000|55000|60000				
+102	0	0						
+102	1	20						
+102	2	20		50100|55100|60100				
+103	0	0						
+103	1	20						
+103	2	20		50400|55400|60400				
+104	0	0						
+104	1	20						
+104	2	20		150|250|350				
+105	0	0						
+105	1	20						
+105	2	20		50200|55200|60200				
+105	3	20	6_10000					
+106	0	0						
+106	1	20						
+106	2	50	7_300					
+106	3	80		50300|55300|60300				
+107	0	0						
+107	1	50					2	
+107	2	100	6_15000					
+107	3	110					3	
+107	4	120		50500|55500|60500				
+108	0	0						
+108	1	80	7_500					
+108	2	130					4	
+108	3	150					6	
+108	4	160		50600|55600|60600				
+109	0	0						
+109	1	90	6_20000					
+109	2	120					5	
+109	3	150					7	
+109	4	160		50700|55700|60700				
+110	0	0						
+110	1	70	7_500					
+110	2	150					8	
+110	3	200					10	
+110	4	260		50800|55800|60800				
+201	0	0		50900|55900|60900				
+202	0	0		50901|55901|60901				
+203	0	0		50902|55902|60902				
+204	0	0		50903|55903|60903				
+205	0	0		50904|55904|60904				
+206	0	0		50905|55905|60905				
+207	0	0		50906|55906|60906				
+208	0	0		50907|55907|60907				
+209	0	0		50908|55908|60908				
+210	0	0		50909|55909|60909				
+211	0	0		50910|55910|60910				
+212	0	0		50911|55911|60911				
+213	0	0		50912|55912|60912				
+214	0	0		50913|55913|60913				
+301	0	0						
+301	1	5						
+302	0	0		47100|47100|47100				0
+304	0	0						
+305	0	0	46_3000					
+306	0	0	19_2000					
+307	0	0	60_3000					
+308	0	0	18_2000					
+111	0	0						
+111	1	50	6_20000					
+111	2	90					9	
+111	3	110					1	
+111	4	120		51000|56000|61000				
+112	0	0						
+112	1	80						
+112	2	170	7_1000					
+112	3	220						
+112	4	220		20049|20049|20049				
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index a611400..c70e815 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -326,7 +326,7 @@
 10055	磐龙印圆形预警	10055	1	1	0	0	3000	1	0	0	2	4	42	6	0	12000	0	0	0	0	0	1010	10000	3014	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	11051	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
 10056	杏黄旗技能无预警	10056	1	1	0	0	0	1	0	0	1	0	41	7	0	6000	0	0	0	0	0	1010	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	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
 10057	杏黄旗普攻	10057	1	1	0	0	0	1	0	0	1	0	41	9	0	2600	0	0	0	0	0	1010	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	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
-10058	杏黄旗直线预警	10058	1	1	0	0	3000	1	0	0	12	15	41	6	0	14000	0	0	0	0	0	1010	50000	4320	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	11051	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
+10058	杏黄旗直线预警	10058	1	1	0	0	3000	1	0	0	12	15	41	6	0	14000	0	0	0	0	0	1010	50000	4010	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	11051	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
 10059	鬼牙刃技能无预警	10059	1	1	0	0	0	1	0	0	1	0	41	6	0	6000	0	0	0	0	0	1010	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	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
 10060	鬼牙刃普攻	10060	1	1	0	0	0	1	0	0	1	0	41	6	0	2600	0	0	0	0	0	1010	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	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
 10061	鬼牙刃圆形预警	10061	1	1	0	0	3000	1	0	0	2	6	40	6	0	12000	0	0	0	0	0	1010	50000	251	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	11052	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
@@ -779,7 +779,7 @@
 48080	万世不竭	48080	1	1	0	7	0	7	1	0	8	0	10	0	0	30000	0	0	0	0	0	1000	4000	0	1	4067	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	349830	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 48200	道法	48200	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	500	1200	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1178	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 48205	强击	48205	1	1	0	6	0	1	2	0	2	8	81	9	0	500	0	0	0	0	0	1010	10000	0	0	1200	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2945	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48210	风雷之变	48210	1	1	0	6	0	5	0	0	0	0	111	0	0	45000	0	0	0	0	0	2102	5000	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	500	0	0	0	0	0	0	0	0	0	0	0	0	2	10307	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48210	风雷之变	48210	1	1	0	6	0	16	1	0	0	0	111	0	0	45000	0	0	0	0	0	2104	5000	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	500	0	0	0	0	0	0	0	0	0	0	0	0	2	10307	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48215	灵通秘术	48215	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1000	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	944	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48220	凝神归元	48220	1	1	0	6	0	14	3	0	1	0	41	8	0	20000	0	0	0	0	0	4012	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1000	2000	0	0	0	0	0	0	0	0	0	0	0	0	2	2360	0	0	0	0	507	507	4	8	0	0	0	0	0	0
 48225	清明自在	48225	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	508	2	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	8260	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -802,7 +802,7 @@
 48302	致盲	48302	1	1	0	6	0	6	3	0	0	0	91	0	0	30000	0	0	0	0	0	117	5000	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	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
 48305	无常之力	48305	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	42244	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48310	无常之心	48310	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	508	5	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	105610	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48315	无常守护	48315	1	1	0	6	0	5	0	0	0	0	111	0	0	30000	0	0	0	0	0	2102	6000	0	0	4514	0	0	0	1011	1	1	0	4512	10000	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	369635	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48315	无常守护	48315	1	1	0	6	0	16	0	0	0	0	111	0	0	30000	0	0	0	0	0	2102	6000	0	0	4514	0	0	0	1011	1	1	0	4512	10000	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	369635	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48320	熊猫之力	48320	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3102	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48325	熊猫封印	48325	1	1	0	6	0	14	3	0	1	0	41	8	0	20000	0	0	0	0	0	16	4000	4	0	4012	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	7755	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48330	乾坤一掷	48330	1	1	0	6	0	5	0	0	0	0	10	0	0	30000	0	0	0	0	0	9	3000	3	0	10	3000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	27142	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -811,13 +811,13 @@
 48345	冰火魂体 	48345	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	509	4	3000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	58170	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48350	咆哮之力	48350	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	19297	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48355	九黎真身	48355	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	509	5	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	48242	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48360	妖虎之威	48360	1	1	0	6	0	5	0	0	0	0	111	0	0	60000	0	0	0	0	0	4501	6000	10000	0	2102	5500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	6000	0	0	0	0	0	0	0	0	0	0	0	0	2	168847	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48360	妖虎之威	48360	1	1	0	6	0	16	0	0	0	0	111	0	0	60000	0	0	0	0	0	4501	6000	10000	0	2102	5500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	6000	0	0	0	0	0	0	0	0	0	0	0	0	2	168847	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48365	咆哮之力	48365	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	6568	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48370	九黎真身	48370	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	509	5	3000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	57470	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48375	妖虎之威	48375	1	1	0	6	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	10000	0	4503	5000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	6000	0	0	0	0	0	0	0	0	0	0	0	0	2	22420	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48380	球球之力	48380	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1582	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48385	球球震慑	48385	1	1	0	6	0	17	3	0	1	0	91	8	0	40000	0	0	0	0	0	4004	10000	0	0	121	1500	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	3955	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48390	球球守护	48390	1	1	0	6	0	5	0	0	0	0	111	0	0	20000	0	0	0	0	0	2102	4000	0	0	13	2000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	13842	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48390	球球守护	48390	1	1	0	6	0	16	0	0	0	0	111	0	0	20000	0	0	0	0	0	2102	4000	0	0	13	2000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	13842	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48395	灵狐之力	48395	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1000	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1452	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48400	灵狐锁心	48400	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	509	2	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3630	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48405	灵狐之怒	48405	1	1	0	6	0	16	0	0	0	0	111	0	0	0	0	0	0	0	0	4039	20	0	0	4508	0	0	0	1011	1	1	0	74	5000	3	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	12705	0	0	0	0	0	0	4	0	0	0	0	0	0	0
@@ -838,7 +838,7 @@
 48480	雷震蛮力	48480	1	1	0	6	0	16	1	0	0	0	111	0	0	25000	0	0	0	0	0	4004	10000	0	0	76	1000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	25119	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48485	灵鲛之力	48485	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2240	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48490	灵鲛狂化	48490	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	508	3	200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	5600	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48495	灵鲛潜心	48495	1	1	0	6	0	5	0	0	0	0	111	0	0	20000	0	0	0	0	0	2102	3000	0	0	13	2000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	19600	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48495	灵鲛潜心	48495	1	1	0	6	0	16	0	0	0	0	111	0	0	20000	0	0	0	0	0	2102	3000	0	0	13	2000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	19600	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48500	剑客之力	48500	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2192	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48505	剑客之怒	48505	1	1	0	6	0	17	3	0	1	0	91	8	0	40000	0	0	0	0	0	4004	10000	0	0	121	1500	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	5480	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48510	剑客之殇	48510	1	1	0	6	0	16	0	0	0	0	111	0	0	0	0	0	0	0	0	4039	10	0	0	4508	0	0	0	1011	1	1	0	26	1000	1	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	19180	0	0	0	0	0	0	4	0	0	48200	0	0	0	0
@@ -847,7 +847,7 @@
 48525	狼牙利齿	48525	1	1	0	6	0	5	0	0	0	0	10	0	0	40000	0	0	0	0	0	9	3000	3	0	10	3000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	78302	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48530	雷蛟之力	48530	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2000	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	9121	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48535	雷蛟护体	48535	1	1	0	6	0	16	0	0	0	0	111	0	0	0	0	0	0	0	0	4039	10	0	0	4508	0	0	0	1011	1	1	0	13	10000	1	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	22802	0	0	0	0	0	0	4	0	0	48200	0	0	0	0
-48540	雷蛟之身	48540	1	1	0	6	0	5	0	0	0	0	111	0	0	40000	0	0	0	0	0	2102	2500	0	0	118	2000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	79807	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48540	雷蛟之身	48540	1	1	0	6	0	16	0	0	0	0	111	0	0	40000	0	0	0	0	0	2102	2500	0	0	118	2000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	79807	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49000	固本	49000	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	100	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1242	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49005	精准	49005	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	14	800	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3105	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49010	培元	49010	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	2	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	10867	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -1747,7 +1747,7 @@
 51188	折光	51165	24	25	2	3	0	20	0	0	0	0	0	0	0	0	55000	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	10000	0	0	0	0	0	0	51135	10	0	0	0	0	0	2	66000	0	0	0	0	0	0	0	4	0	51101	0	0	0	0
 51189	折光	51165	25	25	2	3	0	7	0	0	0	0	0	0	0	0	55000	0	0	0	0	4019	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	51135	10	0	0	0	0	0	2	70000	0	0	0	0	0	0	0	4	0	51101	0	0	0	0
 50900	烈焰之怒	50900	1	1	2	2	0	16	0	0	0	0	10	0	0	0	0	0	0	0	0	4039	10	0	0	4508	0	0	0	1011	1	1	0	74	35000	1	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3051	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50901	无敌决	50901	1	1	2	2	0	16	1	0	0	0	10	0	0	45000	0	0	0	0	0	4023	10000	3500	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	750	0	0	0	0	0	0	0	0	0	0	0	0	2	6543	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+50901	无敌决	50901	1	1	2	2	0	16	1	0	0	0	10	0	0	45000	0	0	0	0	0	4068	3500	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	750	0	0	0	0	0	0	0	0	0	0	0	0	2	6543	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 50902	乾元雷	50902	1	1	2	2	0	7	0	0	3	8	41	8	0	12000	0	0	0	0	0	1010	50000	0	0	1056	100	0	0	1200	5	0	0	4004	2000	0	0	1062	100000	0	1	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	9280	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50903	狂暴怒意	50903	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	4500	0	0	17	3000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	12623	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50904	九转玄功	50904	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4023	10000	0	0	83	1000	1	0	77	1000	1	0	83	1000	1	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	15022	0	0	0	0	0	0	0	4	0	0	0	0	0	0
@@ -3160,7 +3160,7 @@
 56189	折光	56165	25	25	4	3	0	7	0	0	0	0	0	0	0	0	55000	0	0	0	0	4019	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	56135	10	0	0	0	0	0	2	70000	0	0	0	0	0	0	0	4	0	56100	0	0	0	0
 55890	爆破key	55890	1	1	4	3	0	1	0	0	39	0	10	0	0	0	0	0	0	0	0	1014	55865	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	6000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55900	烈焰之怒	55900	1	1	4	2	0	16	0	0	0	0	10	0	0	0	0	0	0	0	0	4039	10	0	0	4508	0	0	0	1011	1	1	0	74	35000	1	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3051	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55901	无敌决	55901	1	1	4	2	0	16	1	0	0	0	10	0	0	45000	0	0	0	0	0	4023	10000	3500	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	750	0	0	0	0	0	0	0	0	0	0	0	0	2	6543	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+55901	无敌决	55901	1	1	4	2	0	16	1	0	0	0	10	0	0	45000	0	0	0	0	0	4068	3500	0	0	2004	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	750	0	0	0	0	0	0	0	0	0	0	0	0	2	6543	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 55902	乾元雷	55902	1	1	4	2	0	7	0	0	3	8	41	8	0	12000	0	0	0	0	0	1010	50000	0	0	1056	100	0	0	1200	5	0	0	4004	2000	0	0	1062	100000	0	1	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	9280	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55903	狂暴怒意	55903	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	4500	0	0	17	3000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	12623	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55904	九转玄功	55904	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4023	10000	0	0	83	1000	1	0	77	1000	1	0	83	1000	1	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	15022	0	0	0	0	0	0	0	4	0	0	0	0	0	0

--
Gitblit v1.8.0