From 0412bb1c695db26ae328f53c53a5268a4cb4a8ee Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期一, 10 九月 2018 21:45:01 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

---
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 2e3c213..a930bdc 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -39,8 +39,8 @@
 MailMaxItemCnt	5	0	0	0	0
 OpenJob	1|2	0	0	0	0
 TeamReadyTime	30				
-BossShunt	10040|21070	2	5		
-MapLine	10040_10|10080_5|21070_1	10010_11|10020_11|10030_11|10080_6|10040_21	[10103001,10203001,10303001,10403001]		
+BossShunt	10040|21070	1	5		
+MapLine	10040_10|10080_10|21070_1	10010_11|10020_11|10030_11|10080_11|10040_26	[10103001,10203001,10303001,10403001]		
 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				
 DropRecordNum	40	1			
 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']}

--
Gitblit v1.8.0