From fb935e975010e9bbb69783faf523cd3ca0e13832 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 25 十二月 2018 20:27:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt |   65 ++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 8c78f0e..cd9862d 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -1,22 +1,45 @@
 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
+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]]}	
+10	6	0	{"1":[[1128,1,1],[5411,1,1]],"2":[[1128,1,1],[5411,1,1]],"3":[[1128,1,1],[5411,1,1]]}	AccumulatedTopUp2
+10	30	1	{"1":[[4681,1,1],[5411,3,1]],"2":[[4681,1,1],[5411,3,1]],"3":[[4681,1,1],[5411,3,1]]}	AccumulatedTopUp2
+11	6	0	{"1":[[4671,2,1],[4674,2,1]],"2":[[4671,2,1],[4674,2,1]],"3":[[4671,2,1],[4674,2,1]]}	AccumulatedTopUp2
+11	30	1	{"1":[[4182,3,1],[923,5,1]],"2":[[4182,3,1],[923,5,1]],"3":[[4182,3,1],[923,5,1]]}	AccumulatedTopUp2
+12	6	0	{"1":[[4695,1,1],[912,1,1]],"2":[[4695,1,1],[912,1,1]],"3":[[4695,1,1],[912,1,1]]}	AccumulatedTopUp2
+12	30	1	{"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]}	AccumulatedTopUp2
+13	6	0	{"1":[[4007,4,1]],"2":[[4007,4,1]],"3":[[4007,4,1]]}	AccumulatedTopUp2
+13	30	1	{"1":[[108,6,1],[109,2,1]],"2":[[108,6,1],[109,2,1]],"3":[[108,6,1],[109,2,1]]}	AccumulatedTopUp2
+14	6	0	{"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]}	AccumulatedTopUp2
+14	30	1	{"1":[[4681,1,1],[5411,2,1]],"2":[[4681,1,1],[5411,2,1]],"3":[[4681,1,1],[5411,2,1]]}	AccumulatedTopUp2
+14	198	2	{"1":[[4680,1,1],[5411,5,1]],"2":[[4680,1,1],[5411,5,1]],"3":[[4680,1,1],[5411,5,1]]}	AccumulatedTopUp2
+15	6	0	{"1":[[5303,100,1]],"2":[[5303,100,1]],"3":[[5303,100,1]]}	AccumulatedTopUp2
+15	30	1	{"1":[[5412,20,1]],"2":[[5412,20,1]],"3":[[5412,20,1]]}	AccumulatedTopUp2
+15	128	2	{"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]}	AccumulatedTopUp2
+16	6	0	{"1":[[144,40,1]],"2":[[144,40,1]],"3":[[144,40,1]]}	AccumulatedTopUp2
+16	30	1	{"1":[[153,20,1]],"2":[[153,20,1]],"3":[[153,20,1]]}	AccumulatedTopUp2
+16	128	2	{"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]}	AccumulatedTopUp2

--
Gitblit v1.8.0