From 6a8db751a8c501ebaaa7d0809a439ae9c9e89ded Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期一, 22 十月 2018 20:51:14 +0800
Subject: [PATCH] Revert "4262 开服运营活动修改"
---
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 41 +++++++++-----------
db/PyMongoDataServer/PySysDB/tagStore.txt | 18 ++++----
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 41 +++++++++-----------
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 12 +++---
4 files changed, 51 insertions(+), 61 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 0560312..a2ea89b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,10 +1,10 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
-1 OpenServer01 [] 2 3 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-2 OpenServer02 [] 4 4 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-3 OpenServer03 [] 5 5 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-4 OpenServer04 [] 6 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-5 OpenServer05 [] 7 7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-5 OpenServer06 [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+1 OpenServer01 [4] 2 3 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+2 OpenServer02 [4] 4 4 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+3 OpenServer03 [4] 5 5 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+4 OpenServer04 [4] 6 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+5 OpenServer05 [4] 7 7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+5 OpenServer06 [4] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
7 NationalDay [] 2018-9-1 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
8 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
9 1OpenServer01 [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index 24f2736..154285a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -1,24 +1,19 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
-1 OpenServer01 [] 3 3 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 0
-2 OpenServer02 [] 4 4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 0
-3 OpenServer03 [] 5 5 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 0
-4 OpenServer04 [] 6 6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 0
-5 OpenServer05 [] 7 7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 0
-6 test1 [] 2018-7-24 2018-7-31 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 50 1
-7 test2 [] 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 120 {} {} [120, "LimitGift1"] 50 1
-8 NationalDay [] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift1"] 50 1
-9 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift1"] 50 1
-10 NationalDay [(200, 210)] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift1"] 50 1
-11 New1 [] 2018-8-5 2018-8-5 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-12 New2 [] 2018-8-7 2018-8-7 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-13 New3 [] 2018-8-9 2018-8-9 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-14 New4 [] 2018-8-11 2018-8-11 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-15 New5 [] 2018-8-13 2018-8-13 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
-16 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
-17 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
-18 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
-19 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
-20 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
-21 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
-22 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
-23 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+1 test1 [] 2018-7-24 2018-7-31 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 50 1
+2 test2 [] 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 120 {} {} [120, "LimitGift4"] 50 1
+3 NationalDay [] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift4"] 50 1
+4 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift4"] 50 1
+5 NationalDay [(200, 210)] 2018-9-1 2018-9-3 120 {} {} [120, "LimitGift4"] 50 1
+6 New1 [] 2018-8-5 2018-8-5 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+7 New2 [] 2018-8-7 2018-8-7 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+8 New3 [] 2018-8-9 2018-8-9 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+9 New4 [] 2018-8-11 2018-8-11 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+10 New5 [] 2018-8-13 2018-8-13 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+11 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+12 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+13 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+14 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+15 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+16 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+17 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+18 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 06c2c87..e711d99 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -1,24 +1,19 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
-1 3 3 120 100 0 SellMail3
-2 4 4 100 0 SellMail3
-3 5 5 100 0 SellMail3
-4 6 6 100 0 SellMail3
-5 7 7 100 0 SellMail3
-6 2018-7-24 2018-7-31 120 50 1 [[16],[17],[18],[20],[21],[22],[23],[24]] SellMail3
-7 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 120 50 1 [[16,17],[16,17],[16,17]] SellMail3
-8 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3
-9 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3
-10 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3
-11 2018-8-5 2018-8-5 120 100 1 [[25]] SellMail3
-12 2018-8-7 2018-8-7 120 100 1 [[26]] SellMail3
-13 2018-8-9 2018-8-9 120 100 1 [[27]] SellMail3
-14 2018-8-11 2018-8-11 120 100 1 [[28]] SellMail3
-15 2018-8-13 2018-8-13 120 100 1 [[29]] SellMail3
-16 2018-10-1 2018-10-1 120 110 0 [[31]] SellMail3
-17 2018-10-2 2018-10-2 110 0 [[32]] SellMail3
-18 2018-10-3 2018-10-3 110 0 [[33]] SellMail3
-19 2018-10-4 2018-10-4 110 0 [[34]] SellMail3
-20 2018-10-5 2018-10-5 110 0 [[35]] SellMail3
-21 2018-10-6 2018-10-6 110 0 [[36]] SellMail3
-22 2018-10-7 2018-10-7 110 0 [[31]] SellMail3
-23 2018-10-8 2018-10-8 110 0 [[37]] SellMail3
+1 2018-7-24 2018-7-31 120 50 1 [[16],[17],[18],[20],[21],[22],[23],[24]] SellMail3 [[13,2,1],[2,2,1]]
+2 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 120 50 1 [[16,17],[16,17],[16,17]] SellMail3 [[13,2,1],[2,2,1]]
+3 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+4 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+5 2018-9-1 2018-9-3 120 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+6 2018-8-5 2018-8-5 120 100 1 [[25]] SellMail3 [[13,2,1],[2,2,1]]
+7 2018-8-7 2018-8-7 120 100 1 [[26]] SellMail3 [[13,2,1],[2,2,1]]
+8 2018-8-9 2018-8-9 120 100 1 [[27]] SellMail3 [[13,2,1],[2,2,1]]
+9 2018-8-11 2018-8-11 120 100 1 [[28]] SellMail3 [[13,2,1],[2,2,1]]
+10 2018-8-13 2018-8-13 120 100 1 [[29]] SellMail3 [[13,2,1],[2,2,1]]
+11 2018-10-1 2018-10-1 120 110 0 [[31]] SellMail3
+12 2018-10-2 2018-10-2 110 0 [[32]] SellMail3
+13 2018-10-3 2018-10-3 110 0 [[33]] SellMail3
+14 2018-10-4 2018-10-4 110 0 [[34]] SellMail3
+15 2018-10-5 2018-10-5 110 0 [[35]] SellMail3
+16 2018-10-6 2018-10-6 110 0 [[36]] SellMail3
+17 2018-10-7 2018-10-7 110 0 [[31]] SellMail3
+18 2018-10-8 2018-10-8 110 0 [[37]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 9a54a8e..c6b43d1 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -131,15 +131,15 @@
712 15 0 2213 140 1 [[1128,1,1]] 1128 0 0 106 1 1 588 2000 6 OpenTakePreferential2
713 15 0 30 588 1 [[912,1,1]] 30 0 0 106 1 1 188 738 7 OpenTakePreferential1
714 15 0 4606 2 1 [[4608,2,1]] 4606 0 0 106 1 1 688 3000 7 OpenTakePreferential2
-751 16 1 4694 2 1 [[141,300,1]] 4694 0 0 0 1 1 88 450 0 LimitGift6
-752 16 1 4183 1 1 [[5303,200,1]] 4183 0 0 0 1 1 288 900 0 LimitGift7
-753 17 1 3513 2 1 [[4695,1,1]] 4695 0 0 0 1 1 88 330 0 LimitGift6
-754 17 1 4606 1 1 [[2213,120,1]] 4606 0 0 0 1 1 888 2500 0 LimitGift7
-755 18 1 912 1 1 [[30,150,1]] 30 0 0 0 1 1 88 300 0 LimitGift6
-756 18 1 200 2 1 [[4681,1,1]] 4681 0 0 0 1 1 488 1450 0 LimitGift7
-757 19 1 982 10 1 [] 982 0 0 0 1 1 888 2500 0 LimitGift6
-758 20 1 2213 30 1 [[4610,1,1]] 4610 0 0 0 1 1 88 575 0 LimitGift6
-759 20 1 4186 1 1 [[4151,50,1]] 4186 0 0 0 1 1 888 2450 0 LimitGift7
+751 16 1 15 1 1 [] 15 0 0 0 1 1 188 500 0 LimitGift6
+752 17 1 4151 60 1 [] 4151 0 0 0 1 1 188 600 0 LimitGift6
+753 18 1 181 40 1 [] 181 0 0 0 1 1 188 600 0 LimitGift6
+754 20 1 142 200 1 [[147,7,1]] 142 0 0 0 1 1 188 475 0 LimitGift6
+755 21 1 4151 30 1 [] 3 0 0 0 1 1 88 300 0 LimitGift6
+756 21 1 4151 70 1 [] 5 0 0 0 1 1 288 700 0 LimitGift7
+757 22 1 181 30 1 [] 3514 0 0 0 1 1 88 300 0 LimitGift6
+758 22 1 181 70 1 [] 3514 0 0 0 1 1 288 700 0 LimitGift7
+759 23 1 851 1 1 [] 851 0 0 0 1 1 99 300 0 LimitGift6
760 23 1 854 1 1 [] 854 0 0 0 1 1 299 600 0 LimitGift7
761 24 1 2213 25 1 [] 0 0 0 0 1 1 188 625 0 LimitGift6
762 24 1 4610 2 1 [[2213,30,1]] 4610 0 0 0 1 1 388 1150 0 LimitGift7
--
Gitblit v1.8.0