~admin/snxx_server.git

parent: b7eb668c | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua-TT

2019-01-15 16506e9c5f609391855b67ad3dcff39a44cfa1d7

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

5个文件已修改

	db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagCollectNPC.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagStore.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinItem.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt

@@ -7,12 +7,12 @@
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

11    11    11    5    0    8

12    12    12    5    0    8

13    13    13    5    0    9

14    14    14    5    0    9

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

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


 db/PyMongoDataServer/PySysDB/tagCollectNPC.txt

@@ -1,5 +1,5 @@
NPCID    PrepareTime    LostHPPer    CollectCount    CollectCountLimitNotify    CollectAward

20302001    10    2|2    0    DogzSmallTreasureLimit    [2388,1,1]

20302002    30    2|4    2    DogzBigTreasureLimit    [2387,1,1]

40108001    10    2|2    0    DogzSmallTreasureLimit    [2388,1,1]

40108002    30    2|4    2    DogzBigTreasureLimit    [2387,1,1]

40108001    10    2|2    0    DogzSmallTreasureLimit    [2429,1,1]

40108002    30    2|4    2    DogzBigTreasureLimit    [2428,1,1]


 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -401,7 +401,7 @@
1211    16    0    2436    1    1    []    2436        0    0    220    1    0    1    28    150    86400        

1212    16    0    2434    1    1    []    2434        0    0    240    1    0    1    28    150    86400        

1213    16    0    5411    2    1    []    5411        0    0    270    1    0    1    28    200    86400        

1214    16    0    2432    2    1    []    2432        0    0    280    1    0    1    88    600    86400		
1214    16    0    2432    1    1    []    2432        0    0    280    1    0    1    88    600    86400		
1300    17    0    4151    1    1    []    0        0    0    0    0    0    18    10    0    0        

1301    17    0    5412    1    1    []    0        8    0    0    100    0    18    5    0    0        

1302    17    0    210    1    1    []    0        3    0    0    1    0    18    50    100    0        


 db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt

@@ -10,7 +10,7 @@
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

4    300    2    {"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    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

@@ -43,3 +43,9 @@
16    6    0    {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]}    AccumulatedTopUp2

16    30    1    {"1":[[4694,2,1],[30,100,1]],"2":[[4694,2,1],[30,100,1]],"3":[[4694,2,1],[30,100,1]]}    AccumulatedTopUp2

16    128    2    {"1":[[4694,3,1],[913,1,1]],"2":[[4694,3,1],[913,1,1]],"3":[[4694,3,1],[913,1,1]]}    AccumulatedTopUp2

17    6    0    {"1":[[5410,1,1],[181,5,1],[802,1,]],"2":[[5410,1,1],[181,5,1],[802,1,0]],"3":[[5410,1,1],[181,5,1],[802,1,0]]}    AccumulatedTopUp2

17    30    1    {"1":[[881,1,1],[4151,10,1],[4306,50,1],[1500,2,1]],"2":[[881,1,1],[4151,10,1],[4306,50,1],[1500,2,1]],"3":[[881,1,1],[4151,10,1],[4306,50,1],[1500,2,1]]}    AccumulatedTopUp2

18    6    0    {"1":[[5410,1,1],[181,5,1],[802,1,]],"2":[[5410,1,1],[181,5,1],[802,1,0]],"3":[[5410,1,1],[181,5,1],[802,1,0]]}    AccumulatedTopUp2

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,]],"2":[[5410,1,1],[181,5,1],[802,1,0]],"3":[[5410,1,1],[181,5,1],[802,1,0]]}    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


 db/PyMongoDataServer/SysDB/tagChinItem.txt

@@ -627,7 +627,7 @@
2427    1    0    巡礼豪华礼包    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    120    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2428    1    0    远古神兽大宝箱    81    0    0    0    0    999    260    1    1    0    1    0    0    1    0    0    1    150    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0

2429    1    0    精巧神兽小宝箱    81    0    0    0    0    999    260    1    1    0    1    0    0    1    0    0    1    150    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    20    0    0    0    0    0    0    0    0

2430    1    0    高级神兽祝福宝箱    81    0    0    0    0    999    260    1    1    0    1    0    0    1    0    0    1    150    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2430    1    0    高级神兽祝福宝箱    81    0    0    0    0    999    260    1    1    0    1    0    0    1    0    0    1    150    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0

2431    1    0    灵宠丹超值礼包    81    0    0    0    0    999    260    1    1    0    1    0    0    1    0    0    1    150    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2432    1    0    神兽紫装礼包    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    1840    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

2433    1    0    红2幸运草超值礼包    81    0    0    0    0    999    1    1    1    0    1    0    0    1    0    0    1    1840    0    5    0    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

			@@ -7,12 +7,12 @@
			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
			11 11 11 5 0 8
			12 12 12 5 0 8
			13 13 13 5 0 9
			14 14 14 5 0 9
			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
			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

			@@ -1,5 +1,5 @@
			NPCID PrepareTime LostHPPer CollectCount CollectCountLimitNotify CollectAward
			20302001 10 2\|2 0 DogzSmallTreasureLimit [2388,1,1]
			20302002 30 2\|4 2 DogzBigTreasureLimit [2387,1,1]
			40108001 10 2\|2 0 DogzSmallTreasureLimit [2388,1,1]
			40108002 30 2\|4 2 DogzBigTreasureLimit [2387,1,1]
			40108001 10 2\|2 0 DogzSmallTreasureLimit [2429,1,1]
			40108002 30 2\|4 2 DogzBigTreasureLimit [2428,1,1]

			@@ -401,7 +401,7 @@
			1211 16 0 2436 1 1 [] 2436 0 0 220 1 0 1 28 150 86400
			1212 16 0 2434 1 1 [] 2434 0 0 240 1 0 1 28 150 86400
			1213 16 0 5411 2 1 [] 5411 0 0 270 1 0 1 28 200 86400
			1214 16 0 2432 2 1 [] 2432 0 0 280 1 0 1 88 600 86400
			1214 16 0 2432 1 1 [] 2432 0 0 280 1 0 1 88 600 86400
			1300 17 0 4151 1 1 [] 0 0 0 0 0 0 18 10 0 0
			1301 17 0 5412 1 1 [] 0 8 0 0 100 0 18 5 0 0
			1302 17 0 210 1 1 [] 0 3 0 0 1 0 18 50 100 0

			@@ -10,7 +10,7 @@
			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
			4 300 2 {"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 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
			@@ -43,3 +43,9 @@
			16 6 0 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
			16 30 1 {"1":[[4694,2,1],[30,100,1]],"2":[[4694,2,1],[30,100,1]],"3":[[4694,2,1],[30,100,1]]} AccumulatedTopUp2
			16 128 2 {"1":[[4694,3,1],[913,1,1]],"2":[[4694,3,1],[913,1,1]],"3":[[4694,3,1],[913,1,1]]} AccumulatedTopUp2
			17 6 0 {"1":[[5410,1,1],[181,5,1],[802,1,]],"2":[[5410,1,1],[181,5,1],[802,1,0]],"3":[[5410,1,1],[181,5,1],[802,1,0]]} AccumulatedTopUp2
			17 30 1 {"1":[[881,1,1],[4151,10,1],[4306,50,1],[1500,2,1]],"2":[[881,1,1],[4151,10,1],[4306,50,1],[1500,2,1]],"3":[[881,1,1],[4151,10,1],[4306,50,1],[1500,2,1]]} AccumulatedTopUp2
			18 6 0 {"1":[[5410,1,1],[181,5,1],[802,1,]],"2":[[5410,1,1],[181,5,1],[802,1,0]],"3":[[5410,1,1],[181,5,1],[802,1,0]]} AccumulatedTopUp2
			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,]],"2":[[5410,1,1],[181,5,1],[802,1,0]],"3":[[5410,1,1],[181,5,1],[802,1,0]]} 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

			@@ -627,7 +627,7 @@
			2427 1 0 巡礼豪华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 120 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			2428 1 0 远古神兽大宝箱 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0
			2429 1 0 精巧神兽小宝箱 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 20 0 0 0 0 0 0 0 0
			2430 1 0 高级神兽祝福宝箱 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			2430 1 0 高级神兽祝福宝箱 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0
			2431 1 0 灵宠丹超值礼包 81 0 0 0 0 999 260 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			2432 1 0 神兽紫装礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			2433 1 0 红2幸运草超值礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0