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-09 10:25:54 +08:00
parent ea6ef0be41 18f67b7d22
commit eb791c364e
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gamesrv/clawdoll/action_clawdoll.go
View File

@ -77,7 +77,7 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
if msg.Result == 1 { if msg.Result == 1 {
logger.Logger.Tracef("上分成功！！！！！！！！！！！！snid = ", msg.Snid) logger.Logger.Tracef("上分成功！！！！！！！！！！！！snid = ", msg.Snid)
//发送向前移动指令 //发送向前移动指令
sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront) //sceneEx.OnPlayerSMPerateOp(p.SnId, int32(sceneEx.machineId), rule.ButtonFront)
s.ChangeSceneState(rule.ClawDollSceneStateStart) s.ChangeSceneState(rule.ClawDollSceneStateStart)
sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateStart)) sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateStart))

23
machine/action/action_server.go
View File

@ -119,6 +119,7 @@ func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data inte
Process(conn, f1, f2) Process(conn, f1, f2)
case 5: case 5:
//投币 //投币
fmt.Println("===========玩家投币===========")
machinedoll.Coin(conn) machinedoll.Coin(conn)
go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId()) go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId())
} }
@ -141,18 +142,20 @@ func SMDollMachineGrabHandler(session *netlib.Session, packetId int, data interf
switch msg.GetTypeId() { switch msg.GetTypeId() {
case 1: case 1:
//弱抓 //弱抓
f1 := []func(){ /* f1 := []func(){
func() { machinedoll.WeakGrab(conn) }, func() { machinedoll.WeakGrab(conn) },
} }
f2 := []func(){} f2 := []func(){}
Process(conn, f1, f2) Process(conn, f1, f2)*/
machinedoll.WeakGrab(conn)
case 2: case 2:
//强力抓 //强力抓
f1 := []func(){ /* f1 := []func(){
func() { machinedoll.Grab(conn) }, func() { machinedoll.Grab(conn) },
} }
f2 := []func(){} f2 := []func(){}
Process(conn, f1, f2) Process(conn, f1, f2)*/
machinedoll.Grab(conn)
} }
return nil return nil
} }