~admin/snxx_server.git

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

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

cehua_wcy

2019-01-23 a50e1ae038627defd01497fa55102712d4e8b024

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

6个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActSpringSale.txt	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChests.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChestsAward.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagStore.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt

@@ -51,6 +51,5 @@
50    20190127    []    []    2019-1-27    2019-1-27                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

51    20190128    []    []    2019-1-28    2019-1-28                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

52    20190129    []    []    2019-1-29    2019-1-29                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

53    20190189    []    []    2019-1-29    2019-1-29                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

54    20190131    []    []    2019-1-31    2019-1-31                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

55    20190202    []    []    2019-2-2    2019-2-2                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

53    20190131    []    []    2019-1-31    2019-1-31                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

54    20190202    []    []    2019-2-2    2019-2-2                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0


 CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt

@@ -1,7 +1,7 @@
WorldLvNum    Rank    Award

0    1    {"1":[[2278,1,0]],"2":[[2278,1,0]]}

0    2    {"1":[[10671,1,0]],"2":[[20671,1,0]]}

0    3    {"1":[[10672,1,0]],"2":[[20672,1,0]]}

0    1    {"1":[[2446,1,0],"2":[[2446,1,0]]}

0    2    {"1":[[2447,1,0],"2":[[2447,1,0]]}

0    3    {"1":[[2448,1,0],"2":[[2448,1,0]]}

1    1    {"1":[[2278,1,0]],"2":[[2278,1,0]]}

1    2    {"1":[[10771,1,0]],"2":[[20771,1,0]]}

1    3    {"1":[[10772,1,0]],"2":[[20772,1,0]]}


 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt

@@ -50,7 +50,6 @@
49    2019-1-23    2019-1-23                110    0    [[130]]    SellMail3    

50    2019-1-27    2019-1-27                110    0    [[131]]    SellMail3    

51    2019-1-28    2019-1-28                110    0    [[132]]    SellMail3    

52    2019-1-29    2019-1-29                110    0    [[133]]    SellMail3	
53    2019-1-29    2019-1-29                110    0    [[134]]    SellMail3	
54    2019-1-31    2019-1-31                110    0    [[135]]    SellMail3	
55    2019-2-2    2019-2-2                110    0    [[136]]    SellMail3	
52    2019-1-29    2019-1-29                110    0    [[133],[134]]    SellMail3	
53    2019-1-31    2019-1-31                110    0    [[135]]    SellMail3	
54    2019-2-2    2019-2-2                110    0    [[136]]    SellMail3	

 db/PyMongoDataServer/PySysDB/tagChests.txt

@@ -234,7 +234,7 @@
2442    0    0    0    1    1

2443    0    0    0    0    1

2444    0    0    0    0    1

2445    0    0    0    1    1

2445    0    0    0    0    1

2446    0    0    0    0    1

2447    0    0    0    0    1

2448    0    0    0    0    1


 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -231,7 +231,7 @@
2442                [[833,[7204,1]],[1666,[7209,1]],[2499,[7214,1]],[3332,[7219,1]],[4165,[7224,1]],[4998,[7229,1]],[5831,[7234,1]],[6664,[7239,1]],[7497,[7244,1]],[8330,[7249,1]],[9163,[7254,1]],[10000,[7259,1]]]    1                            [7204,7209,7214,7219,7224,7229,7234,7239,7244,7249,7254,7259]

2443        7205_1|7210_1|7215_1|7220_1|7225_1|7230_1|7235_1|7240_1|7245_1|7250_1|7255_1|7260_1                                        

2444        4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1                                        [4320,4315,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]

2445                [[2000,[8212,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]]    1                            [8211,8224,8237,8250,8263]

2445                [[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]]    1                            [8211,8224,8237,8250,8263]

2446            8209_1|8222_1|8235_1|8245_1|8258_1                                    

2447            8209_1|8219_1|8245_1|8232_1|8258_1                                    

2448            8206_1|8219_1|8245_1|8232_1|8258_1                                    


 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -376,7 +376,7 @@
1156    215    2    2213    20    1    []    4610        0    0    0    2    10    1    68    250    0    FlashRushToBuy2    FlashToSnapUp

1158    216    2    2456    1    1    []    2456        0    0    0    1    1    1    60    600    0    FlashRushToBuy2    FlashToSnapUp

1159    216    2    2457    1    1    []    2457        0    0    0    10    50    1    600    2430    0    FlashRushToBuy2    FlashToSnapUp

1160    216    2    953    1    1    []    953        0    0    0    10    100    1    55    270    0    FlashRushToBuy2    FlashToSnapUp

1160    216    2    2458    1    1    []    2458        0    0    0    10    100    1    55    270    0    FlashRushToBuy2    FlashToSnapUp

1161    216    2    2459    1    1    []    2459        0    0    0    10    150    1    15    90    0    FlashRushToBuy2    FlashToSnapUp

1162    216    2    2213    20    1    []    2213        0    0    0    2    10    1    68    250    0    FlashRushToBuy2    FlashToSnapUp

1164    217    2    2456    1    1    []    2456        0    0    0    1    1    1    60    600    0    FlashRushToBuy2    FlashToSnapUp

			@@ -51,6 +51,5 @@
			50 20190127 [] [] 2019-1-27 2019-1-27 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			51 20190128 [] [] 2019-1-28 2019-1-28 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			52 20190129 [] [] 2019-1-29 2019-1-29 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			53 20190189 [] [] 2019-1-29 2019-1-29 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			54 20190131 [] [] 2019-1-31 2019-1-31 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			55 20190202 [] [] 2019-2-2 2019-2-2 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			53 20190131 [] [] 2019-1-31 2019-1-31 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			54 20190202 [] [] 2019-2-2 2019-2-2 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0

			@@ -1,7 +1,7 @@
			WorldLvNum Rank Award
			0 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
			0 2 {"1":[[10671,1,0]],"2":[[20671,1,0]]}
			0 3 {"1":[[10672,1,0]],"2":[[20672,1,0]]}
			0 1 {"1":[[2446,1,0],"2":[[2446,1,0]]}
			0 2 {"1":[[2447,1,0],"2":[[2447,1,0]]}
			0 3 {"1":[[2448,1,0],"2":[[2448,1,0]]}
			1 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
			1 2 {"1":[[10771,1,0]],"2":[[20771,1,0]]}
			1 3 {"1":[[10772,1,0]],"2":[[20772,1,0]]}

			@@ -50,7 +50,6 @@
			49 2019-1-23 2019-1-23 110 0 [[130]] SellMail3
			50 2019-1-27 2019-1-27 110 0 [[131]] SellMail3
			51 2019-1-28 2019-1-28 110 0 [[132]] SellMail3
			52 2019-1-29 2019-1-29 110 0 [[133]] SellMail3
			53 2019-1-29 2019-1-29 110 0 [[134]] SellMail3
			54 2019-1-31 2019-1-31 110 0 [[135]] SellMail3
			55 2019-2-2 2019-2-2 110 0 [[136]] SellMail3
			52 2019-1-29 2019-1-29 110 0 [[133],[134]] SellMail3
			53 2019-1-31 2019-1-31 110 0 [[135]] SellMail3
			54 2019-2-2 2019-2-2 110 0 [[136]] SellMail3

			@@ -234,7 +234,7 @@
			2442 0 0 0 1 1
			2443 0 0 0 0 1
			2444 0 0 0 0 1
			2445 0 0 0 1 1
			2445 0 0 0 0 1
			2446 0 0 0 0 1
			2447 0 0 0 0 1
			2448 0 0 0 0 1

			@@ -231,7 +231,7 @@
			2442 [[833,[7204,1]],[1666,[7209,1]],[2499,[7214,1]],[3332,[7219,1]],[4165,[7224,1]],[4998,[7229,1]],[5831,[7234,1]],[6664,[7239,1]],[7497,[7244,1]],[8330,[7249,1]],[9163,[7254,1]],[10000,[7259,1]]] 1 [7204,7209,7214,7219,7224,7229,7234,7239,7244,7249,7254,7259]
			2443 7205_1\|7210_1\|7215_1\|7220_1\|7225_1\|7230_1\|7235_1\|7240_1\|7245_1\|7250_1\|7255_1\|7260_1
			2444 4320_1\|4315_1\|4335_1\|4395_1\|4385_1\|4365_1\|4355_1\|4350_1\|4360_1\|4390_1\|4380_1\|4375_1 [4320,4315,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]
			2445 [[2000,[8212,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]] 1 [8211,8224,8237,8250,8263]
			2445 [[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]] 1 [8211,8224,8237,8250,8263]
			2446 8209_1\|8222_1\|8235_1\|8245_1\|8258_1
			2447 8209_1\|8219_1\|8245_1\|8232_1\|8258_1
			2448 8206_1\|8219_1\|8245_1\|8232_1\|8258_1

			@@ -376,7 +376,7 @@
			1156 215 2 2213 20 1 [] 4610 0 0 0 2 10 1 68 250 0 FlashRushToBuy2 FlashToSnapUp
			1158 216 2 2456 1 1 [] 2456 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp
			1159 216 2 2457 1 1 [] 2457 0 0 0 10 50 1 600 2430 0 FlashRushToBuy2 FlashToSnapUp
			1160 216 2 953 1 1 [] 953 0 0 0 10 100 1 55 270 0 FlashRushToBuy2 FlashToSnapUp
			1160 216 2 2458 1 1 [] 2458 0 0 0 10 100 1 55 270 0 FlashRushToBuy2 FlashToSnapUp
			1161 216 2 2459 1 1 [] 2459 0 0 0 10 150 1 15 90 0 FlashRushToBuy2 FlashToSnapUp
			1162 216 2 2213 20 1 [] 2213 0 0 0 2 10 1 68 250 0 FlashRushToBuy2 FlashToSnapUp
			1164 217 2 2456 1 1 [] 2456 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp