From 65c29381d30710afde3408603274d65f3f498954 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 25 八月 2018 17:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt                                                                  |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc                         |    0 
 db/PyMongoDataServer/PySysDB/tagSuccess.txt                                                                     |   13 +++---
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                                      |   12 +++---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc                                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt |   36 ++++++++++++++++++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc                                 |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc                    |    0 
 db/PyMongoDataServer/PySysDB/tagRefineStove.txt                                                                 |    5 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc           |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc                                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc           |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc                                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc                             |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                                  |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt                |    4 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt          |   14 +++---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip                                                   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc                 |    0 
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                                     |   14 ++++++-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc               |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc                 |    0 
 28 files changed, 77 insertions(+), 25 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
index 5a45d6c..99e204a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
@@ -243,5 +243,41 @@
 11103001: {0 : (0, 0, 0),		
    1 : (90, 0, 0),		
               },		
+30303001: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303002: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303003: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303004: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303005: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303006: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303007: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303008: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303009: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303010: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303011: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
+30303012: {0 : (0, 0, 0),		
+   1 : (90, 0, 0),		
+              },		
 }		
 )		
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index ef54f67..df97a32 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -40,6 +40,8 @@
 #	aDamagePerPVP			PVP伤害加成			万分率
 #	aFinalHurt				最终伤害加成		固定值
 #	aIceAtkSuperHit			真实伤害暴击倍值	倍值, 默认1
+#	FinalHurtPer			最终伤害百分比		万分率
+#	aOnlyFinalHurt			附加伤害		固定值
 #
 # 防守方:
 #	dMinAtk		最低攻击
@@ -75,7 +77,7 @@
 	
 	
 	"PVP_1"	:"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))- dDef*(1-max(aIgnoreDefRate - dIgnoreDefRateReduce,0)/10000.0),0))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+ (aSuperHit*max(1-dSuperHitReduce/10000.0,0) if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+max(aSkillAtkRate-dSkillAtkRateReduce,0)/10000.0)*(1+(aDamagePer+aDamagePerPVP)/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamagePerPVPReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
-	"PVE_1"	:"int(max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
+	"PVE_1"	:"int(max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*max(1+aFinalHurtPer/10000.0,1),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
 	"EVP_1"	:"int(max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
 	"EVE_1"	:"max(aMaxAtk-dDef,1)",
 	"PetVE_1":"max(((aMinAtk + aMaxAtk)/2.0-dDef)*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0),(aMinAtk+aMaxAtk)/2.0*0.05 + (aMinAtk+aMaxAtk)/2.0*0.1*rand)",
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
index 004fbfa..d3e7408 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
@@ -2,12 +2,12 @@
 #{职业:[等级]}
 (
 {
-	0:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	1:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	2:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	3:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	4:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	5:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	6:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,200,210,220,230,240,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	0:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	1:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	2:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	3:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	4:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	5:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	6:[70,80,95,100,105,115,120,125,128,130,140,150,160,170,180,190,195,200,210,220,230,240,245,250,260,270,280,290,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
 }
 )
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index d5cc64a..d408157 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 0cfd58d..cb29af3 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/AttackLogic/Pet_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
index ab718e8..d23fbe5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc
index 646efd2..c3f89b9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc
index 6776124..6de2c14 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc
index 0173e65..6ec1de0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
index 7de63cb..4bdf3fe 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc
index 3532f5d..3301f0b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc
index 130e4f3..87af2d8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc
index 7ef5168..1a4ed2a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc
index 35d7bf5..2e1ba4c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.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 c82ae04..9810950 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/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index 41ae028..1b680a9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
index f2901c9..956ab14 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 212f4d4..66c22ea 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.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 2c12fab..3e972d4 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 48d38c2..18b94ab 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/Skill/EffGetSet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
index 12455ac..ec315cb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.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 9402a9a..52d2891 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/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 3a125cd..4a9ec12 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -204,7 +204,7 @@
 DungeonDeliver	31020|31030|31150				
 DungeonIntegral	10000				
 BuyFBCntCost	{"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}				
-FBEncourageBuff	{31080:20051,52010:20051}				
+FBEncourageBuff	{31080:20081,52010:20081}				
 DropRecordValue	3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
 DropRecordEquipment	{(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}				
 DropRecordNormal	2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182				
diff --git a/db/PyMongoDataServer/PySysDB/tagRefineStove.txt b/db/PyMongoDataServer/PySysDB/tagRefineStove.txt
index 310d64b..f37cc0a 100644
--- a/db/PyMongoDataServer/PySysDB/tagRefineStove.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRefineStove.txt
@@ -1,7 +1,10 @@
 LV	Exp	AttrID	AttrValue
 1	150	6	4119
-2	588	6	8124
+2	840	6	8124
 3	4320	6	13441
 4	10368	6	20537
 5	33177	6	29971
 6	82944	6	42393
+7	149299	6	58548
+8	238878	6	79273
+9	358318	6	105195
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index e7b23b9..d6f631c 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -43,6 +43,7 @@
 303	4	2	0	0		2_10	0		0	107	10
 304	39	2	3|4	0		2_10	0		0	107	10
 305	42	1	204	0		2_10	0		0	107	10
+306	50	3	0	0		2_10	0		0	107	10
 321	33	1	306|0	0		2_10	0		0	107	10
 322	26	120	0	0		2_10	0		0	107	10
 323	7	6	0	0		2_10	0		0	107	10
@@ -246,19 +247,19 @@
 763	112	1	2124	0	0	0	0		0		
 771	36	10	10101001	0	0	0	0		6		
 772	5	10	0	0	0	0	0		7		
-773	48	8	0	0	0	0	0		8		
+773	48	20	0	0	0	0	0		8		
 774	81	20	31080	0	0	0	0		9		
-775	10	1	100|10	0	0	0	0		10		
-776	58	1	50106001|10	0	0	0	0		11		
+775	10	1	100|20	0	0	0	0		10		
+776	58	1	50106001|20	0	0	0	0		11		
 777	19	10	0	0	0	0	0		12		
 778	78	3	0	0	0	0	0		13		
-779	27	7	15	0	0	0	0		14		
+779	27	7	25	0	0	0	0		14		
 780	28	3	0	0	0	0	0		15		
 781	54	1	4|1|1	0	0	0	0		16		
 782	42	1	208	0	0	0	0		17		
-783	1	140	0	0	0	0	0		18		
+783	1	150	0	0	0	0	0		18		
 784	6	1	0	0	0	0	0		19		
-785	50	7	0	0	0	0	0		20		
+785	50	6	0	0	0	0	0		20		
 786	12	5	0	0	0	0	0		21		
 787	120	60	0	0	0	0	0		22		
 801	30	1	1	0	0	0	0		0		
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index c3d406a..7c774dd 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -19,7 +19,7 @@
 106	3	80		50300|55300|60300		
 107	0	0				
 107	1	50			301	
-107	2	100	6_15000			
+107	2	110	6_15000			
 107	3	130				
 107	4	110		50500|55500|60500		
 108	0	0				
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 5bb05c6..6ed2b2e 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -132,14 +132,14 @@
 289	1	0	追风	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	288	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 280	1	0	觉灵鹿	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 281	1	0	皓月狼	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	588	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-282	1	0	雷霆战熊	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+282	1	0	雷霆战熊	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 283	1	0	火炎兽	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	3888	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 284	1	0	泰坦巨猿	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	688	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 285	1	0	龙驹	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	970	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-286	1	0	深海之王	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1588	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+286	1	0	深海之王	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1588	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 287	1	0	百鸟之主	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	8888	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-288	1	0	八宝葫芦	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	5880	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-290	1	0	地狱冥虎	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	3880	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+288	1	0	八宝葫芦	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	5880	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+290	1	0	地狱冥虎	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	3880	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 600	1	0	时装1	91	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	220	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 601	1	0	时装2	92	0	0	0	0	999	120	1	1	0	1	0	0	0	0	0	1	220	0	50	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 602	1	0	时装3	93	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	220	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -235,7 +235,7 @@
 1101	1	0	花粉	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1102	1	0	魂印	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1103	1	0	令牌	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-1104	1	0	魔团	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+1104	1	0	技能钥匙	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1105	1	0	钥匙	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1106	1	0	兵刃	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 1107	1	0	花粉	17	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -767,7 +767,7 @@
 4737	0	0	煞丹(攻击)	9	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	50	0	1000	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5071	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4738	0	0	聚灵丹(仙界秘境)	9	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	15	0	1000	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	21220	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4739	0	0	聚灵丹(守卫人皇)	9	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	150	0	1000	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	21230	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-4740	0	0	炼魄丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	19	300	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4740	0	0	炼魄丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2500	0	1000	0	1	0	0	19	300	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5006	1	0	通用套装石(龙牙)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	50	0	20	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5007	1	0	通用套装石(如意)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	50	0	20	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5012	1	0	枪系套装石(防具)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	10	0	20	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 861b594..3683e23 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -505,6 +505,16 @@
 20058	八阶鼓舞	20051	8	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	76	8000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20059	九阶鼓舞	20051	9	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	76	9000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20060	十阶鼓舞	20051	10	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	76	10000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20081	一阶鼓舞	20081	1	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	1000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20082	二阶鼓舞	20081	2	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	2000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20083	三阶鼓舞	20081	3	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	3000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20084	四阶鼓舞	20081	4	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	4000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20085	五阶鼓舞	20081	5	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	5000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20086	六阶鼓舞	20081	6	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	6000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20087	七阶鼓舞	20081	7	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	7000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20088	八阶鼓舞	20081	8	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	8000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20089	九阶鼓舞	20081	9	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	9000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20090	十阶鼓舞	20081	10	10	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	94	10000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1500000	0	0	0	0	0	0	0	5	0	1	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 21001	1.5倍经验药水	21001	1	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	43	5000	1	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3600000	0	0	0	0	0	0	0	5	0	3	11	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 21002	2倍经验药水	21001	2	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	43	10000	1	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3600000	0	0	0	0	0	0	0	5	0	3	11	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 21003	3倍经验药水	21001	3	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	43	20000	1	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3600000	0	0	0	0	0	0	0	5	0	3	11	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -599,7 +609,7 @@
 23025	娲皇八层Boss眩晕	23025	1	1	0	0	3100	1	0	0	2	5	41	6	0	36000	0	0	0	0	0	1010	50000	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	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
 23024	第四层加血	23024	1	1	0	0	0	2	0	0	8	5	141	20	0	30000	0	0	0	0	0	1000	1000	0	5	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
 23030	境界压制	23030	1	1	0	11	0	13	0	0	16	0	40	8	0	300000	0	0	0	0	0	1060	50105019	0	0	0	0	0	0	0	0	0	0	0	0	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-23031	压制法阵	23031	1	1	0	11	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1013	10000	0	0	1010	100000	0	0	9999	1000	0	0	1200	10	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+23031	压制法阵	23031	1	1	0	11	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	50000	0	0	1013	10000	0	0	9999	1000	0	0	1200	10	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 47000	斗战之力	47000	1	1	2	9	0	16	0	0	0	0	10	0	0	0	0	0	0	0	0	4004	10000	0	0	4503	1000	0	0	4508	0	0	0	1011	1	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	1384	0	0	0	0	0	0	0	0	0	50000	0	0	0	0
 47010	月耀千里	47010	1	1	2	9	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4004	10000	0	0	4045	2	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	1778	0	0	0	0	0	0	0	0	0	50100	0	0	0	0
 47020	磐龙魔弑	47020	1	1	2	9	0	17	0	0	1	8	41	8	0	0	0	0	0	0	0	4004	5000	0	0	121	5000	2	0	0	0	0	0	0	0	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	8166	0	0	0	0	0	0	0	4	0	50200	0	0	0	0
@@ -740,7 +750,7 @@
 50600	紫气东来	50600	1	1	2	1	0	2	0	0	8	1	10	0	0	60000	0	0	0	0	0	1000	3000	500	1	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	4995	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50700	麒麟佑身	50700	1	1	2	1	0	5	0	0	0	0	10	0	0	40000	0	0	0	0	0	801	4000	0	0	0	0	0	0	1200	5	0	0	4012	4	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	7037	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50701	吸收后爆炸	50701	1	1	2	0	0	1	0	0	2	3	40	0	0	40000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-50800	嗜天风暴	50800	1	1	2	1	0	15	0	0	2	4	40	4	0	90000	0	0	0	0	0	1314	5	0	0	1010	30000	0	0	9999	800	1	0	1200	6	0	0	0	0	0	0	0	0	0	0	10000	4000	0	0	0	0	0	0	0	0	0	0	0	0	2	8195	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+50800	嗜天风暴	50800	1	1	2	1	0	15	0	0	2	4	40	4	0	90000	0	0	0	0	0	1010	30000	0	0	1314	5	0	0	9999	800	1	0	1200	6	0	0	0	0	0	0	0	0	0	0	10000	4000	0	0	0	0	0	0	0	0	0	0	0	0	2	8195	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50005	旋枪	50005	1	25	2	3	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	640	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	50000	0	0	0	0	0	0	2	149	0	0	0	0	0	0	0	4	0	50000	0	0	0	0
 50006	旋枪	50005	2	25	2	3	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	830	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	50000	0	0	0	0	0	0	2	317	0	0	0	0	0	0	0	4	0	50000	0	0	0	0
 50007	旋枪	50005	3	25	2	3	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1020	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	50000	0	0	0	0	0	0	2	504	0	0	0	0	0	0	0	4	0	50000	0	0	0	0

--
Gitblit v1.8.0