From 31613971311d5e08efeabb83f80de6d141b9f3b3 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 11 十二月 2018 20:41:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 931b138..071b6eb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -6,4 +6,4 @@
5 test5 [] [] 2018-11-22 2018-11-23 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
6 tast6 [] [] 2018-12-8 2018-12-8 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
7 test7 [] [] 2018-12-9 2018-12-9 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-8 test8 [] [] 2018-12-9 2018-12-9 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+8 test8 [] [] 2018-12-15 2018-12-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index acd3619..f17763c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -6,4 +6,4 @@
5 2018-11-22 2018-11-23 50 0 4
6 2018-12-8 2018-12-8 50 0 5
7 2018-12-9 2018-12-9 50 0 6
-8 2018-12-9 2018-12-9 50 0 7
+8 2018-12-15 2018-12-15 50 0 7
--
Gitblit v1.8.0