From 5ca4e77ba3d006d6e5545a5bc0a765a9af24d1d7 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 21 九月 2018 11:36:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 10 +++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 9cbe958..4d54c4b 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"] 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"] 0
-5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate"] 0
+1 test1 [] 2018-8-30 2018-8-31 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
+2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
+3 NationalDay [] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 1
+4 NationalDay1 [24] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
+5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [240, "ConsumptionRebate1"] 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index 4ff09f8..7183999 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
--
Gitblit v1.8.0