Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hilo-group
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujiebin
hilo-group
Commits
ab72f7bd
Commit
ab72f7bd
authored
Aug 03, 2023
by
chenweijian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
游戏
parent
74cfec26
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
game.go
domain/cache/game_c/game.go
+4
-2
group_op.go
route/group_r/group_op.go
+6
-2
No files found.
domain/cache/game_c/game.go
View file @
ab72f7bd
...
...
@@ -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
...
...
route/group_r/group_op.go
View file @
ab72f7bd
...
...
@@ -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
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment