Commit Graph

255 Commits

Author SHA1 Message Date
kxdd bc5c3c3324 娃娃机视频流自动关闭打开 2024-09-25 15:37:45 +08:00
kxdd ad8b3fe1ce Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 09:22:48 +08:00
kxdd 36a7a61178 娃娃机添加抓取记录 2024-09-25 09:22:39 +08:00
sk 6684dbcec6 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-24 18:32:14 +08:00
sk b4cebfd687 竞技馆系统房间功能 2024-09-24 18:32:00 +08:00
by b04d422d8b 娃娃机离线 踢出房间玩家 2024-09-24 16:36:39 +08:00
sk cd7c3ddebd 竞技馆官方房间配置 2024-09-23 18:32:50 +08:00
sk df3c4d353e 添加竞技馆获奖记录查询接口 2024-09-23 16:43:35 +08:00
sk 4b8f6e6274 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-23 11:30:37 +08:00
sk 72b8f927b0 登录后根据道具记录恢复道具数量 2024-09-23 11:29:36 +08:00
kxdd ae085ec661 娃娃机后台日志添加场景名字 2024-09-23 10:05:40 +08:00
kxdd 8952d98f7d 娃娃机推流修改 2024-09-21 17:07:47 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
kxdd 2141f00ba9 Merge branch 'ma' into develop 2024-09-21 11:52:02 +08:00
kxdd 2743f6cfb0 娃娃卡记录添加渠道信息 2024-09-21 11:51:53 +08:00
sk eaff0f1308 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-21 11:10:45 +08:00
kxdd 193c7fc3d3 Merge branch 'ma' into develop 2024-09-20 17:58:34 +08:00
kxdd 81b529d13b 娃娃机添加每局日志记录 2024-09-20 17:58:10 +08:00
sk 57c58b2fb2 修复v卡掉落问题 2024-09-20 16:53:10 +08:00
sk 19ebda3832 Merge branch 'release' into develop 2024-09-20 16:36:32 +08:00
sk 2c6ea1c7e2 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-20 16:36:22 +08:00
by 7d3613ee39 娃娃机配置 2024-09-20 16:07:10 +08:00
sk 2b0f7b1e28 修复绑定手机积分和竞技馆对局记录 2024-09-20 10:23:01 +08:00
sk 522b284dd6 no message 2024-09-20 08:28:01 +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
by 02dded9b9a 娃娃机配置信息 2024-09-19 18:22:35 +08:00
by 3c51f2794d 娃娃机配置 2024-09-19 18:11:38 +08:00
sk 70d051d938 查询房间信息更新道具表 2024-09-19 09:21:12 +08:00
sk e36c6608c3 查询房间信息 2024-09-18 18:22:46 +08:00
sk 03e0cdb6d7 查询房间信息 2024-09-18 18:03:06 +08:00
sk aa92a9630c 竞技馆房主为创建者 2024-09-18 16:53:10 +08:00
sk 1b2a9c30e7 修复房卡房离开和开始条件 2024-09-18 14:59:17 +08:00
by 9aeb5c3d15 娃娃机调转方向 2024-09-18 09:50:06 +08:00
sk 6240e08abe 竞技馆对局记录 2024-09-14 17:43:23 +08:00
sk f8a55ec7ba tienlen开发模式控牌 2024-09-13 18:19:44 +08:00
kxdd e7e08755a4 娃娃机道具消耗与获得 2024-09-13 18:18:01 +08:00
sk cfa2c003c2 游戏中玩家余额变化 2024-09-13 16:57:37 +08:00
by 31db186564 娃娃机心跳 2024-09-13 10:51:16 +08:00
by d365e9be6a Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-12 09:00:38 +08:00
by 3492ba1631 心跳修改 2024-09-12 09:00:30 +08:00
sk 09202f60d3 同步道具列表 2024-09-11 18:27:40 +08:00
sk 4bf11eb1d1 竞技馆炸弹积分计算 2024-09-11 16:42:47 +08:00
by b53c78cfb3 娃娃机心跳包 2024-09-11 15:59:09 +08:00
sk 0855fc58f4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-11 15:29:46 +08:00
sk 3811215f80 竞技馆积分可以为负数 2024-09-11 15:29:37 +08:00
kxdd a5265e5410 Merge branch 'develop' into ma 2024-09-11 11:08:04 +08:00
kxdd 9d584a8647 娃娃机下抓添加防卡死状态保护 2024-09-11 11:06:55 +08:00
by afab279f3c 娃娃机与游戏服增加心跳 2024-09-10 17:56:32 +08:00