SnxxServerCode.git

			@@ -52,7 +52,6 @@
			import PlayerFamilyBoss
			import PlayerManorWar
			import GameWorldBoss
			import MergeBroadcast
			import GameWorldFamilyWar
			#import PlayerFamilyTech
			import PlayerFamilyRedPacket
			@@ -526,12 +525,6 @@
			# 用于记录全服充值的点券数
			if callName == "RecordChangeCoin":
			GameDataRecord.ChangeCoinCnt(eval(resultName))
			return

			#跨服广播子服
			if callName == 'SendBroadcastMergeClient':
			operType, mapID, dataDict, isRepeat = eval(resultName)
			MergeBroadcast.SendBroadcastMerge(operType, mapID, dataDict, isRepeat)
			return

			#跨服匹配PK战斗结算