From a90a16e33230eb9ae4d8333f143728eab5517432 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期四, 30 八月 2018 14:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 81cc346..dba2f7a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -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,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160}	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
@@ -201,7 +201,7 @@
 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	[10103001]		
+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"}				
@@ -288,4 +288,4 @@
 FlashGiftbagMailItem	[(1,1,1)]				
 SpringSaleMailItem	[(1,1,1)]				
 OSSaleMailItem	[(1,1,1)]				
-FairyGrabBoss	{50103001:{1:[[103,1,1],[102,1,1],[101,1,1]],2:[[102,1,1],[101,1,1]],2:[[101,1,1]]}, 50103002:{1:[[106,1,1],[105,1,1],[104,1,1]],2:[[105,1,1],[104,1,1]],2:[[104,1,1]]}}	5	{50103002:[[103,1,1],[102,1,1],[101,1,1]], 50103001:[[106,1,1],[105,1,1],[104,1,1]]}	[[50, "FairyGrabBossWillKill"], [30, "FairyGrabBossWillKill"], [10, "FairyGrabBossWillKill"]]	
+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]]}	[[50, "FairyGrabBossWillKill"], [30, "FairyGrabBossWillKill"], [10, "FairyGrabBossWillKill"]]	

--
Gitblit v1.8.0