From f3f68728ea4ffcf53133d30240a1684f403ed038 Mon Sep 17 00:00:00 2001
From: CeHua_TRX <526616766@qq.com>
Date: 星期一, 03 十二月 2018 20:59:43 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 54 +++++++++++++++++++++++++++---------------------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 7ed6eb8..b4a7807 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc
index 34ad094..78278c1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 6c2fc9d..946a7ee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 8396e88..a677b06 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -1,28 +1,28 @@
TemplateID NeedRechargeGold AwardIndex AwardItem NotifyKey
-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,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"3":[[982,10,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,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"3":[[982,10,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,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,10,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,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
-5 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
-5 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
-5 1000 2 {"1":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
-6 60 0 {"1":[[4181,2,1],[30,100,1]],"2":[[4181,2,1],[30,100,1]],"3":[[4181,2,1],[30,100,1]]} AccumulatedTopUp2
-6 300 1 {"1":[[4681,1,1],[30,200,1]],"2":[[4681,1,1],[30,200,1]],"3":[[4681,1,1],[30,200,1]]} AccumulatedTopUp2
-6 1500 2 {"1":[[4010,6,1],[30,600,1]],"2":[[4010,6,1],[30,600,1]],"3":[[4010,6,1],[30,600,1]]} AccumulatedTopUp2
-7 60 0 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
-7 300 1 {"1":[[1128,1,1],[30,200,1]],"2":[[1128,1,1],[30,200,1]],"3":[[1128,1,1],[30,200,1]]} AccumulatedTopUp2
-7 1500 2 {"1":[[4010,6,1],[30,600,1]],"2":[[4010,6,1],[30,600,1]],"3":[[4010,6,1],[30,600,1]]} AccumulatedTopUp2
-8 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]]}
-8 300 1 {"1":[[881,1,1],[4151,10,1],[4306,50,1]],"2":[[881,1,1],[4151,10,1],[4306,50,1]],"3":[[881,1,1],[4151,10,1],[4306,50,1]]}
-8 3000 2 {"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}
-9 60 0 {"1":[[983,3,1],[181,10,1],[3,2,1]],"2":[[983,3,1],[181,10,1],[3,2,1]],"3":[[983,3,1],[181,10,1],[3,2,1]]}
-9 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]]}
-9 3000 2 {"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}
+1 6 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 30 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 300 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 6 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 30 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 300 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 6 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 30 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 300 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 6 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 30 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 300 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
+5 6 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
+5 30 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
+5 100 2 {"1":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
+6 6 0 {"1":[[4181,2,1],[30,100,1]],"2":[[4181,2,1],[30,100,1]],"3":[[4181,2,1],[30,100,1]]} AccumulatedTopUp2
+6 30 1 {"1":[[4681,1,1],[30,200,1]],"2":[[4681,1,1],[30,200,1]],"3":[[4681,1,1],[30,200,1]]} AccumulatedTopUp2
+6 150 2 {"1":[[4010,6,1],[30,600,1]],"2":[[4010,6,1],[30,600,1]],"3":[[4010,6,1],[30,600,1]]} AccumulatedTopUp2
+7 6 0 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
+7 30 1 {"1":[[1128,1,1],[30,200,1]],"2":[[1128,1,1],[30,200,1]],"3":[[1128,1,1],[30,200,1]]} AccumulatedTopUp2
+7 150 2 {"1":[[4010,6,1],[30,600,1]],"2":[[4010,6,1],[30,600,1]],"3":[[4010,6,1],[30,600,1]]} AccumulatedTopUp2
+8 6 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]]}
+8 30 1 {"1":[[881,1,1],[4151,10,1],[4306,50,1]],"2":[[881,1,1],[4151,10,1],[4306,50,1]],"3":[[881,1,1],[4151,10,1],[4306,50,1]]}
+8 300 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]]}
+9 6 0 {"1":[[983,3,1],[181,10,1],[3,2,1]],"2":[[983,3,1],[181,10,1],[3,2,1]],"3":[[983,3,1],[181,10,1],[3,2,1]]}
+9 30 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]]}
+9 300 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]]}
--
Gitblit v1.8.0