From b7900cd1efc6e62e709baa82e9eb672996a5913d Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 22 九月 2018 02:46:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index bdaac8a..3abeaa0 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -212,7 +212,7 @@
 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|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				
+DropRecordNormal	2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251|8206|8219|8232|8245|8258|8207|8220|8233|8246|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				
 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"}				
@@ -220,7 +220,7 @@
 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],[60,60,60,60]],1:[[20],[35],[30],[60,60,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]]}				
+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)]} 	
@@ -248,8 +248,8 @@
 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,'30',30,30,30], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'40',6,6,6], (161,162,163,164,165,166,167):[20302003,6,'30',42,42,42]}	20303001	[20302001, 20302003]		
-DogzFBCollect	{20302001:1,20302002:1}	{20302001:1,20302002:1}			
+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,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'14400',42,42,42]}	20303001	[20302002, 20302003]		
+DogzFBCollect	{20302001:2,20302002:2}	{20302001:2,20302002:3}			
 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
 XMZZRobot	[30403002,30403003]	30403001			

--
Gitblit v1.8.0