tomas
|
af99918965
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-13 09:01:47 +08:00 |
sk
|
fa1d1648ac
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-11 16:33:05 +08:00 |
|
sk
|
d74c868947
|
好友进房消耗检查
|
2024-09-11 16:26:05 +08:00 |
|
by
|
b53c78cfb3
|
娃娃机心跳包
|
2024-09-11 15:59:09 +08:00 |
|
by
|
791d82c8aa
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2024-09-10 17:56:43 +08:00 |
|
by
|
afab279f3c
|
娃娃机与游戏服增加心跳
|
2024-09-10 17:56:32 +08:00 |
|
sk
|
8d63969701
|
注释错误
|
2024-09-10 15:31:46 +08:00 |
tomas
|
6e16eb1d52
|
add billed code
|
2024-09-10 11:32:04 +08:00 |
|
sk
|
18fe6403b7
|
邀请活动增加绑定手机号积分
|
2024-09-09 14:04:53 +08:00 |
|
tomas
|
4ba65f9e87
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-09 10:25:12 +08:00 |
kxdd
|
e690d8da76
|
Merge branch 'develop' into ma
# Conflicts:
# gamesrv/clawdoll/action_clawdoll.go
|
2024-09-07 16:58:17 +08:00 |
|
by
|
1d98a31bf4
|
token修改
|
2024-09-07 14:29:34 +08:00 |
|
kxdd
|
de339225d2
|
娃娃机获取token修改
|
2024-09-07 11:58:40 +08:00 |
|
tomas
|
94794a4e7c
|
Merge remote-tracking branch 'origin/develop' into dev_slots
# Conflicts:
# public
|
2024-09-07 09:00:20 +08:00 |
|
kxdd
|
3ac3f2dea1
|
娃娃机获取视频token修改
|
2024-09-06 11:57:45 +08:00 |
|
sk
|
e39a08bb29
|
Merge branch 'develop' into dev_slots
|
2024-09-05 15:38:07 +08:00 |
|
kxdd
|
e1e805f9d8
|
娃娃机添加流禁止流恢复功能
|
2024-09-05 14:23:36 +08:00 |
|
tomas
|
5418b2bdda
|
Merge remote-tracking branch 'origin/develop' into dev_slots
# Conflicts:
# public
|
2024-09-05 11:09:14 +08:00 |
|
kxdd
|
c4d58262de
|
娃娃机添加流ID
|
2024-09-03 17:50:19 +08:00 |
|
tomas
|
bc81ecdfed
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-03 17:16:18 +08:00 |
|
tomas
|
a2e34269fd
|
add test v1 不要合并
|
2024-09-03 17:16:07 +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 |
|
kxdd
|
6a9c6a988b
|
娃娃机获取token修改
|
2024-09-02 16:23:45 +08:00 |
|
kxdd
|
fe26aa3d37
|
娃娃机获取视频流修改
|
2024-08-30 18:15:44 +08:00 |
|
kxdd
|
958a3b1ba4
|
娃娃机等待玩家添加
|
2024-08-30 11:56:15 +08:00 |
|
sk
|
94ca1562e5
|
解决冲突
|
2024-08-29 14:51:32 +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 |
|
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 |
|
sk
|
613ed6da76
|
update excel
|
2024-08-27 11:05:42 +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 |
|
sk
|
4c0c6f7c2b
|
竞技馆后台协议
|
2024-08-23 18:11:54 +08:00 |
|
sk
|
a13ed034d7
|
比赛观战错误码
|
2024-08-23 09:43:51 +08:00 |
|
sk
|
ab974063e8
|
tienlen比赛场观战发送玩家手牌
|
2024-08-22 17:48:10 +08:00 |
|
sk
|
85ba5689b1
|
添加tienlen房卡场游戏配置
|
2024-08-22 16:17:51 +08:00 |
|
by
|
88db5712d8
|
娃娃机获取token
|
2024-08-22 15:43:28 +08:00 |
|
sk
|
18e3e5cd7d
|
比赛观战开关
|
2024-08-22 13:54:22 +08:00 |
|
sk
|
fc29fcddd8
|
比赛列表返回图标信息
|
2024-08-20 09:54:57 +08:00 |
|
sk
|
e5b80fda16
|
小精灵功能
|
2024-08-16 11:28:01 +08:00 |
|
sk
|
e93616dcc9
|
比赛观战
|
2024-08-15 16:18:22 +08:00 |
|
by
|
8ff978db72
|
娃娃机返回操作结果
|
2024-08-14 16:22:57 +08:00 |
|
by
|
d2a8b0e618
|
娃娃机修改
|
2024-08-14 12:06:15 +08:00 |