From bf7cefc032cd57c6f8f565afab3689dd87e0a044 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 23 十月 2018 19:29:21 +0800
Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0

---
 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 9953aac..ba1cd8c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -41,9 +41,9 @@
 TeamReadyTime	30				
 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]	21070|21100|21110	
-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				
+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				
 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,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,(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']}
 CreateRoleMap	{1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}				
 SetWorldPosShunt	{10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25}	160			
 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]		

--
Gitblit v1.8.0