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-07 10:46:47 +08:00
parent 1b67a44d63 759c989719
commit 053db5b83a
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gamesrv/clawdoll/action_clawdoll.go
View File

@ -9,6 +9,7 @@ import (
"mongo.games.com/game/protocol/machine" "mongo.games.com/game/protocol/machine"
"mongo.games.com/goserver/core/logger" "mongo.games.com/goserver/core/logger"
"mongo.games.com/goserver/core/netlib" "mongo.games.com/goserver/core/netlib"
"strconv"
) )
type CSPlayerOpPacketFactory struct { type CSPlayerOpPacketFactory struct {
@ -136,7 +137,7 @@ func (h *CSGetTokenHandler) Process(s *netlib.Session, packetid int, data interf
logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v", machineInfo.AppId, machineInfo.ServerSecret, machineInfo.StreamId) logger.Logger.Tracef("获取娃娃机 appId = %v, serverSecret = %v, streamId = %v", machineInfo.AppId, machineInfo.ServerSecret, machineInfo.StreamId)
//生成token //生成token
token, err := token04.GenerateToken04(uint32(machineInfo.AppId), string(p.SnId), machineInfo.ServerSecret, 7200, "") token, err := token04.GenerateToken04(uint32(machineInfo.AppId), strconv.Itoa(int(p.SnId)), machineInfo.ServerSecret, 7200, "")
if err != nil { if err != nil {
logger.Logger.Error(err) logger.Logger.Error(err)
return err return err

17
machine/action/action_server.go
View File

@ -71,7 +71,7 @@ func processConnMessageQueue(queue *ConnMessageQueue) {
// 移动 // 移动
func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data interface{}) error { func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data interface{}) error {
logger.Logger.Tracef("SMDollMachinePerateHandler %v", data) fmt.Println("SMDollMachinePerateHandler %v", data)
msg, ok := data.(*machine.SMDollMachineoPerate) msg, ok := data.(*machine.SMDollMachineoPerate)
if !ok { if !ok {
return nil return nil
@ -121,13 +121,14 @@ func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data inte
Process(conn, f1, f2) Process(conn, f1, f2)
case 5: case 5:
//投币 //投币
f1 := []func(){ /* f1 := []func(){
func() { machinedoll.Coin(conn) }, func() { machinedoll.Coin(conn) },
} }
f2 := []func(){ f2 := []func(){
func() {}, func() {},
} }
Process(conn, f1, f2) Process(conn, f1, f2)*/
machinedoll.Coin(conn)
go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId()) go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId())
} }
return nil return nil