From 980f6394235daf8a6ed0feff9c5635b7402b934c Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 23 一月 2019 11:14:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 2 --
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 16 ++++++++++++++++
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt | 11 ++++-------
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 2 --
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 11 ++++-------
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 8 --------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
8 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index c2587da..071b6eb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -7,5 +7,3 @@
6 tast6 [] [] 2018-12-8 2018-12-8 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
7 test7 [] [] 2018-12-9 2018-12-9 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
8 test8 [] [] 2018-12-15 2018-12-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-9 test9 [] [] 2019-1-26 2019-1-26 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-10 test10 [] [] 2019-1-27 2019-1-27 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 4dd0e56..a00d55b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -6,13 +6,8 @@
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
-11 OpenServer11 [] [] 11 11 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-12 OpenServer12 [] [] 12 12 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-13 OpenServer13 [] [] 13 13 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-14 OpenServer14 [] [] 14 14 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+8 OpenServer8 [] [] 8 9 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+12 OpenServer12 [] [] 12 13 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
15 New1 [] [] 2018-11-16 2018-11-16 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
16 New2 [] [] 2018-11-17 2018-11-17 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
17 New3 [] [] 2018-11-18 2018-11-18 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
@@ -30,3 +25,5 @@
29 December14 [] [] 2018-12-14 2018-12-14 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
30 December29 [] [] 2018-12-29 2018-12-29 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
31 December30 [] [] 2018-12-30 2018-12-30 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+32 test9 [] [] 2019-1-26 2019-1-26 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+33 test10 [] [] 2019-1-27 2019-1-27 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index ff09909..915dab1 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 3ddc28b..db15942 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index 021ef15..f17763c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -7,5 +7,3 @@
6 2018-12-8 2018-12-8 50 0 5
7 2018-12-9 2018-12-9 50 0 6
8 2018-12-15 2018-12-15 50 0 7
-9 2019-1-26 2019-1-26 50 0 8
-10 2019-1-27 2019-1-27 50 0 9
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index fc4c6c1..adeb271 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -6,13 +6,8 @@
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 17
-10 10 10 5 0 17
-11 11 11 5 0 18
-12 12 12 5 0 18
-13 13 13 5 0 19
-14 14 14 5 0 19
+8 8 9 5 0 22
+12 12 13 5 0 23
15 2018-11-16 2018-11-16 5 0 5
16 2018-11-17 2018-11-17 5 0 5
17 2018-11-18 2018-11-18 5 0 5
@@ -30,3 +25,5 @@
29 2018-12-14 2018-12-14 5 0 14
30 2018-12-29 2018-12-29 5 0 15
31 2018-12-30 2018-12-30 5 0 16
+32 2019-1-26 2019-1-26 5 0 20
+33 2019-1-27 2019-1-27 5 0 21
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index da85ca9..d53bf19 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -22,11 +22,3 @@
6 300 1 [(4610,1,1),(2213,20,1)] ConsumptionRebate2
7 100 0 [(108,5,1),(197,2,1)] ConsumptionRebate3
7 300 1 [(109,2,1),(197,3,1)] ConsumptionRebate2
-8 100 0 [(101,20,1),(2213,6,1)] ConsumptionRebate3
-8 500 1 [(5801,1,1),(912,1,1),(110,20,1)] ConsumptionRebate3
-8 2000 2 [(5800,1,1),(4010,2,1),(4694,10,1),(2213,10,1)] ConsumptionRebate3
-8 6000 3 [(5802,1,1),(4010,2,1),(913,10,1),(2213,10,1)] ConsumptionRebate2
-9 100 0 [(104,20,1),(2213,6,1)] ConsumptionRebate3
-9 500 1 [(5801,1,1),(912,1,1),(110,20,1)] ConsumptionRebate3
-9 2000 2 [(5800,1,1),(4010,2,1),(4694,10,1),(2213,10,1)] ConsumptionRebate3
-9 6000 3 [(5802,1,1),(4010,2,1),(913,10,1),(2213,10,1)] ConsumptionRebate2
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 4a84414..47ba111 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -49,3 +49,19 @@
18 30 1 {"1":[[5411,3,1],[5303,100,1],[4306,50,1],[4007,2,1]],"2":[[5411,3,1],[5303,100,1],[4306,50,1],[4007,2,1]],"3":[[5411,3,1],[5303,100,1],[4306,50,1],[4007,2,1]]} AccumulatedTopUp2
19 6 0 {"1":[[5410,1,1],[181,5,1],[802,1,1]],"2":[[5410,1,1],[181,5,1],[802,1,1]],"3":[[5410,1,1],[181,5,1],[802,1,1]]} AccumulatedTopUp2
19 30 1 {"1":[[1128,1,1],[5412,20,1],[4306,50,1],[4010,2,1]],"2":[[1128,1,1],[5412,20,1],[4306,50,1],[4010,2,1]],"3":[[1128,1,1],[5412,20,1],[4306,50,1],[4010,2,1]]} AccumulatedTopUp2
+20 100 0 {"1":[[101,20,1],[2213,6,1]],"2":[[101,20,1],[2213,6,1]],"3":[[101,20,1],[2213,6,1]]} AccumulatedTopUp2
+20 500 1 {"1":[[5801,1,1],[912,1,1],[110,20,1]],"2":[[5801,1,1],[912,1,1],[110,20,1]],"3":[[5801,1,1],[912,1,1],[110,20,1]]} AccumulatedTopUp2
+20 2000 2 {"1":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"2":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"3":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]]} AccumulatedTopUp2
+20 6000 3 {"1":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"2":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"3":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]]} AccumulatedTopUp2
+21 100 0 {"1":[[104,20,1],[2213,6,1]],"2":[[104,20,1],[2213,6,1]],"3":[[104,20,1],[2213,6,1]]} AccumulatedTopUp2
+21 500 1 {"1":[[5801,1,1],[912,1,1],[110,20,1]],"2":[[5801,1,1],[912,1,1],[110,20,1]],"3":[[5801,1,1],[912,1,1],[110,20,1]]} AccumulatedTopUp2
+21 2000 2 {"1":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"2":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]],"3":[[5800,1,1],[4010,2,1],[4694,10,1],[2213,10,1]]} AccumulatedTopUp2
+21 6000 3 {"1":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"2":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]],"3":[[5802,1,1],[4010,2,1],[913,10,1],[2213,10,1]]} AccumulatedTopUp2
+22 300 0 {"1":[[4610,1,1],[881,1,1],[4151,10,1]],"2":[[4610,1,1],[881,1,1],[4151,10,1]],"3":[[4610,1,1],[881,1,1],[4151,10,1]]} AccumulatedTopUp2
+22 1000 1 {"1":[[4608,1,1],[5410,3,1],[912,2,1]],"2":[[4608,1,1],[5410,3,1],[912,2,1]],"3":[[4608,1,1],[5410,3,1],[912,2,1]]} AccumulatedTopUp2
+22 3000 2 {"1":[[4606,1,1],[5411,3,1],[4694,5,1]],"2":[[4606,1,1],[5411,3,1],[4694,5,1]],"3":[[4606,1,1],[5411,3,1],[4694,5,1]]} AccumulatedTopUp2
+22 5000 3 {"1":[[63,1,1],[193,1,1],[913,1,1],[4010,4,1]],"2":[[63,1,1],[193,1,1],[913,1,1],[4010,4,1]],"3":[[63,1,1],[193,1,1],[913,1,1],[4010,4,1]]} AccumulatedTopUp2
+23 300 0 {"1":[[5801,1,1],[881,1,1],[181,10,1]],"2":[[5801,1,1],[881,1,1],[181,10,1]],"3":[[5801,1,1],[881,1,1],[181,10,1]]} AccumulatedTopUp2
+23 1000 1 {"1":[[5800,1,1],[5411,5,1],[912,2,1]],"2":[[5800,1,1],[5411,5,1],[912,2,1]],"3":[[5800,1,1],[5411,5,1],[912,2,1]]} AccumulatedTopUp2
+23 3000 2 {"1":[[5802,1,1],[2390,1,1],[5411,5,1]],"2":[[5802,1,1],[2390,1,1],[5411,5,1]],"3":[[5802,1,1],[2390,1,1],[5411,5,1]]} AccumulatedTopUp2
+23 5000 3 {"1":[[64,1,1],[4183,1,1],[913,1,1],[4010,4,1]],"2":[[64,1,1],[4183,1,1],[913,1,1],[4010,4,1]],"3":[[64,1,1],[4183,1,1],[913,1,1],[4010,4,1]]} AccumulatedTopUp2
--
Gitblit v1.8.0