From 892a61aa470e1af3b2e40f1c77c29d3bcabf2bca Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 6 Sep 2024 17:30:28 +0800 Subject: [PATCH 1/2] log --- machine/action/action_server.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/machine/action/action_server.go b/machine/action/action_server.go index da5749b..759543c 100644 --- a/machine/action/action_server.go +++ b/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 } From 7889c982eafed6e8660a03acc687c42a596e69bb Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 6 Sep 2024 18:06:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A8=83=E5=A8=83=E6=A9=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- machine/action/action_server.go | 12 ++++++------ machine/machinedoll/machinemgr.go | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/machine/action/action_server.go b/machine/action/action_server.go index 759543c..ea70d6b 100644 --- a/machine/action/action_server.go +++ b/machine/action/action_server.go @@ -195,13 +195,13 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid //fmt.Println("Failed to read response from server:", err) return } - session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ + fmt.Println("没有抓到礼品！！！！！！！！snid = ", snid, "num = ", num) + machinedoll.SendToGameServer(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ Snid: snid, Id: id, Result: 0, TypeId: 2, }) - fmt.Println("没有抓到礼品！！！！！！！！snid = ", snid, "num = ", num) return } if bytes.Contains(part, instruction1) && num != 1 { @@ -212,20 +212,20 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid fmt.Println("Failed to read response from server:", err) return } - session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ + fmt.Println("抓到礼品了！！！！！！！！snid = ", snid, "num = ", num) + machinedoll.SendToGameServer(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ Snid: snid, Id: id, Result: 1, TypeId: 2, }) - fmt.Println("抓到礼品了！！！！！！！！snid = ", snid, "num = ", num) return } //上分成功 coinData := []byte{0xAA, 0x04, 0x02, 0x03, 0x01} if bytes.Contains(part, coinData) { //返回消息 - session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ + machinedoll.SendToGameServer(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ Snid: snid, Id: id, Result: 1, @@ -237,7 +237,7 @@ func DollMachineGrabResult(session *netlib.Session, conn *machinedoll.Conn, snid coinData = []byte{0xAA, 0x04, 0x02, 0x03, 0x00} if bytes.Contains(part, coinData) { //返回消息 - session.Send(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ + machinedoll.SendToGameServer(int(machine.DollMachinePacketID_PACKET_MSDollMachineoPerateResult), &machine.MSDollMachineoPerateResult{ Snid: snid, Id: id, Result: 0, diff --git a/machine/machinedoll/machinemgr.go b/machine/machinedoll/machinemgr.go index 3fc997e..bbad9ff 100644 --- a/machine/machinedoll/machinemgr.go +++ b/machine/machinedoll/machinemgr.go @@ -152,9 +152,7 @@ func (this *MachineManager) UpdateToGameServer(conn *Conn, status int32) { } func SendToGameServer(pid int, msg interface{}) { - if GameConn == nil { - GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 701) - } + GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 777) if GameConn != nil { GameConn.Send(pid, msg) } else {