From 30b27c5d6f867ed6e890f64a56cf89825908ba88 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 13 十一月 2018 10:28:05 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2
---
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 16 ++++++++--------
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 94074a4..0188e7e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,13 +1,13 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
1 OpenServer01 [] [] 2 2 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-2 OpenServer02 [] [] 3 3 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-3 OpenServer03 [] [] 5 5 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-4 OpenServer04 [] [] 6 6 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-5 OpenServer05 [] [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
-6 NationalDay [] [] 2018-9-1 2018-9-1 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-7 NationalDay [] [(1,10), (100, 110), 120] 2018-9-2 2018-9-2 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
-8 NationalDay [] [] 2018-9-3 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-9 NationalDay [] [(1,10), (100, 110), 120] 2018-9-4 2018-9-4 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+2 OpenServer02 [] [] 4 4 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+3 OpenServer03 [] [] 6 6 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+4 OpenServer04 [] [] 9 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+5 NationalDay [] [] 2018-9-1 2018-9-1 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
+6 NationalDay [] [(1,10), (100, 110), 120] 2018-9-2 2018-9-2 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+7 NationalDay [] [] 2018-9-3 2018-9-3 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
+8 NationalDay [] [(1,10), (100, 110), 120] 2018-9-4 2018-9-4 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+9 NationalDay [] [(1,10), (100, 110), 120] 2018-9-5 2018-9-5 12:00|18:00 13:00|19:00 120 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
10 1OpenServer01 [] [7001] 2018-9-7 2018-9-7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
11 1OpenServer02 [] [7001] 2018-9-9 2018-9-9 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
12 1OpenServer03 [] [7001] 2018-9-11 2018-9-11 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 8b5554e..e6e99ac 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,13 +1,13 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
1 2 2 120 50 0 [[22]] SellMail4
-2 3 3 0 50 0 [[16]] SellMail4
-3 5 5 120 50 0 [[18]] SellMail4
-4 6 6 0 50 0 [[19]] SellMail4
-5 9 10 120 50 0 [[15]] SellMail4
-6 2018-9-1 2018-9-1 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
-7 2018-9-2 2018-9-2 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-8 2018-9-3 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
-9 2018-9-4 2018-9-4 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+2 4 4 120 50 0 [[16]] SellMail4
+3 6 6 120 50 0 [[18]] SellMail4
+4 9 10 120 50 0 [[15]] SellMail4
+5 2018-9-1 2018-9-1 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+6 2018-9-2 2018-9-2 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+7 2018-9-3 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+8 2018-9-4 2018-9-4 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+9 2018-9-5 2018-9-5 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
10 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
11 2018-9-9 2018-9-9 120 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
12 2018-9-11 2018-9-11 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
--
Gitblit v1.8.0