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

machine/action/action_server.go

@@ -201,7 +201,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 						Result: 0,
 						TypeId: 2,
 					})
-					logger.Logger.Trace("没有抓到礼品！！！！！！！！snid = ", snid, "num = ", num)
+					fmt.Println("没有抓到礼品！！！！！！！！snid = ", snid, "num = ", num)
 					return
 				}
 				if bytes.Contains(part, instruction1) && num != 1 {
@@ -209,7 +209,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 					//回应数据
 					_, err = conn.Write([]byte{0xAA, 0x04, 0x01, 0x50, 0x09, 0x5c, 0xdd})
 					if err != nil {
-						logger.Logger.Error("Failed to read response from server:", err)
+						fmt.Println("Failed to read response from server:", err)
 						return
 					}
 					session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{
@@ -218,7 +218,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 						Result: 1,
 						TypeId: 2,
 					})
-					logger.Logger.Trace("抓到礼品了！！！！！！！！snid = ", snid, "num = ", num)
+					fmt.Println("抓到礼品了！！！！！！！！snid = ", snid, "num = ", num)
 					return
 				}
 				//上分成功
@@ -231,6 +231,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 						Result: 1,
 						TypeId: 1,
 					})
+					fmt.Println("上分成功！！！！！！！！！！snid = ", snid, "num = ", num)
 				}
 				//上分失败
 				coinData = []byte{0xAA, 0x04, 0x02, 0x03, 0x00}
@@ -242,6 +243,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 						Result: 0,
 						TypeId: 1,
 					})
+					fmt.Println("上分失败！！！！！！！！！！snid = ", snid, "num = ", num)
 				}
 			}
 		}
@@ -254,7 +256,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid
 
 // 与游戏服务器连接成功，向游戏服务器推送所有娃娃机连接
 func SMGameLinkSucceedHandler(session *netlib.Session, packetId int, data interface{}) error {
-	logger.Logger.Trace("与游戏服务器连接成功")
+	fmt.Println("与游戏服务器连接成功")
 	//开始向游戏服务器发送娃娃机连接信息
 	msg := &machine.MSDollMachineList{}
 	for i, _ := range machinedoll.MachineMgr.ConnMap {
@@ -263,7 +265,7 @@ func SMGameLinkSucceedHandler(session *netlib.Session, packetId int, data interf
 		msg.Data = append(msg.Data, info)
 	}
 	session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineList), msg)
-	logger.Logger.Tracef("向游戏服务器发送娃娃机连接信息：%v", msg)
+	fmt.Println("向游戏服务器发送娃娃机连接信息：%v", msg)
 	return nil
 }
 
@@ -304,7 +306,7 @@ func SMGetTokenHandler(session *netlib.Session, packetId int, data interface{})
 	info.StreamId = msg.StreamId
 
 	session.Send(int(machine.DollMachinePacketID_PACKET_MSSendToken), info)
-	logger.Logger.Tracef("向游戏服务器发送娃娃机token：%v", info)
+	fmt.Println("向游戏服务器发送娃娃机token：%v", info)
 	return nil
 }