From 5ba7f9215e6128710d0016783679427df6964978 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 27 十二月 2018 15:18:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt |   49 +++++++++++++++++++++++++++++--------------------
 1 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0b9359a..765e5ec 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -15,11 +15,11 @@
 PackageSortPriority	1|5|81|4|14|13|8|9|26|28|125|27|41|22|124|21|25|20|45|58|54|39|52|6|34|35|36|76|11|12|15|17|29|44|48|50|51|60|80|7|101|102|103|104|105|106|107|108|109|111|112	0	0	0	0
 IceLodeSweep	{31401001:10,31403001:2}	0	0	0	0
 IceLodeNeedPoint	1500	31401001_50|31403001_300	0	0	0
-IceLodeCfg	25	[8,5]	125	[[5303,25,1],[5412,5,1]]	4
+IceLodeCfg	25	[8,5]	125	[[5303,50,1]]	4
 IceLodeSpecial	[31403002]	[23043,23044]			
 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]],"4111023":[[17,16]],"4111024":[[17,16]],"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]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]]} 				
+AI197Point	{"31040":[[16,34],[18,99]],"31340":[[10,29],[38,29],[58,29],[58,10],[23,10],[23,40]]} 				
+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]],"4111023":[[17,16]],"4111024":[[17,16]],"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]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]],"32010000":[[24,23]],"32010001":[[24,23]]} 				
 AIRefreshPointNPCRun	{101:[[7,15]],102:[[13,22]],103:[[21,25]]}				
 RuneUnlock	0|204|304|404|504|604|704|804	8_100	8_120	9	0
 RuneDoubleInlayCnt	101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9				
@@ -46,9 +46,9 @@
 RuneAttr17	(level-1)*50	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_440|4_220|3_110|2_66|1_44	0
 RuneAttr28	(level-1)*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_240|4_120|3_60|2_36|1_24	0
 RuneAttr29	(level-1)*30	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_280|4_140|3_70|2_42|1_28	0
-RuneExp	int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5)))	1_0.5|2_0.7|3_0.8|4_0.9|5_1	1.6	1_100|2_300|3_3000|4_15000|5_30000	0
+RuneExp	int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5)))	1_0.5|2_0.7|3_0.8|4_0.9|5_1	1.6	1_100|2_300|3_800|4_3200|5_9600	0
 RuneMaxLV	1_10|2_20|3_30|4_40|5_50	0	0	0	0
-RuneAwardCntRate	{(101,1608):[(6000,2),(8000,3),(10000,4)],(1701,3208):[(6000,2),(8000,3),(10000,4)]}	{(101,1608):[(6000,0),(9000,1),(10000,2)],(1701,3208):[(6000,0),(9000,1),(10000,2)]}	0	0	0
+RuneAwardCntRate	{(101,1608):[(6000,2),(8000,3),(10000,4)],(1701,3208):[(6000,2),(8000,3),(10000,4)]}	{(101,1608):[(9000,0),(10000,1),(10000,2)],(1701,3208):[(9000,0),(10000,1),(10000,2)]}	0	0	0
 TowerRuneType	{"1":[2],"2":[1],"3":[5],"4":[17],"5":[15],"6":[11],"7":[9],"8":[8],"9":[10],"10":[16],"11":[14],"12":[13],"13":[24],"14":[25],"15":[26],"16":[27],"17":[2],"18":[1],"19":[5],"20":[17],"21":[15],"22":[11],"23":[9],"24":[8],"25":[10],"26":[16],"27":[14],"28":[13],"29":[24],"30":[25],"31":[26],"32":[27]}	8			
 RuneAwardColor	{(101,1608):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(1000000,1)]},(1701,3208):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(500000,1),(1000000,2)]}}	{(101,1608):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(1000000,1)]},(1701,3208):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(500000,1),(1000000,2)]}}	0	0	0
 PreFourAward	{101:[(4316,3)],102:[(4316,3)],103:[(4316,2),(4317,1)],104:[(4316,2),(4317,1)]}				
@@ -78,13 +78,13 @@
 PlayerMaxLV	500	0	0	0	0
 MaxLVExpStore	20000000000	0	0	0	0
 GreatMasterStartLV	800	0	0	0	0
-LVUPAttr1	6_LV*58|7_int(LV*2.08)|8_int(LV*0.35)|9_LV*20|10_LV*2	0	0	0	0
-LVUPAttr2	6_LV*50|7_int(LV*2.4)|8_int(LV*0.3)|9_int(LV*19.5)|10_LV*3	0	0	0	0
-LVUPAttr3	6_LV*55|7_int(LV*2.08)|8_int(LV*0.35)|9_LV*19|10_LV*4	0	0	0	0
+LVUPAttr1	6_LV*58|7_int(LV*2)|8_int(LV*1)|9_LV*20|10_LV*2	0	0	0	0
+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
 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*2350015))	equipScoreTotal*4	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*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		
 RealmFBHelpLimit	10				
 RealmSitNPCID	10000				
@@ -99,15 +99,15 @@
 GodWeapon1	101|102|103	0	0	0	0
 GodWeapon2	104|105|106	0	0	0	0
 GodWeapon3	107|108|109	0	0	0	0
-GodWeapon4	110|111|112	int(35469+maxHP*proDefPer/10000.0)	0	0	0
-GodWeaponActive	1	{"2":[[1,100]],  "4":[[2,150]]}	{"2":250,  "4":320}	0	0
+GodWeapon4	110|111|112	int(46870+maxHP*proDefPer/10000.0)	0	0	0
+GodWeaponActive	1	{"2":[[1,100]],  "4":[[2,100]]}	{"2":250,  "4":320}	0	0
 GodWeaponSys	{1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}				
 GodMagicExp	{"1":[1,10],"2":[1,10],"4":[1,10]}				
-MagicExterior	{"1":0,"2":0,"3":0,"4":0}	0	500		
+MagicExterior	{"1":0,"2":0,"3":0,"4":35470}	0	500		
 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":8,"2":8},"4":{"1":8,"2":8},"5":{"1":8,"2":8},"6":{"1":8,"2":8},"7":{"1":8,"2":8},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}				
+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}}				
 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}	{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
@@ -121,7 +121,7 @@
 MapDropBindRule	{52010: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],3001:[8205,8218,8231,8244,8257],3002:[8205,8218,8231,8244,8257],3003:[8205,8218,8231,8244,8257],4001:[8208,8221,8234,8247,8260],4002:[8209,8222,8235,8248,8261],4003:[8210,8223,8236,8249,8262],5002:[8211,8224,8237,8250,8263],5003:[8212,8225,8238,8251,8264],6003:[8213,8226,8239,8252,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],3001:[8205,8218,8231,8244,8257],3002:[8205,8218,8231,8244,8257],3003:[8205,8218,8231,8244,8257],4001:[8208,8221,8234,8247,8260],4002:[8209,8222,8235,8248,8261],4003:[8210,8223,8236,8249,8262],5002:[8211,8224,8237,8250,8263],5003:[8212,8225,8238,8251,8264],6003:[8213,8226,8239,8252,8265],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]}				
 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]]}}		
@@ -175,7 +175,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:{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	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/2.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)	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)	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)}				
@@ -213,12 +213,12 @@
 GodAlchemy	[[800,4706,1],[1600,4707,1],[3200,4708,1],[1600,4709,1],[800,4710,1],[400,4711,1],[3200,4712,1],[1600,4713,1],[800,4714,1],[400,4715,1],[1600,4716,1],[3200,4717,1],[1600,4718,1],[800,4719,1],[400,4720,1],[3200,4721,1],[1600,4722,1],[800,4723,1],[400,4724,1],[1600,4725,1],[800,4726,1],[400,4727,1],[800,4728,1],[400,4729,1],[145,4730,1],[94,4731,1],[53,4732,1],[11,4733,1],[533,4740,1],[5,4742,1],[200,4780,1],[200,4781,1],[200,4782,1],[200,4783,1],[200,4784,1],[200,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,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*3)"}	500	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	
-NeutralMapExpAward	{(21070,21100,21110):[500,'int(1.5*reExp)']}				
+NeutralMapExpAward	{(21070,21100,21110):[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"}				
@@ -257,14 +257,15 @@
 SealDemonFirstPos	[20,16]				
 UnblockTreasure	101|102|103	{301:'UnblockTreasure301',302:'UnblockTreasure302',303:'UnblockTreasure303',304:'UnblockTreasure304',305:'UnblockTreasure305',306:'UnblockTreasure306',307:'UnblockTreasure307',308:'UnblockTreasure308'}			
 MWSignDayAttr	{"7":100}	304			
+MagicWeaponOfKing	401_1|402_2|403_3|404_4|405_5|406_6|407_7|408_8|409_9|410_10|411_11|412_12|413_13|414_14|415_15	2			
 DiceReward	{"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,1]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,3]},"4":{"exp":"360*reExp","gold":500000,"item":[2381,4]},"5":{"exp":"360*reExp","gold":500000,"item":[2381,7]},"6":{"exp":"720*reExp","gold":1000000,"item":[2382,12]}}				
 DiceFreeNum	5				
 DiceRandomList	{0:[[1600,1],[3200,2],[4800,3],[6400,4],[8000,5],[10000,6]],1:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],2:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],3:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],4:[[1200,1],[2400,2],[3600,3],[4800,4],[6000,5],[10000,6]],5:[[1000,1],[2000,2],[3000,3],[4000,4],[5000,5],[10000,6]]}				
 TJG	int(min((min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(attackEff/10000.0)/(npcMaxHP*1.0),1)*2.9*0.320833333333333+min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(150000/10000.0)/(npcMaxHP*1.0),1)*15*0.0166666666666667+skill2*min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(50000/10000.0)/(npcMaxHP*1.0),1)*2.1*0.041667+min((((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(10000.0/10000.0)+(petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25))/(npcMaxHP*1.0),0.78)*2.06*(60*math.sqrt(atkSpeed/10000)-(4+60/8+60/12+60/16+60/20))/60*1)+max(min((petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25)/(npcMaxHP*1.0),1)-0.5,0)*0.47*math.sqrt(atkSpeed/10000),5*math.sqrt(atkSpeed/10000.0))*npcExp*(1+max(min(0.14*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.9),0.12),0)+max(min((0.15*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.95)-0.12),0),0)))*times	300	72000	{1:[50900, 50902],2:[55900,55902]}	48215|48235|48245|48260|48275|48320|48290
-AutoUseGuardian	4101	300			
+AutoUseGuardian	4101|4106	300			
 TJGGiftTime	36000				
-ItemTimeOut	{"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688]}				
-OutOfPrintValue	int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))				
+ItemTimeOut	{"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688],"4106":[4106,668,0],"4107":[4107,468,0]}				
+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))))				
 BossStoneDelayTime	1500				
 DogzAssist	3|6	5409	2|3|5	1_10|2_20|3_30|4_40|5_50|6_50	8352
 DogzFBRefreshCfg	{(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):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]}	20303001	[20302002, 20302003]		
@@ -320,3 +321,11 @@
 HelpBattleRefresh	5	5	2	5	
 HelpBattlePoint	1400	{"1":[8, 8], "2":[8, 8]}	1|2		
 HelpBattleRobot	50105026	baseHurt*hpCoefficient			
+CrossRealmCfg	5				
+CrossRealmPKAward	{"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}	{"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}	{"10":[[2139,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2139,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2139,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}		
+CrossRealmPKMatchCount	10	10	10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*20+min(max(todayBuyCount-5,0),1)*40+min(max(todayBuyCount-7,0),1)*40		
+CrossRealmPKFB	[30, 3, 30,30,10]	[[15,20,20,15,0], [33,25,25,33,0]]	2		
+GatherSoulHole	0_300|1_300|2_305|3_310|4_315|5_320|6_330	0_62|1_62|2_62|3_62|4_62|5_62|6_63			
+GatherSoulMaxLevel	1_50|2_50|3_50|4_50|5_50				
+GatherSoulLevelUp	int(4529520*(0+0.02*(level/49.0)+0.08*pow(level/49.0,2)+0.2*pow(level/49.0,3)+0.3*pow(level/49.0,4)+0.4*pow(level/49.0,5))-4529520*(0+0.02*((level-1)/49.0)+0.08*pow((level-1)/49.0,2)+0.2*pow((level-1)/49.0,3)+0.3*pow((level-1)/49.0,4)+0.4*pow((level-1)/49.0,5)))	{"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}}	1_1|2_1.8|3_2.7|4_3.6	1_100|2_200|3_300|4_400|5_500	0_1|1_1.2
+GatherSoulPackCount	150				

--
Gitblit v1.8.0