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

machine/action/action_server.go

@@ -173,6 +173,9 @@ func SMDollMachineGrabHandler(session *netlib.Session, packetId int, data interf
 
 // 监听抓取结果返回
 func DollMachineGrabResult(conn *machinedoll.Conn, snid, id int32) {
+	if conn == nil {
+		return
+	}
 	num := int64(1)
 	for {
 		// 读取数据
@@ -183,6 +186,7 @@ func DollMachineGrabResult(conn *machinedoll.Conn, snid, id int32) {
 			logger.Logger.Error("Failed to read response from client:", err)
 			err := conn.Conn.Close()
 			if err != nil {
+				logger.Logger.Error("conn.Conn.Close():", err)
 				return
 			}
 			return