~admin/snxx_server.git

parent: 93623bc6 | 补丁 | 提交 | ignore whitespace

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

cehua-TT

2019-02-25 01f5a5dea1fc13af91b225dc76a77bfc742b9a6e

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

15个文件已修改

	CoreServerGroup/GameServer/Script/ChPyNetPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.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/IpyGameDataPY.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagActWeekParty.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagWeekParty.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinItem.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini

@@ -68,7 +68,7 @@
Writer = wdb

Releaser = wdb

RegType = 0

RegisterPackCount = 2

RegisterPackCount = 3



PacketCMD_1=0xA2

PacketSubCMD_1=0x01

@@ -78,6 +78,10 @@
PacketSubCMD_2=0x11

PacketCallFunc_2=OnSellManyItem



PacketCMD_3=0xA2

PacketSubCMD_3=0x32

PacketCallFunc_3=OnMysticalShopRefresh



;物品管理

[ItemControler]

ScriptName = Item\ItemControler.py


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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.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/IpyGameDataPY.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActWeekParty.txt

@@ -1,2 +1,2 @@
CfgID    StartDate    EndDate    AdvanceMinutes    IsDayReset    ResetType    LimitLV    TemplateID    PointAward

1    8    15    300    1    1    110    [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2500]]    {0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}

1    8    15    300    1    1    110    [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,2700,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,2700,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,2700,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1201,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1201,2500]]    {0:{180:[(2488,1,1)],330:[(1652,1,1)]},1:{310:[(5801,1,1)],410:[(5801,1,1)]},2:{310:[(5800,1,1)],410:[(5800,1,1)]},3:{310:[(5802,1,1)],410:[(5802,1,1)]},4:{180:[(2488,1,1)],380:[(4216,1,1)]},5:{180:[(2488,1,1)],380:[(62,1,1)]},6:{180:[(2488,1,1)],380:[(4221,1,1)]},}


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -354,4 +354,4 @@
LuckyAppraisal    30    10    8        

MixServerMail    [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]]    [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]]    [500, 2000000]    [[947,1,1]]    

MysteryShopGoods    10     [(3000,5),(5000,6),(7000,7),(10000,8)]             

MysteryShopRefresh    3809     {(0,5):1,(6,10):2,(11,15):3,(16,100000):5}    10    6	
MysteryShopRefresh    3809     {"5":1,"10":2,"15":3,"100000":5}    10    21600    {0:[4,20000]}


 db/PyMongoDataServer/PySysDB/tagWeekParty.txt

@@ -36,3 +36,4 @@
2400    24    90    90    [(2427,1,1),(882,1,1)]    60

2500    25    150    150    [(2427,1,1),(882,1,1)]    60

2600    26    5    5    [(2427,1,1),(882,1,1)]    60

2700    27    5    1    [(2427,1,1),(882,1,1)]    20


 db/PyMongoDataServer/SysDB/tagChinItem.txt

@@ -134,7 +134,7 @@
263    1    0    坐骑：筋斗云    41    19    1    0    0    1    1    1    1    0    1    0    0    0    0    0    1    980    0    30000    0    1    0    0    7    11014    0    0    6    220281    0    0    23    100    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

264    1    0    坐骑：福源猫    41    19    1    0    0    1    1    1    1    0    1    0    0    0    0    0    1    1680    0    50000    0    1    0    0    7    11014    0    0    6    220281    0    0    23    100    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

265    1    0    坐骑：森之灵    41    19    1    0    0    1    1    1    1    0    1    0    0    0    0    0    1    180    0    20000    0    1    0    0    7    11014    0    0    6    220281    0    0    23    100    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

266    1    0    坐骑：年兽    41    19    1    0    0    1    1    1    1    0    1    0    0    0    0    0    1    980    0    30000    0    1    0    0    7    11014    0    0    6    220281    0    0    23    100    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

266    1    0    坐骑：年兽    41    19    1    0    0    1    1    1    1    0    1    0    0    0    0    0    1    980    0    30000    0    1    0    0    7    11014    0    0    6    220281    0    0    23    100    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

267    1    0    坐骑：迷山画卷    41    19    1    0    0    1    1    1    1    0    1    0    0    0    0    0    1    1680    0    50000    0    1    0    0    7    11014    0    0    6    220281    0    0    23    100    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

268    1    0    坐骑：月莲之恋    41    19    1    0    0    1    1    1    1    0    1    0    0    0    0    0    1    180    0    20000    0    1    0    0    7    11014    0    0    6    220281    0    0    23    100    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

289    1    0    追风    42    19    0    0    0    1    1    0    1    0    1    0    0    0    0    0    1    288    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    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

			@@ -68,7 +68,7 @@
			Writer = wdb
			Releaser = wdb
			RegType = 0
			RegisterPackCount = 2
			RegisterPackCount = 3

			PacketCMD_1=0xA2
			PacketSubCMD_1=0x01
			@@ -78,6 +78,10 @@
			PacketSubCMD_2=0x11
			PacketCallFunc_2=OnSellManyItem

			PacketCMD_3=0xA2
			PacketSubCMD_3=0x32
			PacketCallFunc_3=OnMysticalShopRefresh

			;物品管理
			[ItemControler]
			ScriptName = Item\ItemControler.py

			@@ -1,2 +1,2 @@
			CfgID StartDate EndDate AdvanceMinutes IsDayReset ResetType LimitLV TemplateID PointAward
			1 8 15 300 1 1 110 [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2500]] {0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}
			1 8 15 300 1 1 110 [[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,2700,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,2700,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,2700,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1201,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1201,2500]] {0:{180:[(2488,1,1)],330:[(1652,1,1)]},1:{310:[(5801,1,1)],410:[(5801,1,1)]},2:{310:[(5800,1,1)],410:[(5800,1,1)]},3:{310:[(5802,1,1)],410:[(5802,1,1)]},4:{180:[(2488,1,1)],380:[(4216,1,1)]},5:{180:[(2488,1,1)],380:[(62,1,1)]},6:{180:[(2488,1,1)],380:[(4221,1,1)]},}

			@@ -354,4 +354,4 @@
			LuckyAppraisal 30 10 8
			MixServerMail [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]] [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]] [500, 2000000] [[947,1,1]]
			MysteryShopGoods 10 [(3000,5),(5000,6),(7000,7),(10000,8)]
			MysteryShopRefresh 3809 {(0,5):1,(6,10):2,(11,15):3,(16,100000):5} 10 6
			MysteryShopRefresh 3809 {"5":1,"10":2,"15":3,"100000":5} 10 21600 {0:[4,20000]}

			@@ -36,3 +36,4 @@
			2400 24 90 90 [(2427,1,1),(882,1,1)] 60
			2500 25 150 150 [(2427,1,1),(882,1,1)] 60
			2600 26 5 5 [(2427,1,1),(882,1,1)] 60
			2700 27 5 1 [(2427,1,1),(882,1,1)] 20

			@@ -134,7 +134,7 @@
			263 1 0 坐骑：筋斗云 41 19 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 980 0 30000 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
			264 1 0 坐骑：福源猫 41 19 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1680 0 50000 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
			265 1 0 坐骑：森之灵 41 19 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 180 0 20000 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			266 1 0 坐骑：年兽 41 19 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 980 0 30000 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
			266 1 0 坐骑：年兽 41 19 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 980 0 30000 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
			267 1 0 坐骑：迷山画卷 41 19 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 1680 0 50000 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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
			268 1 0 坐骑：月莲之恋 41 19 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 180 0 20000 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			289 1 0 追风 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 288 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0