From 7034b9a897f7644606842b0ec25c93b3b49737d1 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 21 九月 2018 16:32:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 41 +++++++++++---------
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 41 +++++++++++---------
2 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index d573cb6..e9fdb44 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,19 +1,24 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
-1 test1 [3] 7 12 12:00|18:00 13:00|19:00 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-2 NationalDay [] 2018-9-1 2018-9-3 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-3 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
-4 1OpenServer01 [7001] 2018-9-7 2018-9-7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-5 1OpenServer02 [7001] 2018-9-9 2018-9-9 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-6 1OpenServer03 [7001] 2018-9-11 2018-9-11 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-7 1OpenServer04 [7001] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-8 1OpenServer05 [7001] 2018-9-15 2018-9-15 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
-9 2OpenServer01 [7002] 2018-9-8 2018-9-8 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-10 2OpenServer02 [7002] 2018-9-10 2018-9-10 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-11 2OpenServer03 [7002] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-12 2OpenServer04 [7002] 2018-9-13 2018-9-13 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-13 2OpenServer05 [7002] 2018-9-16 2018-9-16 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
-14 3OpenServer01 [7003] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-15 3OpenServer02 [7003] 2018-9-14 2018-9-14 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-16 3OpenServer03 [7003] 2018-9-16 2018-9-16 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
-17 3OpenServer04 [7003] 2018-9-17 2018-9-17 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
-18 3OpenServer05 [7003] 2018-9-20 2018-9-20 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+1 OpenServer01 [] 2 2 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 50 0
+2 OpenServer02 [] 4 4 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 50 0
+3 OpenServer03 [] 6 6 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 50 0
+4 OpenServer04 [] 7 7 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 180 0
+5 OpenServer05 [] 10 10 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [30, "LimitGift1"] 280 0
+6 test1 [3] 7 12 12:00|18:00 13:00|19:00 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
+7 NationalDay [] 2018-9-1 2018-9-3 1440 {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 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+9 1OpenServer01 [7001] 2018-9-7 2018-9-7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+10 1OpenServer02 [7001] 2018-9-9 2018-9-9 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+11 1OpenServer03 [7001] 2018-9-11 2018-9-11 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+12 1OpenServer04 [7001] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+13 1OpenServer05 [7001] 2018-9-15 2018-9-15 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+14 2OpenServer01 [7002] 2018-9-8 2018-9-8 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+15 2OpenServer02 [7002] 2018-9-10 2018-9-10 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+16 2OpenServer03 [7002] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+17 2OpenServer04 [7002] 2018-9-13 2018-9-13 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+18 2OpenServer05 [7002] 2018-9-16 2018-9-16 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+19 3OpenServer01 [7003] 2018-9-12 2018-9-12 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+20 3OpenServer02 [7003] 2018-9-14 2018-9-14 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+21 3OpenServer03 [7003] 2018-9-16 2018-9-16 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
+22 3OpenServer04 [7003] 2018-9-17 2018-9-17 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
+23 3OpenServer05 [7003] 2018-9-20 2018-9-20 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 2c338f7..6c25bfb 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,19 +1,24 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
-1 7 12 12:00|18:00 13:00|19:00 1440 50 1 [[1,2],[2,3]] SellMail4 [[13,2,1],[2,2,1]]
-2 2018-9-1 2018-9-3 1440 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
-3 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-4 2018-9-7 2018-9-7 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-5 2018-9-9 2018-9-9 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-6 2018-9-11 2018-9-11 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-7 2018-9-12 2018-9-12 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-8 2018-9-15 2018-9-15 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
-9 2018-9-8 2018-9-8 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-10 2018-9-10 2018-9-10 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-11 2018-9-12 2018-9-12 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-12 2018-9-13 2018-9-13 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-13 2018-9-16 2018-9-16 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
-14 2018-9-12 2018-9-12 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
-15 2018-9-14 2018-9-14 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
-16 2018-9-16 2018-9-16 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
-17 2018-9-17 2018-9-17 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
-18 2018-9-20 2018-9-20 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+1 2 2 120 50 0 [[2]] SellMail4 [[181,2,1],[4151,2,1]]
+2 4 4 120 50 0 [[4]] SellMail4 [[181,2,1],[4151,2,1]]
+3 6 6 120 50 0 [[1]] SellMail4 [[181,2,1],[4151,2,1]]
+4 7 7 120 180 0 [[3]] SellMail4 [[181,2,1],[4151,2,1]]
+5 10 10 120 280 0 [[5]] SellMail4 [[181,2,1],[4151,2,1]]
+6 7 12 12:00|18:00 13:00|19:00 1440 50 1 [[1,2],[2,3]] SellMail4 [[13,2,1],[2,2,1]]
+7 2018-9-1 2018-9-3 1440 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+8 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+9 2018-9-7 2018-9-7 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+10 2018-9-9 2018-9-9 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+11 2018-9-11 2018-9-11 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+12 2018-9-12 2018-9-12 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+13 2018-9-15 2018-9-15 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+14 2018-9-8 2018-9-8 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+15 2018-9-10 2018-9-10 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+16 2018-9-12 2018-9-12 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+17 2018-9-13 2018-9-13 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+18 2018-9-16 2018-9-16 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+19 2018-9-12 2018-9-12 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+20 2018-9-14 2018-9-14 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+21 2018-9-16 2018-9-16 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+22 2018-9-17 2018-9-17 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+23 2018-9-20 2018-9-20 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
--
Gitblit v1.8.0