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

gamesrv/clawdoll/action_clawdoll.go

@@ -9,6 +9,7 @@ import (
 	"mongo.games.com/game/protocol/machine"
 	"mongo.games.com/goserver/core/logger"
 	"mongo.games.com/goserver/core/netlib"
+	"strconv"
 )
 
 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)
 
 		//生成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 {
 			logger.Logger.Error(err)
 			return err

machine/action/action_server.go

@@ -71,7 +71,7 @@ func processConnMessageQueue(queue *ConnMessageQueue) {
 
 // 移动
 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)
 	if !ok {
 		return nil
@@ -121,13 +121,14 @@ func SMDollMachinePerateHandler(session *netlib.Session, packetId int, data inte
 		Process(conn, f1, f2)
 	case 5:
 		//投币
-		f1 := []func(){
-			func() { machinedoll.Coin(conn) },
-		}
-		f2 := []func(){
-			func() {},
-		}
-		Process(conn, f1, f2)
+		/*		f1 := []func(){
+					func() { machinedoll.Coin(conn) },
+				}
+				f2 := []func(){
+					func() {},
+				}
+				Process(conn, f1, f2)*/
+		machinedoll.Coin(conn)
 		go DollMachineGrabResult(session, conn, msg.Snid, msg.GetId())
 	}
 	return nil