~admin/snxx_server.git

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

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

cehua_wcy

2018-09-10 7c7213758e3924b17f3d0a19254904c915b748e3

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

11个文件已修改

	CoreServerGroup/GameServer/PyNetPack.ini	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ChPyNetPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagSuccess.txt	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PyNetPack.ini

@@ -269,7 +269,7 @@
Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 9

RegisterPackCount = 10



PacketCMD_1=0xB9

PacketSubCMD_1=0x01

@@ -307,6 +307,10 @@
PacketSubCMD_9=0x10

PacketCallFunc_9=OnQueryTeamMemFuncData



PacketCMD_10=0xB9

PacketSubCMD_10=0x0A

PacketCallFunc_10=OnInvitePlayerJoinTeamByLV



[PlayerViewCache]

ScriptName = Player\PlayerViewCache.py

Writer = alee


 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagSuccess.txt

@@ -387,3 +387,13 @@
1048    91    15    50635|55635|60635                0        0        

1049    91    15    50735|55735|60735                0        0        

1050    91    5    50865|55865|60865                0        0        

1061    1    160    0                0        0		
1062    1    180    0                0        0		
1063    1    195    0                0        0		
1064    1    210    0                0        0		
1065    1    225    0                0        0		
1066    1    240    0                0        0		
1067    1    250    0                0        0		
1068    1    260    0                0        0		
1069    1    270    0                0        0		
1070    1    280    0                0        0		

 db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt

@@ -1,11 +1,11 @@
PrivilegeID    EffectValue    singleValue    maxValue    attr    itemAward    successList

1    0            {"6":10000,"7":200}        1001|1021|1041

2    0    3    180    {"7":50}        1003|1023|1043

3    0                    1002|1022|1042

4    10000                    1004|1024|1044

5    0    4    0    {"7":100}        1006|1026|1046

6    0    1    0    {"6":12000}        1005|1025|1045

7    0    5    450    {"26":200}        1008|1028|1048

8    0            {"86":5000}        1007|1027|1047

9    0            {"87":5000}        1009|1029|1049

10    0    0    0        [[5303,50,1]]    1010|1030|1050

1    0            {"6":10000,"7":200}        1061|1021|1041

2    0    3    180    {"7":50}        1063|1023|1043

3    0                    1062|1022|1042

4    10000                    1064|1024|1044

5    0    4    0    {"7":100}        1066|1026|1046

6    0    1    0    {"6":12000}        1065|1025|1045

7    0    5    450    {"26":200}        1068|1028|1048

8    0            {"86":5000}        1067|1027|1047

9    0            {"87":5000}        1069|1029|1049

10    0    0    0        [[5303,50,1]]    1070|1030|1050

			@@ -269,7 +269,7 @@
			Writer = hxp
			Releaser = hxp
			RegType = 0
			RegisterPackCount = 9
			RegisterPackCount = 10

			PacketCMD_1=0xB9
			PacketSubCMD_1=0x01
			@@ -307,6 +307,10 @@
			PacketSubCMD_9=0x10
			PacketCallFunc_9=OnQueryTeamMemFuncData

			PacketCMD_10=0xB9
			PacketSubCMD_10=0x0A
			PacketCallFunc_10=OnInvitePlayerJoinTeamByLV

			[PlayerViewCache]
			ScriptName = Player\PlayerViewCache.py
			Writer = alee

			@@ -387,3 +387,13 @@
			1048 91 15 50635\|55635\|60635 0 0
			1049 91 15 50735\|55735\|60735 0 0
			1050 91 5 50865\|55865\|60865 0 0
			1061 1 160 0 0 0
			1062 1 180 0 0 0
			1063 1 195 0 0 0
			1064 1 210 0 0 0
			1065 1 225 0 0 0
			1066 1 240 0 0 0
			1067 1 250 0 0 0
			1068 1 260 0 0 0
			1069 1 270 0 0 0
			1070 1 280 0 0 0

			@@ -1,11 +1,11 @@
			PrivilegeID EffectValue singleValue maxValue attr itemAward successList
			1 0 {"6":10000,"7":200} 1001\|1021\|1041
			2 0 3 180 {"7":50} 1003\|1023\|1043
			3 0 1002\|1022\|1042
			4 10000 1004\|1024\|1044
			5 0 4 0 {"7":100} 1006\|1026\|1046
			6 0 1 0 {"6":12000} 1005\|1025\|1045
			7 0 5 450 {"26":200} 1008\|1028\|1048
			8 0 {"86":5000} 1007\|1027\|1047
			9 0 {"87":5000} 1009\|1029\|1049
			10 0 0 0 [[5303,50,1]] 1010\|1030\|1050
			1 0 {"6":10000,"7":200} 1061\|1021\|1041
			2 0 3 180 {"7":50} 1063\|1023\|1043
			3 0 1062\|1022\|1042
			4 10000 1064\|1024\|1044
			5 0 4 0 {"7":100} 1066\|1026\|1046
			6 0 1 0 {"6":12000} 1065\|1025\|1045
			7 0 5 450 {"26":200} 1068\|1028\|1048
			8 0 {"86":5000} 1067\|1027\|1047
			9 0 {"87":5000} 1069\|1029\|1049
			10 0 0 0 [[5303,50,1]] 1070\|1030\|1050