From b4ec4633c2ca4e57422b9ab8d0db2b2f2e32d750 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 31 一月 2019 14:19:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt |   58 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 63a294a..1e11670 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -1,10 +1,15 @@
 KEY	Numerical1	Numerical2	Numerical3	Numerical4	Numerical5
-GemOpen	1|3|5	0	0	0	0
+GemOpen	1|3|5	1|1|1	0	0	0
 GemOpenVip	6	0	0	0	0
 GemType1	3|4|5|6|7	可镶嵌生命翡翠	0	0	0
 GemType2	1|2|8|9|10	可镶嵌攻击炎晶	0	0	0
-GemTypeCount	2	0	0	0	0
-GemUpCostFormula	1_3501|2_3511	3	0	0	0
+GemType3	121|122|123|124	可镶嵌生命宝石	170	0	0
+GemType4	125|126|127|128	可镶嵌攻击宝石	171	0	0
+GemType5	129|130|131|132	可镶嵌附伤宝石	0	0	0
+GemTypeCount	5	0	0	0	0
+GemResonance	8				
+GemUpCostFormula	1_3501|2_3511|5_5521	3	0	0	0
+PutInItemPack	{"255":[30, 31], "254":[61,62,63], "32":[70,119,120,121,122,123,139], "34":[128,129,130,131,132,133,134,135,136,137,138,140]}				
 OpenBagItem	951	int(math.ceil(index/4.0))	20	0	0
 InitDepotCellCount	60	0	0	0	0
 MaxDepotCellCount	100	0	0	0	0
@@ -82,7 +87,7 @@
 LVUPAttr2	6_LV*50|7_int(LV*3)|8_int(LV*0)|9_int(LV*19)|10_LV*3	0	0	0	0
 LVUPAttr3	6_LV*58|7_int(LV*2)|8_int(LV*1)|9_LV*20|10_LV*2	0	0	0	0
 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
+AtkInterval	int(1000*max(1/math.sqrt(max(atkSpeed,1)/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*20+FinalHurtReduce*20+(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*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700+ProDefPer/10000.0*2068666))	equipScoreTotal*4	0	0	0
 RealmFBHelpAttr	{"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}}	10000	6		
@@ -107,7 +112,7 @@
 WorldLvExpRate	int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000)	0	0	0	0
 EquipSuitLimit	4	2	3	0	0
 EquipSuitColorStar	{"1":[4,1],"2":[5,2]}	2			
-EquipSuitMaxLv	{"3":{"1":9,"2":9},"4":{"1":9,"2":9},"5":{"1":9,"2":9},"6":{"1":9,"2":9},"7":{"1":9,"2":9},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}				
+EquipSuitMaxLv	{"3":{"1":10,"2":10},"4":{"1":10,"2":10},"5":{"1":10,"2":10},"6":{"1":10,"2":10},"7":{"1":10,"2":10},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}				
 EquipSuitType	{"1":[3,4,5,6,7],"2":[8,9,10]}				
 GlobalDropCD	{3802:100,3803:2880,3804:4320,3805:86400,9051:1440,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160,5408:1440,5409:10080}	{50103001:{1:[0,{4202:1,4253:2,4151:10},[]]},50103002:{1:[0,{250:1,224:2,181:20},[]]},50103003:{1:[0,{4213:1,4252:2,4151:20},[]]},50103004:{1:[0,{222:3,181:50},[]]},50103005:{1:[0,{4250:3,4151:50},[]]}}	0	0	0
 NPCGlobalDropRate	{3806:[[101,102],"10000+killedCnt*20000"]}	0	0	0	0
@@ -117,11 +122,11 @@
 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,2349,2350,2379,2380,2340,4151]	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,5414]	0	0	0	0
 MapDropBindRule	{52010:1,31340:1}	0	0	0	0
 MapDropItemNoBind	{52010:[3801,4606,4608]}	0	0	0	0
 MapDropItemBind	{}	0	0	0	0
-JobItemDropSets	{2:[5012,5022]}	{5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}	{3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]]}		
+JobItemDropSets	{2:[5012,5022]}	{5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}	{3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]],8411:[[5000,8411],[10000,8412]],8412:[[3500,8411],[7000,8412],[9000,8414],[10000,8415]],8421:[[5000,8421],[10000,8422]],8422:[[3500,8421],[7000,8422],[9000,8424],[10000,8425]],8431:[[5000,8431],[10000,8432]],8432:[[3500,8431],[7000,8432],[9000,8434],[10000,8435]]}		
 EquipDropPartSets	{102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]}				
 FamilyBOSSDropRule	6000+grade*800	min(2*playerCount,50)			
 FBGradeEquipDropRate	{}	{}	{30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,4]], 4:[[1016,1],[1131,6],[1134,6]], 5:[[1015,1],[1131,8],[1134,8]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,6]], 5:[[1015,1],[1132,8],[1135,8]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,6]], 5:[[1015,1],[1133,8],[1136,8]]}}		
@@ -153,7 +158,7 @@
 FamilyMatchCollect	10|10	3|3			
 FamilyMatchPersonalScore	12	12	{0:20, 30909004:40}	16	10
 FamilyMatchPlayTime	[60,1020,30]				
-FamilyMatchRankReward	{1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]}	[40,50,60,80,100]	[[103,2,1],[26,13200,1]]		
+FamilyMatchRankReward	{1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]}	[40,50,60,80,100]	[[26,13200,1]]		
 FamilyMatchRankOneReward	{215:[[2299,1,0]],265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]}	{215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}			
 FamilyMatchSRankOneReward	{215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}	{215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}			
 FamilyMatchDayReward	[[914,1,1],[911,1,1],[2213,1,1]]	11|12	41		
@@ -169,16 +174,16 @@
 Strengthen2	3|4|5|6|7	0	0	0	0
 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				
-SkillPlusAttrID	{102:[50000,55000,60000],103:[50100,55100,60100],104:[50400,55400,60400],105:[50200,55200,60200],106:[50300,55300,60300],107:[50800,55800,60800],108:[51000,56000,61000],109:[50000,55000,60000],110:[50100,55100,60100],111:[50400,55400,60400],112:[50200,55200,60200],113:[50300,55300,60300],114:[50800,55800,60800],115:[51000,56000,61000]}				
-EquipZhuXian	{"122":2, "125":4, "124":6, "127":8, "128":10, "126":13}	{"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]}	{"45000":{"1":[121,122,123,124,125,126,127,128]},"45001":{"2":[121,122,123,124,125,126,127,128]},"45002":{"3":[121,122,123,124,125,126,127,128]},"45100":{"1":[121,122,123,124,125,126,127,128]},"45101":{"2":[121,122,123,124,125,126,127,128]},"45102":{"3":[121,122,123,124,125,126,127,128]},"45200":{"1":[121,122,123,124,125,126,127,128]},"45201":{"2":[121,122,123,124,125,126,127,128]},"45202":{"3":[121,122,123,124,125,126,127,128]}}		
-LegendAttrRandRule	{1:[109,110,111,112,113,114,115],2:[102,103,104,105,106,107,108]}	{(128,129,130):[1], (131,132,133):[2], (134,135,136,137):[1,2]}	{(1,0):[1,2], (2,0):[1,3], (3,0):[1,4],(4,0):[2,5],(5,0):[2,6],(6,0):[2,7]}	{102:[937,468,234],103:[875,437,218],104:[833,416,208],105:[833,416,208],106:[833,416,208],107:[833,416,208],108:[1250,625,312],109:[937,468,234],110:[875,437,218],111:[833,416,208],112:[833,416,208],113:[833,416,208],114:[833,416,208],115:[1250,625,312]}	{(2,0):0, (3,0):1}
+SkillPlusAttrID	{102:[50000,55000,60000],103:[50100,55100,60100],104:[50400,55400,60400],105:[50200,55200,60200],106:[50300,55300,60300],107:[50800,55800,60800],108:[51000,56000,61000],109:[50000,55000,60000],110:[50100,55100,60100],111:[50400,55400,60400],112:[50200,55200,60200],113:[50300,55300,60300],114:[50800,55800,60800],115:[51000,56000,61000]}	{"102":[50000,55000,60000],"103":[50100,55100,60100],"104":[50400,55400,60400],"105":[50200,55200,60200],"106":[50300,55300,60300],"107":[50800,55800,60800],"108":[51000,56000,61000],"109":[50000,55000,60000],"110":[50100,55100,60100],"111":[50400,55400,60400],"112":[50200,55200,60200],"113":[50300,55300,60300],"114":[50800,55800,60800],"115":[51000,56000,61000]}			
+EquipZhuXian		{"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]}	{"45000":{"1":[121,122,123,124,125,126,127,128]},"45001":{"2":[121,122,123,124,125,126,127,128]},"45002":{"3":[129,130,131,132,125,126,127,128]},"45100":{"1":[121,122,123,124,125,126,127,128]},"45101":{"2":[121,122,123,124,125,126,127,128]},"45102":{"3":[129,130,131,132,125,126,127,128]},"45200":{"1":[121,122,123,124,125,126,127,128]},"45201":{"2":[121,122,123,124,125,126,127,128]},"45202":{"3":[129,130,131,132,125,126,127,128]}}		
+LegendAttrRandRule	{"1":[109,110,111,112,113,114,115],"2":[102,103,104,105,106,107,108]}	{"128":[1], "129":[1], "130":[1], "131":[2], "132":[2], "133":[2], "134":[1, 2], "135":[1, 2], "136":[1, 2], "137":[1, 2]}	{"1":{"0":[1,2]}, "2":{"0":[1,3]}, "3":{"0":[1,4]}, "4":{"0":[2,5]}, "5":{"0":[2,6]}, "6":{"0":[2,7]}}	{"102":[1000,500,250],"103":[2000,1000,500],"104":[1500,750,375],"105":[2500,1250,625],"106":[3000,1500,750],"107":[3750,1875,937],"108":[7500,3750,1875],"109":[1000,500,250],"110":[2000,1000,500],"111":[1500,750,375],"112":[2500,1250,625],"113":[3000,1500,750],"114":[3750,1875,937],"115":[7500,3750,1875]}	{(2,0):0, (3,0):0}
 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,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:[[9,10,52,53,25,55],[30,26,27],0],102:[[9,10,52,53,25,55],[14,26,27],0],103:[[9,10,52,53,25,55],[14,70,29],0],104:[[9,10,52,53,25,55],[30,70,29],0],105:[[9,10,52,53,25,55],[30,70,26],0]}	0	0	0	0
 LegendAttrValueByColor	{51:{3:300,4:525,5:750,6:750},19:{3:360,4:630,5:900,6:900},11:{3:600,4:1050,5:1500,6:1500},12:{3:200,4:350,5:500,6:500},70:{3:800,4:1400,5:2000,6:2000},20:{3:240,4:420,5:600,6:600},50:{3:240,4:420,5:600,6:600},49:{3:300,4:525,5:750,6:750},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	{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:{8:600,9:900,10:1200,11:1320,12:1425,13:1500,14:1575},30:{8:1200,9:1800,10:2400,11:2640,12:2850,13:3000,14:3150},14:{8:1600,9:2400,10:3200,11:3520,12:3800,13:4000,14:4200},18:{8:1000,9:1500,10:2000,11:2200,12:2375,13:2500,14:2625},71:{8:800,9:1200,10:1600,11:1760,12:1900,13:2000,14:2100}}	0	0	0	0
 EquipGSTypeForSort	101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123|128|129|130|131|132|133|134|135|136|137	0	0	0	0
-EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.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+PVPAtkBackHP*5.0+SpeedPer/10000.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*10.0+IceDef*10.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)	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*10.0+IceDef*10.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
+EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.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+PVPAtkBackHP*5.0+SpeedPer/10000.0+SkillAtkRateReduce/10000.0))	[67,68,6,7,8,9,10,11,20,19,23]	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*10.0+IceDef*10.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)	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+Hit/10000.0+Miss/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)	0
 HorseUpItem	181	100	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)}				
@@ -204,7 +209,7 @@
 FreeExpPrayItem	986	1127			
 DailyQuestMailLvLimit	110				
 DailyQuestKillMonster	60				
-FBEnterCD	31080_300|31370_300	31080_35	31080_150		
+FBEnterCD	31080_300|31370_60	31080_35	31080_150		
 FairylandNPC	[[(0,60),30801001], [(61,120),30801002], [(121,180),30801003]]	max(min(2000-(heroCnt-1)*400,2000),800)	25		
 FairylandNPCCnt	min(max(10+(heroCnt-1)*10,12+(heroCnt-1)*12-npcCnt),40+(heroCnt-1)*10-npcCnt)				
 FairylandPoint	[104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120]	1	[101,102,103]		
@@ -212,24 +217,24 @@
 XjmjFirstEnter	[5000, 25, 911]	350000			
 XjmjAddHarm	20	20061			
 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]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,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]]},31:{1:[[80,4254,1],[20,4183,1]],3:[[80,4254,1],[20,4183,1]]},32:{1:[[80,225,1],[20,4185,1]],3:[[80,225,1],[20,4185,1]]}}	{4206:1,253:1}	4254|225	
-GodAlchemy	[[6075,4706,1],[12150,4707,1],[24300,4708,1],[8100,4709,1],[2700,4710,1],[900,4711,1],[24300,4712,1],[8100,4713,1],[2700,4714,1],[900,4715,1],[12150,4716,1],[24300,4717,1],[8100,4718,1],[2700,4719,1],[900,4720,1],[24300,4721,1],[8100,4722,1],[2700,4723,1],[900,4724,1],[8100,4725,1],[2700,4726,1],[900,4727,1],[2700,4728,1],[900,4729,1],[736,4730,1],[317,4731,1],[120,4732,1],[17,4733,1],[4050,4740,1],[5,4742,1],[300,4780,1],[300,4781,1],[300,4782,1],[300,4783,1],[300,4784,1],[300,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1]]	20	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]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]},109:{15:[[1,4798,1]],40:[[1,4798,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]]},31:{1:[[80,4254,1],[20,4183,1]],3:[[80,4254,1],[20,4183,1]]},32:{1:[[80,225,1],[20,4185,1]],3:[[80,225,1],[20,4185,1]]}}	{4206:1,253:1}	4254|225	
+GodAlchemy	[[6075,4706,1],[12150,4707,1],[24300,4708,1],[8100,4709,1],[2700,4710,1],[900,4711,1],[24300,4712,1],[8100,4713,1],[2700,4714,1],[900,4715,1],[12150,4716,1],[24300,4717,1],[8100,4718,1],[2700,4719,1],[900,4720,1],[24300,4721,1],[8100,4722,1],[2700,4723,1],[900,4724,1],[8100,4725,1],[2700,4726,1],[900,4727,1],[2700,4728,1],[900,4729,1],[736,4730,1],[317,4731,1],[120,4732,1],[17,4733,1],[4050,4740,1],[5,4742,1],[300,4780,1],[300,4781,1],[300,4782,1],[300,4783,1],[300,4784,1],[300,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1],[30,4792,1],[30,4793,1],[30,4794,1],[30,4795,1],[30,4796,1],[30,4797,1],[1,4798,1]]	20	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*2)"}	500	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	1	3		
-MapLine	10040_10|10080_10|21070_1	10010_11|10020_11|10030_11|10080_11|10040_26	[10103001,10203001,10303001,10403001]	21070|21100|21110|32020	
-NeutralMapExpAward	{(21070,21100,21110,32020):[500,'int(0.6*reExp)']}				
+MapLine	10040_10|10080_10|21070_1	10010_11|10020_11|10030_11|10080_11|10040_26	[10103001,10203001,10303001,10403001]	21070|21100|21110|32020|21310	
+NeutralMapExpAward	{(21070,21100,21110,21310,32020,31230):[500,'int(0.6*reExp)']}				
 DungeonDeliver	31020|31030|31150|31031				
 DungeonIntegral	2000				
 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","51010":"50","31380":"50"}				
 FBEncourageBuff	{31080:20051,52010:20081,31380:20081}	31080_10|52010_10|31380_10	31080_10|52010_20|31380_10		
-DropRecordValue	4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078|5409				
-DropRecordEquipment	{(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0],(101,102,103,104,105):[1,3,1]}				
+DropRecordValue	4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078|5409|5302				
+DropRecordEquipment	{(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0],(101,102,103,104,105):[1,3,1],(121,122,123,124,125,126,127,128,129,130,131,132):[1,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|31501009|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|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008|31503009				
+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|31501009|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|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008|31503009|60303001|60303002|60303003|60303004|60303005|60303006|20403001|20403002|20403003|20403004|20403005|20403006|20403007|30303017|30303018|30303019|30303020				
 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,10903001,11003001,11103001,20403001,20403002,20403003,20403004,20403005,20403006,20403007):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007,40103001,40103002,40103003,40103004,40103005,40103006,40103007,40103008):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016,30303017,30303018,30303019,30303020):1}	0_3|2_3|1_9999	{0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'}	{}	{0:[21,'WorldBossNoHarm']}
@@ -271,7 +276,7 @@
 OutOfPrintValue	int(maxOOPValue*min(1,(0.001 + 0.05*(lv/400.0) + 0.1*pow((lv/400.0), 2) +0.15*pow((lv/400.0), 3) + 0.699*pow((lv/400.0), 4))))	{"79":"min(maxOOPValue,int(132141*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))", "80":"min(maxOOPValue,int(79285*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))"}			
 BossStoneDelayTime	1500				
 DogzAssist	3|6	5409	2|3|5	1_10|2_20|3_30|4_40|5_50|6_50	8352
-RandomRefreshNPC	{32020:{1:[[40108002], [101,102,103,104,105,106,107,108,129,130,131,132,133], 1, 8, 7200], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128], 1, 15, 300]}, 21110:{1:[[20302002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 2:[[20302001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60]}}				
+RandomRefreshNPC	{32020:{1:[[40108002], [101,102,103,104,105,106,107,108,129,130,131,132,133], 1, 8, 0, 2], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128], 1, 15, 300, 0]}, 21110:{1:[[20302002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 0, 2], 2:[[20302001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60, 0]}}				
 XMZZBetCfg	{}				
 XMZZAward	{"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]}	[]	[[992,1,1]]	[[993,1,1]]	500
 XMZZRobot	[30403002,30403003,30403004]	30403001			
@@ -279,7 +284,7 @@
 XMZZPKAward	[0,10,20,30,40,50,60,70,80,90]	addPer+100 + int(math.ceil(HPPer/10.0))	50	reExp*216*(100+addPer)/100	reExp*108
 CollectNPC	[[20302002, 40108002],[20302001, 40108001]]				
 PayRMB	10				
-OSCBillboardOpen	{"2":[20,1,2],"8":[50,3,3],"10":[20,4,4],"3":[12,5,5],"7":[50,6,6],"6":[1200000,7,7]}	10			
+OSCBillboardOpen	{"2":[25,1,2],"8":[50,3,3],"10":[40,4,4],"3":[40,5,5],"7":[150,6,6],"6":[3000000,7,7]}	10			
 OSCRankRedpackAward	{1:80,(2,5):81}				
 WeekResetSuccType	[]				
 InvestCost	{"1":[300],"2":[98],"3":[300,680,1280,1880],"4":[300,680,1280,1880],"5":[300,680,1280,1880]}				
@@ -296,6 +301,7 @@
 OpenServerRedPacketType	5				
 OSRAllMoneySys	[100,300,500,800,1000,1200,1500,1800]				
 OpenServerRedPacketCfg	3	10	3600	50	5
+FeastRedPacket	10	max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5))))	[100,300,500,800,1000,1200,1500,1800]	1	
 PotentialSkillLearn	{"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"51065":[15,47130],"51165":[15,47140],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290],"56065":[15,47330],"56165":[15,47340]}				
 FirstGold	{"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]}	{"1":388,"2":388}	1800		
 CTG	20181224				
@@ -311,6 +317,10 @@
 CeremonyRecharge	{"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]],"3":[[4184,1,1],[2424,1,1],[912,1,1],[1025,5,1],[4609,1,1]]}				
 CeremonyFireParty	{"0":801,"1":802,"2":803,"3":804}				
 CeremonyRankLimit	3280				
+NewCeremonyWorldLv	{"1":[[0,250],[251,300],[301,330],[331,900]],"2":[[0,250],[251,300],[301,330],[331,900]],"3":[[0,250],[251,300],[301,330],[331,900]],"4":[[0,250],[251,280],[281,330],[331,380],[381,900]]}				
+NewCeremonyRecharge	{"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]],"3":[[4184,1,1],[2424,1,1],[912,1,1],[1025,5,1],[4609,1,1]]}				
+NewCeremonyFireParty	{"0":810,"1":811,"2":812,"3":813}				
+NewCeremonyRankLimit	3280				
 TJDropTaskItem	{}				
 SuperGiftTimeList	[[6,3],[7,5],[8,7]]	[]			
 OSSaleOpenMail	[1,2,3,4,5,6,7]	[]			
@@ -336,5 +346,5 @@
 GatherSoulPackCount	150				
 ShareUseCntItem	[[2387,2428,2430],[2388,2429]] 				
 ChangeOldItem	{102:[101,6, 'GodWeaponStoneMail'],105:[104,6, 'GodWeaponStoneMail'],108:[107,6, 'GodWeaponStoneMail'],111:[110,6, 'GodWeaponStoneMail']}				
-ZhuXianBossCntCfg	3	8	5		
-ZhuXianTowerBossTime	min(max((playerPower/4+needPower)/(playerPower)*48,10),119)	8	5		
+ZhuXianBossCntCfg	2	4	4		
+ZhuXianTowerBossTime	int(min(max((playerPower/4.0+needPower)/(playerPower*1.0)*48,10),119))	8	5		

--
Gitblit v1.8.0