From 1fc498bc8771d195d6ec5c4c1cde396b1bbc194a Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期三, 13 二月 2019 17:41:48 +0800
Subject: [PATCH] 6212 【后端】【1.6】合服开发单 / 【测试】【1.6】合服
---
CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt | 10 +++++++---
CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt | 31 ++++++++++++++++++++++---------
2 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt
index a7b92f8..d4568cb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt
@@ -1,4 +1,8 @@
ID MixServerDay DailyQuestID TimeList Duration NotifyInfo
-1 1 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
-2 3 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
-3 5 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
+1 1 7 [[12,0]] 60
+2 2 7 [[12,0]] 60
+3 3 7 [[12,0]] 60
+4 4 7 [[12,0]] 60
+5 5 7 [[12,0]] 60
+6 2 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
+7 4 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt
index 1223516..613b662 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt
@@ -1,12 +1,25 @@
ID MixServerDay DataMapID StartHour StartMinute EndHour EndMinute CanEnter StateValue NotifyInfo
1 1 31170 21 0 21 15 1 1 {}
2 1 31170 21 15 21 30 0 1 {}
-3 2 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-4 3 31160 20 30 20 50 1 1 {}
-5 4 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-6 4 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-7 4 31220 21 19 21 20 0 13 {}
-8 4 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-9 4 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-10 4 31220 21 49 23 59 0 23 {}
-11 5 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+3 2 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+4 2 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+5 2 31220 21 19 21 20 0 13 {}
+6 2 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+7 2 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+8 2 31220 21 49 23 59 0 23 {}
+9 1 31230 20 0 20 3 1 1 {}
+10 1 31230 20 3 20 20 1 2 {}
+11 2 31230 20 0 20 3 1 1 {}
+12 2 31230 20 3 20 20 1 2 {}
+13 3 31230 20 0 20 3 1 1 {}
+14 3 31230 20 3 20 20 1 2 {}
+15 4 31230 20 0 20 3 1 1 {}
+16 4 31230 20 3 20 20 1 2 {}
+17 5 31230 20 0 20 3 1 1 {}
+18 5 31230 20 3 20 20 1 2 {}
+19 1 31160 20 30 20 50 1 1 {}
+20 3 31160 20 30 20 50 1 1 {}
+21 5 31160 20 30 20 50 1 1 {}
+22 3 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+23 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+24 4 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
--
Gitblit v1.8.0