~admin/snxx_server.git

			@@ -148,36 +148,6 @@
			PacketSubCMD_2=0x08
			PacketCallFunc_2=QueryFamilyActionInfo


			;跨服报名(上传数据)
			[MergeRegister]
			ScriptName = Player\PlayerMergeRegister.py
			Writer = hxp
			Releaser = hxp
			RegType = 0
			RegisterPackCount = 2

			PacketCMD_1=0xC0
			PacketSubCMD_1=0x11
			PacketCallFunc_1=MergeWarRegisterPack

			PacketCMD_2=0xC0
			PacketSubCMD_2=0x12
			PacketCallFunc_2=MergeWarAccQueryPack

			;跨服玩家
			[MergePlayer]
			ScriptName = Player\MergePlayer.py
			Writer = hxp
			Releaser = hxp
			RegType = 0
			RegisterPackCount = 1

			PacketCMD_1=0xC0
			PacketSubCMD_1=0x15
			PacketCallFunc_1=OnGotoMergeServer


			;排行榜
			[PlayerBillboard]
			ScriptName = Player\PlayerBillboard.py