From 23572a06f460ee66f516486b576d2ff2a49755be Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 10 十一月 2018 10:20:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagTalentSkill.txt | 64 ++++++++++++++++----------------
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 24 ++++++------
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt | 14 +++++--
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 14 +++++--
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
9 files changed, 67 insertions(+), 53 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 5813b99..1028e7c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -1,5 +1,11 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd NotifyInfoLoop IsDayReset
-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
+1 OpenServer1 [] [] 1 1 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+2 OpenServer2 [] [] 2 2 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+3 OpenServer3 [] [] 3 3 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+4 OpenServer4 [] [] 4 4 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+5 OpenServer5 [] [] 5 5 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+6 OpenServer6 [] [] 6 6 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+7 OpenServer7 [] [] 7 7 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+8 OpenServer8 [] [] 8 8 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+9 OpenServer9 [] [] 9 9 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+10 OpenServer10 [] [] 10 10 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 345cf22..255176a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -98,3 +98,4 @@
146 300 0 0
147 60 0 0
148 205 0 0
+149 600 0 0
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index afbc90a..fb25ab3 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 2dcb317..3876dfa 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index c8051a2..b32c672 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -1,5 +1,11 @@
CfgID StartDate EndDate LimitLV IsDayReset TemplateIDList
-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
+1 1 1 5 0 1
+2 2 2 5 0 1
+3 3 3 5 0 2
+4 4 4 5 0 2
+5 5 5 5 0 3
+6 6 6 5 0 3
+7 7 7 5 0 4
+8 8 8 5 0 4
+9 9 9 5 0 4
+10 10 10 5 0 4
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index e3c784c..1da8062 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -98,3 +98,4 @@
146 300 0 0 0 4
147 60 0 0 0 0
148 205 0 0 0 0
+149 600 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
index 67b7a67..c684089 100644
--- a/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
@@ -31,35 +31,35 @@
32450 1 3
32500 1 3
32550 1 3
-35000 2 1
-35050 2 1
-35100 2 1
-35150 2 1
-35200 2 1
-35250 2 1
-35300 2 1
-35350 2 1
-35400 2 1
-35450 2 1
-35500 2 1
-35550 2 2
-35600 2 2
-35650 2 2
-35700 2 2
-35750 2 2
-35800 2 2
-35850 2 2
-35900 2 2
-35950 2 2
-36000 2 2
-37100 2 3
-37150 2 3
-37200 2 3
-37250 2 3
-37300 2 3
-37350 2 3
-37400 2 3
-37450 2 3
-37500 2 3
-37550 2 3
-37600 2 3
+35000 4 1
+35050 4 1
+35100 4 1
+35150 4 1
+35200 4 1
+35250 4 1
+35300 4 1
+35350 4 1
+35400 4 1
+35450 4 1
+35500 4 1
+35550 4 2
+35600 4 2
+35650 4 2
+35700 4 2
+35750 4 2
+35800 4 2
+35850 4 2
+35900 4 2
+35950 4 2
+36000 4 2
+37100 4 3
+37150 4 3
+37200 4 3
+37250 4 3
+37300 4 3
+37350 4 3
+37400 4 3
+37450 4 3
+37500 4 3
+37550 4 3
+37600 4 3
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index b1aa51b..56d2679 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -1,13 +1,13 @@
TemplateID NeedRechargeGold AwardIndex AwardItem NotifyKey
-1 128 0 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-1 588 1 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-1 1588 2 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-1 5000 3 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate2
-2 60 0 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-2 150 1 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-2 300 2 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-2 1500 3 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate2
-3 60 0 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-3 150 1 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-3 300 2 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate3
-3 1500 3 {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]} ConsumptionRebate2
+1 60 0 {"1":[[986,1,1],[181,10,1],[3,2,1]],"2":[[986,1,1],[181,10,1],[3,2,1]],"3":[[986,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
+1 300 1 {"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]} AccumulatedTopUp2
+1 3000 2 {"1":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]],"2":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]],"3":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]]} AccumulatedTopUp2
+2 60 0 {"1":[[983,1,1],[181,10,1],[3,2,1]],"2":[[983,1,1],[181,10,1],[3,2,1]],"3":[[983,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
+2 300 1 {"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]} AccumulatedTopUp2
+2 3000 2 {"1":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]],"2":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]],"3":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
+3 60 0 {"1":[[1128,1,1],[181,10,1],[3,2,1]],"2":[[1128,1,1],[181,10,1],[3,2,1]],"3":[[1128,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
+3 300 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
+3 3000 2 {"1":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
+4 60 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
+4 300 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
+4 3000 2 {"1":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 3804079..ed001b9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -3335,7 +3335,7 @@
35957 雪上加霜 35950 8 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4057 8000 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51500 35900 9 0 20040 0 0 0 2 3865 0 0 0 0 0 0 0 0 0 0 0 0 0 0
35958 雪上加霜 35950 9 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4057 9000 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51500 35900 9 0 20040 0 0 0 2 4092 0 0 0 0 0 0 0 0 0 0 0 0 0 0
35959 雪上加霜 35950 10 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4057 10000 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51500 35900 9 0 20040 0 0 0 2 4319 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-36000 不灭冰心 36000 1 1 4 4 0 16 0 0 0 0 10 2 0 120000 0 0 0 0 0 4028 10000 0 0 4519 0 0 0 56 10000 1 0 9 8000 4 0 10 8000 4 0 0 0 0 0 10000 0 0 0 0 0 51700 35950 6 0 20050 0 0 0 2 4547 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+36000 不灭冰心 36000 1 1 4 4 0 16 0 0 0 0 10 2 0 120000 0 0 0 0 0 4028 10000 0 0 4519 0 0 0 56 10000 1 0 9 8000 4 0 10 8000 4 0 0 0 0 0 10000 5000 0 0 0 0 51700 35950 6 0 20050 0 0 0 2 4547 0 0 0 0 0 0 0 0 0 0 0 0 0 0
36050 闪避本能 36050 1 10 4 4 0 7 0 0 0 0 10 2 0 0 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1274 0 0 0 0 0 0 0 0 0 0 0 0 0 0
36051 闪避本能 36050 2 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1529 0 0 0 0 0 0 0 0 0 0 0 0 0 0
36052 闪避本能 36050 3 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1784 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0