kxdd
|
8c8ee30ef8
|
Merge branch 'develop' into ma
# Conflicts:
# public
|
2024-09-06 18:20:54 +08:00 |
|
kxdd
|
770b9b084a
|
public
|
2024-09-06 15:39:17 +08:00 |
by
|
98a834b357
|
public
|
2024-09-06 14:56:40 +08:00 |
|
kxdd
|
3ac3f2dea1
|
娃娃机获取视频token修改
|
2024-09-06 11:57:45 +08:00 |
|
kxdd
|
8f59f4d03a
|
娃娃机抓取后结果通知修改
|
2024-09-06 09:41:41 +08:00 |
|
kxdd
|
e1e805f9d8
|
娃娃机添加流禁止流恢复功能
|
2024-09-05 14:23:36 +08:00 |
|
kxdd
|
8514f22fc6
|
娃娃机修改
|
2024-09-04 11:18:04 +08:00 |
|
kxdd
|
9cdc0f24c7
|
娃娃机配置更新
|
2024-09-04 10:49:37 +08:00 |
|
kxdd
|
27eb944329
|
娃娃机配置更新
|
2024-09-04 10:49:16 +08:00 |
|
kxdd
|
c4d58262de
|
娃娃机添加流ID
|
2024-09-03 17:50:19 +08:00 |
|
kxdd
|
85a115809c
|
添加娃娃机配置
|
2024-09-03 16:48:21 +08:00 |
|
by
|
36edf8ba7b
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-09-03 16:22:59 +08:00 |
|
by
|
fe375fb15f
|
删除无用代码
|
2024-09-03 16:22:47 +08:00 |
|
kxdd
|
9ef1f9d896
|
娃娃机报错修改
|
2024-09-03 16:09:43 +08:00 |
|
kxdd
|
da83b674d2
|
public 提交
|
2024-09-03 15:48:23 +08:00 |
|
by
|
59535c2015
|
更新配置
|
2024-09-03 15:46:54 +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 |
|
by
|
e7a6049341
|
娃娃机后台配置 增加StreamId字段
|
2024-09-03 15:12:24 +08:00 |
|
kxdd
|
ddcaa62f13
|
娃娃机修改
|
2024-09-03 15:10:41 +08:00 |
|
sk
|
d292cbc118
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-03 10:04:13 +08:00 |
|
sk
|
05a54af2db
|
活动礼包
|
2024-09-03 10:02:26 +08:00 |
|
sk
|
d2c5c4f159
|
活动礼包
|
2024-09-02 17:31:45 +08:00 |
|
sk
|
151a739dab
|
创建房间参数初始化
|
2024-09-02 16:26: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
|
04a0772415
|
竞技馆
|
2024-09-02 14:35:10 +08:00 |
|
sk
|
9f490a7aca
|
竞技馆
|
2024-09-02 11:44:12 +08:00 |
|
sk
|
03cd5dda2b
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-02 10:08:35 +08:00 |
|
sk
|
1d9bfd5802
|
竞技馆
|
2024-09-02 10:08:23 +08:00 |
tomas
|
77748f066f
|
Merge branch 'develop' into dev_slots
|
2024-09-02 09:32:56 +08:00 |
|
sk
|
b7d4efb7a6
|
代码优化
|
2024-08-30 18:52:11 +08:00 |
|
kxdd
|
fe26aa3d37
|
娃娃机获取视频流修改
|
2024-08-30 18:15:44 +08:00 |
|
sk
|
89bdfac420
|
新增拉霸游戏
|
2024-08-30 17:53:42 +08:00 |
|
sk
|
0ba53df8ec
|
新增拉霸游戏
|
2024-08-30 17:29:11 +08:00 |
|
sk
|
74efab000e
|
新增拉霸游戏
|
2024-08-30 17:19:03 +08:00 |
|
sk
|
9ab3da69a4
|
新增拉霸游戏
|
2024-08-30 17:18:06 +08:00 |
|
by
|
ece16ac947
|
获取token
|
2024-08-30 16:45:07 +08:00 |
|
tomas
|
18a884da43
|
11
|
2024-08-30 15:59:55 +08:00 |
|
by
|
3a6e420e98
|
token测试数据
|
2024-08-30 15:34:28 +08:00 |
|
sk
|
fa57f5e8e6
|
保存玩家游戏数据
|
2024-08-30 14:49:55 +08:00 |
|
kxdd
|
958a3b1ba4
|
娃娃机等待玩家添加
|
2024-08-30 11:56:15 +08:00 |
|
sk
|
a77cfa41dd
|
离开房间返回错误码
|
2024-08-29 16:54:30 +08:00 |
|
sk
|
33eab3f5bc
|
竞技馆房间列表变更通知
|
2024-08-29 16:35:57 +08:00 |
|
sk
|
94ca1562e5
|
解决冲突
|
2024-08-29 14:51:32 +08:00 |
|
sk
|
3bff2c17f3
|
review
|
2024-08-29 14:28:54 +08:00 |
|
by
|
ccc0e97635
|
娃娃机etcd配置
|
2024-08-29 11:55:57 +08:00 |
|
by
|
6bd95be413
|
娃娃机etcd配置
|
2024-08-29 11:33:52 +08:00 |
|
by
|
94d7e4f45f
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
# Conflicts:
# protocol/clawdoll/clawdoll.pb.go
|
2024-08-29 11:33:26 +08:00 |
|
by
|
46c68b9785
|
娃娃机etcd配置
|
2024-08-29 11:32:55 +08:00 |