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

gamesrv/clawdoll/action_clawdoll.go

@@ -77,7 +77,7 @@ func MSDollMachineoCoinResultHandler(session *netlib.Session, packetId int, data
 			if msg.Result == 1 {
 				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)
 				sceneEx.SetPlayingState(int32(rule.ClawDollSceneStateStart))

machine/action/action_server.go

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