From bf7cefc032cd57c6f8f565afab3689dd87e0a044 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 23 十月 2018 19:29:21 +0800
Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0
---
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index 154285a..8b3b048 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -1,12 +1,12 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
-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
+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 OpenServer06 [] 8 8 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+7 OpenServer07 [] 9 9 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 100 1
+8 OpenServer08 [] 10 10 {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
--
Gitblit v1.8.0