From dfa5c929a64369a5d6df862fee3f3e80f8574ddc Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 21 九月 2018 11:12:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 6 +++---
db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 10 +++++-----
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index cbb8c8d..9cbe958 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,6 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd NotifyInfoLoop IsDayReset
1 test1 [] 2018-8-30 2018-8-31 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 0
-2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 1
+2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 0
3 NationalDay [] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 1
-4 NationalDay1 [24] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 1
-5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 1
+4 NationalDay1 [24] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 0
+5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index ea60537..ce5528a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,6 @@
CfgID StartDate EndDate LimitLV IsDayReset TemplateIDList
1 2018-8-30 2018-8-31 50 0 1
-2 2018-7-13 2018-7-15 50 1 3
+2 2018-7-13 2018-7-15 50 0 3
3 2018-9-13 2018-9-15 50 1 1|2|3
-4 2018-9-13 2018-9-15 50 1 1
-5 5 6 50 1 1
+4 2018-9-13 2018-9-15 50 0 1
+5 5 6 50 0 1
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index ec49eed..7f9c342 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -18,22 +18,22 @@
106 2 60 7_300
106 3 80 50300|55300|60300
107 0 0
-107 1 50 1
+107 1 50 2
107 2 100 3
-107 3 110 2
+107 3 110 4
107 4 130 50500|55500|60500
108 0 0
-108 1 80 4
+108 1 80 6_15000
108 2 130 6
108 3 160 5
108 4 190 50600|55600|60600
109 0 0
-109 1 90 6_20000
+109 1 90 7_500
109 2 120 7
109 3 140 8
109 4 160 50700|55700|60700
110 0 0
-110 1 70 7_800
+110 1 70 6_20000
110 2 150 10
110 3 180 9
110 4 200 50800|55800|60800
--
Gitblit v1.8.0