diff --git a/domain/cache/game_c/game.go b/domain/cache/game_c/game.go index 67298eee60fea0d640a86d371b266c3eec7a6cf6..82de8479c604f1c594887e2e8ddce63705f23aca 100644 --- a/domain/cache/game_c/game.go +++ b/domain/cache/game_c/game.go @@ -13,11 +13,13 @@ type gameAutoJoinMsg struct { Token string EnterType string GameCode string + Is1V1 string + GameMode string } -func SetAutoMathEnterRoom(userId uint64, imGroupId, traceId, token, enterType, gameCode string) error { +func SetAutoMathEnterRoom(userId uint64, imGroupId, traceId, token, enterType, gameCode, is1V1, gameMode string) error { key := game_e.GetAutoMathEnterRoom(userId, imGroupId) - info := gameAutoJoinMsg{traceId, token, enterType, gameCode} + info := gameAutoJoinMsg{traceId, token, enterType, gameCode, is1V1, gameMode} data, err := json.Marshal(info) if err != nil { return err diff --git a/route/group_r/group_op.go b/route/group_r/group_op.go index 120bc8f9f96993204edb329816f85e54b91ed042..7773a347b2958f72a93841a7367b2ba712bd878f 100644 --- a/route/group_r/group_op.go +++ b/route/group_r/group_op.go @@ -1730,8 +1730,10 @@ func downgradeRoom(myContext *mycontext.MyContext, gi *group_m.GroupInfo) error // @Param nonce header string true "随机数字" // @Param groupId formData string true "群ID" // @Param password formData string false "房间密码" -// @Param enterType formData int false "进房类型:1.ludo游戏快速匹配进房 2:uno" +// @Param enterType formData int false "进房类型:1.ludo游戏快速匹配进房 2:uno 10.domino" // @Param gameCode formData string false "gameCode" +// @Param is1V1 formData int false "是否1v1,0否1是" +// @Param gameMode formData int false "游戏模式0.快速1.经典" // @Success 200 {object} group_cv.GroupChannelId // @Router /v1/imGroup/in [put] func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { @@ -1744,6 +1746,8 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { password := c.PostForm("password") enterType := c.PostForm("enterType") gameCode := c.PostForm("gameCode") + is1V1 := c.PostForm("is1V1") + gameMode := c.PostForm("gameMode") // 把id:9 添加进房间:5030的黑名单 if (userId == 2087771 || userId == 1763211) && groupId == "HTGS#a46766257" { return myContext, bizerr.NoPrivileges @@ -1890,7 +1894,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { if enterType != "" && gameCode != "" { traceId, _ := c.Get(mycontext.TRACEID) token := c.Writer.Header().Get(mycontext.TOKEN) - err := game_c.SetAutoMathEnterRoom(userId, gi.ImGroupId, cast.ToString(traceId), token, enterType, gameCode) + err := game_c.SetAutoMathEnterRoom(userId, gi.ImGroupId, cast.ToString(traceId), token, enterType, gameCode, is1V1, gameMode) if err != nil { model.Log.Errorf("GroupIn cache.SetAutoMathEnterRoom userId:%v, imGroupId:%v, err:%v", userId, gi.ImGroupId, err) }