From 3627a9090610ae8dcf03d5700fac37f020aec76a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 01 九月 2018 10:32:03 +0800
Subject: [PATCH] fix:增加复活CD中提示

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

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0dd92ab..6604be2 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -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]],"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]]} 				
 AIRefreshPointNPCRun	{101:[[7,15]],102:[[13,22]],103:[[21,25]]}				
 RuneUnlock	0|204|304|404|504|604|704|804	0	0	0	0
-RuneDoubleInlayCnt	908_1|1008_2|1108_3|1208_4				
+RuneDoubleInlayCnt	101_1|908_2|1008_3|1108_4|1208_5				
 RunePackageNum	200	0	0	0	0
 RuneAttr7	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
 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
@@ -99,7 +99,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:20160,3804:60480,3805:86400,260:4320,222:180,4209:1440,4250:180,9062:1440,9073:4320,9074:10080}	0	0	0	0
+GlobalDropCD	{3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160}	{50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]},50103004:{1:[0,[222,222,222,222],[]]},50103005:{1:[0,[4250,4250,4250,4250],[]]}}	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
@@ -107,7 +107,7 @@
 DropEquipPlaceMode	0	3	0	0	0
 EquipDropBindingRule		0	[108]	0	0
 MonsterDropBindingRule	[4003,4002,4005,4006,956,4501,4502,5012,5022]	0	0	0	0
-BossDropBindingRule	[959,984,958,4184,987,988,989,990,991,994,995,996,997,998,999,181,2339]	0	0	0	0
+BossDropBindingRule	[959,984,958,4184,987,988,989,990,991,994,995,996,997,998,999,181,2339,2349,2350,2379,2380,2340]	0	0	0	0
 MapDropBindRule	{52010:1}	0	0	0	0
 MapDropItemNoBind	{52010:[3801,4606,4608]}	0	0	0	0
 MapDropItemBind	{}	0	0	0	0
@@ -125,13 +125,13 @@
 FamilyRedPacketCnt	10	0	0	0	0
 FamilyRedPacketGoldLimit	1000	0	0	0	0
 FamilyBossWeekNum	5	0	0	0	0
-FamilyBossNeedFood	7000	0	0	0	0
+FamilyBossNeedFood	6000	0	0	0	0
 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	0	[100,0]	["PartyKing",1,[(28,25,1)]]	1	
+PartyReward	12800	[200,0]	["PartyKing",1,[(28,25,1)]]	1	
 FamilyPartyAreaAward	{"Exp":"int(reExp*300)"}	5	60		
-FamilyPartyDesk	1000	10			
+FamilyPartyDesk	3200	10	[(3901,150,1)]		
 FamilyActive	40|80|120|160|220	10|10|15|25|30			
 FamilyMatchSpawnPoint	[[18,74,4],[216,74,4]]	[[40,66,40,83], [190,66,190,81]]			
 FamilyMatchResourcePoint	[[(170,18,5)],[(56,131,5)],[(170,132,5)],[(111,74,5)],[(56,18,5)]]	[30909001,30909002,30909003,30909004,30909005]	[[2,5,4,3,1],[1,3,4,5,2]]	0	6000
@@ -140,7 +140,7 @@
 FamilyMatchCollect	10|10	3|3			
 FamilyMatchPersonalScore	12	12	{0:20, 30909004:40}	16	10
 FamilyMatchPlayTime	[60,1200,30]				
-FamilyMatchRankReward	{1:[[28,80,1,0],[26,60000,1,1]],4:[[28,64,1,0],[26,45000,1,1]],10:[[28,56,1,0],[26,30000,1,1]],20:[[28,48,1,0],[26,18000,1,1]],21:[[28,40,1,0],[26,12000,1,1]]}	[40,50,60,80,100]	[[103,5,1],[26,40000,1]]		
+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]]}				
 FamilyMatchDayReward	[[914,1,1],[911,1,1],[2213,1,1]]	11|12	41		
@@ -194,23 +194,23 @@
 XjmjMonsterExp	baseExp*expMulti*min((hurtValue*1.0/npcMaxHP),2.8)*reExp*(1+max(min(playerCnt-1,1),0)*0.06+max(min(playerCnt-2,1),0)*0.02-max(min(playerCnt-3,1),0)*0.03)*0.8	2	0	0	0
 XjmjFirstEnter	[5000, 25, 911]	350000			
 AlchemyNotify	3	4716	4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729		
-SpecialAlchemy	{102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}}	{1:{2:[[1,1128,1]]},11:{2:[[1,4681,1]]},31:{3:[[1,4206,1]]},21:{2:[[1,4680,1]]},32:{5:[[1,253,1]]},22:{2:[[1,4680,1]]}}	{4206:1,253:1}		
+SpecialAlchemy	{102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}}	{1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]}}	{4206:1,253:1}		
 TreasureUpRateItem	101|105|106|107|104|102|109|110	4601|4602|4603|4604|4605			
 ClientFightEnable	1	0	0	0	0
 GodAreaExpAward	{"Exp":"int(reExp*10)"}	5	0		
 AngryAdd	60	1	20	100	0
 BossHomeCost	1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200	0	0	0	0
 BossShunt	10040|21070	2	5		
-MapLine	10040_10|21070_1	10010_11|10020_11|10030_11|10040_21			
+MapLine	10040_10|21070_1	10010_11|10020_11|10030_11|10040_21	[10103001,10203001,10303001,10403001]		
 DungeonDeliver	31020|31030|31150				
 DungeonIntegral	10000				
 BuyFBCntCost	{"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}				
 FBEncourageBuff	{31080:20051,52010:20051}				
-DropRecordValue	3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
+DropRecordValue	4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|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				
-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				
-PKConfig	[[22,00], [8,00]]	50	10	10	130
+DropRecordNormal	2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251				
+DropRecordBossID	10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007				
+PKConfig	[[22,00], [8,00]]	50	10	10	100
 FamilyKilledNotify	{1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}				
 KillBossCntLimit	{(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2}	0_3|1_0|2_3	{0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'}	{1:27}	{0:[21,'WorldBossNoHarm']}
 BossHurtValue	30	0	0	0	0
@@ -261,11 +261,11 @@
 VIPInvest	{"1":[1,280],"2":[281,350],"3":[351,1000]}	4			
 GoldInvestLVLimit	300				
 OfflinePostItem	181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502				
-TreasureSet	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]}			
+TreasureSet	{0:10,1:10}	{2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}			
 TreasureSet11	[1, 10]	[248, 1984]	[[982,1], [982, 8]]	[0, 0]	[10, 100]
-TreasureSet21	max(baseRate,min(curLuck,30)*0.001+min(max(curLuck-30,0),10)*0.002+min(max(curLuck-40,0),20)*0.005)	[1, 10]	1000		
+TreasureSet21	max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10))	[1, 10]	1000		
 TreasureSet12	[1, 10]	[98, 784]	[[983,1], [983, 8]]	[1440, 0]	[5, 50]
-TreasureSet22	min(0.05,baseRate+curLuck/300.0*(0.01-baseRate)*max(1,curLuck/100.0))	[1, 10]	1000		
+TreasureSet22	min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))	[1, 10]	1000		
 OpenServerRedPacketType	5				
 OSRAllMoneySys	[100,300,500,800,1000,1200,1500,1800]				
 OpenServerRedPacketCfg	3	10	3600	50	
@@ -284,7 +284,9 @@
 CeremonyFireParty	{"0":801,"1":802,"2":803}				
 CeremonyRankLimit	3280				
 TJDropTaskItem	{20007:[120,1104,100,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}				
-SuperGiftTimeList	[[651,3],[652,4],[653,5]]	[(1,1,1)]			
-FlashGiftbagMailItem	[(1,1,1)]				
-SpringSaleMailItem	[(1,1,1)]				
-OSSaleMailItem	[(1,1,1)]				
+SuperGiftTimeList	[[651,2],[652,2],[653,2]]	[(181,1,1)]			
+FlashGiftbagMailItem	[(181,1,1)]				
+SpringSaleMailItem	[(181,1,1)]				
+OSSaleMailItem	[(181,1,1)]				
+FairyGrabBossID	[50103001,50103002,50103003,50103004,50103005,50103006,50103007]	[[26,14000,1]]			
+FairyGrabBoss	{50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}}	10	{50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]}	[[10, "FairyGrabBossWillKill"]]	

--
Gitblit v1.8.0