From e5cc29b7f705c26cc4ce7b87bc937f2710cc095d Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 27 十一月 2018 21:24:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 6 ++++++
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt | 9 +++++++++
CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc | 0
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 9 +++++++++
4 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 1028e7c..37599e2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -9,3 +9,12 @@
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
+11 New1 [] [] 2018-11-16 2018-11-16 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+12 New2 [] [] 2018-11-17 2018-11-17 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+13 New3 [] [] 2018-11-18 2018-11-18 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+14 New4 [] [] 2018-11-19 2018-11-19 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+15 New5 [] [] 2018-11-20 2018-11-20 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+16 New6 [] [] 2018-11-21 2018-11-21 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+17 New7 [] [] 2018-11-22 2018-11-22 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+18 New8 [] [] 2018-12-1 2018-12-1 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+19 New9 [] [] 2018-12-2 2018-12-2 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc
new file mode 100644
index 0000000..7756a70
--- /dev/null
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index b32c672..eb9bda2 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -9,3 +9,12 @@
8 8 8 5 0 4
9 9 9 5 0 4
10 10 10 5 0 4
+11 2018-11-16 2018-11-16 5 0 5
+12 2018-11-17 2018-11-17 5 0 5
+13 2018-11-18 2018-11-18 5 0 5
+14 2018-11-19 2018-11-19 5 0 5
+15 2018-11-20 2018-11-20 5 0 5
+16 2018-11-21 2018-11-21 5 0 5
+17 2018-11-22 2018-11-22 5 0 5
+18 2018-12-1 2018-12-1 5 0 6
+19 2018-12-2 2018-12-2 5 0 7
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 4cf12bc..8c78f0e 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -14,3 +14,9 @@
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
--
Gitblit v1.8.0