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 |
|
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 |
|
sk
|
b7d4efb7a6
|
代码优化
|
2024-08-30 18:52:11 +08:00 |
|
kxdd
|
fe26aa3d37
|
娃娃机获取视频流修改
|
2024-08-30 18:15:44 +08:00 |
|
by
|
ece16ac947
|
获取token
|
2024-08-30 16:45:07 +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
|
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
|
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 |
|
sk
|
9ea57766a4
|
房卡场对局记录
|
2024-08-28 18:18:36 +08:00 |
|
kxdd
|
ebe7b1c4c8
|
娃娃机协议修改
|
2024-08-28 17:00:31 +08:00 |
|
sk
|
bfdf500eec
|
创建房间参数优化
|
2024-08-28 16:08:55 +08:00 |
|
sk
|
17c0817dab
|
游戏服道具变化同步到大厅
|
2024-08-27 17:05:00 +08:00 |
|
kxdd
|
cbd00bf0f8
|
娃娃机状态修改
|
2024-08-27 15:13:32 +08:00 |
|
sk
|
466eafe1bc
|
房间信息添加比赛配置id
|
2024-08-26 18:13:15 +08:00 |
|
sk
|
904982158a
|
房卡场游戏
|
2024-08-26 16:54:07 +08:00 |
|
sk
|
f4434bd945
|
去掉ParamsEx,agentor
|
2024-08-24 18:22:06 +08:00 |
|
by
|
ba9dde2005
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-08-24 16:11:03 +08:00 |
|
by
|
4580f69514
|
请求token注册协议修改
|
2024-08-24 16:10:28 +08:00 |
kxdd
|
aed283b37e
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-08-24 15:17:17 +08:00 |
|
kxdd
|
87486f1a48
|
娃娃机状态流程修改
|
2024-08-24 15:13:22 +08:00 |
|
sk
|
ab974063e8
|
tienlen比赛场观战发送玩家手牌
|
2024-08-22 17:48:10 +08:00 |
|
by
|
88db5712d8
|
娃娃机获取token
|
2024-08-22 15:43:28 +08:00 |
|
sk
|
71655d8126
|
比赛观战
|
2024-08-22 09:43:10 +08:00 |
|
sk
|
fe8ccec885
|
review
|
2024-08-20 09:46:13 +08:00 |
|
by
|
154a037e08
|
娃娃机监听消息
|
2024-08-15 11:31:45 +08:00 |
|
kxdd
|
f23cfda629
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-08-14 16:24:31 +08:00 |
|
kxdd
|
a4b4a0b2a0
|
封装移动投币操作
|
2024-08-14 16:23:58 +08:00 |
|
by
|
8ff978db72
|
娃娃机返回操作结果
|
2024-08-14 16:22:57 +08:00 |
|
kxdd
|
2c8ce6a467
|
添加上分投币
|
2024-08-14 15:53:27 +08:00 |
|
kxdd
|
ac608b4a44
|
Merge branch 'ma' of https://git.pogorockgames.com/mango-games/server/game into ma
|
2024-08-14 14:25:46 +08:00 |
|
kxdd
|
1fff8b2ebb
|
添加移动响应
|
2024-08-14 14:09:05 +08:00 |
|
by
|
d2a8b0e618
|
娃娃机修改
|
2024-08-14 12:06:15 +08:00 |
|
kxdd
|
49b0c6cc00
|
下抓通知添加
|
2024-08-13 15:33:44 +08:00 |
|
by
|
d703046f63
|
娃娃机
|
2024-08-13 14:47:12 +08:00 |
|
sk
|
ed358edfce
|
娃娃机
|
2024-08-13 14:07:28 +08:00 |
|
sk
|
dc631f4334
|
比赛场记录机器人皮肤
|
2024-08-12 16:30:03 +08:00 |
|
by
|
4880d41aa3
|
娃娃机
|
2024-08-10 16:24:10 +08:00 |
|
by
|
d232592524
|
娃娃机主机实现
|
2024-08-10 15:48:01 +08:00 |
|
sk
|
33f0d7c8aa
|
添加娃娃机服务
|
2024-08-08 16:03:59 +08:00 |