SnxxServerCode.git

			@@ -285,6 +285,7 @@
			dgMergeQueryNewAccount = _IPY_ServerDefine.dgMergeQueryNewAccount
			dgBroadcastMergeClient = _IPY_ServerDefine.dgBroadcastMergeClient
			dgMergerChildToCenter = _IPY_ServerDefine.dgMergerChildToCenter
			dgLoginMergeServer = _IPY_ServerDefine.dgLoginMergeServer
			gmMapInitOk = _IPY_ServerDefine.gmMapInitOk
			gmPlayerInit = _IPY_ServerDefine.gmPlayerInit
			gmPlayerLogout = _IPY_ServerDefine.gmPlayerLogout
			@@ -312,6 +313,7 @@
			gmQueryNewGuyCardState = _IPY_ServerDefine.gmQueryNewGuyCardState
			gmUpdateNewGuyCardState = _IPY_ServerDefine.gmUpdateNewGuyCardState
			gmReChargePush = _IPY_ServerDefine.gmReChargePush
			gmMergePlayerData = _IPY_ServerDefine.gmMergePlayerData
			mgMapInit = _IPY_ServerDefine.mgMapInit
			mgMapInitOK = _IPY_ServerDefine.mgMapInitOK
			mgPlayerIsBattle = _IPY_ServerDefine.mgPlayerIsBattle
			@@ -395,6 +397,7 @@
			gbProxyDBOper = _IPY_ServerDefine.gbProxyDBOper
			gbSynPlayerName = _IPY_ServerDefine.gbSynPlayerName
			gbMergerChildToCenter = _IPY_ServerDefine.gbMergerChildToCenter
			gbCrossServerState = _IPY_ServerDefine.gbCrossServerState
			gstPlayerLogin = _IPY_ServerDefine.gstPlayerLogin
			gstPlayerDetail = _IPY_ServerDefine.gstPlayerDetail
			gstCreatePlayer = _IPY_ServerDefine.gstCreatePlayer
			@@ -507,6 +510,9 @@
			gstMergerChildToCenter = _IPY_ServerDefine.gstMergerChildToCenter
			gstQueryRecharge = _IPY_ServerDefine.gstQueryRecharge
			gstFinishRecharge = _IPY_ServerDefine.gstFinishRecharge
			gstSendDBMergeClientMsg = _IPY_ServerDefine.gstSendDBMergeClientMsg
			gstSendDBMergeClientListMsg = _IPY_ServerDefine.gstSendDBMergeClientListMsg
			gstMergePlayerData = _IPY_ServerDefine.gstMergePlayerData
			gstMax = _IPY_ServerDefine.gstMax
			btgServerSupport = _IPY_ServerDefine.btgServerSupport
			btgLineID = _IPY_ServerDefine.btgLineID