From f525ee60280758402cb8241c2523a376f7526118 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期三, 14 十一月 2018 14:50:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9904879..9abd03e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -8,11 +8,11 @@
 OpenBagItem	951	int(math.ceil(index/4.0))	20	0	0
 InitDepotCellCount	60	0	0	0	0
 MaxDepotCellCount	100	0	0	0	0
-DepotSortPriority	101|102|103|104|105|106|107|108|109|110|112	0	0	0	0
+DepotSortPriority	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
 InitBagCellCount	60	0	0	0	0
 MaxBagCellCount	100	0	0	0	0
 UnShowMsgBuffItemID	901|902|903	0	0	0	0
-PackageSortPriority	101|102|103|104|105|106|107|108|109|110|111	0	0	0	0
+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
 ClearDevilPoint	1200	{30102001:20,30102002:50,30102003:300}	0	0	0
@@ -20,7 +20,7 @@
 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]]} 				
 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				
+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
@@ -55,6 +55,7 @@
 ComposeAddonsType	101|102|103|104|105|106|107	0	0	0	0
 ComposeAddonsQuality	1|2	0	0	0	0
 ComposeAddonsFormula	min(int((800+100*itemClassLV)*(0.6+(itemColor-2)*0.4)),2500)	0	0	0	0
+ComposeMustSuccess	1_1|2_3|3_1				
 Coins1	万	亿	0	0	0
 BoursePriceLimit	2	100000000			
 BourseCharge	1	0			
@@ -81,7 +82,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))	int(MinAtk*10+MaxAtk*10+MaxHP+Def*20)	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))	equipScoreTotal*4	0	0	0
 RealmFBHelpAttr	{"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}}	10000	6		
 RealmFBHelpLimit	10				
 RealmSitNPCID	10000				
@@ -97,7 +98,7 @@
 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	0	0	0	0
+GodWeaponActive	1	{"2":[[1,10]], "3":[[1,15], [2,10]], "4":[[2,20], [3,10]]}	0	0	0
 GodWeaponSys	{1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2'}				
 GodLv	{1:[100,200,300,400],2:[100,200,300,400],3:[100,200,300,400]}				
 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
@@ -105,7 +106,7 @@
 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}}				
 EquipSuitType	{"1":[3,4,5,6,7],"2":[8,9,10]}				
-GlobalDropCD	{3802:100,3803:2880,3804:4320,3805:86400,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],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}}	0	0	0
+GlobalDropCD	{3802:100,3803:2880,3804:4320,3805:86400,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
 GoldModel	[(500,2100),(2000,2101),(10000,2102)]	0	0	0	0
 MapItemProtectTime	60000	0	0	0	0
@@ -137,7 +138,8 @@
 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	[(26,12800,1)]	[200,0]	["PartyKing",1,[(28,25,1)]]	1	
+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))			
 FamilyPartyAreaAward	{"Exp":"int(reExp*300)"}	5	60		
 FamilyPartyDesk	3200	10	[(3901,150,1)]		
 FamilyActive	40|80|120|160|220	10|10|15|25|30			
@@ -148,9 +150,9 @@
 FamilyMatchCollect	10|10	3|3			
 FamilyMatchPersonalScore	12	12	{0:20, 30909004:40}	16	10
 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]]}				
+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]]		
+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		
 WingLV	{"5":1,"6":2,"8":3,"10":4,"12":5}				
 WingLegendAttrCount	{5:1,6:1,8:1,10:2,12:2}		0	0	0
@@ -179,7 +181,7 @@
 VIPPrice	1_1288|2_788|3_288	1_4320|2_2160|3_720	1_至尊VIP（半年卡）|2_白金VIP（季度卡）|3_黄金VIP（包月卡）	1_增加180天VIP时长，赠送200点VIP经验，实力首选|2_增加90天VIP时长，赠送100点VIP经验|3_增加30天VIP时长	1_VipCard1|2_VipCard2|3_VipCard3
 VIPTitle	1_1|2_1|3_1|4_2|5_3|6_5|7_6|8_7|9_8|10_9				
 VIPLimit	1095	["VIPAwardMail",30]	259200	1_200|2_100|3_5	
-VIPExperience	6_2|10_1|5_1	1800			
+VIPExperience	6_2|10_1|5_1	5400			
 VIPAddAtkEXP	int(npcLV/5.0)+1	303	0	0	0
 VIPPanel	1_170|2_158|3_157|4_159|5_160|6_161|7_162|8_163|9_164|10_165				
 VIPRedPackAward	{3:54,4:55,5:56,6:57,7:58,8:59,9:60,10:61}				
@@ -188,7 +190,7 @@
 AutoBuyDrug	251|252|253|254				
 RunTaskKillNPCCnt	{(50,80):40,(81,100):45,(101,120):50,(121,140):55,(141,160):60,(161,180):65,(180,200):70,(201,220):75,(221,2000):80}				
 RunTaskCnt	7_20|12_70	7_10|12_10			
-RunTaskAward	{7:[3,200000,1500000], 12:[6,3000,8000]}	{7:[100,9999999]}			
+RunTaskAward	{7:[3,200000,1500000]}	{7:[100,9999999]}	{"12":[[28,50,1],[2324,1,1]]}	{"12":'5625*reExp'}	2103
 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]	
@@ -196,46 +198,51 @@
 FreeExpPrayItem	986	1127			
 DailyQuestMailLvLimit	110				
 DailyQuestKillMonster	60				
-FBEnterCD	31080_300	31080_35			
+FBEnterCD	31080_300	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]		
 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			
+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}		
 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*10)"}	5	0		
+GodAreaExpAward	{"Exp":"int(reExp*3)"}	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	5		
+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)']}				
 DungeonDeliver	31020|31030|31150				
-DungeonIntegral	10000				
+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"}				
 FBEncourageBuff	{31080:20051,52010:20081}	31080_10|52010_10	31080_10|52010_10		
-DropRecordValue	4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078				
+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				
 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|8205|8206|8207|8218|8219|8220|8231|8232|8233|8244|8245|8246|8257|8258|8259				
 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|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001				
 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):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2}	0_3|1_0|2_3	{0:'WB_Limit',1:'BossHome_Limit',2:'DogzDungeonPL'}	{1:27}	{0:[21,'WorldBossNoHarm']}
+KillBossCntLimit	{(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2}	0_3|2_3	{0:'WB_Limit',2:'DogzDungeonPL'}	{}	{0:[21,'WorldBossNoHarm']}
 BossHurtValue	30	0	0	0	0
 FamilyInvadeCfg	[180,1500,10,31170, [84,85,86,87], [101,31704003], {102:31704002,103:31704001}]	{1:0.5,3:0.6,4:0.8,5:1}	int(48000*reExp*starPer*min(passWheel/8.0,1))	[21010,21011]	[31704001,31704002,31704003]
 SwrhMonsterExp	reExp*baseExp				
 MunekadoTrialStarTime	{0:[[20],[40],[40,80,60,60]],1:[[20],[35],[30],[40,80,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,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:[(181,10,1),(1141,1,1)],4:[(181,8,1),(1140,1,1)],3:[(181,6,1),(1139,1,1)],2:[(181,4,1),(1138,1,1)],1:[(181,2,1),(1137,1,1)]} 	
-ElderBattlefieldCfg	{31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200}	300	20	[200,600,1200,2000,3200,4800]	
+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)]} 	
+ElderBattlefieldCfg	{31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200}	300	{0:[12,8,20],1:[20,5,20],2:[20,5,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}	20051	5	[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			
+CreateRoleMap	{1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}				
 SetWorldPosShunt	{10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10}	350			
 TransportPay	954	1			
 GuardFBCageNPCID	32502001	32504001	3		
@@ -250,11 +257,12 @@
 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			
+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))))				
 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',8,8,8], (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]		
+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
@@ -262,7 +270,7 @@
 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],"1":[200,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}	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			
 OSCRankRedpackAward	{1:80,(2,5):81}				
 WeekResetSuccType	[]				
 InvestCost	{"1":[300],"2":[98],"3":[300,680,1280,1880]}				
@@ -294,11 +302,11 @@
 CeremonyFireParty	{"0":801,"1":802,"2":803}				
 CeremonyRankLimit	3280				
 TJDropTaskItem	{}				
-SuperGiftTimeList	[[651,2],[652,2],[653,2]]	[]			
+SuperGiftTimeList	[[651,3],[652,5],[653,7]]	[]			
 OSSaleOpenMail	[1,2,3,4,5,6,7]	[]			
 FairyGrabBossID	[50103001,50103002,50103003,50103004,50103005,50103006,50103007]	[[26,14000,1]]	-60		
 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]]}}	2	{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	9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018				
 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	7200	refreshCnt+10	8	5	
+WishingWellCfg	14400	10	8	5	

--
Gitblit v1.8.0