~admin/snxx_server.git

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

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

CeHua_TRX

2018-12-11 de909eef94f17f2d8ec07abde42c594666923b2d

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

12个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagStore.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActExpRate.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActSpringSale.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagStore.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt

@@ -7,3 +7,4 @@
6    NovemberExp25    []    []    2018-11-25    2018-11-25    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

7    DecemberExp2    []    []    2018-12-2    2018-12-2    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

8    DecemberExp8    []    []    2018-12-8    2018-12-8    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000

9    DecemberExp16    []    []    2018-12-16    2018-12-16    18:00    20:00    { 0:["ExpActivity_Start", [2]]}    {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}    [30, "ExpActivity_Goahead", [2]]    110    10000


 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt

@@ -60,3 +60,7 @@
59    December12    []    []    2018-12-10    2018-12-10                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

60    December13    []    []    2018-12-11    2018-12-11                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

61    December14    []    []    2018-12-12    2018-12-12                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

58    December15    []    []    2018-12-15    2018-12-15                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

59    December16    []    []    2018-12-16    2018-12-16                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

60    December17    []    []    2018-12-17    2018-12-17                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0

61    December18    []    []    2018-12-18    2018-12-18                {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [120, "LimitGift1"]    110    0


 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt

@@ -34,3 +34,6 @@
33    December2    []    []    2018-11-30    2018-11-30                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

34    December3    []    []    2018-12-3    2018-12-3                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

35    December4    []    []    2018-12-4    2018-12-4                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

36    December16    []    []    2018-12-16    2018-12-16            120    {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

37    December17    []    []    2018-12-17    2018-12-17                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0

38    December18    []    []    2018-12-18    2018-12-18                {0:["LimitGift4",[]]}    {-60:["LimitGift5",[]]}    [120, "LimitGift4"]    110    0


 CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt

@@ -27,3 +27,5 @@
26    December7    []    []    2018-12-7    2018-12-7    {0:["AccumulatedTopUp1", []]}    {0:["AccumulatedTopUp3", [2]]}    {0:["AccumulatedTopUp1", []]}    0

27    December10    []    []    2018-12-10    2018-12-10    {0:["AccumulatedTopUp1", []]}    {0:["AccumulatedTopUp3", [2]]}    {0:["AccumulatedTopUp1", []]}    0

28    December11    []    []    2018-12-11    2018-12-11    {0:["AccumulatedTopUp1", []]}    {0:["AccumulatedTopUp3", [2]]}    {0:["AccumulatedTopUp1", []]}    0

29    December13    []    []    2018-12-13    2018-12-13    {0:["AccumulatedTopUp1", []]}    {0:["AccumulatedTopUp3", [2]]}    {0:["AccumulatedTopUp1", []]}    0

30    December14    []    []    2018-12-14    2018-12-14    {0:["AccumulatedTopUp1", []]}    {0:["AccumulatedTopUp3", [2]]}    {0:["AccumulatedTopUp1", []]}    0


 CoreServerGroup/GameServer/PySysDB/tagStore.txt

@@ -193,6 +193,9 @@
780    114    0    0

781    115    0    0

782    116    0    0

783    117    0    0

784    118    0    0

785    119    0    0

801    19    0    0

802    19    0    0

803    19    0    0


 db/PyMongoDataServer/PySysDB/tagActExpRate.txt

@@ -7,3 +7,4 @@
6    110    10000

7    110    10000

8    110    10000

9    110    10000


 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt

@@ -60,3 +60,7 @@
59    2018-12-10    2018-12-10                110    0    [[48]]    SellMail4    

60    2018-12-11    2018-12-11                110    0    [[49]]    SellMail4    

61    2018-12-12    2018-12-12                110    0    [[50]]    SellMail4    

58    2018-12-15    2018-12-15                110    0    [[51]]    SellMail4	
59    2018-12-16    2018-12-16                110    0    [[52]]    SellMail4	
60    2018-12-17    2018-12-17                110    0    [[53]]    SellMail4	
61    2018-12-18    2018-12-18                110    0    [[54]]    SellMail4	

 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt

@@ -34,3 +34,6 @@
33    2018-11-30    2018-11-30                110    0    [[110]]    SellMail3    

34    2018-12-3    2018-12-3                110    0    [[111]]    SellMail3    

35    2018-12-4    2018-12-4                110    0    [[112]]    SellMail3    

36    2018-12-16    2018-12-16            120    110    0    [[117]]    SellMail3	
37    2018-12-17    2018-12-17                110    0    [[118]]    SellMail3	
38    2018-12-18    2018-12-18                110    0    [[119]]    SellMail3	

 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt

@@ -27,3 +27,5 @@
26    2018-12-7    2018-12-7    5    0    11

27    2018-12-10    2018-12-10    5    0    12

28    2018-12-11    2018-12-11    5    0    13

29    2018-12-13    2018-12-13    5    0    14

30    2018-12-14    2018-12-14    5    0    14


 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt

@@ -49,3 +49,7 @@
2    48    30    1    [(1503,4,1),(30,100,1)]    1503    LimitGift3

2    49    25    1    [(1500,5,1),(30,100,1)]    1500    LimitGift3

8    50    318    1    [(264,1,1),(181,150,1)]    264    LimitGift3

2    51    30    1    [(2213,50,1),(4607,1,1)]    4607    LimitGift3

4    52    110    1    [(912,1,1),(4694,1,1)]    4694    LimitGift3

4    53    33    1    [(913,10,1),(3807,10,1)]    3807    LimitGift3

5    54    110    1    [(4606,1,1),(2213,25,1)]    4606    LimitGift3


 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -193,6 +193,9 @@
780    114    1    4181    5    1    [[4182,1,1]]    4182        0    0    0    1    0    1    88    550    0    LimitGift6    

781    115    1    2346    6    1    []    2346        0    0    0    1    0    1    588    1620    0    LimitGift7    

782    116    1    4007    6    1    [[144,100,1]]    4007        0    0    0    1    0    1    188    780    0    LimitGift6    

783    117    1    913    1    1    [[4694,10,1]]    913        0    0    0    1    0    1    388    1500    0    LimitGift6	
784    118    1    1503    4    1    [[4007,3,1]]    1503        0    0    0    1    0    1    88    440    0    LimitGift6	
785    119    1    912    2    1    [[2213,10,1]]    912        0    0    0    1    0    1    88    425    0    LimitGift6	
801    19    0    2391    1    0    []    0        0    0    0    0    0    1    60    0    0        

802    19    0    2393    1    0    []    0        0    0    0    0    0    1    60    0    0        

803    19    0    2395    1    0    []    0        0    0    0    0    0    1    60    0    0        


 db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt

@@ -34,3 +34,6 @@
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    1    {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]}    AccumulatedTopUp2

14    30    0    {"1":[[4681,1,1],[5411,2,1]],"2":[[4681,1,1],[5411,2,1]],"3":[[4681,1,1],[5411,2,1]]}    AccumulatedTopUp2

14    198    1    {"1":[[4680,1,1],[5411,5,1]],"2":[[4681,1,1],[5411,5,1]],"3":[[4681,1,1],[5411,5,1]]}    AccumulatedTopUp2

			@@ -7,3 +7,4 @@
			6 NovemberExp25 [] [] 2018-11-25 2018-11-25 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
			7 DecemberExp2 [] [] 2018-12-2 2018-12-2 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
			8 DecemberExp8 [] [] 2018-12-8 2018-12-8 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
			9 DecemberExp16 [] [] 2018-12-16 2018-12-16 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000

			@@ -60,3 +60,7 @@
			59 December12 [] [] 2018-12-10 2018-12-10 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			60 December13 [] [] 2018-12-11 2018-12-11 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			61 December14 [] [] 2018-12-12 2018-12-12 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			58 December15 [] [] 2018-12-15 2018-12-15 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			59 December16 [] [] 2018-12-16 2018-12-16 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			60 December17 [] [] 2018-12-17 2018-12-17 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
			61 December18 [] [] 2018-12-18 2018-12-18 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0

			@@ -34,3 +34,6 @@
			33 December2 [] [] 2018-11-30 2018-11-30 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			34 December3 [] [] 2018-12-3 2018-12-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			35 December4 [] [] 2018-12-4 2018-12-4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			36 December16 [] [] 2018-12-16 2018-12-16 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			37 December17 [] [] 2018-12-17 2018-12-17 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
			38 December18 [] [] 2018-12-18 2018-12-18 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0

			@@ -27,3 +27,5 @@
			26 December7 [] [] 2018-12-7 2018-12-7 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
			27 December10 [] [] 2018-12-10 2018-12-10 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
			28 December11 [] [] 2018-12-11 2018-12-11 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
			29 December13 [] [] 2018-12-13 2018-12-13 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
			30 December14 [] [] 2018-12-14 2018-12-14 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0

			@@ -193,6 +193,9 @@
			780 114 0 0
			781 115 0 0
			782 116 0 0
			783 117 0 0
			784 118 0 0
			785 119 0 0
			801 19 0 0
			802 19 0 0
			803 19 0 0

			@@ -60,3 +60,7 @@
			59 2018-12-10 2018-12-10 110 0 [[48]] SellMail4
			60 2018-12-11 2018-12-11 110 0 [[49]] SellMail4
			61 2018-12-12 2018-12-12 110 0 [[50]] SellMail4
			58 2018-12-15 2018-12-15 110 0 [[51]] SellMail4
			59 2018-12-16 2018-12-16 110 0 [[52]] SellMail4
			60 2018-12-17 2018-12-17 110 0 [[53]] SellMail4
			61 2018-12-18 2018-12-18 110 0 [[54]] SellMail4

			@@ -34,3 +34,6 @@
			33 2018-11-30 2018-11-30 110 0 [[110]] SellMail3
			34 2018-12-3 2018-12-3 110 0 [[111]] SellMail3
			35 2018-12-4 2018-12-4 110 0 [[112]] SellMail3
			36 2018-12-16 2018-12-16 120 110 0 [[117]] SellMail3
			37 2018-12-17 2018-12-17 110 0 [[118]] SellMail3
			38 2018-12-18 2018-12-18 110 0 [[119]] SellMail3

			@@ -27,3 +27,5 @@
			26 2018-12-7 2018-12-7 5 0 11
			27 2018-12-10 2018-12-10 5 0 12
			28 2018-12-11 2018-12-11 5 0 13
			29 2018-12-13 2018-12-13 5 0 14
			30 2018-12-14 2018-12-14 5 0 14

			@@ -49,3 +49,7 @@
			2 48 30 1 [(1503,4,1),(30,100,1)] 1503 LimitGift3
			2 49 25 1 [(1500,5,1),(30,100,1)] 1500 LimitGift3
			8 50 318 1 [(264,1,1),(181,150,1)] 264 LimitGift3
			2 51 30 1 [(2213,50,1),(4607,1,1)] 4607 LimitGift3
			4 52 110 1 [(912,1,1),(4694,1,1)] 4694 LimitGift3
			4 53 33 1 [(913,10,1),(3807,10,1)] 3807 LimitGift3
			5 54 110 1 [(4606,1,1),(2213,25,1)] 4606 LimitGift3

			@@ -193,6 +193,9 @@
			780 114 1 4181 5 1 [[4182,1,1]] 4182 0 0 0 1 0 1 88 550 0 LimitGift6
			781 115 1 2346 6 1 [] 2346 0 0 0 1 0 1 588 1620 0 LimitGift7
			782 116 1 4007 6 1 [[144,100,1]] 4007 0 0 0 1 0 1 188 780 0 LimitGift6
			783 117 1 913 1 1 [[4694,10,1]] 913 0 0 0 1 0 1 388 1500 0 LimitGift6
			784 118 1 1503 4 1 [[4007,3,1]] 1503 0 0 0 1 0 1 88 440 0 LimitGift6
			785 119 1 912 2 1 [[2213,10,1]] 912 0 0 0 1 0 1 88 425 0 LimitGift6
			801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
			802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
			803 19 0 2395 1 0 [] 0 0 0 0 0 0 1 60 0 0

			@@ -34,3 +34,6 @@
			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 1 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
			14 30 0 {"1":[[4681,1,1],[5411,2,1]],"2":[[4681,1,1],[5411,2,1]],"3":[[4681,1,1],[5411,2,1]]} AccumulatedTopUp2
			14 198 1 {"1":[[4680,1,1],[5411,5,1]],"2":[[4681,1,1],[5411,5,1]],"3":[[4681,1,1],[5411,5,1]]} AccumulatedTopUp2