From f8135c5e7b38774783394e40472912a5b19470dc Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 13 十月 2018 12:25:28 +0800
Subject: [PATCH] 4175 【测试】限时活动配置错误修复

---
 CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt |    6 +-
 CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt |  122 ++++++++++++++++++++--------------------
 CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt       |   35 ++++++-----
 3 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt
index bec16d9..9312d1a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustom.txt
@@ -81,9 +81,9 @@
 80	4	11	7	[[12,0]]	60	
 81	5	1	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
 82	5	2	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
-83	5	3	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
-84	5	5	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
-85	5	7	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
+83	5	4	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
+84	5	6	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
+85	5	8	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
 86	5	10	17	[[20,30]]	30	{-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
 87	5	1	7	[[12,0]]	60	
 88	5	2	7	[[12,0]]	60	
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
index a0d984a..1bb07da 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
@@ -3,22 +3,23 @@
 2	31170	1	21	15	21	30	0	1	{}
 3	31170	4	21	0	21	15	1	1	{}
 4	31170	4	21	15	21	30	0	1	{}
-5	31180	6	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-6	31230	1	20	0	20	15	1	1	{}
-7	31230	2	20	0	20	15	1	1	{}
-8	31230	3	20	0	20	15	1	1	{}
-9	31230	4	20	0	20	15	1	1	{}
-10	31230	5	20	0	20	15	1	1	{}
-11	31230	6	20	0	20	15	1	1	{}
-12	31230	7	20	0	20	15	1	1	{}
-13	31160	2	20	30	21	0	1	1	{}
-14	31160	4	20	30	21	0	1	1	{}
-15	31160	6	20	30	21	0	1	1	
-16	31220	5	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
-17	31220	5	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-18	31220	5	21	21	21	25	0	13	{}
-19	31220	5	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
-20	31220	5	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-21	31220	5	21	51	23	59	0	23	{}
+5	31180	2	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+6	31180	6	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+7	31230	1	20	0	20	15	1	1	{}
+8	31230	2	20	0	20	15	1	1	{}
+9	31230	3	20	0	20	15	1	1	{}
+10	31230	4	20	0	20	15	1	1	{}
+11	31230	5	20	0	20	15	1	1	{}
+12	31230	6	20	0	20	15	1	1	{}
+13	31230	7	20	0	20	15	1	1	{}
+14	31160	2	20	30	21	0	1	1	{}
+15	31160	4	20	30	21	0	1	1	{}
+16	31160	6	20	30	21	0	1	1	
+17	31220	5	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
+18	31220	5	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+19	31220	5	21	21	21	25	0	13	{}
+20	31220	5	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
+21	31220	5	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+22	31220	5	21	51	23	59	0	23	{}
 23	31010	3	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
 24	31010	7	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
index de5d4d4..09efa99 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
@@ -208,65 +208,63 @@
 207	5	10	31230	20	0	20	15	1	1	{}
 208	6	4	31170	21	0	21	15	1	1	{}
 209	6	4	31170	21	15	21	30	0	1	{}
-210	6	7	31170	21	0	21	15	1	1	{}
-211	6	7	31170	21	15	21	30	0	1	{}
-212	6	1	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-213	6	5	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-214	6	8	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-215	6	3	31160	20	30	21	0	1	1	{}
-216	6	5	31160	20	30	21	0	1	1	{}
-217	6	8	31160	20	30	21	0	1	1	{}
-218	6	3	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
-219	6	3	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-220	6	3	31220	21	21	21	25	0	13	{}
-221	6	3	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
-222	6	3	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-223	6	3	31220	21	51	23	59	0	23	{}
-224	6	7	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
-225	6	7	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-226	6	7	31220	21	21	21	25	0	13	{}
-227	6	7	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
-228	6	7	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-229	6	7	31220	21	51	23	59	0	23	{}
-230	6	2	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-231	6	6	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-232	6	9	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-233	6	1	31230	20	0	20	15	1	1	{}
-234	6	2	31230	20	0	20	15	1	1	{}
-235	6	3	31230	20	0	20	15	1	1	{}
-236	6	4	31230	20	0	20	15	1	1	{}
-237	6	5	31230	20	0	20	15	1	1	{}
-238	6	6	31230	20	0	20	15	1	1	{}
-239	6	7	31230	20	0	20	15	1	1	{}
-240	6	8	31230	20	0	20	15	1	1	{}
-241	6	9	31230	20	0	20	15	1	1	{}
-242	7	4	31170	21	0	21	15	1	1	{}
-243	7	4	31170	21	15	21	30	0	1	{}
-244	7	1	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-245	7	5	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-246	7	7	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-247	7	3	31160	20	30	21	0	1	1	{}
-248	7	5	31160	20	30	21	0	1	1	{}
-249	7	7	31160	20	30	21	0	1	1	{}
-250	7	3	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
-251	7	3	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-252	7	3	31220	21	21	21	25	0	13	{}
-253	7	3	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
-254	7	3	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-255	7	3	31220	21	51	23	59	0	23	{}
-256	7	6	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
-257	7	6	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-258	7	6	31220	21	21	21	25	0	13	{}
-259	7	6	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
-260	7	6	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-261	7	6	31220	21	51	23	59	0	23	{}
-262	7	2	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-263	7	8	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-264	7	1	31230	20	0	20	15	1	1	{}
-265	7	2	31230	20	0	20	15	1	1	{}
-266	7	3	31230	20	0	20	15	1	1	{}
-267	7	4	31230	20	0	20	15	1	1	{}
-268	7	5	31230	20	0	20	15	1	1	{}
-269	7	6	31230	20	0	20	15	1	1	{}
-270	7	7	31230	20	0	20	15	1	1	{}
-271	7	8	31230	20	0	20	15	1	1	{}
+210	6	1	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+211	6	5	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+212	6	8	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+213	6	3	31160	20	30	21	0	1	1	{}
+214	6	5	31160	20	30	21	0	1	1	{}
+215	6	8	31160	20	30	21	0	1	1	{}
+216	6	3	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
+217	6	3	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+218	6	3	31220	21	21	21	25	0	13	{}
+219	6	3	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
+220	6	3	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+221	6	3	31220	21	51	23	59	0	23	{}
+222	6	7	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
+223	6	7	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+224	6	7	31220	21	21	21	25	0	13	{}
+225	6	7	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
+226	6	7	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+227	6	7	31220	21	51	23	59	0	23	{}
+228	6	2	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+229	6	6	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+230	6	9	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+231	6	1	31230	20	0	20	15	1	1	{}
+232	6	2	31230	20	0	20	15	1	1	{}
+233	6	3	31230	20	0	20	15	1	1	{}
+234	6	4	31230	20	0	20	15	1	1	{}
+235	6	5	31230	20	0	20	15	1	1	{}
+236	6	6	31230	20	0	20	15	1	1	{}
+237	6	7	31230	20	0	20	15	1	1	{}
+238	6	8	31230	20	0	20	15	1	1	{}
+239	6	9	31230	20	0	20	15	1	1	{}
+240	7	4	31170	21	0	21	15	1	1	{}
+241	7	4	31170	21	15	21	30	0	1	{}
+242	7	1	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+243	7	5	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+244	7	7	31180	21	0	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+245	7	3	31160	20	30	21	0	1	1	{}
+246	7	5	31160	20	30	21	0	1	1	{}
+247	7	7	31160	20	30	21	0	1	1	{}
+248	7	3	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
+249	7	3	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+250	7	3	31220	21	21	21	25	0	13	{}
+251	7	3	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
+252	7	3	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+253	7	3	31220	21	51	23	59	0	23	{}
+254	7	6	31220	19	0	21	0	0	11	{0:["FamilyMatchTime", []]}
+255	7	6	31220	21	0	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+256	7	6	31220	21	21	21	25	0	13	{}
+257	7	6	31220	21	25	21	30	0	21	{0:["FamilyMatchTime", []]}
+258	7	6	31220	21	30	21	50	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+259	7	6	31220	21	51	23	59	0	23	{}
+260	7	2	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+261	7	8	31010	21	0	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+262	7	1	31230	20	0	20	15	1	1	{}
+263	7	2	31230	20	0	20	15	1	1	{}
+264	7	3	31230	20	0	20	15	1	1	{}
+265	7	4	31230	20	0	20	15	1	1	{}
+266	7	5	31230	20	0	20	15	1	1	{}
+267	7	6	31230	20	0	20	15	1	1	{}
+268	7	7	31230	20	0	20	15	1	1	{}
+269	7	8	31230	20	0	20	15	1	1	{}

--
Gitblit v1.8.0