tomas
|
365ba5edc8
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-19 19:08:56 +08:00 |
|
tomas
|
05a9c79dc1
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-19 19:06:57 +08:00 |
kxdd
|
8e156dba18
|
Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop
|
2024-09-19 18:29:01 +08:00 |
|
kxdd
|
7d7f5804f1
|
Merge branch 'develop' into ma
# Conflicts:
# common/constant.go
|
2024-09-19 18:27:45 +08:00 |
by
|
9cc5d30032
|
娃娃机配置信息
|
2024-09-19 18:26:27 +08:00 |
|
kxdd
|
be57df77a1
|
娃娃机娃娃卡获取明细
|
2024-09-19 18:22:36 +08:00 |
|
by
|
02dded9b9a
|
娃娃机配置信息
|
2024-09-19 18:22:35 +08:00 |
|
by
|
3c51f2794d
|
娃娃机配置
|
2024-09-19 18:11:38 +08:00 |
|
by
|
d3642c93e4
|
娃娃兑换
|
2024-09-19 17:18:16 +08:00 |
|
by
|
7e8ceebbf7
|
proto
|
2024-09-19 13:36:43 +08:00 |
|
by
|
5c4e4d0f4a
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2024-09-19 13:35:57 +08:00 |
|
by
|
2925465b41
|
背包兑换娃娃
|
2024-09-19 13:35:34 +08:00 |
|
sk
|
2206eba159
|
房间列表返回房间最大人数配置
|
2024-09-19 10:03:57 +08:00 |
|
tomas
|
a3741fd685
|
add rabbit proto
|
2024-09-19 09:04:46 +08:00 |
|
tomas
|
002bf3ec05
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-19 08:56:17 +08:00 |
|
by
|
e0d414e6af
|
娃娃后台proto增加字段
|
2024-09-18 11:28:07 +08:00 |
tomas
|
9d164f86da
|
Merge remote-tracking branch 'origin/develop' into dev_slots
|
2024-09-14 09:00:24 +08:00 |
|
kxdd
|
e7e08755a4
|
娃娃机道具消耗与获得
|
2024-09-13 18:18:01 +08:00 |
|
by
|
a9de61a96a
|
协议修改
|
2024-09-13 18:11:05 +08:00 |
|
by
|
1b3b98e359
|
Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
|
2024-09-13 17:56:47 +08:00 |
|
by
|
f1eccf335f
|
娃娃兑换商城
|
2024-09-13 17:56:06 +08:00 |
|
sk
|
cfa2c003c2
|
游戏中玩家余额变化
|
2024-09-13 16:57:37 +08:00 |
|
by
|
31db186564
|
娃娃机心跳
|
2024-09-13 10:51:16 +08:00 |
|
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 |