From 87e43591a8e75001a7c9c14c46429417dee9f5dd Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 26 十月 2018 20:53:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index db3efb7..1865eaf 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,5 +1,5 @@
CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV TemplateID
-1 OpenSever1 [] 3 5 1 {0:["BossFHOpen", []]} {} 110 1
+1 OpenSever1 [] 4 6 1 {0:["BossFHOpen", []]} {} 110 1
2 OpenSever2 [] 9 11 1 {0:["BossFHOpen", []]} {} 110 1
3 Guoqing1 [7001,7002,7003,8002,8003,8004] 2018-10-1 2018-10-3 1 {0:["BossFHOpen", []]} {} 110 1
4 Guoqing2 [7001,7002,7003,8002,8003,8004] 2018-10-5 2018-10-7 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 991837e..500113b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -39,7 +39,7 @@
MailMaxItemCnt 5 0 0 0 0
OpenJob 1|2 0 0 0 0
TeamReadyTime 30
-BossShunt 10040|21070 1 5
+BossShunt 10040|21070 1 3
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|5408|9074|9075|9077|9078
DropRecordNum 40 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 22a705a..6a0ff47 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -1,5 +1,5 @@
CfgID StartDate EndDate ResetType LimitLV TemplateID
-1 3 5 1 110 1
+1 4 6 1 110 1
2 9 11 1 110 1
3 2018-10-1 2018-10-3 1 110 1
4 2018-10-5 2018-10-7 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index bd56fec..0fa3014 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -211,7 +211,7 @@
GodAreaExpAward {"Exp":"int(reExp*10)"} 5 0
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 1 5
+BossShunt 10040|21070 1 3
MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110
DungeonDeliver 31020|31030|31150
DungeonIntegral 10000
--
Gitblit v1.8.0