From 9a115f3559e9dd44ad0903d20198d81fe3bc1cb6 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 03 十二月 2018 21:04:26 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 2 ++
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 4 ++++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 656e726..b019669 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -4,3 +4,5 @@
3 test3 [] [] 2018-5-2 2018-5-3 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
4 tast4 [] [7001,7002,7003,8002,8003,8004] 2018-9-29 2018-9-30 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
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
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index f2a0981..5939c78 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -4,3 +4,5 @@
3 2018-5-2 2018-5-3 50 0 3
4 2018-9-29 2018-9-30 50 0 3
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
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index 54eab12..2fe5b6e 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -16,3 +16,7 @@
4 300 2 [(4007,4,1),(2213,10,1)] ConsumptionRebate3
4 1500 3 [(4010,8,1),(30,500,1)] ConsumptionRebate3
4 3000 4 [(4681,1,1),(30,1000,1)] ConsumptionRebate2
+5 100 0 [(912,1,1),(4694,2,1)] ConsumptionRebate3
+5 300 1 [(9131,1,1),(4694,2,1)] ConsumptionRebate2
+6 100 0 [(4609,1,1),(2213,10,1)] ConsumptionRebate3
+6 300 1 [(4610,1,1),(2213,20,1)] ConsumptionRebate2
--
Gitblit v1.8.0