From ec91316f550cc40b74395cc2a57c33d681393e30 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期五, 23 十一月 2018 10:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 16 ++++++++--------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 02bd74a..1bb3b6f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -55,14 +55,14 @@
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [3,1800,15,101]
-51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [5,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [793536, [141,45]]
-51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [5,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [135,33,33,33,33] [831840, [141,36], [142,6]]
-51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [5,360,10] [{5101031:1, 5101032:1}] [150,38,38,38,38] [1017600, [141,13], [142,18], [143,5]]
-51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [5,360,10] [{5101041:0, 5101042:1}] [150,38,38,38,38] [1169280, [142,24], [143,8]]
-51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [5,360,10] [{5101051:1, 5101052:0}] [150,38,38,38,38] [1404720, [142,9], [143,15], [144,6]]
-51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [5,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [150,38,38,38,38] [1666080, [143,18], [144,9]]
-51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [5,360,10] [{5101071:1, 5101072:0}] [150,38,38,38,38] [1953360, [144,15]]
-51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [5,360,10] [{5101081:1}] [150,38,38,38,38] [2265840, [153,15]]
+51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [5,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,30,30,30,30] [793536, [141,45]]
+51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [5,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,30,30,30,30] [831840, [141,36], [142,6]]
+51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [5,360,10] [{5101031:1, 5101032:1}] [60,30,30,30,30] [1017600, [141,13], [142,18], [143,5]]
+51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [5,360,10] [{5101041:0, 5101042:1}] [60,30,30,30,30] [1169280, [142,24], [143,8]]
+51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [5,360,10] [{5101051:1, 5101052:0}] [60,30,30,30,30] [1404720, [142,9], [143,15], [144,6]]
+51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [5,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [60,30,30,30,30] [1666080, [143,18], [144,9]]
+51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [5,360,10] [{5101071:1, 5101072:0}] [60,30,30,30,30] [1953360, [144,15]]
+51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [5,360,10] [{5101081:1}] [60,30,30,30,30] [2265840, [153,15]]
60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [5,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [5,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [5,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9b727b5..0709515 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -232,7 +232,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],[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]]}
+MunekadoTrialStarTime {0:[[20],[20],[30,30,30,30]],1:[[20],[20],[20],[30,30,30,30]],2:[[20],[20],[20],[30,30,30,30]],3:[[20],[20],[30,30,30,30]],4:[[20],[20],[30,30,30,30]],5:[[20],[20],[30,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:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}
--
Gitblit v1.8.0