Commit c5bc5ecd authored by chenweijian's avatar chenweijian

游戏

parent 62d93839
...@@ -15,11 +15,12 @@ type gameAutoJoinMsg struct { ...@@ -15,11 +15,12 @@ type gameAutoJoinMsg struct {
GameCode string GameCode string
Is1V1 string Is1V1 string
GameMode string GameMode string
Is1V1Robot string
} }
func SetAutoMathEnterRoom(userId uint64, imGroupId, traceId, token, enterType, gameCode, is1V1, gameMode string) error { func SetAutoMathEnterRoom(userId uint64, imGroupId, traceId, token, enterType, gameCode, is1V1, gameMode, is1V1Robot string) error {
key := game_e.GetAutoMathEnterRoom(userId, imGroupId) key := game_e.GetAutoMathEnterRoom(userId, imGroupId)
info := gameAutoJoinMsg{traceId, token, enterType, gameCode, is1V1, gameMode} info := gameAutoJoinMsg{traceId, token, enterType, gameCode, is1V1, gameMode, is1V1Robot}
data, err := json.Marshal(info) data, err := json.Marshal(info)
if err != nil { if err != nil {
return err return err
......
...@@ -1734,6 +1734,7 @@ func downgradeRoom(myContext *mycontext.MyContext, gi *group_m.GroupInfo) error ...@@ -1734,6 +1734,7 @@ func downgradeRoom(myContext *mycontext.MyContext, gi *group_m.GroupInfo) error
// @Param gameCode formData string false "gameCode" // @Param gameCode formData string false "gameCode"
// @Param is1V1 formData int false "是否1v1,0否1是" // @Param is1V1 formData int false "是否1v1,0否1是"
// @Param gameMode formData int false "游戏模式0.快速1.经典" // @Param gameMode formData int false "游戏模式0.快速1.经典"
// @Param is1V1Robot formData int false "是否游戏机器人,0否1是"
// @Success 200 {object} group_cv.GroupChannelId // @Success 200 {object} group_cv.GroupChannelId
// @Router /v1/imGroup/in [put] // @Router /v1/imGroup/in [put]
func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { func GroupIn(c *gin.Context) (*mycontext.MyContext, error) {
...@@ -1748,6 +1749,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -1748,6 +1749,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) {
gameCode := c.PostForm("gameCode") gameCode := c.PostForm("gameCode")
is1V1 := c.PostForm("is1V1") is1V1 := c.PostForm("is1V1")
gameMode := c.PostForm("gameMode") gameMode := c.PostForm("gameMode")
is1V1Robot := c.PostForm("is1V1Robot")
// 把id:9 添加进房间:5030的黑名单 // 把id:9 添加进房间:5030的黑名单
if (userId == 2087771 || userId == 1763211) && groupId == "HTGS#a46766257" { if (userId == 2087771 || userId == 1763211) && groupId == "HTGS#a46766257" {
return myContext, bizerr.NoPrivileges return myContext, bizerr.NoPrivileges
...@@ -1894,7 +1896,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -1894,7 +1896,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) {
if enterType != "" && gameCode != "" { if enterType != "" && gameCode != "" {
traceId, _ := c.Get(mycontext.TRACEID) traceId, _ := c.Get(mycontext.TRACEID)
token := c.Writer.Header().Get(mycontext.TOKEN) token := c.Writer.Header().Get(mycontext.TOKEN)
err := game_c.SetAutoMathEnterRoom(userId, gi.ImGroupId, cast.ToString(traceId), token, enterType, gameCode, is1V1, gameMode) err := game_c.SetAutoMathEnterRoom(userId, gi.ImGroupId, cast.ToString(traceId), token, enterType, gameCode, is1V1, gameMode, is1V1Robot)
if err != nil { if err != nil {
model.Log.Errorf("GroupIn cache.SetAutoMathEnterRoom userId:%v, imGroupId:%v, err:%v", userId, gi.ImGroupId, err) model.Log.Errorf("GroupIn cache.SetAutoMathEnterRoom userId:%v, imGroupId:%v, err:%v", userId, gi.ImGroupId, err)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment