~admin/snxx_server.git

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

Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

CeHua_TRX

2018-12-11 3b92022a2e83469497a1a238dd838b8518d4d630

Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

3个文件已修改

	db/PyMongoDataServer/PySysDB/tagCTG.txt	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagVIPAward.txt	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 db/PyMongoDataServer/PySysDB/tagCTG.txt

@@ -10,8 +10,8 @@
109    0    30000    5888    0    []    

110    0    10    1    0    []    

111    1    0    0    0    [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]    Bargaingift1

112    1    0    0    0    [[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]]    Bargaingift2

113    1    0    0    0    [[255,1,1],[196,1,1],[181,50,1],[913,1,1]]    Bargaingift3

112    1    0    0    0    [[4208,1,1],[4151,15,1],[5,1,1],[913,1,1]]    Bargaingift2

113    1    0    0    0    [[255,1,1],[196,1,1],[181,40,1],[913,1,1]]    Bargaingift3

2    0    60    6    0    []    

201    1    0    0    0    [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]    

202    0    60    6    0    []    

@@ -25,5 +25,5 @@
210    0    1    0    0    []    

211    0    1    0    0    []    

212    1    0    0    0    [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]    Bargaingift1

213    1    0    0    0    [[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]]    Bargaingift2

214    1    0    0    0    [[255,1,1],[196,1,1],[181,50,1],[913,1,1]]    Bargaingift3

213    1    0    0    0    [[4208,1,1],[4151,15,1],[5,1,1],[913,1,1]]    Bargaingift2

214    1    0    0    0    [[255,1,1],[196,1,1],[181,40,1],[913,1,1]]    Bargaingift3


 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt

@@ -14,13 +14,13 @@
4    13    50    1    [(30,310,1),(2389,1,1)]    2389    LimitGift3

4    14    50    1    [(2213,10,1),(2389,1,1)]    2389    LimitGift3

8    15    400    1    [(262,1,1),(181,45,1)]    262    LimitGift3

3    16    50    1    [(4215,1,1),(4151,15,1)]    4215    LimitGift3

3    16    50    1    [(4215,1,1),(4151,8,1)]    4215    LimitGift3

5    17    180    1    [(7002,1,1),(195,1,1)]    7002    LimitGift3

5    18    180    1    [(263,1,1),(181,30,1)]    263    LimitGift3

5    19    180    1    [(4220,1,1),(4151,25,1)]    4220    LimitGift3

5    18    180    1    [(263,1,1),(181,25,1)]    263    LimitGift3

5    19    180    1    [(4220,1,1),(4151,15,1)]    4220    LimitGift3

4    20    80    1    [(913,1,1),(181,30,1)]    913    LimitGift3

8    21    400    1    [(4214,1,1),(4151,50,1)]    4214    LimitGift3

3    22    50    1    [(265,1,1),(181,15,1)]    265    LimitGift3

8    21    400    1    [(4214,1,1),(4151,25,1)]    4214    LimitGift3

3    22    50    1    [(265,1,1),(181,8,1)]    265    LimitGift3

2    23    25    1    [(2213,20,1)]    2213    LimitGift3

2    24    27    1    [(3514,1,1)]    3514    LimitGift3

2    25    27    1    [(4694,9,1)]    4694    LimitGift3


 db/PyMongoDataServer/PySysDB/tagVIPAward.txt

@@ -1,9 +1,9 @@
VIPLV    VIPgift    GiftPrice    OldPrice

1    {"1":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"2":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"3":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]]}    88    800

2    {"1":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]],"2":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]],"3":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]]}    188    1500

2    {"1":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,10,1]],"2":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,10,1]],"3":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,10,1]]}    188    1500

3    {"1":[[2123,1,1],[913,1,1],[923,1,1],[3503,1,1],[3513,1,1]],"2":[[2123,1,1],[913,1,1],[923,1,1],[3503,1,1],[3513,1,1]],"3":[[2123,1,1],[913,1,1],[923,1,1],[3503,1,1],[3513,1,1]]}    388    2000

4    {"1":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,50,1]],"2":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,50,1]],"3":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,50,1]]}    588    3000

5    {"1":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,50,1]],"2":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,50,1]],"3":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,50,1]]}    1288    4000

4    {"1":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,30,1]],"2":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,30,1]],"3":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,30,1]]}    588    3000

5    {"1":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,30,1]],"2":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,30,1]],"3":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,30,1]]}    1288    4000

6    {"1":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,1,1]],"2":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,1,1]],"3":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,1,1]]}    1888    5000

7    {"1":[[202,1,1],[3505,1,1],[3515,1,1],[3807,1,1],[7,1,1]],"2":[[202,1,1],[3505,1,1],[3515,1,1],[3807,1,1],[7,1,1]],"3":[[202,1,1],[3505,1,1],[3515,1,1],[3807,1,1],[7,1,1]]}    2888    7000

8    {"1":[[4189,1,1],[3506,1,1],[3516,1,1],[4151,100,1],[7,1,1]],"2":[[4189,1,1],[3506,1,1],[3516,1,1],[4151,100,1],[7,1,1]],"3":[[4189,1,1],[3506,1,1],[3516,1,1],[4151,100,1],[7,1,1]]}    6888    15000

			@@ -10,8 +10,8 @@
			109 0 30000 5888 0 []
			110 0 10 1 0 []
			111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
			112 1 0 0 0 [[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]] Bargaingift2
			113 1 0 0 0 [[255,1,1],[196,1,1],[181,50,1],[913,1,1]] Bargaingift3
			112 1 0 0 0 [[4208,1,1],[4151,15,1],[5,1,1],[913,1,1]] Bargaingift2
			113 1 0 0 0 [[255,1,1],[196,1,1],[181,40,1],[913,1,1]] Bargaingift3
			2 0 60 6 0 []
			201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
			202 0 60 6 0 []
			@@ -25,5 +25,5 @@
			210 0 1 0 0 []
			211 0 1 0 0 []
			212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
			213 1 0 0 0 [[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]] Bargaingift2
			214 1 0 0 0 [[255,1,1],[196,1,1],[181,50,1],[913,1,1]] Bargaingift3
			213 1 0 0 0 [[4208,1,1],[4151,15,1],[5,1,1],[913,1,1]] Bargaingift2
			214 1 0 0 0 [[255,1,1],[196,1,1],[181,40,1],[913,1,1]] Bargaingift3

			@@ -14,13 +14,13 @@
			4 13 50 1 [(30,310,1),(2389,1,1)] 2389 LimitGift3
			4 14 50 1 [(2213,10,1),(2389,1,1)] 2389 LimitGift3
			8 15 400 1 [(262,1,1),(181,45,1)] 262 LimitGift3
			3 16 50 1 [(4215,1,1),(4151,15,1)] 4215 LimitGift3
			3 16 50 1 [(4215,1,1),(4151,8,1)] 4215 LimitGift3
			5 17 180 1 [(7002,1,1),(195,1,1)] 7002 LimitGift3
			5 18 180 1 [(263,1,1),(181,30,1)] 263 LimitGift3
			5 19 180 1 [(4220,1,1),(4151,25,1)] 4220 LimitGift3
			5 18 180 1 [(263,1,1),(181,25,1)] 263 LimitGift3
			5 19 180 1 [(4220,1,1),(4151,15,1)] 4220 LimitGift3
			4 20 80 1 [(913,1,1),(181,30,1)] 913 LimitGift3
			8 21 400 1 [(4214,1,1),(4151,50,1)] 4214 LimitGift3
			3 22 50 1 [(265,1,1),(181,15,1)] 265 LimitGift3
			8 21 400 1 [(4214,1,1),(4151,25,1)] 4214 LimitGift3
			3 22 50 1 [(265,1,1),(181,8,1)] 265 LimitGift3
			2 23 25 1 [(2213,20,1)] 2213 LimitGift3
			2 24 27 1 [(3514,1,1)] 3514 LimitGift3
			2 25 27 1 [(4694,9,1)] 4694 LimitGift3

			@@ -1,9 +1,9 @@
			VIPLV VIPgift GiftPrice OldPrice
			1 {"1":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"2":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"3":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]]} 88 800
			2 {"1":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]],"2":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]],"3":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,20,1]]} 188 1500
			2 {"1":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,10,1]],"2":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,10,1]],"3":[[206,1,1],[1650,1,1],[912,1,1],[3,1,1],[4151,10,1]]} 188 1500
			3 {"1":[[2123,1,1],[913,1,1],[923,1,1],[3503,1,1],[3513,1,1]],"2":[[2123,1,1],[913,1,1],[923,1,1],[3503,1,1],[3513,1,1]],"3":[[2123,1,1],[913,1,1],[923,1,1],[3503,1,1],[3513,1,1]]} 388 2000
			4 {"1":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,50,1]],"2":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,50,1]],"3":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,50,1]]} 588 3000
			5 {"1":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,50,1]],"2":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,50,1]],"3":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,50,1]]} 1288 4000
			4 {"1":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,30,1]],"2":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,30,1]],"3":[[254,1,1],[912,1,1],[3,3,1],[923,1,1],[181,30,1]]} 588 3000
			5 {"1":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,30,1]],"2":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,30,1]],"3":[[4212,1,1],[913,1,1],[3504,1,1],[3514,1,1],[4151,30,1]]} 1288 4000
			6 {"1":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,1,1]],"2":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,1,1]],"3":[[2124,1,1],[1651,1,1],[913,1,1],[3505,1,1],[3515,1,1]]} 1888 5000
			7 {"1":[[202,1,1],[3505,1,1],[3515,1,1],[3807,1,1],[7,1,1]],"2":[[202,1,1],[3505,1,1],[3515,1,1],[3807,1,1],[7,1,1]],"3":[[202,1,1],[3505,1,1],[3515,1,1],[3807,1,1],[7,1,1]]} 2888 7000
			8 {"1":[[4189,1,1],[3506,1,1],[3516,1,1],[4151,100,1],[7,1,1]],"2":[[4189,1,1],[3506,1,1],[3516,1,1],[4151,100,1],[7,1,1]],"3":[[4189,1,1],[3506,1,1],[3516,1,1],[4151,100,1],[7,1,1]]} 6888 15000