tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sk 2024-09-06 18:33:42 +08:00
parent 4da55c9588 7889c982ea
commit ad3e8d4b9f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
machine/action/action_server.go
View File

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

4
machine/machinedoll/machinemgr.go
View File

@ -152,9 +152,7 @@ func (this *MachineManager) UpdateToGameServer(conn *Conn, status int32) {
} }
func SendToGameServer(pid int, msg interface{}) { func SendToGameServer(pid int, msg interface{}) {
if GameConn == nil { GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 777)
GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 701)
}
if GameConn != nil { if GameConn != nil {
GameConn.Send(pid, msg) GameConn.Send(pid, msg)
} else { } else {