From 7fcb88497340f17b488b89c5e41cabfe597ba09e Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 08 十二月 2018 15:36:10 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

---
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt |   90 +++++++++++++++++++++++---------------------
 1 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 40b83de..e283ad8 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -16,35 +16,36 @@
 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
+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]]} 				
+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]]} 				
 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				
 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
-RuneAttr6	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)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr44	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr45	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr46	1000+level*100	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	0	0
-RuneAttr35	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*0.7/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr36	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*0.7/3/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr63	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr64	(1500+level*500)*1.3	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr65	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr66	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr11	1000+level*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	0	0
-RuneAttr42	level*600	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr41	level*400	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr27	(150+level*50)/2	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr8	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/3)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr26	150+level*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr15	500+level*20	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	0	0
-RuneAttr14	160+level*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	0	0
-RuneAttr17	200+level*50	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	0	0
-RuneAttr28	160+level*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	0	0
-RuneAttr29	150+level*30	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	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	5_725|4_238|3_25|2_15|1_10	0
+RuneAttr6	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)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_14459|4_4722|3_480|2_288|1_192	0
+RuneAttr44	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr45	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr46	(level-1)*100	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	5_1200|4_600|3_300|2_180|1_120	0
+RuneAttr35	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*0.7/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr36	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*0.7/3/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr63	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_2800|4_1400|3_700|2_420|1_280	0
+RuneAttr64	(level-1)*500*1.3	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_3520|4_1760|3_880|2_528|1_352	0
+RuneAttr65	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_2080|4_1040|3_520|2_312|1_208	0
+RuneAttr66	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_2280|4_1140|3_570|2_342|1_228	0
+RuneAttr11	(level-1)*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	5_1240|4_620|3_310|2_186|1_124	0
+RuneAttr42	(level-1)*600	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_1480|4_740|3_370|2_222|1_148	0
+RuneAttr41	(level-1)*400	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_880|4_440|3_220|2_132|1_88	0
+RuneAttr27	(level-1)*25	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	5_964|4_482|3_241|2_145|1_96	0
+RuneAttr8	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/3)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_623|4_270|3_104|2_63|1_42	0
+RuneAttr26	(level-1)*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	5_1348|4_674|3_337|2_202|1_135	0
+RuneAttr15	(level-1)*20	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	5_520|4_260|3_130|2_78|1_52	0
+RuneAttr14	(level-1)*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_640|4_320|3_160|2_96|1_64	0
+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
 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
@@ -83,7 +84,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*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))	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*2350015))	equipScoreTotal*4	0	0	0
 RealmFBHelpAttr	{"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}}	10000	6		
 RealmFBHelpLimit	10				
 RealmSitNPCID	10000				
@@ -98,11 +99,11 @@
 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	0	0	0	0
-GodWeaponActive	1	{"2":[[1,100]],  "4":[[2,100]]}	0	0	0
-GodWeaponSys	{1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon2'}				
-GodLv	{1:[50,150,200,250,325,500,650],2:[50,150,200,250,325,500,650],3:[50,150,200,250,325,500,650]}				
-GodMagicExp	{"1":[10,10],"2":[15,15],"4":[25,25]}				
+GodWeapon4	110|111|112	int(35469+maxHP*proDefPer/10000.0)	0	0	0
+GodWeaponActive	1	{"2":[[1,120]],  "4":[[2,120]]}	{"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		
 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			
@@ -141,7 +142,7 @@
 FamilyStoreItemRule2	8|9|10	4|0|3	0	0	0
 PetFoodExchange	1130	1	50	999	0
 PartyReward	[(26,12800,1),(28,25,1)]	[200,0]	["PartyKing",1,[(28,25,1)]]	1	
-FamilyPartySitAward	int(min((max(worldlv-reLV,0)*0.05+1),6)*18000*reExp)	int(min(max(worldlv-reLV,0)*0.25,10))			
+FamilyPartySitAward	int((1+min(max(worldlv-reLV,0)*0.2,1)+min(max(worldlv-reLV-5,0)*0.4,4)+min(max(worldlv-reLV-15,0)*0.24,1.2)+min(max(worldlv-reLV-20,0)*0.08,0.8))*18000*reExp)	0			
 FamilyPartyAreaAward	{"Exp":"int(reExp*300)"}	5	60		
 FamilyPartyDesk	3200	10	[(3901,150,1)]		
 FamilyActive	40|80|120|160|220	10|10|15|25|30			
@@ -152,7 +153,7 @@
 FamilyMatchCollect	10|10	3|3			
 FamilyMatchPersonalScore	12	12	{0:20, 30909004:40}	16	10
 FamilyMatchPlayTime	[60,1140,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,5,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]	[[102,6,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]]}	{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		
@@ -174,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*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
+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
 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)}				
@@ -208,7 +209,7 @@
 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]]}}	{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]]},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	[[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
@@ -235,12 +236,12 @@
 MunekadoTrialStarTime	{0:[[20],[20],[30,30,30,30]],1:[[20],[20],[20],[30,30,30,30]],2:[[20],[20],[20],[30,30,30,30]],3:[[20],[20],[30,30,30,30]],4:[[20],[20],[30,30,30,30]],5:[[20],[20],[30,30,30,30]]}				
 MunekadoLockLimit	5				
 ChaosDemonCfg	[[(31801001,10)],[(31801004,10)],[(31803001,1)]]	[101,102,103,104,105]			
-ChaosDemonReward	{103:1,102:3,101:5}	5_100|4_90|3_80|2_70|1_60	0*reExp	{5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]} 	
+ChaosDemonReward	{}	5_100|4_90|3_80|2_70|1_60	0*reExp	{5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]} 	
 ElderBattlefieldCfg	{31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200}	300	{0:[20,0,20],1:[20,0,20],2:[20,0,20]}	[200,600,1200,2000,3200,4800]	
 ElderBattlefieldPoint	500	500			
 ElderBattlefieldSys	['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6']	20	10		
 ElderBattlefieldExp	{1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}				
-ElderBattlefieldRobot	20	{0:60103010,1:60103010,2:60103010}	23100	5	[111,112,113,114,115,116,117,118]
+ElderBattlefieldRobot	20	{0:60103010,1:60103010,2:60103010}	23100	10	[111,112,113,114,115,116,117,118]
 ElderBattlefieldTopAward	[[2214,1,1]]				
 ElderBattlefieldBuff	[23001,23002,23003,23004]	31609001	[102,105,106,107,108]	3	
 CornerPresentedMoney	0	1			
@@ -268,12 +269,12 @@
 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]		
 DogzFBCollect	{20302001:2,20302002:2}	{20302001:2,20302002:4}			
 XMZZBetCfg	{}				
-XMZZAward	{"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]}	[]	[[992,1,1]]	[[993,1,1]]	500
+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			
 XMZZRobotSkill	{1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}				
 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
 PayRMB	10				
-OSCBillboardOpen	{"2":[20,1,2],"7":[50,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}	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			
 OSCRankRedpackAward	{1:80,(2,5):81}				
 WeekResetSuccType	[]				
 InvestCost	{"1":[300],"2":[98],"3":[300,680,1280,1880]}				
@@ -281,12 +282,12 @@
 InvestRedPackAward	{2:51,3:50}				
 VIPInvest	{"1":[1,280],"2":[281,350],"3":[351,1000]}	3			
 GoldInvestLVLimit	300				
-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]	[250, 2000]	[[982,1], [982, 10]]	[0, 0]	[10, 100]
-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		
+OfflinePostItem	181|4151|4002|4003|4008|4009|4005|4006|4011|951|956|4501|4502				
+TreasureSet	{0:10,1:10}	{2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373,4428,4433,4438,4443],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374,4429,4434,4439,4444],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375,4430,4435,4440,4445]}			
+TreasureSet11	[1, 10]	[80, 640]	[[982,1], [982, 10]]	[0, 0]	[4, 40]
+TreasureSet21	max(baseRate,min(int(min(curLuck,300)*0.2+min(max(curLuck-300,0),100)*0.4+min(max(curLuck-400,0),200)*1)+max(curLuck-999,0),10000))	[10, 100]	1000		
 TreasureSet12	[1, 10]	[30, 240]	[[983,1], [983, 10]]	[1440, 0]	[2, 20]
-TreasureSet22	min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))	[1, 10]	1000		
+TreasureSet22	min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000)	[2, 20]	1000		
 OpenServerRedPacketType	5				
 OSRAllMoneySys	[100,300,500,800,1000,1200,1500,1800]				
 OpenServerRedPacketCfg	3	10	3600	50	5
@@ -313,4 +314,7 @@
 BindJadeWheelCfg	88	{"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588}	[(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)]	{1:[(6000,3),(10000,4)],30:[(10000,9)]}	[[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
 BindJadeWheelNotice	150				
 WishingWellCfg	14400	10	8	5	
-HelpBattlePoint	1500	{"1":[20, 10], "2":[10, 5]}			
+HelpBattleCall	6	3	3	60	10
+HelpBattleRefresh	5	5	2	5	
+HelpBattlePoint	1400	{"1":[8, 8], "2":[8, 8]}	1|2		
+HelpBattleRobot	50105026	baseHurt*hpCoefficient			

--
Gitblit v1.8.0