From 95501cd2db0f8b117862e8d7880d346ca40f7686 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 11 九月 2018 16:48:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 032f213..27dd1b3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -17,9 +17,9 @@
 IceLodeNeedPoint	1500	31401001_50|31403001_300	0	0	0
 ClearDevilPoint	1200	{30102001:20,30102002:50,30102003:300}	0	0	0
 AI197Point	{"31040":[[16,34],[18,99]]} 				
-AI198Point	{"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]]} 				
+AI198Point	{"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]]} 				
 AIRefreshPointNPCRun	{101:[[7,15]],102:[[13,22]],103:[[21,25]]}				
-RuneUnlock	0|204|304|404|504|604|704|804	0	0	0	0
+RuneUnlock	0|204|304|404|504|604|704|804	8_100	8_120	0	0
 RuneDoubleInlayCnt	101_1|908_2|1008_3|1108_4|1208_5				
 RunePackageNum	200	0	0	0	0
 RuneAttr7	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
@@ -75,7 +75,7 @@
 ExpAttenuation	max(baseExp*max(1-max(playerLV-npcLV-10,0)*0.02,0),1)	0	0	0	0
 AtkInterval	int(1000*max(1/math.sqrt(atkSpeed/10000.0),0.5))	0	0	0	0
 MoveSpeed	max(int(1.0/(3+(math.sqrt(speed/100.0)-1)*2)/2.0*1000),100)	50	25	0	0
-FightpowerFormula	int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*10+FinalHurtReduce*10+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*10.0+PVPAtkBackHP*20.0))	0	0	0	0
+FightpowerFormula	int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*10+FinalHurtReduce*10+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*10.0+PVPAtkBackHP*20.0+NPCHurtAddPer/10000.0*240000))	0	0	0	0
 RealmFBHelpAttr	{"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}}	10000	6		
 RealmFBHelpLimit	10				
 RealmSitNPCID	10000				
@@ -107,7 +107,7 @@
 DropEquipPlaceMode	0	3	0	0	0
 EquipDropBindingRule		0	[108]	0	0
 MonsterDropBindingRule	[4003,4002,4005,4006,956,4501,4502,5012,5022]	0	0	0	0
-BossDropBindingRule	[959,984,958,4184,987,988,989,990,991,994,995,996,997,998,999,181,2339]	0	0	0	0
+BossDropBindingRule	[959,984,958,4184,987,988,989,990,991,994,995,996,997,998,999,181,2339,2349,2350,2379,2380,2340,4151]	0	0	0	0
 MapDropBindRule	{52010:1}	0	0	0	0
 MapDropItemNoBind	{52010:[3801,4606,4608]}	0	0	0	0
 MapDropItemBind	{}	0	0	0	0
@@ -126,12 +126,14 @@
 FamilyRedPacketGoldLimit	1000	0	0	0	0
 FamilyBossWeekNum	5	0	0	0	0
 FamilyBossNeedFood	6000	0	0	0	0
+SWRHFamilyLV	2				
+TechFamilyLV	3				
 FamilyStoreItemRule1	1|2|3|4|5|6|7	0|1|0	0	0	0
 FamilyStoreItemRule2	8|9|10	4|0|3	0	0	0
 PetFoodExchange	1130	1	50	999	0
-PartyReward	12800	[200,0]	["PartyKing",1,[(28,25,1)]]	1	
+PartyReward	[(26,12800,1)]	[200,0]	["PartyKing",1,[(28,25,1)]]	1	
 FamilyPartyAreaAward	{"Exp":"int(reExp*300)"}	5	60		
-FamilyPartyDesk	3200	10			
+FamilyPartyDesk	3200	10	[(3901,150,1)]		
 FamilyActive	40|80|120|160|220	10|10|15|25|30			
 FamilyMatchSpawnPoint	[[18,74,4],[216,74,4]]	[[40,66,40,83], [190,66,190,81]]			
 FamilyMatchResourcePoint	[[(170,18,5)],[(56,131,5)],[(170,132,5)],[(111,74,5)],[(56,18,5)]]	[30909001,30909002,30909003,30909004,30909005]	[[2,5,4,3,1],[1,3,4,5,2]]	0	6000
@@ -139,10 +141,10 @@
 FamilyMatchRandomBuff	[[113,18],[113,131],[165,74],[52,74]]	1	[30909006,30909007,30909008,30909019]	120	
 FamilyMatchCollect	10|10	3|3			
 FamilyMatchPersonalScore	12	12	{0:20, 30909004:40}	16	10
-FamilyMatchPlayTime	[60,1200,30]				
+FamilyMatchPlayTime	[60,1140,30]				
 FamilyMatchRankReward	{1:[[28,80,1,0],[26,59400,1,0]],4:[[28,64,1,0],[26,49500,1,0]],10:[[28,56,1,0],[26,39600,1,0]],20:[[28,48,1,0],[26,29700,1,0]],21:[[28,40,1,0],[26,19800,1,0]]}	[40,50,60,80,100]	[[103,5,1],[26,13200,1]]		
-FamilyMatchRankOneReward	{215 :[[2299,1,0]], 265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]}				
-FamilyMatchSRankOneReward	{215 :[[2300,1,0]], 265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}				
+FamilyMatchRankOneReward	{215:[[2299,1,0]],265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]}				
+FamilyMatchSRankOneReward	{215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}				
 FamilyMatchDayReward	[[914,1,1],[911,1,1],[2213,1,1]]	11|12	41		
 WingLV	{"5":1,"6":2,"8":3,"10":4,"12":5}				
 WingLegendAttrCount	{6:1,8:1,10:2,12:2}		0	0	0
@@ -157,12 +159,12 @@
 StrengthenLevelLimit	1_1|2_1|3_1|4_1|5_1|6_1|7_1|8_2|9_3|10_3	1_1|2_1|8_1|9_1|10_1|3_2|4_2|5_2|6_2|7_2			
 StrengthenLevelBroadCast	20|35|50|70|90|110|130|150|170|190				
 LegendAttrCount	{(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]}	{(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]}	0	0	0
-LegendAttrRule	{1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,69],18],4:[[22,45,44,53,54,55],[20,50,69],30],5:[[22,45,44,53,54,55],[20,50,11],29],6:[[22,45,44,53,54,55],[20,50,69],14],7:[[22,45,44,53,54,55],[20,50,69],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[15,25,44,52,54,55],[11,51,19],0],102:[[15,25,44,52,54,55],[11,51,19],0],103:[[22,45,44,53,54,55],[20,50,69],18],104:[[22,45,44,53,54,55],[20,50,69],30],105:[[22,45,44,53,54,55],[20,50,11],29]}	0	0	0	0
-LegendAttrValueByColor	{51:{3:200,4:320,5:400,6:400},19:{3:200,4:320,5:400,6:400},11:{3:625,4:1000,5:1250,6:1250},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},69:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:250,4:400,5:500,6:500},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}}	0	0	0	0
+LegendAttrRule	{1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,49],18],4:[[22,45,44,53,54,55],[20,50,49],30],5:[[22,45,44,53,54,55],[20,50,49],29],6:[[22,45,44,53,54,55],[20,50,49],14],7:[[22,45,44,53,54,55],[20,50,49],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[15,25,44,52,54,55],[11,51,19],0],102:[[15,25,44,52,54,55],[11,51,19],0],103:[[22,45,44,53,54,55],[20,50,69],18],104:[[22,45,44,53,54,55],[20,50,69],30],105:[[22,45,44,53,54,55],[20,50,11],29]}	0	0	0	0
+LegendAttrValueByColor	{51:{3:320,4:400,5:500,6:500},19:{3:300,4:480,5:600,6:600},11:{3:500,4:800,5:1000,6:1000},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},49:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}}	0	0	0	0
 LegendAttrValueByColor2	{51:{3:200,4:320,5:400,6:400},19:{3:200,4:320,5:400,6:400},11:{3:625,4:1000,5:1250,6:1250},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},69:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:250,4:400,5:500,6:500},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}}				
 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)*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))	[67,68,6,8,11,20,19,23]	int(((MinAtk+MaxAtk)*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))	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,8,11,20,19,23]	int(((MinAtk+MaxAtk)*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))	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)}				
@@ -184,7 +186,7 @@
 RunTaskExp	reExp*baseExp				
 RunTaskAwardTaskID	{7:2009,12:3009}				
 MoneyPray	10+min(max(cnt-2,0),1)*5+min(max(cnt-4,0),1)*5+min(max(cnt-6,0),1)*10+min(max(cnt-8,0),1)*10+min(max(cnt-10,0),1)*10+min(max(cnt-12,0),1)*10+min(max(cnt-14,0),1)*10+min(max(cnt-16,0),1)*10	1000000	28800	[1,1000000]	
-ExpPray	min(10+min(max(cnt-2,0),2)*5+min(max(cnt-4,0),1)*10+min(max(cnt-6,0),9)*10,120)	min(exp,(21600*reExp))			
+ExpPray	10+min(max(cnt-2,0),2)*5+min(max(cnt-4,0),4)*10+min(max(cnt-8,0),12)*20	min(exp,(21600*reExp))			
 FreeExpPrayItem	986	1127			
 DailyQuestMailLvLimit	110				
 FBEnterCD	31080_300	31080_35			
@@ -194,14 +196,14 @@
 XjmjMonsterExp	baseExp*expMulti*min((hurtValue*1.0/npcMaxHP),2.8)*reExp*(1+max(min(playerCnt-1,1),0)*0.06+max(min(playerCnt-2,1),0)*0.02-max(min(playerCnt-3,1),0)*0.03)*0.8	2	0	0	0
 XjmjFirstEnter	[5000, 25, 911]	350000			
 AlchemyNotify	3	4716	4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729		
-SpecialAlchemy	{102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}}	{1:{2:[[1,1128,1]]},11:{2:[[1,4681,1]]},31:{3:[[1,4206,1]]},21:{2:[[1,4680,1]]},32:{5:[[1,253,1]]},22:{2:[[1,4680,1]]}}	{4206:1,253:1}		
+SpecialAlchemy	{102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}}	{1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]}}	{4206:1,253:1}		
 TreasureUpRateItem	101|105|106|107|104|102|109|110	4601|4602|4603|4604|4605			
 ClientFightEnable	1	0	0	0	0
 GodAreaExpAward	{"Exp":"int(reExp*10)"}	5	0		
 AngryAdd	60	1	20	100	0
 BossHomeCost	1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200	0	0	0	0
-BossShunt	10040|21070	2	5		
-MapLine	10040_10|21070_1	10010_11|10020_11|10030_11|10040_21	[10103001,10203001,10303001,10403001]		
+BossShunt	10040|21070	1	5		
+MapLine	10040_10|10080_10|21070_1	10010_11|10020_11|10030_11|10080_11|10040_26	[10103001,10203001,10303001,10403001]		
 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"}				
@@ -210,7 +212,7 @@
 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|4253|224|4252|222|4250|223|4251				
 DropRecordBossID	10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007				
-PKConfig	[[22,00], [8,00]]	50	10	10	130
+PKConfig	[[22,00], [8,00]]	50	10	10	110
 FamilyKilledNotify	{1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}				
 KillBossCntLimit	{(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2}	0_3|1_0|2_3	{0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'}	{1:27}	{0:[21,'WorldBossNoHarm']}
 BossHurtValue	30	0	0	0	0
@@ -263,7 +265,7 @@
 OfflinePostItem	181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502				
 TreasureSet	{0:10,1:10}	{2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}			
 TreasureSet11	[1, 10]	[248, 1984]	[[982,1], [982, 8]]	[0, 0]	[10, 100]
-TreasureSet21	max(baseRate,int(min(curLuck,30)*1+min(max(curLuck-30,0),10)*2+min(max(curLuck-40,0),20)*5))	[1, 10]	1000		
+TreasureSet21	max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10))	[1, 10]	1000		
 TreasureSet12	[1, 10]	[98, 784]	[[983,1], [983, 8]]	[1440, 0]	[5, 50]
 TreasureSet22	min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))	[1, 10]	1000		
 OpenServerRedPacketType	5				
@@ -271,7 +273,7 @@
 OpenServerRedPacketCfg	3	10	3600	50	
 PotentialSkillLearn	{"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290]}				
 FirstGold	{"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]}	{"1":388,"2":388}	1800		
-FirstGoldTryItem	1_6621|2_6622	1_10331|2_20331	9	100	
+FirstGoldTryItem	1_6621|2_6622	1_10221|2_20221	9	100	
 ItemRecord	1	0			
 ItemRecordRule	{0:4,39:3,111:2,45:3,9:2,58:3,22:3,28:3,8:3}	[4,25,26,41,112]	[947,948,949,950,953,982,983,986,1128]	[]	[]
 GeTuiTJG	离线挂机已开始托管角色挂机,角色当前经验效率:%s经验/分,剩余离线挂机时间:%s小时%s分钟	您被[%s]杀死,剩余离线挂机时间:%s小时%s分钟	当前背包已满,赶快上线查收战利品吧	您的离线挂机时间已不足1个小时	
@@ -283,10 +285,9 @@
 CeremonyRecharge	{"0":[[1,10,1],[2,10,1],[3,10,1]],"1":[[1,10,1],[2,10,1],[3,10,1]],"2":[[1,10,1],[2,10,1],[3,10,1]]}				
 CeremonyFireParty	{"0":801,"1":802,"2":803}				
 CeremonyRankLimit	3280				
-TJDropTaskItem	{20007:[120,1104,100,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}				
-SuperGiftTimeList	[[651,2],[652,2],[653,2]]	[(181,1,1)]			
-FlashGiftbagMailItem	[(181,1,1)]				
-SpringSaleMailItem	[(181,1,1)]				
-OSSaleMailItem	[(181,1,1)]				
+TJDropTaskItem	{20007:[120,1104,50,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}				
+SuperGiftTimeList	[[651,2],[652,2],[653,2]]	[(181,1,1),(4151,1,1)]			
+OSSaleOpenMail	[1,2,3,4,5,6,7]	[(181,1,1),(4151,1,1)]			
 FairyGrabBossID	[50103001,50103002,50103003,50103004,50103005,50103006,50103007]	[[26,14000,1]]			
-FairyGrabBoss	{50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}}	10	{50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]}	[[10, "FairyGrabBossWillKill"]]	
+FairyGrabBoss	{50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}}	5	{50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]}	[[10, "FairyGrabBossWillKill"]]	
+SamboSpecialUnlock	6601|6602|6603|6604|6605|6606|6607|6608|6609|6610|6611|6612|6613|6614|6615|6616|6617|6618				

--
Gitblit v1.8.0