From 9ad82fc3a53700fdc1c3c48606c085a40dec9e9e Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 28 九月 2018 20:30:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt       |    8 +++-----
 db/PyMongoDataServer/SysDB/tagChinSkill.txt             |    9 +++++++++
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt       |    2 +-
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt |    8 +++-----
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt          |    2 +-
 db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt  |   18 ++++++++----------
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index d5bcdd2..4f06916 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,4 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
-1	test1	[]	2018-8-30	2018-8-31	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-2	test2	[24,30]	2018-7-13	2018-7-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-3	NationalDay	[]	2018-9-13	2018-9-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	1
-4	NationalDay1	[24]	2018-9-13	2018-9-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-5	test3	[]	5	6	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+1	test1	[]	2	3	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+2	test2	[]	5	6	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+3	test3	[]	8	9	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index ce5528a..769a613 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,4 @@
 CfgID	StartDate	EndDate	LimitLV	IsDayReset	TemplateIDList
-1	2018-8-30	2018-8-31	50	0	1
-2	2018-7-13	2018-7-15	50	0	3
-3	2018-9-13	2018-9-15	50	1	1|2|3
-4	2018-9-13	2018-9-15	50	0	1
-5	5	6	50	0	1
+1	2	3	50	0	2
+2	5	6	50	0	3
+3	8	9	50	0	3
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index 0fc88bb..45731ef 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -3,13 +3,11 @@
 1	588	1	[(199,1,1),(14,2,1),(3807,1,1)]	ConsumptionRebate3
 1	1588	2	[(51,1,1),(143,50,1),(4151,30,1)]	ConsumptionRebate3
 1	5000	3	[(3515,1,1),(3505,1,1),(106,8,1),(103,8,1)]	ConsumptionRebate2
-2	500	0	[(4651,10,1),(4652,10,1)]	
-2	1000	1	[(4651,20,1),(4652,20,1)]	
-2	2000	2	[(4651,30,1),(4652,30,1)]	ConsumptionRebate3
-2	5000	3	[(4651,40,1),(4652,40,1)]	ConsumptionRebate3
-2	10000	4	[(4651,50,1),(4652,50,1)]	ConsumptionRebate2
-3	500	0	[(921,10,1),(922,10,1)]	
-3	1000	1	[(921,20,1),(922,20,1)]	
-3	2000	2	[(921,30,1),(922,30,1)]	ConsumptionRebate3
-3	5000	3	[(921,40,1),(922,40,1)]	ConsumptionRebate3
-3	10000	4	[(921,50,1),(922,50,1)]	ConsumptionRebate2
+2	60	0	[(4181,1,1),(181,10,1),(4151,10,1),(2211,10,1)]	ConsumptionRebate3
+2	150	1	[(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)]	ConsumptionRebate3
+2	300	2	[(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)]	ConsumptionRebate3
+2	1500	3	[(51,1,1),(4182,1,1),(181,30,1),(4151,30,1)]	ConsumptionRebate2
+3	60	0	[(4181,1,1),(181,10,1),(4151,10,1),(2211,10,1)]	ConsumptionRebate3
+3	150	1	[(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)]	ConsumptionRebate3
+3	300	2	[(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)]	ConsumptionRebate3
+3	1500	3	[(4610,1,1),(4182,1,1),(181,30,1),(4151,30,1)]	ConsumptionRebate2
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1e73c0f..de3bcf3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -165,7 +165,7 @@
 LegendAttrValueByColor2	{30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}				
 LegendAttrValueByClassLV	{29:{9:600,10:900,11:1200,12:1320,13:1425,14:1500,15:1575},30:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},14:{9:1600,10:2400,11:3200,12:3520,13:3800,14:4000,15:4200},18:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},71:{9:800,10:1200,11:1600,12:1760,13:1900,14:2000,15:2100}}	0	0	0	0
 EquipGSTypeForSort	101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123	0	0	0	0
-EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0))	[67,68,6,7,8,11,20,19,23]	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+MaxHPPer/10000.0+PerLVAtk/100.0+Hit/10000.0+Miss/10000.0)	0	0
+EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0))	[67,68,6,7,8,11,20,19,23]	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0)	0	0
 HorseUpItem	181	20	0	0	0
 HorseSuperRate	{}	0	0	0	0
 NeedSysHorseLV	{100:(3,6,9),101:(3,6,9),102:(3,6,9),103:(3,6,9),104:(3,6,9),105:(3,6,9),106:(3,6,9),107:(3,6,9),108:(3,6,9),109:(3,6,9),110:(3,6,9)}				
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 5b8a552..3867918 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -9,6 +9,6 @@
 8	14	0	8	0	{"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}	50000	{"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
 9	8	0	25	0	{"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]}	150000	{"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
 10	7	0	50	0	{"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]}	167000	{"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
-11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*634828+max(min(2,extraData)-1,0)*665472+max(min(3,extraData)-2,0)*814080+max(min(4,extraData)-3,0)*935424+max(min(5,extraData)-4,0)*1123776+max(min(6,extraData)-5,0)*1332864+max(min(7,extraData)-6,0)*1562688+max(min(8,extraData)-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*20+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*3+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*12+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*4+max(min(5,extraData)-4,0)*8+max(min(6,extraData)-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*4+max(min(7,extraData)-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*8"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*436444+max(min(2,extraData)-1,0)*457512+max(min(3,extraData)-2,0)*559680+max(min(4,extraData)-3,0)*643104+max(min(5,extraData)-4,0)*772596+max(min(6,extraData)-5,0)*916344+max(min(7,extraData)-6,0)*1074348+max(min(8,extraData)-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*17+max(min(2,extraData)-1,0)*13+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*6+max(min(4,extraData)-3,0)*8+max(min(5,extraData)-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*1+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*5+max(min(6,extraData)-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)*3+max(min(7,extraData)-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*5"}]}
+11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
 12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}	200000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
 13	12	0	20	0	{"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"}	200000	{"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index c4cbe7f..3c6342c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -762,6 +762,9 @@
 48455	海牛之力	48455	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2951	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48460	海牛幻体	48460	1	1	0	6	0	17	0	0	0	0	91	8	0	25000	0	0	0	0	0	4004	10000	0	0	9	1500	4	0	10	1500	4	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	7377	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48465	海牛狂化	48465	1	1	0	6	0	16	0	0	0	0	111	0	0	25000	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	25819	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48470	雷震之力	48470	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1500	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2871	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48475	雷震之心	48475	1	1	0	6	0	17	0	0	0	0	91	8	0	25000	0	0	0	0	0	4004	10000	0	0	13	1000	4	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	7177	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48480	雷震蛮力	48480	1	1	0	6	0	7	0	0	0	0	91	0	0	20000	0	0	0	0	0	4051	2000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	25119	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49000	固本	49000	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	100	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	1242	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49005	精准	49005	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	14	800	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3105	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49010	培元	49010	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	2	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	10867	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -805,6 +808,12 @@
 49180	旺盛	49180	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	307	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3598	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49185	强攻	49185	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	3	7	500	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	8995	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49190	必杀	49190	1	1	0	5	0	7	0	0	0	0	41	0	0	10000	0	0	0	0	0	4051	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	31482	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49195	霸天	49195	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	309	7	300	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	5920	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49200	游龙	49200	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	3	6	300	511	3	7	300	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	5920	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49205	云痕	49205	1	1	0	5	0	7	0	0	0	0	41	0	0	10000	0	0	0	0	0	4051	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	31482	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49210	浩瀚	49210	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	307	6	1000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3598	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49215	玄翎	49215	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	3	7	500	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	8995	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49220	烨火	49220	1	1	0	5	0	7	0	0	0	0	41	0	0	10000	0	0	0	0	0	4051	1500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	31482	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 50000	金箍幻灭	50000	1	1	2	1	0	1	0	0	2	8	40	4	0	8000	0	0	0	0	0	1010	25000	0	0	1200	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	692	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50100	皓月腾空	50100	1	1	2	1	0	1	0	0	2	6	41	10	0	16000	0	0	0	0	0	1010	30000	0	0	1200	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	50101	0	0	0	0	0	0	0	0	0	0	2	879	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50101	加速	50101	1	1	0	0	0	5	0	0	0	0	10	0	0	0	0	0	0	0	0	16	1000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	50100	0	0	0	0

--
Gitblit v1.8.0