Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop

gamesrv/action/action_machine.go

@@ -4,6 +4,7 @@ import (
 	"mongo.games.com/game/protocol/machine"
 	"mongo.games.com/goserver/core/logger"
 	"mongo.games.com/goserver/core/netlib"
+	"mongo.games.com/goserver/srvlib"
 	"sync"
 )
 
@@ -73,7 +74,12 @@ func MSDollMachineHeartBeatHandler(session *netlib.Session, packetId int, data i
 	//fmt.Println("收到娃娃机服务心跳！！！")
 	//返回心跳
 	pack := &machine.SMDollMachineHeartBeat{}
-	session.Send(int(machine.DollMachinePacketID_Packet_SMDollMachineHeartBeat), pack)
+	machineConn := srvlib.ServerSessionMgrSington.GetSession(1, 10, 1001)
+	if machineConn != nil {
+		machineConn.Send(int(machine.DollMachinePacketID_Packet_SMDollMachineHeartBeat), pack)
+	} else {
+		logger.Logger.Error("MSDollMachineHeartBeatHandler:MachineConn is nil !")
+	}
 	return nil
 }