From 61a63dd832c20ae2bd9e81d1ca56fbfff458a426 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 03 九月 2025 17:08:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt                |   83 +++++---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureItemLib.txt      |  106 +++++-----
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt                |   83 +++++---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushWorker.txt       |    7 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroQuality.txt          |   10 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc                                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagOrderInfo.txt         |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroQuality.txt          |   10 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc                            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt           |   11 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc                          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushCamp.txt         |    7 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.pyc                          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushWorker.txt       |    7 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt          |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagCTG.txt               |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagOrderInfo.txt         |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt           |   11 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc                  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureItemLib.txt      |  106 +++++-----
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt          |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushCamp.txt         |    7 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc                         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt        |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc                          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini                                         |   22 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushItem.txt         |   21 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc                            |    0 
 /dev/null                                                                                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagCTG.txt               |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc                            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc                        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt        |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/CollectionDefine.pyc     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushItem.txt         |   21 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GoldRush.pyc                       |    0 
 42 files changed, 315 insertions(+), 217 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 65c8a1e..47673ca 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1592,29 +1592,29 @@
 PacketSubCMD_2=0x24
 PacketCallFunc_2=OnUseTreeLVUPTimeItem
 
-;福地
-[PlayerMineArea]
-ScriptName = Player\PlayerMineArea.py
+;淘金
+[PlayerGoldRush]
+ScriptName = Player\PlayerGoldRush.py
 Writer = hxp
 Releaser = hxp
 RegType = 0
 RegisterPackCount = 4
 
 PacketCMD_1=0xB0
-PacketSubCMD_1=0x30
-PacketCallFunc_1=OnMineItemPull
+PacketSubCMD_1=0x36
+PacketCallFunc_1=OnGoldRushOP
 
 PacketCMD_2=0xB0
-PacketSubCMD_2=0x31
-PacketCallFunc_2=OnMineItemRefresh
+PacketSubCMD_2=0x37
+PacketCallFunc_2=OnGoldRushUnlock
 
 PacketCMD_3=0xB0
-PacketSubCMD_3=0x32
-PacketCallFunc_3=OnMineWorkerEmploy
+PacketSubCMD_3=0x38
+PacketCallFunc_3=OnGoldRushWarehouseAward
 
 PacketCMD_4=0xB0
-PacketSubCMD_4=0x35
-PacketCallFunc_4=OnMineHouseKeeperFreeUse
+PacketSubCMD_4=0x39
+PacketCallFunc_4=OnGoldRushAutoFreeUse
 
 ;仙盟攻城战
 [PlayerActFamilyGCZ]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
index 6158c84..ffaf91e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.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 90bb78f..f44cc09 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/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 1625729..07f37cd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 8c2627a..5a9ce40 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc
index 0bdb29e..c2b85b8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CTG.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GoldRush.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GoldRush.pyc
new file mode 100644
index 0000000..f509a5b
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GoldRush.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MineArea.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MineArea.pyc
deleted file mode 100644
index dd4f057..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MineArea.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.pyc
deleted file mode 100644
index 8602be3..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 828de2e..008ffbe 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/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 759053f..5f366db 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc
index 87493d2..b9899aa 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.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 5bb655b..b1f36da 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/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
index 976fb5a..24fa4a1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.pyc
new file mode 100644
index 0000000..6127f30
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldRush.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.pyc
index d61f86f..9591308 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.pyc
deleted file mode 100644
index 6713ec2..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
index 71ac7c0..9707bfa 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MineArea.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MineArea.pyc
deleted file mode 100644
index 78f696c..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MineArea.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/CollectionDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/CollectionDefine.pyc
index f4af00a..a545320 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/CollectionDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/CollectionDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.pyc
index 0fd7008..bb5cff9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Collections/DataServerPlayerData.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc
index 58fb926..c6860d5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.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 7150633..8b9991a 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index d0450a2..2fe817f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -375,11 +375,6 @@
 GubaoPiece	{"3":6,"4":6, "5":10}				
 GubaoAct	{"3":10, "4":50, "5":100}	1			
 Zhanling	{"1":[119], "2":[120], "3":[121], "4":[122], "5":[403], "6":[404], "7":[432], "8":[456], "9":[462], "10":[460], "11":[572]}		{"5":[458],"6":[405],"7":[433],"8":[457],"10":[461],"11":[573]}	{"5":4,"10":6}	
-MineAreaHousekeeper	2	[3, 7, 30]	[[574], [575]]	60	{"575":27}
-MineAreaWorker	[50,25,10,15]	481	[0, 30, 300, 600, 900, 1200, 1500, 1800, 2100, 2400]		
-MineAreaRefresh	{"0":[1, 10]}	{"1":2, "2":100}	50		
-MineAreaTreasure	[[], [269], [270]]	[5, 2, 1]	[[[20,1000,0]],  [[20,2500,0]],  [[20,10000,0]]]	{"0":"鼠宝","1":"金蟾","2":"貔貅"}	[1000, 800, 500]
-MineAreaHelp	10	[[6505,1,0]]			
 GatherTheSoulHole	6	1|10			
 HorsePetTrainAct	{"181":1, "4150":1, "4151":1, "4152":1, "4153":5, "4154":5, "4159":30, "4160":30}				
 OpenServerDailyAward	111111	[[541,64800,0]]			
@@ -422,12 +417,11 @@
 TreasureSet	{0:10,1:10}	{2330:[4318,4313,4323,4328,4358,4393,4383,4433,4348,4438,4388,4443,4363,4428,4343,4353],2331:[4319,4314,4324,4329,4359,4394,4384,4434,4349,4439,4389,4444,4364,4429,4344,4354],2332:[4320,4315,4325,4330,4360,4395,4385,4435,4350,4440,4390,4445,4365,4430,4345,4355],2214:[4183,4185,195,199]}	200		
 NewRoleInit	{100101:1,100104:2}	{510003:2}			
 HeroStarTalent	4	10	3	5	
-HeroWash	181	[20,40,60,100,150,230]			
+HeroWash	10	[20,40,60,100,150,230]			
 HeroRebirth	1	2			
 HeroAttrFormula	(lvValue+equipValue+bookValue)*(1+lineupHaloPer+bookPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue	(lvValue+equipValue+bookValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	int(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+(StunRate*StunRateRatio+SuperHitRate*SuperHitRateRatio+ComboRate*ComboRateRatio+MissRate*MissRateRatio+ParryRate*ParryRateRatio+SuckHPPer*SuckHPPerRatio+StunRateDef*StunRateDefRatio+SuperHitRateDef*SuperHitRateDefRatio+ComboRateDef*ComboRateDefRatio+MissRateDef*MissRateDefRatio+ParryRateDef*ParryRateDefRatio+SuckHPPerDef*SuckHPPerDefRatio+FinalDamPer*FinalDamPerRatio+FinalDamPerDef*FinalDamPerDefRatio+PhyDamPer*PhyDamPerRatio+PhyDamPerDef*PhyDamPerDefRatio+MagDamPer*MagDamPerRatio+MagDamPerDef*MagDamPerDefRatio+NormalSkillPer*NormalSkillPerRatio+NormalSkillPerDef*NormalSkillPerDefRatio+AngerSkillPer*AngerSkillPerRatio+AngerSkillPerDef*AngerSkillPerDefRatio+SuperDamPer*SuperDamPerRatio+SuperDamPerDef*SuperDamPerDefRatio+CurePer*CurePerRatio+CurePerDef*CurePerDefRatio+ShieldPer*ShieldPerRatio+ShieldPerDef*ShieldPerDefRatio+DOTPer*DOTPerRatio+DOTPerDef*DOTPerDefRatio+WeiFinalDamPer*WeiFinalDamPerRatio+WeiFinalDamPerDef*WeiFinalDamPerDefRatio+ShuFinalDamPer*ShuFinalDamPerRatio+ShuFinalDamPerDef*ShuFinalDamPerDefRatio+WuFinalDamPer*WuFinalDamPerRatio+WuFinalDamPerDef*WuFinalDamPerDefRatio+QunFinalDamPer*QunFinalDamPerRatio+QunFinalDamPerDef*QunFinalDamPerDefRatio)/100.0)	SkillPower*OfficialLV	
 DownReward	[(20,500,1),(2,1,1),(911,1,1)] 	20	[[150,50,0],[181,10,0],[4151,10,0],[3,1,0]]	1	1
 DailyPackBuyGift	{"0":[[20,10,0]], "1":[[2222,1,0],[1099,1,0],[20,100,0]], "2":[[2222,1,0],[4694,1,0],[20,50,0]], "3":[[2222,3,0],[1099,3,0],[20,150,0]]}	{"1":[146], "2":[147], "3":[148]}	[149]	10	
-EquipGSFormula	int(MaxHP/4.0+MinAtk*5.0+MaxAtk*5.0+Def*5.0+IceAtk*10.0+IceDef*10.0+LuckyHit*2.5+LuckyHitReduce*2.5+FabaoHurt*5.0+FinalHurt*5.0+FinalHurtReduce*5.0+BaseEquipMaxHPAddPer/10000.0+BaseEquipAtkAddPer/10000.0+PerLVMaxHP+PerLVAtk/10000.0+Hit/10000.0+Miss/10000.0+DropMoneyPer/10000.0+LuckyHitRate/10000.0+LuckyHitRateReduce/10000.0+LuckyHitPer/10000.0+SuperHitRate/10000.0+SuperHitRateReduce/10000.0+SuperHitPer/10000.0+SuperHit/10000.0+SuperHitReduce/10000.0+DropEquipPer*1.45+AtkBackHP*10.0+MaxHPPer/10000.0+AtkPer/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+SkillAddPerA/10000.0+SkillAddPerB/10000.0+SkillAddPerC/10000.0+SkillAddPerD/10000.0+SkillAddPerE/10000.0+SkillAddPerF/10000.0+SkillAddPerG/10000.0+SkillReducePerA/10000.0+SkillReducePerB/10000.0+SkillReducePerC/10000.0+SkillReducePerD/10000.0+SkillReducePerE/10000.0+SkillReducePerF/10000.0+SkillReducePerG/10000.0+ReduceSkillCDPer/10000.0+LuckyHitPer/10000.0+FaintDefRate/10000.0+ProDefPer/10000.0+IgnoreDefRate/10000.0+IgnoreDefRateReduce/10000.0)	[67,68,6,7,8,16,139,13,136,26,27]	int(MaxHP/4.0+Atk*10.0+Def*5.0+IceAtk*10.0+IceDef*10.0+SuperHit*5.0+SuperHitReduce*5.0+PetDamPer/10000.0+SuperHitRateReduce/10000.0+Miss/10000.0+Hit/10000.0+DropMoneyPer/10000.0+PerLVMaxHP+PerLVAtk/10000.0)	{"45000":18000,"45001":18000,"45002":35000,"45003":70000,"45004":90000}	0
 PlayerMaxLV	1000	-1	0	0	0
 ZhanchuiCost	2	2			
 Mainline	10	15	20		
@@ -446,3 +440,6 @@
 CureFormula	int(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))				
 InvestCost	{}	{}	{"7":[101],"12":[102]} 	{}	{}
 InvestMaxDay	{"7":28,"12":0}	[7,8]			
+GoldRush	12|12	60|60	10		
+GoldRushAuto	[3, 7, 30]	[[1], [2]]			
+GoldRushRefresh	1	42	[10,20,30,40,50]	30	{"1":195}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushCamp.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushCamp.txt
new file mode 100644
index 0000000..b4db423
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushCamp.txt
@@ -0,0 +1,7 @@
+CampID	PanningUnlock	MoneyUnlock
+1	0	
+2	0	
+3	20	
+4	50	
+5	0	1|1000
+6	0	1|2000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushItem.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushItem.txt
new file mode 100644
index 0000000..cb7e193
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushItem.txt
@@ -0,0 +1,21 @@
+GoldID	ItemID	ItemLV	ItemCount	RefreshWeight	WorkerMax	NeedSeconds
+1	2	1	500	50	1	60
+2	2	2	1000	40	2	75
+3	2	3	1500	30	3	90
+4	2	4	2000	20	3	105
+5	2	5	2500	10	3	120
+6	3	1	5	50	1	60
+7	3	2	10	40	2	75
+8	3	3	15	30	3	90
+9	3	4	20	20	3	105
+10	3	5	30	10	3	120
+11	4	1	1	50	1	60
+12	4	2	2	40	2	75
+13	4	3	3	30	3	90
+14	4	4	4	20	3	105
+15	4	5	5	10	3	120
+16	1	1	5	50	1	60
+17	1	2	8	40	2	75
+18	1	3	10	30	3	90
+19	1	4	15	20	3	105
+20	1	5	30	10	3	120
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushWorker.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushWorker.txt
new file mode 100644
index 0000000..f9424e0
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/GoldRushWorker.txt
@@ -0,0 +1,7 @@
+WorkerID	PlayerLVUnlock	MoneyUnlock
+1	0	
+2	0	
+3	60	
+4	120	
+5	0	1|1500
+6	0	1|3000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroQuality.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroQuality.txt
index 3304c8e..94a6252 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroQuality.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroQuality.txt
@@ -1,6 +1,6 @@
 Quality	InitTalentWeight	InitStarUpper	InitAddPer	LVAddPer	BreakLVAddPer	StarAddPer	BookActAwardMoney	BookInitAddPer	BookStarAddPer	BookBreakLVAddPer	DismissReturnItems
-1	[[100,1]]	40	300	5	100	100	1|30	100	100	100	[[7,10], [8,1]]
-2	[[100,1]]	40	600	10	100	150	1|50	150	150	100	[[7,20], [8,2]]
-3	[[100,2]]	40	900	20	100	200	1|100	200	200	100	[[7,30], [8,3]]
-4	[[100,3]]	40	1200	25	100	250	1|200	250	250	100	[[7,40], [8,4]]
-5	[[60,4], [40,5]]	40	1500	30	100	300	1|300	300	300	100	[[7,50], [8,5]]
+1	[[100,1]]	40	300	10	200	100	1|100	100	100	100	[[7,10],[8,1]]
+2	[[100,1]]	40	600	10	200	100	1|100	100	100	100	[[7,20],[8,2]]
+3	[[100,2]]	40	900	10	200	100	1|100	100	100	100	[[7,50],[8,5]]
+4	[[100,3]]	40	1200	15	200	150	1|100	100	100	100	[[7,100],[8,10]]
+5	[[60,4],[40,5]]	40	1500	20	200	200	1|200	100	100	100	[[7,300],[8,30]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
index bcf00f2..c49d13c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -1,13 +1,21 @@
 SkillID	SkillTypeID	SkillLV	SkillMaxLV	SkillName	FuncType	SkillType	HurtType	AtkType	TagAim	TagFriendly	TagAffect	TagCount	CalcType	SkillPer	SkillValue	HappenRate	EffectID1	EffectValues1	TriggerWay1	TriggerSrc1	EffectID2	EffectValues2	TriggerWay2	TriggerSrc2	EffectID3	EffectValues3	TriggerWay3	TriggerSrc3	CoolDownTime	IgnoreStates	BuffState	LastTime	LayerCnt	LayerMax	BuffRepeat	DieContinue	FightPower	SkillMotionName
 100	100	1	1	通用反击	4	1	1	1	0	0	0	1	0	10000	0	10000	0				0				0				0			0	0	0	0	0	0	
-200	200	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	10000	0				0				0				0		3	1	0	0	6	0	0	
-201	201	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	2000	0				0				0				0		3	1	0	0	6	0	0	
-300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	6	0	0	
-301	301	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	2	0	0	6	0	0	
-302	302	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	5000	0				0				0				0		1	2	0	0	6	0	0	
-304	304	1	1	灼烧	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		4	1	0	0	6	0	0	
-305	305	1	1	沉默	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		10	1	0	0	6	0	0	
-1001	1001	1	1	暴击	0	5	0	0	5	1	0	1	0	10000	0	10000	35	10000|1			0				0				0								0	
+200	200	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	10000	0				0				0				0		3	1	0	0	0	0	0	
+201	201	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	2000	0				0				0				0		3	1	0	0	0	0	0	
+300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	0	0	0	
+301	301	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	2	0	0	0	0	0	
+302	302	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	5000	0				0				0				0		1	2	0	0	0	0	0	
+1001	1001	1	1	暴击	0	5	0	0	5	1	0	1	0	10000	0	10000	35	10000|1			0				0				0			99	0	0	0	0	0	
+1002	1002	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	36	10000|1			0				0				0			99	0	0	0	0	0	
+1003	1003	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	37	10000|1			0				0				0			99	0	0	0	0	0	
+1004	1004	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	38	10000|1			0				0				0			99	0	0	0	0	0	
+1005	1005	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	39	10000|1			0				0				0			99	0	0	0	0	0	
+1006	1006	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	40	10000|1			0				0				0			99	0	0	0	0	0	
+1007	1007	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	41	10000|1			0				0				0			99	0	0	0	0	0	
+1008	1008	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	42	10000|1			0				0				0			99	0	0	0	0	0	
+1009	1009	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	43	10000|1			0				0				0			99	0	0	0	0	0	
+1010	1010	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	44	10000|1			0				0				0			99	0	0	0	0	0	
+1011	1011	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	45	10000|1			0				0				0			99	0	0	0	0	0	
 100101	100101	1	1	枭影	1	1	1	1	0	0	1	1	0	10000	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
 100102	100102	1	1	噬魄	2	1	1	1	4	0	0	2	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerskill
 100107	100107	1	1	鹰视	3	1	1	0	1	0	0	1	0	10000	0	10000	0		13		0				0				0				0	0	0	0	0	
@@ -17,7 +25,7 @@
 1002011	1002011	1	1	登先	0	4	2	1001	6	0	0	0	0	2000	0	5000	5001		4	2	5002	2|3|0|300	13		0				0		2	4	1	0	4	0	0	
 100202	100202	1	1	疾霆破垒	2	1	2	1	1	0	0	1	0	35600	0	10000	5010	1002021	13		0				0				0		0	0	0	0	0	0	0	angerskill
 1002021	1002021	1	1	疾霆破垒	0	6	0	1001	6	0	0	0	0	0	0	5000	17	5000|2			0				0				0		0	1	0	0	0	0	0	
-100203	1002011	1	1	炬石	0	6	1	0	6	0	0	0	0	0	0	8000	0				0				0				0			3	1	0	0	0	0	
+100203	1002011	1	1	炬石	0	6	1	0	6	0	0	0	0	0	0	8000	0				0				0				0		0	3	1	0	0	0	0	
 100205	100205	1	1	威震逍遥	3	9	0	0	5	1	0	0	0	22000	0	10000	0				0				0				0	0			0	0	0	0	0	
 100207	100207	1	1	折冲	3	9	0	0	5	1	0	0	0	18500	0	10000	0				0				0				0	0			0	0	0	0	0	
 100208	100208	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
@@ -47,22 +55,22 @@
 100508	100508	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100509	100509	1	1	升变	3	1	0																														0	
 100601	100601	1	1	寒星	1	1	2	1	3	0	0	1	0	10000	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	attack
-100602	100602	1	1	寒霜叠嶂	2	1	2	1	3	0	0	3	0	18500	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerskill
+100602	100602	1	1	寒霜叠嶂	2	1	2	1	3	0	0	3	0	18500	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerSkill
 100603	100603	1	1	朔风	3	1	2																														0	
 100605	100605	1	1	怒雪	3	9	0																														0	
 100607	100607	1	1	凝霜	3	9																															0	
 100608	100608	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100609	100609	1	1	升变	3	1																															0	
-100701	100701	1	1	博望	1	1	1	1	1	0	0	1	0	8000	0	10000	5010	201	13		0				0							0					0	attack
-100702	100702	1	1	仁者之壁	2	1	1	1	2	0	0	3	0	7000	0	10000					0				0							0					0	angerskill
+100701	100701	1	1	博望	1	1	1	1	1	0	0	1	0	8000	0	10000	5010	201	13		0				0				0		0	0	0	0	0	0	0	attack
+100702	100702	1	1	仁者之壁	2	1	1	1	2	0	0	3	0	7000	0	10000					0				0				0		0	0	0	0	0	0	0	angerskill
 1007021	1007021	1	1	仁者之壁	0	4	2	1001	6	0	0	0	0	2000	0	10000	5001		4	2	5002	2|3|0|300	13		0				0		2	4	1	0	4	0	0	
 100703	100703	1	1	守义	3	9																															0	
 100705	100705	1	1	淯水护驾	3	1																															0	
 100707	100707	1	1	山阳遗风	3	9																															0	
 100708	100708	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100709	100709	1	1	升变	3	9																															0	
-100801	100801	1	1	太素	1	2	2	2	2	1	0	3	0	3000	0	10000	0															0					0	attack
-100802	100802	1	1	广陵止息	1	2	2	2	0	1	0	6	0	15500	0	10000	0															0					0	angerskill
+100801	100801	1	1	太素	1	2	2	2	2	1	0	3	0	3000	0	10000	0												0			0					0	attack
+100802	100802	1	1	广陵止息	1	2	2	2	0	1	0	6	0	15500	0	10000	0												0			0					0	angerskill
 100803	100803	1	1	回还	3	9																															0	
 100805	100805	1	1	生机	3	9																															0	
 100807	100807	1	1	续命	3																																0	
@@ -79,9 +87,9 @@
 100909	100909	1	1	升变	3																																0	
 101001	101001	1	1	穿杨	1	1	1	1	3	0	0	1	0	10500	0	10000	5010	[1010011,[1]]	6		0				0				0		0	0	0	0	0	0	0	attack
 1010011	1010011	1	1	穿杨	0	3	0	1001	5	1	0	1	0	0	0	10000	23	5000|1			0				0				0		0	1	0	0	0	0	0	
-101002	101002	1	1	洞彻寒川	2	1	1	1	3	0	0	1	0	38000	0	10000	5010	[1010021,[1]]	6		0				0				0		0	0	0	0	0	0	0	angerskill
+101002	101002	1	1	洞彻寒川	2	1	1	1	3	0	0	1	0	38000	0	10000	5010	[1010021,[1]]	6		0				0				0		0	0	0	0	0	0	0	angerSkill
 1010021	1010021	1	1	洞彻寒川	0	4	0	1001	6	0	0	0	0	0	0	10000	7	10000|2			0				0				0		0	1	0	0	0	0	0	
-101003	101003	1	1	先机	3	1	1	1	3	0	0	1	0	18000	0	10000	5010	300	13		0				0				0		0	0	0	0	0	0	0	passiveskill
+101003	101003	1	1	先机	3	1	1	1	3	0	0	1	0	18000	0	10000	5010	300	13		0				0				0		0	0	0	0	0	0	0	passiveSkill
 101005	101005	1	1	戮神	3																																0	
 101007	101007	1	1	归墟	3																																0	
 101008	101008	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
@@ -96,14 +104,14 @@
 101109	101109	1	1	升变	3																																0	
 101201	101201	1	1	魅魉	1	1	2	1	0	0	0	3	0	3000	0	10000	5010	1012011	13		0				0				0	0	0	0	0	0	0	0	0	attack
 1012011	1012011	1	1	魅魉	0	4	0	1001	6	0	0	0	0	0	0	3000	5010	300			0				0				0	0	1	1	0	0	0	0	0	
-101202	101202	1	1	冢虎蚀谋	2	1	2	1	0	0	0	6	0	7000	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerskill
+101202	101202	1	1	冢虎蚀谋	2	1	2	1	0	0	0	6	0	7000	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerSkill
 101203	101203	1	1	血鉴	3																																0	
-101205	101205	1	1	返照	3	1	2	0	0	0	0	6	0	10000	0	10000	0																				0	passiveskill
+101205	101205	1	1	返照	3	1	2	0	0	0	0	6	0	10000	0	10000	0												0								0	passiveSkill
 101207	101207	1	1	饮真止渴	3																																0	
 101208	101208	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 101209	101209	1	1	升变	3																																0	
 101301	101301	1	1	回春	1	1	2	1	1	0	0	1	0	6500	0	10000	5010	1013011	13		0				0				0	0	0	0	0	0	0	0	0	attack
-1013011	1013011	1	1	回春	0	2	2	2	0	1	1	2	0	9000	0	10000													0	0	0	0	0	0	0	0	0	
+1013011	1013011	1	1	回春	0	2	2	1002	0	1	1	2	0	9000	0	10000													0	0	0	0	0	0	0	0	0	
 101302	101302	1	1	鹤唳霜华	2	2	2	2	0	1	1	2	0	12000	0	10000	5010	1013021	13		0				0				0	0	0	0	0	0	0	0	0	angerskill
 1013021	1013021	1	1	鹤唳霜华	0	5	0	1003	6	0	0	2	0	20000	0	10000	0				0				0				0		0	3	0	0	0	0	0	
 101303	101303	1	1	织命	3																																0	attack
@@ -111,10 +119,10 @@
 101307	101307	1	1	九霄环佩	3																																0	
 101308	101308	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 101309	101309	1	1	升变	3																																0	
-101401	101401	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	10000	5010	1014011	13																		0	attack
+101401	101401	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	10000	5010	1014011	13										0		0	0	0	0	0	0	0	attack
 1014011	1012011	1	1	铭霜	0	4	0	1001	6	0	0	0	0	0	0	5000	5010	300			0				0				0	0	1	1	0	0	0	0	0	
-101402	101402	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	10000	5010	1014021																			0	angerskill
-1014021	1014021	1	1	朔雪龙骧		2	2	2	5	1	0	1	0	10000	0	10000																					0	
+101402	101402	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	10000	5010	1014021											0		0	0	0	0	0	0	0	angerskill
+1014021	1014021	1	1	朔雪龙骧		2	2	2	5	1	0	1	0	10000	0	10000													0		0	0	0	0	0	0	0	
 101403	101403	1	1	断虹	3																																0	
 101405	101405	1	1	玉翎	3																																0	
 101407	101407	1	1	威压三辰	3																																0	
@@ -122,7 +130,7 @@
 101409	101409	1	1	升变	3																																0	
 101501	101501	1	1	崩云	1	1	1	1	1	0	0	1	0	8000	0	10000	5010	[1015011,[1,3,12]]	13		0				0				0		0	0	0	0	0	0	0	attack
 1015011	1015011	1	1	崩云	0	5	0	1003	5	0	0	0	1	1000	0	10000	0				0				0				0		0	0	0	0	0	0	0	
-101502	101502	1	1	北溟嘲风	2	5	1	1003	5	0	0	0	1	2000	0	10000	5010	1015021	13	2	5011	302	11	2	5011	301	12	101502	0		0	2	0	0	0	0	0	angerskill
+101502	101502	1	1	北溟嘲风	2	5	1	1003	5	0	0	0	1	2000	0	10000	5010	1015021	13	2	5011	302	11	2	5011	301	12	101502	0		0	2	0	0	0	0	0	angerSkill
 1015021	1015021	1	1	北溟嘲风	0	6	1	0	0	0	4	2	0	0	0	10000	0				0				0				0		9	1	0	0	5	0	0	
 101503	101503	1	1	铁壁	3																																0	
 101505	101505	1	1	返咒	3																																0	
@@ -158,45 +166,50 @@
 200307	200307	1	1	山峦	3																																0	
 200308	200308	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200309	200309	1	1	升变	3																																0	
-200401	200401	1	1	观星	1	1	2	1	1	0	0	1	0	120	0	10000	5010	2004011	13		0				0				0		0	0	0	0	0	0	0	
-2004011	2004011	1	1	观星	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200401	13		0				0				0		0	0	0	0	0	0	0	
+200401	200401	1	2	观星	1	1	2	1	1	0	0	1	0	12000	0	10000	5010	2004011	13		0				0				0		0	0	0	0	0	0	0	
+2004011	2004011	1	2	观星	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200401	13		0				0				0		0	0	0	0	0	0	0	
 200402	200402	1	1	天机星杼	2	6	0	0	5	1	0	1	0	0	0	10000	25	4000|1			0				0				0		0	2	0	0	0	0	0	
-200403	200403	1	1	逐月	3																																0	
+200403	200401	2	2	逐月	1	1	2	1	1	0	0	1	0	15000	0	10000	5010	2004011	13		0				0				0		0	0	0	0	0	0	0	
+2004031	2004011	2	2	逐月	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200401	13		0				0				0		0	0	0	0	0	0	0	
 200405	200405	1	1	追光	3																																0	
 200407	200407	1	1	聚元	3																																0	
 200408	200408	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200409	200409	1	1	升变	3																																0	
 200501	200501	1	1	重岳	1	1	1	1	1	0	0	1	0	12000	0	10000	5010	2005011	13		0				0				0		0	0	0	0	0	0	0	
 2005011	2005011	1	1	重岳	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200501	13		0				0				0		0	0	0	0	0	0	0	
-200502	200502	1	1	金戈铁马	2	1	1	1	1	0	1	1	0	25000	0	10000																					0	
+200502	200502	1	1	金戈铁马	2	1	1	1	1	0	1	1	0	25000	0	10000													0		0	0	0	0	0	0	0	
 200503	200503	1	1	狂澜	3																																0	
 200505	200505	1	1	龙骧	3																																0	
 200507	200507	1	1	死地	3																																0	
 200508	200508	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200509	200509	1	1	升变	3																																0	
-200601	200601	1	1	甘泉	1	1	2	1	1	0	0	1	0	9500	0	10000																					0	
-200602	200602	1	1	云梦泽被	2																																0	
+200601	200601	1	1	甘泉	1	1	2	1	1	0	0	1	0	9500	0	10000	5010	2006011	13		0				0				0		0	0	0	0	0	0	0	
+2006011	2006011	1	1		0	2	0	1002	0	1	1	1	0	9500	0	10000					0				0				0		0	0	0	0	0	0		
+200602	200602	1	1	云梦泽被	2	2	0	2	0	1	1	2	0	26000	0	10000	6	2000|1	13		0				0				0		0	2	0	0	0	0	0	
 200603	200603	1	1	魂梦	3																																0	
 200605	200605	1	1	解佩	3																																0	
 200607	200607	1	1	凌波	3																																0	
 200608	200608	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200609	200609	1	1	升变	3																																0	
-200701	200701	1	1	炫彩	1																																0	
-200702	200702	1	1	明镜止水	2																																0	
+200701	200701	1	1	炫彩	1	1	1	1	0	0	0	1	0	8500	0	10000	5010	2007011	13		0				0				0		0	0	0	0	0	0	0	
+2007011	2007011	1	1	炫彩	0	6	0	1001	6	0	0	0	0	0	0	3000	5010	2007051	13		0				0				0		0	0	0	0	0	0		
+200702	200702	1	1	明镜止水	2																0				0				0								0	
 200703	200703	1	1	霓裳	3																																0	
 200705	200705	1	1	虹鳞	3																																0	
 200707	200707	1	1	浣纱	3																																0	
 200708	200708	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200709	200709	1	1	升变	3																																0	
-200801	200801	1	1	啸林	1																																0	
-200802	200802	1	1	春秋刀域	2																																0	
+200751	200751	1	1	追击	0	1	1	1	0	0	0	1	0	8000	0	10000	0				0				0				0		0	0	0	0	0	0		
+200801	200801	1	1	啸林	1	1	2	1	2	0	0	3	0	5000	0	10000	0				0				0				0		0	0	0	0	0	0	0	
+200802	200802	1	1	春秋刀域	2	1	2	1	2	0	0	3	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	
 200803	200803	1	1	刀意盈袖	3																																0	
 200805	200805	1	1	踏雪	3																																0	
 200807	200807	1	1	破虚	3																																0	
 200808	200808	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200809	200809	1	1	升变	3																																0	
-200901	200901	1	1	铁索横江	1																																0	
-200902	200902	1	1	火凤燎原	2																																0	
+200901	200901	1	1	铁索横江	1	1	2	1	0	0	0	1	0	7000	0	10000	22	2000|2	13	2												1					0	
+200902	200902	1	1	火凤燎原	2	1	2	1	0	0	0	6	0	7500	0	10000																					0	
+2009021	2009021	1	1	火凤燎原	0	4	2	1001	6	0	0	0	0	2000	0	5000	5001		4	2	5002	2|3|0|300	13		0				0		2	4	1	0	4	0	0	
 200903	200903	1	1	连环	3																																0	
 200905	200905	1	1	余火	3																																0	
 200907	200907	1	1	断谋	3																																0	
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt
index c18dbf7..9b81423 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt
@@ -1,3 +1,3 @@
 TreasureType	MinLV	GridItemInfo	GridLibInfo	JobItemList	GridItemRateListFree	GridItemRateList1	GridItemRateList2	GridItemRateList3	LuckyItemRateList
-12	0	{}	{"2":102, "3":103, "4":104, "5":105}	[]	[]	[(5700,2),(8700,3),(9700,4),(10000,5)]	[(9000,4),(1000,5)]	{}	[]
-13	0	{}	{"5":105}	[]	[]	[(10000,5)]	[]	{}	[]
+12	0	{}	{"1":101,"2":102,"3":103,"4":104,"5":105}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[(8000,4),(10000,5)]	{}	[]
+13	0	{}	{"4":104,"5":105}	[]	[]	[(8000,4),(10000,5)]	[]	{}	[]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureItemLib.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureItemLib.txt
index 2c0c051..bd8599e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureItemLib.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureItemLib.txt
@@ -1,5 +1,5 @@
 LibID	ItemID	ItemCount	ItemWeight
-102	510001	1	100
+101	510001	1	100
 102	510002	1	100
 102	510003	1	100
 103	510004	1	100
@@ -9,57 +9,57 @@
 104	510008	1	100
 104	510009	1	100
 104	510010	1	100
-104	510011	1	90
+104	510011	1	100
 105	510012	1	100
 105	510013	1	100
-105	510014	1	90
-105	510015	1	0
-105	510016	1	0
-102	520001	1	0
-102	520002	1	0
-102	520003	1	0
-103	520004	1	0
-103	520005	1	0
-103	520006	1	0
-103	520007	1	0
-104	520008	1	0
-104	520009	1	0
-104	520010	1	0
-104	520011	1	0
-105	520012	1	0
-105	520013	1	0
-105	520014	1	0
-105	520015	1	0
-105	520016	1	0
-102	530001	1	0
-102	530002	1	0
-102	530003	1	0
-103	530004	1	0
-103	530005	1	0
-103	530006	1	0
-103	530007	1	0
-104	530008	1	0
-104	530009	1	0
-104	530010	1	0
-104	530011	1	0
-105	530012	1	0
-105	530013	1	0
-105	530014	1	0
-105	530015	1	0
-105	530016	1	0
-102	540001	1	0
-102	540002	1	0
-102	540003	1	0
-103	540004	1	0
-103	540005	1	0
-103	540006	1	0
-103	540007	1	0
-104	540008	1	0
-104	540009	1	0
-104	540010	1	0
-104	540011	1	0
-105	540012	1	0
-105	540013	1	0
-105	540014	1	0
-105	540015	1	0
-105	540016	1	0
+105	510014	1	100
+105	510015	1	100
+105	510016	1	100
+101	520001	1	100
+102	520002	1	100
+102	520003	1	100
+103	520004	1	100
+103	520005	1	100
+103	520006	1	100
+103	520007	1	100
+104	520008	1	100
+104	520009	1	100
+104	520010	1	100
+104	520011	1	100
+105	520012	1	100
+105	520013	1	100
+105	520014	1	100
+105	520015	1	100
+105	520016	1	100
+101	530001	1	100
+102	530002	1	100
+102	530003	1	100
+103	530004	1	100
+103	530005	1	100
+103	530006	1	100
+103	530007	1	100
+104	530008	1	100
+104	530009	1	100
+104	530010	1	100
+104	530011	1	100
+105	530012	1	100
+105	530013	1	100
+105	530014	1	100
+105	530015	1	100
+105	530016	1	100
+101	540001	1	100
+102	540002	1	100
+102	540003	1	100
+103	540004	1	100
+103	540005	1	100
+103	540006	1	100
+103	540007	1	100
+104	540008	1	100
+104	540009	1	100
+104	540010	1	100
+104	540011	1	100
+105	540012	1	100
+105	540013	1	100
+105	540014	1	100
+105	540015	1	100
+105	540016	1	100
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt
index 52e5396..13d20ae 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt
@@ -1,3 +1,3 @@
 TreasureType	PackType	CheckPack	IsActType	DailyMaxCount	DailyFreeCount	TreasureCountList	RecycleItemMail	CostItemID	CostItemCountList	CostMoneyType	CostMoneyList	EnsureCount	OnceLucky	FullLucky	LuckyRateFormat	LuckyGridNum	GridNumMaxLimitInfo	NotifyGridNumList	NotifyKey	AwardMoneyType	AwardMoneyValue
-12	35	1	0	99999	1	[1, 10]		5	[1, 10]	1	[200, 2000]	20	0	0	baseRate	0	{}	[5,6]		51	10
+12	35	1	0	99999	1	[1, 10]		5	[1, 10]	1	[200, 2000]	100	0	0	baseRate	0	{}	[5,6]		51	10
 13	35	1	0	99999	0	[1, 10]		0	[]	51	[1000]	0	0	0	baseRate	0	{}	[]		0	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagCTG.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagCTG.txt
index 6172558..60cf47b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagCTG.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagCTG.txt
@@ -1,4 +1,6 @@
 RecordID	CanResetBuyCount	TotalBuyCount	DailyBuyCount	WeekBuyCount	MonthBuyCount	MoneyType	GainGold	GainGoldPaper	FirstGoldPaperPrize	GainItemList	ActWorldLVGainItemInfo	SelectItemInfo	NotifyMark	PayType
+1	0	0	0	0	0	0	0	0	0	[]	{}			0
+2	0	0	0	0	0	0	0	0	0	[]	{}			0
 100	0	0	1	0	0	0	0	0	0	[]	{}			1
 101	1	0	0	0	0	1	60	6	60	[]	{}			2
 102	1	0	0	0	0	1	300	30	300	[]	{}			2
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagOrderInfo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagOrderInfo.txt
index be61a08..b864057 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagOrderInfo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/tagOrderInfo.txt
@@ -17,3 +17,5 @@
 test.cz.6	test	198	106	0	1980	198
 test.cz.7	test	328	107	0	3280	328
 test.cz.8	test	648	108	0	6480	648
+test.taojinzd.week	test	6	1	0	60	6
+test.taojinzd.month	test	18	2	0	180	18
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
index d0450a2..2fe817f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -375,11 +375,6 @@
 GubaoPiece	{"3":6,"4":6, "5":10}				
 GubaoAct	{"3":10, "4":50, "5":100}	1			
 Zhanling	{"1":[119], "2":[120], "3":[121], "4":[122], "5":[403], "6":[404], "7":[432], "8":[456], "9":[462], "10":[460], "11":[572]}		{"5":[458],"6":[405],"7":[433],"8":[457],"10":[461],"11":[573]}	{"5":4,"10":6}	
-MineAreaHousekeeper	2	[3, 7, 30]	[[574], [575]]	60	{"575":27}
-MineAreaWorker	[50,25,10,15]	481	[0, 30, 300, 600, 900, 1200, 1500, 1800, 2100, 2400]		
-MineAreaRefresh	{"0":[1, 10]}	{"1":2, "2":100}	50		
-MineAreaTreasure	[[], [269], [270]]	[5, 2, 1]	[[[20,1000,0]],  [[20,2500,0]],  [[20,10000,0]]]	{"0":"鼠宝","1":"金蟾","2":"貔貅"}	[1000, 800, 500]
-MineAreaHelp	10	[[6505,1,0]]			
 GatherTheSoulHole	6	1|10			
 HorsePetTrainAct	{"181":1, "4150":1, "4151":1, "4152":1, "4153":5, "4154":5, "4159":30, "4160":30}				
 OpenServerDailyAward	111111	[[541,64800,0]]			
@@ -422,12 +417,11 @@
 TreasureSet	{0:10,1:10}	{2330:[4318,4313,4323,4328,4358,4393,4383,4433,4348,4438,4388,4443,4363,4428,4343,4353],2331:[4319,4314,4324,4329,4359,4394,4384,4434,4349,4439,4389,4444,4364,4429,4344,4354],2332:[4320,4315,4325,4330,4360,4395,4385,4435,4350,4440,4390,4445,4365,4430,4345,4355],2214:[4183,4185,195,199]}	200		
 NewRoleInit	{100101:1,100104:2}	{510003:2}			
 HeroStarTalent	4	10	3	5	
-HeroWash	181	[20,40,60,100,150,230]			
+HeroWash	10	[20,40,60,100,150,230]			
 HeroRebirth	1	2			
 HeroAttrFormula	(lvValue+equipValue+bookValue)*(1+lineupHaloPer+bookPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue	(lvValue+equipValue+bookValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	int(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+(StunRate*StunRateRatio+SuperHitRate*SuperHitRateRatio+ComboRate*ComboRateRatio+MissRate*MissRateRatio+ParryRate*ParryRateRatio+SuckHPPer*SuckHPPerRatio+StunRateDef*StunRateDefRatio+SuperHitRateDef*SuperHitRateDefRatio+ComboRateDef*ComboRateDefRatio+MissRateDef*MissRateDefRatio+ParryRateDef*ParryRateDefRatio+SuckHPPerDef*SuckHPPerDefRatio+FinalDamPer*FinalDamPerRatio+FinalDamPerDef*FinalDamPerDefRatio+PhyDamPer*PhyDamPerRatio+PhyDamPerDef*PhyDamPerDefRatio+MagDamPer*MagDamPerRatio+MagDamPerDef*MagDamPerDefRatio+NormalSkillPer*NormalSkillPerRatio+NormalSkillPerDef*NormalSkillPerDefRatio+AngerSkillPer*AngerSkillPerRatio+AngerSkillPerDef*AngerSkillPerDefRatio+SuperDamPer*SuperDamPerRatio+SuperDamPerDef*SuperDamPerDefRatio+CurePer*CurePerRatio+CurePerDef*CurePerDefRatio+ShieldPer*ShieldPerRatio+ShieldPerDef*ShieldPerDefRatio+DOTPer*DOTPerRatio+DOTPerDef*DOTPerDefRatio+WeiFinalDamPer*WeiFinalDamPerRatio+WeiFinalDamPerDef*WeiFinalDamPerDefRatio+ShuFinalDamPer*ShuFinalDamPerRatio+ShuFinalDamPerDef*ShuFinalDamPerDefRatio+WuFinalDamPer*WuFinalDamPerRatio+WuFinalDamPerDef*WuFinalDamPerDefRatio+QunFinalDamPer*QunFinalDamPerRatio+QunFinalDamPerDef*QunFinalDamPerDefRatio)/100.0)	SkillPower*OfficialLV	
 DownReward	[(20,500,1),(2,1,1),(911,1,1)] 	20	[[150,50,0],[181,10,0],[4151,10,0],[3,1,0]]	1	1
 DailyPackBuyGift	{"0":[[20,10,0]], "1":[[2222,1,0],[1099,1,0],[20,100,0]], "2":[[2222,1,0],[4694,1,0],[20,50,0]], "3":[[2222,3,0],[1099,3,0],[20,150,0]]}	{"1":[146], "2":[147], "3":[148]}	[149]	10	
-EquipGSFormula	int(MaxHP/4.0+MinAtk*5.0+MaxAtk*5.0+Def*5.0+IceAtk*10.0+IceDef*10.0+LuckyHit*2.5+LuckyHitReduce*2.5+FabaoHurt*5.0+FinalHurt*5.0+FinalHurtReduce*5.0+BaseEquipMaxHPAddPer/10000.0+BaseEquipAtkAddPer/10000.0+PerLVMaxHP+PerLVAtk/10000.0+Hit/10000.0+Miss/10000.0+DropMoneyPer/10000.0+LuckyHitRate/10000.0+LuckyHitRateReduce/10000.0+LuckyHitPer/10000.0+SuperHitRate/10000.0+SuperHitRateReduce/10000.0+SuperHitPer/10000.0+SuperHit/10000.0+SuperHitReduce/10000.0+DropEquipPer*1.45+AtkBackHP*10.0+MaxHPPer/10000.0+AtkPer/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+SkillAddPerA/10000.0+SkillAddPerB/10000.0+SkillAddPerC/10000.0+SkillAddPerD/10000.0+SkillAddPerE/10000.0+SkillAddPerF/10000.0+SkillAddPerG/10000.0+SkillReducePerA/10000.0+SkillReducePerB/10000.0+SkillReducePerC/10000.0+SkillReducePerD/10000.0+SkillReducePerE/10000.0+SkillReducePerF/10000.0+SkillReducePerG/10000.0+ReduceSkillCDPer/10000.0+LuckyHitPer/10000.0+FaintDefRate/10000.0+ProDefPer/10000.0+IgnoreDefRate/10000.0+IgnoreDefRateReduce/10000.0)	[67,68,6,7,8,16,139,13,136,26,27]	int(MaxHP/4.0+Atk*10.0+Def*5.0+IceAtk*10.0+IceDef*10.0+SuperHit*5.0+SuperHitReduce*5.0+PetDamPer/10000.0+SuperHitRateReduce/10000.0+Miss/10000.0+Hit/10000.0+DropMoneyPer/10000.0+PerLVMaxHP+PerLVAtk/10000.0)	{"45000":18000,"45001":18000,"45002":35000,"45003":70000,"45004":90000}	0
 PlayerMaxLV	1000	-1	0	0	0
 ZhanchuiCost	2	2			
 Mainline	10	15	20		
@@ -446,3 +440,6 @@
 CureFormula	int(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))				
 InvestCost	{}	{}	{"7":[101],"12":[102]} 	{}	{}
 InvestMaxDay	{"7":28,"12":0}	[7,8]			
+GoldRush	12|12	60|60	10		
+GoldRushAuto	[3, 7, 30]	[[1], [2]]			
+GoldRushRefresh	1	42	[10,20,30,40,50]	30	{"1":195}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushCamp.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushCamp.txt
new file mode 100644
index 0000000..b4db423
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushCamp.txt
@@ -0,0 +1,7 @@
+CampID	PanningUnlock	MoneyUnlock
+1	0	
+2	0	
+3	20	
+4	50	
+5	0	1|1000
+6	0	1|2000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushItem.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushItem.txt
new file mode 100644
index 0000000..cb7e193
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushItem.txt
@@ -0,0 +1,21 @@
+GoldID	ItemID	ItemLV	ItemCount	RefreshWeight	WorkerMax	NeedSeconds
+1	2	1	500	50	1	60
+2	2	2	1000	40	2	75
+3	2	3	1500	30	3	90
+4	2	4	2000	20	3	105
+5	2	5	2500	10	3	120
+6	3	1	5	50	1	60
+7	3	2	10	40	2	75
+8	3	3	15	30	3	90
+9	3	4	20	20	3	105
+10	3	5	30	10	3	120
+11	4	1	1	50	1	60
+12	4	2	2	40	2	75
+13	4	3	3	30	3	90
+14	4	4	4	20	3	105
+15	4	5	5	10	3	120
+16	1	1	5	50	1	60
+17	1	2	8	40	2	75
+18	1	3	10	30	3	90
+19	1	4	15	20	3	105
+20	1	5	30	10	3	120
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushWorker.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushWorker.txt
new file mode 100644
index 0000000..f9424e0
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/GoldRushWorker.txt
@@ -0,0 +1,7 @@
+WorkerID	PlayerLVUnlock	MoneyUnlock
+1	0	
+2	0	
+3	60	
+4	120	
+5	0	1|1500
+6	0	1|3000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroQuality.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroQuality.txt
index 3304c8e..94a6252 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroQuality.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroQuality.txt
@@ -1,6 +1,6 @@
 Quality	InitTalentWeight	InitStarUpper	InitAddPer	LVAddPer	BreakLVAddPer	StarAddPer	BookActAwardMoney	BookInitAddPer	BookStarAddPer	BookBreakLVAddPer	DismissReturnItems
-1	[[100,1]]	40	300	5	100	100	1|30	100	100	100	[[7,10], [8,1]]
-2	[[100,1]]	40	600	10	100	150	1|50	150	150	100	[[7,20], [8,2]]
-3	[[100,2]]	40	900	20	100	200	1|100	200	200	100	[[7,30], [8,3]]
-4	[[100,3]]	40	1200	25	100	250	1|200	250	250	100	[[7,40], [8,4]]
-5	[[60,4], [40,5]]	40	1500	30	100	300	1|300	300	300	100	[[7,50], [8,5]]
+1	[[100,1]]	40	300	10	200	100	1|100	100	100	100	[[7,10],[8,1]]
+2	[[100,1]]	40	600	10	200	100	1|100	100	100	100	[[7,20],[8,2]]
+3	[[100,2]]	40	900	10	200	100	1|100	100	100	100	[[7,50],[8,5]]
+4	[[100,3]]	40	1200	15	200	150	1|100	100	100	100	[[7,100],[8,10]]
+5	[[60,4],[40,5]]	40	1500	20	200	200	1|200	100	100	100	[[7,300],[8,30]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
index bcf00f2..c49d13c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -1,13 +1,21 @@
 SkillID	SkillTypeID	SkillLV	SkillMaxLV	SkillName	FuncType	SkillType	HurtType	AtkType	TagAim	TagFriendly	TagAffect	TagCount	CalcType	SkillPer	SkillValue	HappenRate	EffectID1	EffectValues1	TriggerWay1	TriggerSrc1	EffectID2	EffectValues2	TriggerWay2	TriggerSrc2	EffectID3	EffectValues3	TriggerWay3	TriggerSrc3	CoolDownTime	IgnoreStates	BuffState	LastTime	LayerCnt	LayerMax	BuffRepeat	DieContinue	FightPower	SkillMotionName
 100	100	1	1	通用反击	4	1	1	1	0	0	0	1	0	10000	0	10000	0				0				0				0			0	0	0	0	0	0	
-200	200	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	10000	0				0				0				0		3	1	0	0	6	0	0	
-201	201	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	2000	0				0				0				0		3	1	0	0	6	0	0	
-300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	6	0	0	
-301	301	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	2	0	0	6	0	0	
-302	302	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	5000	0				0				0				0		1	2	0	0	6	0	0	
-304	304	1	1	灼烧	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		4	1	0	0	6	0	0	
-305	305	1	1	沉默	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		10	1	0	0	6	0	0	
-1001	1001	1	1	暴击	0	5	0	0	5	1	0	1	0	10000	0	10000	35	10000|1			0				0				0								0	
+200	200	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	10000	0				0				0				0		3	1	0	0	0	0	0	
+201	201	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	2000	0				0				0				0		3	1	0	0	0	0	0	
+300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	0	0	0	
+301	301	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	2	0	0	0	0	0	
+302	302	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	5000	0				0				0				0		1	2	0	0	0	0	0	
+1001	1001	1	1	暴击	0	5	0	0	5	1	0	1	0	10000	0	10000	35	10000|1			0				0				0			99	0	0	0	0	0	
+1002	1002	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	36	10000|1			0				0				0			99	0	0	0	0	0	
+1003	1003	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	37	10000|1			0				0				0			99	0	0	0	0	0	
+1004	1004	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	38	10000|1			0				0				0			99	0	0	0	0	0	
+1005	1005	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	39	10000|1			0				0				0			99	0	0	0	0	0	
+1006	1006	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	40	10000|1			0				0				0			99	0	0	0	0	0	
+1007	1007	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	41	10000|1			0				0				0			99	0	0	0	0	0	
+1008	1008	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	42	10000|1			0				0				0			99	0	0	0	0	0	
+1009	1009	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	43	10000|1			0				0				0			99	0	0	0	0	0	
+1010	1010	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	44	10000|1			0				0				0			99	0	0	0	0	0	
+1011	1011	1	1		0	5	0	0	5	1	0	1	0	10000	0	10000	45	10000|1			0				0				0			99	0	0	0	0	0	
 100101	100101	1	1	枭影	1	1	1	1	0	0	1	1	0	10000	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
 100102	100102	1	1	噬魄	2	1	1	1	4	0	0	2	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerskill
 100107	100107	1	1	鹰视	3	1	1	0	1	0	0	1	0	10000	0	10000	0		13		0				0				0				0	0	0	0	0	
@@ -17,7 +25,7 @@
 1002011	1002011	1	1	登先	0	4	2	1001	6	0	0	0	0	2000	0	5000	5001		4	2	5002	2|3|0|300	13		0				0		2	4	1	0	4	0	0	
 100202	100202	1	1	疾霆破垒	2	1	2	1	1	0	0	1	0	35600	0	10000	5010	1002021	13		0				0				0		0	0	0	0	0	0	0	angerskill
 1002021	1002021	1	1	疾霆破垒	0	6	0	1001	6	0	0	0	0	0	0	5000	17	5000|2			0				0				0		0	1	0	0	0	0	0	
-100203	1002011	1	1	炬石	0	6	1	0	6	0	0	0	0	0	0	8000	0				0				0				0			3	1	0	0	0	0	
+100203	1002011	1	1	炬石	0	6	1	0	6	0	0	0	0	0	0	8000	0				0				0				0		0	3	1	0	0	0	0	
 100205	100205	1	1	威震逍遥	3	9	0	0	5	1	0	0	0	22000	0	10000	0				0				0				0	0			0	0	0	0	0	
 100207	100207	1	1	折冲	3	9	0	0	5	1	0	0	0	18500	0	10000	0				0				0				0	0			0	0	0	0	0	
 100208	100208	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
@@ -47,22 +55,22 @@
 100508	100508	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100509	100509	1	1	升变	3	1	0																														0	
 100601	100601	1	1	寒星	1	1	2	1	3	0	0	1	0	10000	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	attack
-100602	100602	1	1	寒霜叠嶂	2	1	2	1	3	0	0	3	0	18500	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerskill
+100602	100602	1	1	寒霜叠嶂	2	1	2	1	3	0	0	3	0	18500	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerSkill
 100603	100603	1	1	朔风	3	1	2																														0	
 100605	100605	1	1	怒雪	3	9	0																														0	
 100607	100607	1	1	凝霜	3	9																															0	
 100608	100608	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100609	100609	1	1	升变	3	1																															0	
-100701	100701	1	1	博望	1	1	1	1	1	0	0	1	0	8000	0	10000	5010	201	13		0				0							0					0	attack
-100702	100702	1	1	仁者之壁	2	1	1	1	2	0	0	3	0	7000	0	10000					0				0							0					0	angerskill
+100701	100701	1	1	博望	1	1	1	1	1	0	0	1	0	8000	0	10000	5010	201	13		0				0				0		0	0	0	0	0	0	0	attack
+100702	100702	1	1	仁者之壁	2	1	1	1	2	0	0	3	0	7000	0	10000					0				0				0		0	0	0	0	0	0	0	angerskill
 1007021	1007021	1	1	仁者之壁	0	4	2	1001	6	0	0	0	0	2000	0	10000	5001		4	2	5002	2|3|0|300	13		0				0		2	4	1	0	4	0	0	
 100703	100703	1	1	守义	3	9																															0	
 100705	100705	1	1	淯水护驾	3	1																															0	
 100707	100707	1	1	山阳遗风	3	9																															0	
 100708	100708	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100709	100709	1	1	升变	3	9																															0	
-100801	100801	1	1	太素	1	2	2	2	2	1	0	3	0	3000	0	10000	0															0					0	attack
-100802	100802	1	1	广陵止息	1	2	2	2	0	1	0	6	0	15500	0	10000	0															0					0	angerskill
+100801	100801	1	1	太素	1	2	2	2	2	1	0	3	0	3000	0	10000	0												0			0					0	attack
+100802	100802	1	1	广陵止息	1	2	2	2	0	1	0	6	0	15500	0	10000	0												0			0					0	angerskill
 100803	100803	1	1	回还	3	9																															0	
 100805	100805	1	1	生机	3	9																															0	
 100807	100807	1	1	续命	3																																0	
@@ -79,9 +87,9 @@
 100909	100909	1	1	升变	3																																0	
 101001	101001	1	1	穿杨	1	1	1	1	3	0	0	1	0	10500	0	10000	5010	[1010011,[1]]	6		0				0				0		0	0	0	0	0	0	0	attack
 1010011	1010011	1	1	穿杨	0	3	0	1001	5	1	0	1	0	0	0	10000	23	5000|1			0				0				0		0	1	0	0	0	0	0	
-101002	101002	1	1	洞彻寒川	2	1	1	1	3	0	0	1	0	38000	0	10000	5010	[1010021,[1]]	6		0				0				0		0	0	0	0	0	0	0	angerskill
+101002	101002	1	1	洞彻寒川	2	1	1	1	3	0	0	1	0	38000	0	10000	5010	[1010021,[1]]	6		0				0				0		0	0	0	0	0	0	0	angerSkill
 1010021	1010021	1	1	洞彻寒川	0	4	0	1001	6	0	0	0	0	0	0	10000	7	10000|2			0				0				0		0	1	0	0	0	0	0	
-101003	101003	1	1	先机	3	1	1	1	3	0	0	1	0	18000	0	10000	5010	300	13		0				0				0		0	0	0	0	0	0	0	passiveskill
+101003	101003	1	1	先机	3	1	1	1	3	0	0	1	0	18000	0	10000	5010	300	13		0				0				0		0	0	0	0	0	0	0	passiveSkill
 101005	101005	1	1	戮神	3																																0	
 101007	101007	1	1	归墟	3																																0	
 101008	101008	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
@@ -96,14 +104,14 @@
 101109	101109	1	1	升变	3																																0	
 101201	101201	1	1	魅魉	1	1	2	1	0	0	0	3	0	3000	0	10000	5010	1012011	13		0				0				0	0	0	0	0	0	0	0	0	attack
 1012011	1012011	1	1	魅魉	0	4	0	1001	6	0	0	0	0	0	0	3000	5010	300			0				0				0	0	1	1	0	0	0	0	0	
-101202	101202	1	1	冢虎蚀谋	2	1	2	1	0	0	0	6	0	7000	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerskill
+101202	101202	1	1	冢虎蚀谋	2	1	2	1	0	0	0	6	0	7000	0	10000	0				0				0				0	0	0	0	0	0	0	0	0	angerSkill
 101203	101203	1	1	血鉴	3																																0	
-101205	101205	1	1	返照	3	1	2	0	0	0	0	6	0	10000	0	10000	0																				0	passiveskill
+101205	101205	1	1	返照	3	1	2	0	0	0	0	6	0	10000	0	10000	0												0								0	passiveSkill
 101207	101207	1	1	饮真止渴	3																																0	
 101208	101208	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 101209	101209	1	1	升变	3																																0	
 101301	101301	1	1	回春	1	1	2	1	1	0	0	1	0	6500	0	10000	5010	1013011	13		0				0				0	0	0	0	0	0	0	0	0	attack
-1013011	1013011	1	1	回春	0	2	2	2	0	1	1	2	0	9000	0	10000													0	0	0	0	0	0	0	0	0	
+1013011	1013011	1	1	回春	0	2	2	1002	0	1	1	2	0	9000	0	10000													0	0	0	0	0	0	0	0	0	
 101302	101302	1	1	鹤唳霜华	2	2	2	2	0	1	1	2	0	12000	0	10000	5010	1013021	13		0				0				0	0	0	0	0	0	0	0	0	angerskill
 1013021	1013021	1	1	鹤唳霜华	0	5	0	1003	6	0	0	2	0	20000	0	10000	0				0				0				0		0	3	0	0	0	0	0	
 101303	101303	1	1	织命	3																																0	attack
@@ -111,10 +119,10 @@
 101307	101307	1	1	九霄环佩	3																																0	
 101308	101308	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 101309	101309	1	1	升变	3																																0	
-101401	101401	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	10000	5010	1014011	13																		0	attack
+101401	101401	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	10000	5010	1014011	13										0		0	0	0	0	0	0	0	attack
 1014011	1012011	1	1	铭霜	0	4	0	1001	6	0	0	0	0	0	0	5000	5010	300			0				0				0	0	1	1	0	0	0	0	0	
-101402	101402	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	10000	5010	1014021																			0	angerskill
-1014021	1014021	1	1	朔雪龙骧		2	2	2	5	1	0	1	0	10000	0	10000																					0	
+101402	101402	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	10000	5010	1014021											0		0	0	0	0	0	0	0	angerskill
+1014021	1014021	1	1	朔雪龙骧		2	2	2	5	1	0	1	0	10000	0	10000													0		0	0	0	0	0	0	0	
 101403	101403	1	1	断虹	3																																0	
 101405	101405	1	1	玉翎	3																																0	
 101407	101407	1	1	威压三辰	3																																0	
@@ -122,7 +130,7 @@
 101409	101409	1	1	升变	3																																0	
 101501	101501	1	1	崩云	1	1	1	1	1	0	0	1	0	8000	0	10000	5010	[1015011,[1,3,12]]	13		0				0				0		0	0	0	0	0	0	0	attack
 1015011	1015011	1	1	崩云	0	5	0	1003	5	0	0	0	1	1000	0	10000	0				0				0				0		0	0	0	0	0	0	0	
-101502	101502	1	1	北溟嘲风	2	5	1	1003	5	0	0	0	1	2000	0	10000	5010	1015021	13	2	5011	302	11	2	5011	301	12	101502	0		0	2	0	0	0	0	0	angerskill
+101502	101502	1	1	北溟嘲风	2	5	1	1003	5	0	0	0	1	2000	0	10000	5010	1015021	13	2	5011	302	11	2	5011	301	12	101502	0		0	2	0	0	0	0	0	angerSkill
 1015021	1015021	1	1	北溟嘲风	0	6	1	0	0	0	4	2	0	0	0	10000	0				0				0				0		9	1	0	0	5	0	0	
 101503	101503	1	1	铁壁	3																																0	
 101505	101505	1	1	返咒	3																																0	
@@ -158,45 +166,50 @@
 200307	200307	1	1	山峦	3																																0	
 200308	200308	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200309	200309	1	1	升变	3																																0	
-200401	200401	1	1	观星	1	1	2	1	1	0	0	1	0	120	0	10000	5010	2004011	13		0				0				0		0	0	0	0	0	0	0	
-2004011	2004011	1	1	观星	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200401	13		0				0				0		0	0	0	0	0	0	0	
+200401	200401	1	2	观星	1	1	2	1	1	0	0	1	0	12000	0	10000	5010	2004011	13		0				0				0		0	0	0	0	0	0	0	
+2004011	2004011	1	2	观星	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200401	13		0				0				0		0	0	0	0	0	0	0	
 200402	200402	1	1	天机星杼	2	6	0	0	5	1	0	1	0	0	0	10000	25	4000|1			0				0				0		0	2	0	0	0	0	0	
-200403	200403	1	1	逐月	3																																0	
+200403	200401	2	2	逐月	1	1	2	1	1	0	0	1	0	15000	0	10000	5010	2004011	13		0				0				0		0	0	0	0	0	0	0	
+2004031	2004011	2	2	逐月	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200401	13		0				0				0		0	0	0	0	0	0	0	
 200405	200405	1	1	追光	3																																0	
 200407	200407	1	1	聚元	3																																0	
 200408	200408	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200409	200409	1	1	升变	3																																0	
 200501	200501	1	1	重岳	1	1	1	1	1	0	0	1	0	12000	0	10000	5010	2005011	13		0				0				0		0	0	0	0	0	0	0	
 2005011	2005011	1	1	重岳	0	0	0	1001	5	1	0	1	0	0	0	4000	5010	200501	13		0				0				0		0	0	0	0	0	0	0	
-200502	200502	1	1	金戈铁马	2	1	1	1	1	0	1	1	0	25000	0	10000																					0	
+200502	200502	1	1	金戈铁马	2	1	1	1	1	0	1	1	0	25000	0	10000													0		0	0	0	0	0	0	0	
 200503	200503	1	1	狂澜	3																																0	
 200505	200505	1	1	龙骧	3																																0	
 200507	200507	1	1	死地	3																																0	
 200508	200508	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200509	200509	1	1	升变	3																																0	
-200601	200601	1	1	甘泉	1	1	2	1	1	0	0	1	0	9500	0	10000																					0	
-200602	200602	1	1	云梦泽被	2																																0	
+200601	200601	1	1	甘泉	1	1	2	1	1	0	0	1	0	9500	0	10000	5010	2006011	13		0				0				0		0	0	0	0	0	0	0	
+2006011	2006011	1	1		0	2	0	1002	0	1	1	1	0	9500	0	10000					0				0				0		0	0	0	0	0	0		
+200602	200602	1	1	云梦泽被	2	2	0	2	0	1	1	2	0	26000	0	10000	6	2000|1	13		0				0				0		0	2	0	0	0	0	0	
 200603	200603	1	1	魂梦	3																																0	
 200605	200605	1	1	解佩	3																																0	
 200607	200607	1	1	凌波	3																																0	
 200608	200608	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200609	200609	1	1	升变	3																																0	
-200701	200701	1	1	炫彩	1																																0	
-200702	200702	1	1	明镜止水	2																																0	
+200701	200701	1	1	炫彩	1	1	1	1	0	0	0	1	0	8500	0	10000	5010	2007011	13		0				0				0		0	0	0	0	0	0	0	
+2007011	2007011	1	1	炫彩	0	6	0	1001	6	0	0	0	0	0	0	3000	5010	2007051	13		0				0				0		0	0	0	0	0	0		
+200702	200702	1	1	明镜止水	2																0				0				0								0	
 200703	200703	1	1	霓裳	3																																0	
 200705	200705	1	1	虹鳞	3																																0	
 200707	200707	1	1	浣纱	3																																0	
 200708	200708	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200709	200709	1	1	升变	3																																0	
-200801	200801	1	1	啸林	1																																0	
-200802	200802	1	1	春秋刀域	2																																0	
+200751	200751	1	1	追击	0	1	1	1	0	0	0	1	0	8000	0	10000	0				0				0				0		0	0	0	0	0	0		
+200801	200801	1	1	啸林	1	1	2	1	2	0	0	3	0	5000	0	10000	0				0				0				0		0	0	0	0	0	0	0	
+200802	200802	1	1	春秋刀域	2	1	2	1	2	0	0	3	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	
 200803	200803	1	1	刀意盈袖	3																																0	
 200805	200805	1	1	踏雪	3																																0	
 200807	200807	1	1	破虚	3																																0	
 200808	200808	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 200809	200809	1	1	升变	3																																0	
-200901	200901	1	1	铁索横江	1																																0	
-200902	200902	1	1	火凤燎原	2																																0	
+200901	200901	1	1	铁索横江	1	1	2	1	0	0	0	1	0	7000	0	10000	22	2000|2	13	2												1					0	
+200902	200902	1	1	火凤燎原	2	1	2	1	0	0	0	6	0	7500	0	10000																					0	
+2009021	2009021	1	1	火凤燎原	0	4	2	1001	6	0	0	0	0	2000	0	5000	5001		4	2	5002	2|3|0|300	13		0				0		2	4	1	0	4	0	0	
 200903	200903	1	1	连环	3																																0	
 200905	200905	1	1	余火	3																																0	
 200907	200907	1	1	断谋	3																																0	
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt
index c18dbf7..9b81423 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt
@@ -1,3 +1,3 @@
 TreasureType	MinLV	GridItemInfo	GridLibInfo	JobItemList	GridItemRateListFree	GridItemRateList1	GridItemRateList2	GridItemRateList3	LuckyItemRateList
-12	0	{}	{"2":102, "3":103, "4":104, "5":105}	[]	[]	[(5700,2),(8700,3),(9700,4),(10000,5)]	[(9000,4),(1000,5)]	{}	[]
-13	0	{}	{"5":105}	[]	[]	[(10000,5)]	[]	{}	[]
+12	0	{}	{"1":101,"2":102,"3":103,"4":104,"5":105}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[(8000,4),(10000,5)]	{}	[]
+13	0	{}	{"4":104,"5":105}	[]	[]	[(8000,4),(10000,5)]	[]	{}	[]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureItemLib.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureItemLib.txt
index 2c0c051..bd8599e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureItemLib.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureItemLib.txt
@@ -1,5 +1,5 @@
 LibID	ItemID	ItemCount	ItemWeight
-102	510001	1	100
+101	510001	1	100
 102	510002	1	100
 102	510003	1	100
 103	510004	1	100
@@ -9,57 +9,57 @@
 104	510008	1	100
 104	510009	1	100
 104	510010	1	100
-104	510011	1	90
+104	510011	1	100
 105	510012	1	100
 105	510013	1	100
-105	510014	1	90
-105	510015	1	0
-105	510016	1	0
-102	520001	1	0
-102	520002	1	0
-102	520003	1	0
-103	520004	1	0
-103	520005	1	0
-103	520006	1	0
-103	520007	1	0
-104	520008	1	0
-104	520009	1	0
-104	520010	1	0
-104	520011	1	0
-105	520012	1	0
-105	520013	1	0
-105	520014	1	0
-105	520015	1	0
-105	520016	1	0
-102	530001	1	0
-102	530002	1	0
-102	530003	1	0
-103	530004	1	0
-103	530005	1	0
-103	530006	1	0
-103	530007	1	0
-104	530008	1	0
-104	530009	1	0
-104	530010	1	0
-104	530011	1	0
-105	530012	1	0
-105	530013	1	0
-105	530014	1	0
-105	530015	1	0
-105	530016	1	0
-102	540001	1	0
-102	540002	1	0
-102	540003	1	0
-103	540004	1	0
-103	540005	1	0
-103	540006	1	0
-103	540007	1	0
-104	540008	1	0
-104	540009	1	0
-104	540010	1	0
-104	540011	1	0
-105	540012	1	0
-105	540013	1	0
-105	540014	1	0
-105	540015	1	0
-105	540016	1	0
+105	510014	1	100
+105	510015	1	100
+105	510016	1	100
+101	520001	1	100
+102	520002	1	100
+102	520003	1	100
+103	520004	1	100
+103	520005	1	100
+103	520006	1	100
+103	520007	1	100
+104	520008	1	100
+104	520009	1	100
+104	520010	1	100
+104	520011	1	100
+105	520012	1	100
+105	520013	1	100
+105	520014	1	100
+105	520015	1	100
+105	520016	1	100
+101	530001	1	100
+102	530002	1	100
+102	530003	1	100
+103	530004	1	100
+103	530005	1	100
+103	530006	1	100
+103	530007	1	100
+104	530008	1	100
+104	530009	1	100
+104	530010	1	100
+104	530011	1	100
+105	530012	1	100
+105	530013	1	100
+105	530014	1	100
+105	530015	1	100
+105	530016	1	100
+101	540001	1	100
+102	540002	1	100
+102	540003	1	100
+103	540004	1	100
+103	540005	1	100
+103	540006	1	100
+103	540007	1	100
+104	540008	1	100
+104	540009	1	100
+104	540010	1	100
+104	540011	1	100
+105	540012	1	100
+105	540013	1	100
+105	540014	1	100
+105	540015	1	100
+105	540016	1	100
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt
index 52e5396..13d20ae 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt
@@ -1,3 +1,3 @@
 TreasureType	PackType	CheckPack	IsActType	DailyMaxCount	DailyFreeCount	TreasureCountList	RecycleItemMail	CostItemID	CostItemCountList	CostMoneyType	CostMoneyList	EnsureCount	OnceLucky	FullLucky	LuckyRateFormat	LuckyGridNum	GridNumMaxLimitInfo	NotifyGridNumList	NotifyKey	AwardMoneyType	AwardMoneyValue
-12	35	1	0	99999	1	[1, 10]		5	[1, 10]	1	[200, 2000]	20	0	0	baseRate	0	{}	[5,6]		51	10
+12	35	1	0	99999	1	[1, 10]		5	[1, 10]	1	[200, 2000]	100	0	0	baseRate	0	{}	[5,6]		51	10
 13	35	1	0	99999	0	[1, 10]		0	[]	51	[1000]	0	0	0	baseRate	0	{}	[]		0	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagCTG.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagCTG.txt
index 6172558..60cf47b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagCTG.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagCTG.txt
@@ -1,4 +1,6 @@
 RecordID	CanResetBuyCount	TotalBuyCount	DailyBuyCount	WeekBuyCount	MonthBuyCount	MoneyType	GainGold	GainGoldPaper	FirstGoldPaperPrize	GainItemList	ActWorldLVGainItemInfo	SelectItemInfo	NotifyMark	PayType
+1	0	0	0	0	0	0	0	0	0	[]	{}			0
+2	0	0	0	0	0	0	0	0	0	[]	{}			0
 100	0	0	1	0	0	0	0	0	0	[]	{}			1
 101	1	0	0	0	0	1	60	6	60	[]	{}			2
 102	1	0	0	0	0	1	300	30	300	[]	{}			2
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagOrderInfo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagOrderInfo.txt
index be61a08..b864057 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagOrderInfo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/tagOrderInfo.txt
@@ -17,3 +17,5 @@
 test.cz.6	test	198	106	0	1980	198
 test.cz.7	test	328	107	0	3280	328
 test.cz.8	test	648	108	0	6480	648
+test.taojinzd.week	test	6	1	0	60	6
+test.taojinzd.month	test	18	2	0	180	18

--
Gitblit v1.8.0