~admin/snxx_server.git

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

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

cehua_wcy

2019-01-28 619acff0e343707ac68802ce86de9038927da042

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

15个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerStore.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActFlashSale.txt	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt

@@ -1,8 +1,8 @@
CfgID    ActMark    PlatformList    ServerIDList    StartDate    EndDate    StartTime    EndTime    AdvanceMinutes    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    LimitLV    IsDayReset    ShopTypeList

1    OpenServer    []    []    5    5    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    {0:["FlashRushToBuy3",[]]}    []    []    100    1    [[200,201,202,203,204]]

2    New1    []    []    2018-11-16    2018-11-16    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[205,206,207,208]]

3    December12    []    []    2018-12-12    2018-12-12    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[205,206,207,208]]

4    December25    []    []    2018-12-25    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[205,206,207,208,209]]

5    December26    []    []    2019-1-16    2019-1-16    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    [[210,211,212,213,214]]

6    OpenServer1    []    []    10    10    10:00|16:00|20:00    11:59|17:59|21:59    600    {0:["FlashRushToBuy3",[]]}    []    []    100    1    [[215,216,217]]

7    OpenServer2    []    []    14    14    10:00|16:00|20:00    11:59|17:59|21:59    600    {0:["FlashRushToBuy3",[]]}    []    []    100    1    [[220,221,222]]

1    OpenServer    []    []    5    5    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    {0:["FlashRushToBuy3",[]]}    []    []    100    1    {(0,1000):[[200,201,202,203,204]]}

2    New1    []    []    2018-11-16    2018-11-16    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    {(0,1000):[[205,206,207,208]]}

3    December12    []    []    2018-12-12    2018-12-12    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    {(0,1000):[[205,206,207,208]]}

4    December25    []    []    2018-12-25    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    {(0,1000):[[205,206,207,208,209]]}

5    December26    []    []    2019-1-16    2019-1-16    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    {0:["FlashRushToBuy3",[]]}    []    []    100    0    {(0,1000):[[210,211,212,213,214]]}

6    OpenServer1    []    []    10    10    10:00|16:00|20:00    11:59|17:59|21:59    600    {0:["FlashRushToBuy3",[]]}    []    []    100    1    {(0,1000):[[215,216,217]]}

7    OpenServer2    []    []    14    14    10:00|16:00|20:00    11:59|17:59|21:59    600    {0:["FlashRushToBuy3",[]]}    []    []    100    1    {(0,1000):[[220,221,222]]}


 CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt

@@ -6,4 +6,4 @@
5    [(7022,7025)]    32021    32020    0

6    [(7026,7028),(30001,30002)]    32021    32020    1

7    [(7029,7031),(30003,30004),(30005,30006)]    32021    32020    2

8    [(30007,30010)]    32021    32020    3

8    [(30007,30010),(7032,7035)]    32021    32020    3


 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerStore.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActFlashSale.txt

@@ -1,8 +1,8 @@
CfgID    StartDate    EndDate    StartTime    EndTime    AdvanceMinutes    LimitLV    IsDayReset    ShopTypeList    MailKey    MailItemPrize

1    5    5    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    100    1    [[200,201,202,203,204]]    SellMail5	
2    2018-11-16    2018-11-16    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    100    0    [[205,206,207,208]]    SellMail5	
3    2018-12-12    2018-12-12    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    100    0    [[205,206,207,208]]    SellMail5	
4    2018-12-25    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    240    100    0    [[205,206,207,208,209]]    SellMail5	
5    2019-1-16    2019-1-16    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    100    0    [[210,211,212,213,214]]    SellMail5	
6    10    10    10:00|16:00|20:00    11:59|17:59|21:59    600    100    1    [[215,216,217]]    SellMail5	
7    14    14    10:00|16:00|20:00    11:59|17:59|21:59    600    100    1    [[220,221,222]]    SellMail5	
1    5    5    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    100    1    {(0,1000):[[200,201,202,203,204]]}    SellMail5	
2    2018-11-16    2018-11-16    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    100    0    {(0,1000):[[205,206,207,208]]}    SellMail5	
3    2018-12-12    2018-12-12    12:00|16:00|20:00|22:00    13:30|17:30|21:30|23:30    240    100    0    {(0,1000):[[205,206,207,208]]}    SellMail5	
4    2018-12-25    2018-12-25    00:00|12:00|16:00|20:00|22:00    1:30|13:30|17:30|21:30|23:30    240    100    0    {(0,1000):[[205,206,207,208,209]]}    SellMail5	
5    2019-1-16    2019-1-16    00:00|12:00|16:00|20:00|22:00    1:59|13:59|17:59|21:59|23:59    240    100    0    {(0,1000):[[210,211,212,213,214]]}    SellMail5	
6    10    10    10:00|16:00|20:00    11:59|17:59|21:59    600    100    1    {(0,1000):[[215,216,217]]}    SellMail5	
7    14    14    10:00|16:00|20:00    11:59|17:59|21:59    600    100    1    {(0,1000):[[220,221,222]]}    SellMail5	

 db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt

@@ -6,4 +6,4 @@
5    [(7022,7025)]    32021    32020    0    199    380

6    [(7026,7028),(30001,30002)]    32021    32020    1    199    380

7    [(7029,7031),(30003,30004),(30005,30006)]    32021    32020    2    199    380

8    [(30007,30010)]    32021    32020    3    199    380

8    [(30007,30010),(7032,7035)]    32021    32020    3    199    380

			@@ -1,8 +1,8 @@
			CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset ShopTypeList
			1 OpenServer [] [] 5 5 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[200,201,202,203,204]]
			2 New1 [] [] 2018-11-16 2018-11-16 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[205,206,207,208]]
			3 December12 [] [] 2018-12-12 2018-12-12 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[205,206,207,208]]
			4 December25 [] [] 2018-12-25 2018-12-25 00:00\|12:00\|16:00\|20:00\|22:00 1:30\|13:30\|17:30\|21:30\|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[205,206,207,208,209]]
			5 December26 [] [] 2019-1-16 2019-1-16 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[210,211,212,213,214]]
			6 OpenServer1 [] [] 10 10 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[215,216,217]]
			7 OpenServer2 [] [] 14 14 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[220,221,222]]
			1 OpenServer [] [] 5 5 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 1 {(0,1000):[[200,201,202,203,204]]}
			2 New1 [] [] 2018-11-16 2018-11-16 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[205,206,207,208]]}
			3 December12 [] [] 2018-12-12 2018-12-12 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[205,206,207,208]]}
			4 December25 [] [] 2018-12-25 2018-12-25 00:00\|12:00\|16:00\|20:00\|22:00 1:30\|13:30\|17:30\|21:30\|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[205,206,207,208,209]]}
			5 December26 [] [] 2019-1-16 2019-1-16 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[210,211,212,213,214]]}
			6 OpenServer1 [] [] 10 10 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 {(0,1000):[[215,216,217]]}
			7 OpenServer2 [] [] 14 14 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 {(0,1000):[[220,221,222]]}

			@@ -6,4 +6,4 @@
			5 [(7022,7025)] 32021 32020 0
			6 [(7026,7028),(30001,30002)] 32021 32020 1
			7 [(7029,7031),(30003,30004),(30005,30006)] 32021 32020 2
			8 [(30007,30010)] 32021 32020 3
			8 [(30007,30010),(7032,7035)] 32021 32020 3

			@@ -1,8 +1,8 @@
			CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
			1 5 5 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 100 1 [[200,201,202,203,204]] SellMail5
			2 2018-11-16 2018-11-16 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 100 0 [[205,206,207,208]] SellMail5
			3 2018-12-12 2018-12-12 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 100 0 [[205,206,207,208]] SellMail5
			4 2018-12-25 2018-12-25 00:00\|12:00\|16:00\|20:00\|22:00 1:30\|13:30\|17:30\|21:30\|23:30 240 100 0 [[205,206,207,208,209]] SellMail5
			5 2019-1-16 2019-1-16 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 100 0 [[210,211,212,213,214]] SellMail5
			6 10 10 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 100 1 [[215,216,217]] SellMail5
			7 14 14 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 100 1 [[220,221,222]] SellMail5
			1 5 5 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 100 1 {(0,1000):[[200,201,202,203,204]]} SellMail5
			2 2018-11-16 2018-11-16 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 100 0 {(0,1000):[[205,206,207,208]]} SellMail5
			3 2018-12-12 2018-12-12 12:00\|16:00\|20:00\|22:00 13:30\|17:30\|21:30\|23:30 240 100 0 {(0,1000):[[205,206,207,208]]} SellMail5
			4 2018-12-25 2018-12-25 00:00\|12:00\|16:00\|20:00\|22:00 1:30\|13:30\|17:30\|21:30\|23:30 240 100 0 {(0,1000):[[205,206,207,208,209]]} SellMail5
			5 2019-1-16 2019-1-16 00:00\|12:00\|16:00\|20:00\|22:00 1:59\|13:59\|17:59\|21:59\|23:59 240 100 0 {(0,1000):[[210,211,212,213,214]]} SellMail5
			6 10 10 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 100 1 {(0,1000):[[215,216,217]]} SellMail5
			7 14 14 10:00\|16:00\|20:00 11:59\|17:59\|21:59 600 100 1 {(0,1000):[[220,221,222]]} SellMail5

			@@ -6,4 +6,4 @@
			5 [(7022,7025)] 32021 32020 0 199 380
			6 [(7026,7028),(30001,30002)] 32021 32020 1 199 380
			7 [(7029,7031),(30003,30004),(30005,30006)] 32021 32020 2 199 380
			8 [(30007,30010)] 32021 32020 3 199 380
			8 [(30007,30010),(7032,7035)] 32021 32020 3 199 380