Commit Graph

1331 Commits

Author SHA1 Message Date
sk 0e84e74049 Merge branch 'develop' into release 2024-09-19 17:20:41 +08:00
sk d82822c990 后台结算查询不到房间的问题 2024-09-19 17:20:18 +08:00
by d3642c93e4 娃娃兑换 2024-09-19 17:18:16 +08:00
sk ecb9c17920 no message 2024-09-19 14:30:18 +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 6161d2da1c Merge branch 'develop' into review 2024-09-19 11:54:59 +08:00
sk 79915a49e1 Merge branch 'develop' into release 2024-09-19 11:52:32 +08:00
sk 999eea0766 游戏中增加金币 2024-09-19 11:52:18 +08:00
sk 9c10355acf Merge branch 'develop' into review 2024-09-19 11:48:02 +08:00
sk ba27fa4b3a 金币道具优化 2024-09-19 11:47:43 +08:00
sk 8aa5fd7c56 Merge branch 'develop' into release 2024-09-19 10:37:41 +08:00
sk 7dd1a191ea 获取游戏记录使用task 2024-09-19 10:35:58 +08:00
sk e636afc4aa Merge branch 'develop' into release 2024-09-19 10:04:46 +08:00
sk 2206eba159 房间列表返回房间最大人数配置 2024-09-19 10:03:57 +08:00
sk 46081a862a Merge branch 'develop' into release 2024-09-19 09:55:14 +08:00
sk e479b2e6fd no message 2024-09-19 09:55:02 +08:00
sk cca29b64c6 Merge branch 'develop' into release 2024-09-19 09:39:31 +08:00
sk 692cf306f5 no message 2024-09-19 09:37:52 +08:00
sk e1f5447da0 解决冲突 2024-09-19 09:25:13 +08:00
sk 70d051d938 查询房间信息更新道具表 2024-09-19 09:21:12 +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
sk 2629c16689 查询房间信息 2024-09-18 18:42:44 +08:00
sk 3da6a1a667 查询房间信息 2024-09-18 18:35:01 +08:00
sk e36c6608c3 查询房间信息 2024-09-18 18:22:46 +08:00
sk 03e0cdb6d7 查询房间信息 2024-09-18 18:03:06 +08:00
sk ca5d442874 查询房间信息 2024-09-18 18:02:40 +08:00
sk 90b8b5c113 竞技馆房主为创建者 2024-09-18 16:55:03 +08:00
sk aa92a9630c 竞技馆房主为创建者 2024-09-18 16:53:10 +08:00
sk 02365888a1 update excel 2024-09-18 15:30:43 +08:00
sk fc0321afdc Merge branch 'develop' into release 2024-09-18 15:01:36 +08:00
sk a98d7ac0b4 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-18 14:59:45 +08:00
sk 1b2a9c30e7 修复房卡房离开和开始条件 2024-09-18 14:59:17 +08:00
by e0d414e6af 娃娃后台proto增加字段 2024-09-18 11:28:07 +08:00
by d2a64cb8ae 娃娃卡积分40004 2024-09-18 11:19:14 +08:00
sk 0eeaad7caa Merge branch 'develop' into dev_slots 2024-09-18 10:58:51 +08:00
sk 97a6d363e7 登录判断玩家是否在比赛场 2024-09-18 10:58:29 +08:00
sk 8865dc49da Merge branch 'develop' into release 2024-09-18 10:00:48 +08:00
sk df5de58f46 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-18 10:00:36 +08:00
sk 60ce6ed085 添加索引 2024-09-18 09:55:33 +08:00
by 9aeb5c3d15 娃娃机调转方向 2024-09-18 09:50:06 +08:00
tomas 984a501087 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-18 09:06:28 +08:00
sk e0640c7fd5 Merge branch 'develop' into release 2024-09-14 17:47:26 +08:00
sk 6240e08abe 竞技馆对局记录 2024-09-14 17:43:23 +08:00
sk ec0d5b3f94 Merge branch 'develop' into release 2024-09-14 17:22:01 +08:00
sk e6105b40b0 重连如果比赛没有开始就退赛 2024-09-14 17:21:28 +08:00
sk a647da01aa Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-14 16:22:22 +08:00
sk f83b22688c 重连如果比赛没有开始就退赛 2024-09-14 16:22:06 +08:00