From 05efc787647e5e30741e5a8c438f2ec8907e88f0 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 08 十月 2018 20:16:40 +0800
Subject: [PATCH] Merge branch '1.0.18' of http://192.168.0.87:10010/r/snxx_server into 1.0.18
---
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 6 +++---
db/PyMongoDataServer/PySysDB/tagLVAward.txt | 4 ++--
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 6 +++---
CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 0e3c8f2..d6d9839 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,5 +1,5 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd NotifyInfoLoop IsDayReset
-1 test1 [] 2 3 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-2 test2 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-3 test3 [] 8 9 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+1 test1 [] 2018-5-29 2018-5-30 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+2 test2 [] 2018-5-31 2018-5-1 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+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
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc
index ec76548..da80c2b 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 7bd542e..95e9342 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index f365c81..d267d86 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index 0cb754c..c8051a2 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -1,5 +1,5 @@
CfgID StartDate EndDate LimitLV IsDayReset TemplateIDList
-1 2 3 50 0 2
-2 5 6 50 0 3
-3 8 9 50 0 3
+1 2018-5-29 2018-5-30 50 0 2
+2 2018-5-31 2018-5-1 50 0 3
+3 2018-5-2 2018-5-3 50 0 3
4 2018-9-29 2018-9-30 50 0 3
diff --git a/db/PyMongoDataServer/PySysDB/tagLVAward.txt b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
index 35d9a11..b9c8129 100644
--- a/db/PyMongoDataServer/PySysDB/tagLVAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
@@ -1,6 +1,6 @@
RewardID LV LimitNUM Reward VIPLimit VIPAward
-1 60 0 {"1":[[922,1],[4151,2],[911,1],[2,1]],"2":[[922,1],[4151,2],[911,1],[2,1]],"3":[[922,1],[4151,2],[911,1],[2,1]]} 2 [[4151,10]]
-2 80 0 {"1":[[3511,1],[1500,1],[2,1],[2107,1]],"2":[[3511,1],[1500,1],[2,1],[2107,1]],"3":[[3511,1],[1500,1],[2,1],[2107,1]]} 2 [[181,10]]
+1 60 0 {"1":[[922,1],[924,1],[911,1],[4151,2]],"2":[[922,1],[924,1],[911,1],[4151,2]],"3":[[922,1],[924,1],[911,1],[4151,2]]} 2 [[4151,10]]
+2 80 0 {"1":[[3511,1],[1500,1],[923,1],[2107,1]],"2":[[3511,1],[1500,1],[923,1],[2107,1]],"3":[[3511,1],[1500,1],[923,1],[2107,1]]} 2 [[181,10]]
3 100 0 {"1":[[4151,5],[1502,1],[4001,1],[2107,1]],"2":[[4151,5],[1502,1],[4001,1],[2107,1]],"3":[[4151,5],[1502,1],[4001,1],[2107,1]]} 2 [[194,1]]
4 120 0 {"1":[[105,2],[102,5],[141,60],[911,1]],"2":[[105,2],[102,5],[141,60],[911,1]],"3":[[105,2],[102,5],[141,60],[911,1]]} 2 [[1001,1]]
5 150 0 {"1":[[1501,1],[142,60],[151,1],[30,100]],"2":[[1501,1],[142,60],[151,1],[30,100]],"3":[[1501,1],[142,60],[151,1],[30,100]]} 3 [[5,1]]
--
Gitblit v1.8.0