kxdd
|
418b16d2e9
|
娃娃机状态修改
|
2024-09-10 14:59:36 +08:00 |
|
kxdd
|
7991a8044d
|
娃娃机状态调整
|
2024-09-07 17:37:22 +08:00 |
|
kxdd
|
e690d8da76
|
Merge branch 'develop' into ma
# Conflicts:
# gamesrv/clawdoll/action_clawdoll.go
|
2024-09-07 16:58:17 +08:00 |
by
|
d61a153948
|
投币后向前移动一下
|
2024-09-07 16:22:12 +08:00 |
|
kxdd
|
f26cb4d2ff
|
娃娃机playing判定修改
|
2024-09-07 16:08:46 +08:00 |
|
by
|
7099975e9e
|
客户端请求token
|
2024-09-07 14:48:44 +08:00 |
|
by
|
1d98a31bf4
|
token修改
|
2024-09-07 14:29:34 +08:00 |
|
by
|
83d5ec05fb
|
生成token修改
|
2024-09-07 14:04:44 +08:00 |
|
kxdd
|
de339225d2
|
娃娃机获取token修改
|
2024-09-07 11:58:40 +08:00 |
|
by
|
d34473c688
|
token
|
2024-09-07 11:40:04 +08:00 |
|
by
|
59eb4ecc22
|
token
|
2024-09-07 11:17:33 +08:00 |
|
sk
|
053db5b83a
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-07 10:46:47 +08:00 |
|
sk
|
1b67a44d63
|
竞技馆牌局记录
|
2024-09-07 10:46:34 +08:00 |
|
by
|
759c989719
|
获取token
|
2024-09-07 10:43:36 +08:00 |
|
sk
|
cb4b51b4aa
|
竞技馆游戏记录
|
2024-09-07 10:03:50 +08:00 |
|
sk
|
67a85f6535
|
竞技房间没人解散
|
2024-09-06 17:28:10 +08:00 |
|
kxdd
|
8a19cd642f
|
娃娃机通知状态修改
|
2024-09-06 15:36:59 +08:00 |
|
kxdd
|
19dde360d6
|
Merge branch 'ma' into develop
|
2024-09-06 11:58:07 +08:00 |
|
kxdd
|
3ac3f2dea1
|
娃娃机获取视频token修改
|
2024-09-06 11:57:45 +08:00 |
|
kxdd
|
979645567e
|
合并代码
|
2024-09-06 10:08:29 +08:00 |
|
kxdd
|
b74f284654
|
Merge branch 'ma' into develop
# Conflicts:
# gamesrv/clawdoll/scenepolicy_clawdoll.go
|
2024-09-06 10:08:05 +08:00 |
|
kxdd
|
8f59f4d03a
|
娃娃机抓取后结果通知修改
|
2024-09-06 09:41:41 +08:00 |
|
sk
|
33380d1bf8
|
查询房间信息
|
2024-09-05 16:02:50 +08:00 |
|
sk
|
58fe35c90f
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-05 14:51:52 +08:00 |
|
sk
|
3b15a84df3
|
查询房间信息
|
2024-09-05 14:46:43 +08:00 |
|
kxdd
|
2869fb7e3f
|
Merge branch 'ma' into develop
|
2024-09-05 14:46:34 +08:00 |
|
kxdd
|
e1e805f9d8
|
娃娃机添加流禁止流恢复功能
|
2024-09-05 14:23:36 +08:00 |
|
sk
|
1948560a03
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-05 11:25:13 +08:00 |
|
sk
|
f056014c50
|
玩家游戏数据保存
|
2024-09-05 11:24:46 +08:00 |
|
by
|
68a8e010cf
|
scene只能绑定对应的娃娃机编号
|
2024-09-05 10:28:43 +08:00 |
|
by
|
fb8bfbde87
|
刪除log
|
2024-09-04 14:03:37 +08:00 |
|
by
|
12623d7b94
|
增加log
|
2024-09-04 13:46:10 +08:00 |
|
kxdd
|
4ab95e058e
|
Merge branch 'ma' into develop
# Conflicts:
# data/DB_PropExchange.dat
# data/DB_Task.dat
# public
# xlsx/DB_GameFree.xlsx
|
2024-09-04 11:21:13 +08:00 |
|
kxdd
|
8514f22fc6
|
娃娃机修改
|
2024-09-04 11:18:04 +08:00 |
|
kxdd
|
27eb944329
|
娃娃机配置更新
|
2024-09-04 10:49:16 +08:00 |
|
sk
|
92bf5fe16e
|
review
|
2024-09-03 18:09:09 +08:00 |
|
kxdd
|
c4d58262de
|
娃娃机添加流ID
|
2024-09-03 17:50:19 +08:00 |
|
by
|
c226024401
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2024-09-03 17:15:26 +08:00 |
|
by
|
d16c1a1887
|
修改log
|
2024-09-03 17:15:05 +08:00 |
|
sk
|
6c4e49ef44
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-03 16:40:53 +08:00 |
|
kxdd
|
9ef1f9d896
|
娃娃机报错修改
|
2024-09-03 16:09:43 +08:00 |
|
by
|
981c3860d1
|
Merge remote-tracking branch 'origin/develop' into ma
# Conflicts:
# data/DB_GameFree.dat
# data/DB_PropExchange.dat
# data/DB_Task.dat
# etcd/keyconf.go
# model/config.go
# protocol/webapi/common.pb.go
# protocol/webapi/common.proto
# protocol/webapi/webapi.proto
# public
# xlsx/DB_GameFree.xlsx
|
2024-09-03 15:46:11 +08:00 |
|
kxdd
|
ddcaa62f13
|
娃娃机修改
|
2024-09-03 15:10:41 +08:00 |
|
sk
|
034abb64e2
|
牌局回放
|
2024-09-03 11:20:49 +08:00 |
|
sk
|
5c6dce2f4d
|
房卡场中途不能离开房间
|
2024-09-03 10:57:05 +08:00 |
|
kxdd
|
6a9c6a988b
|
娃娃机获取token修改
|
2024-09-02 16:23:45 +08:00 |
|
sk
|
00dcc3199f
|
竞技馆房主付费
|
2024-09-02 16:13:23 +08:00 |
|
sk
|
26db8f4b21
|
竞技馆
|
2024-09-02 14:55:18 +08:00 |
|
sk
|
9f490a7aca
|
竞技馆
|
2024-09-02 11:44:12 +08:00 |
|
sk
|
1d9bfd5802
|
竞技馆
|
2024-09-02 10:08:23 +08:00 |