From e6424d9aace5f4cfc402f0b59725c31c9137c0d8 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 20 十一月 2018 10:33:09 +0800
Subject: [PATCH] 4897 【测试】【1.2】11/22——11/23消费返利活动
---
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 1 +
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 12 ++++++------
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 5 +++++
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 5813b99..656e726 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -3,3 +3,4 @@
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
+5 test5 [] [] 2018-11-22 2018-11-23 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index c8051a2..f2a0981 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -3,3 +3,4 @@
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
+5 2018-11-22 2018-11-23 50 0 4
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index 45731ef..54eab12 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -11,3 +11,8 @@
3 150 1 [(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)] ConsumptionRebate3
3 300 2 [(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)] ConsumptionRebate3
3 1500 3 [(4610,1,1),(4182,1,1),(181,30,1),(4151,30,1)] ConsumptionRebate2
+4 60 0 [(2107,10,1)] ConsumptionRebate3
+4 150 1 [(197,1,1),(1128,1,1)] ConsumptionRebate3
+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
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 16f59d3..fc1ccc0 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -342,12 +342,12 @@
10101005 2 0 发狂山豹 14 0 26 26 12 0 0 488 0 1 0 0 0 0 4514 0 0 0 4000 5639 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 152 0 0 0 0 0 5 0 1 1 1
10102001 2 0 凶牙猛虎 17 0 54 54 12 0 0 462 0 2 0 0 0 0 5794 0 0 0 4000 6485 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 152 0 0 0 0 0 6 0 1 1 1
10103001 2 0 狂暴巨熊 20 0 55 55 12 0 0 0 0 171 0 3 0 0 6794 0 0 0 3000 5639 2 0 200 0 6 0 0 0 0 0 0 0 0 1 10 1 1660 0 10000 0 0 5 0 0 186 1 1
-10201001 2 0 魔化野猪 22 0 36 36 12 0 0 455 0 5 0 0 0 0 7206 0 0 0 4000 7425 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 204 0 0 0 0 0 7 0 1 1 1
-10201002 2 0 云鹰 24 0 48 48 12 0 0 488 0 5 0 0 0 0 7448 0 0 0 4000 8271 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 204 0 0 0 0 0 10 0 1 1 1
-10201003 2 0 妖兵 29 0 49 49 14 0 0 509 0 6 0 0 0 0 9070 0 0 0 4000 9211 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 271 0 0 0 0 0 13 0 1 1 1
-10201004 2 0 幽魂巫师 31 0 50 50 14 0 0 561 0 6 0 0 0 0 9484 0 0 0 4000 10058 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 311 0 0 0 0 0 16 0 1 1 1
-10201005 2 0 魔物 35 0 62 62 19 0 0 613 0 7 0 0 0 0 12021 0 0 0 4000 10998 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 472 0 0 0 0 0 19 0 1 1 1
-10202001 2 0 魂灵 37 0 77 77 22 0 0 667 0 7 0 0 0 0 12527 0 0 0 4000 12220 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 518 0 0 0 0 0 22 0 1 1 1
+10201001 2 0 魔化野猪 22 0 36 36 12 0 0 455 0 5 0 0 0 0 7206 0 0 0 4000 7425 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 330 0 0 0 0 0 7 0 1 1 1
+10201002 2 0 云鹰 24 0 48 48 12 0 0 488 0 5 0 0 0 0 7448 0 0 0 4000 8271 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 330 0 0 0 0 0 10 0 1 1 1
+10201003 2 0 妖兵 29 0 49 49 14 0 0 509 0 6 0 0 0 0 9070 0 0 0 4000 9211 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 395 0 0 0 0 0 13 0 1 1 1
+10201004 2 0 幽魂巫师 31 0 50 50 14 0 0 561 0 6 0 0 0 0 9484 0 0 0 4000 10058 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 412 0 0 0 0 0 16 0 1 1 1
+10201005 2 0 魔物 35 0 62 62 19 0 0 613 0 7 0 0 0 0 12021 0 0 0 4000 10998 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 512 0 0 0 0 0 19 0 1 1 1
+10202001 2 0 魂灵 37 0 77 77 22 0 0 667 0 7 0 0 0 0 12527 0 0 0 4000 12220 0 0 200 2 6 0 0 0 0 0 0 0 0 1 10 1 550 0 0 0 0 0 22 0 1 1 1
10203001 2 0 狂躁巨猿 40 0 96 96 36 1 0 0 0 193 0 3 0 0 13136 0 0 0 3000 101543 4 0 200 0 6 0 0 0 0 0 0 0 0 1 10 1 7410 0 10000 0 0 5 0 0 186 1 1
10301001 2 0 剑士 43 0 106 106 44 0 0 715 0 18 0 0 0 0 14566 0 0 0 4000 13066 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 693 0 0 0 0 0 44 0 1 1 1
10301002 2 0 巨剑士 48 0 132 132 46 0 0 770 0 18 0 0 0 0 15812 0 0 0 4000 13912 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 760 0 0 0 0 0 66 0 1 1 1
--
Gitblit v1.8.0