Commit Graph

938 Commits

Author SHA1 Message Date
tomas af99918965 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-13 09:01:47 +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 6eedc84050 竞技馆房主付费 2024-09-11 17:47:44 +08:00
sk ef15347caf 竞技馆房主付费 2024-09-11 17:30:05 +08:00
sk 0df3e0938c 竞技馆房主付费 2024-09-11 17:21:12 +08:00
sk 4bf11eb1d1 竞技馆炸弹积分计算 2024-09-11 16:42: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
sk 1063cc8fba 盲盒问题 2024-09-11 16:17:18 +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
sk cc882657a4 开发模式每分钟保存一次玩家数据 2024-09-11 13:37:46 +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 be703582f6 修改娃娃机链接 2024-09-11 11:01:08 +08:00
sk 07bea1ac2f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-11 09:32:13 +08:00
sk 8dac055bd6 进入房间房卡校验 2024-09-11 09:32:01 +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
tomas d79718f0f2 fix protoid 2024-09-10 16:20:40 +08:00
sk 8d63969701 注释错误 2024-09-10 15:31:46 +08:00
sk 9012b2a4db Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-10 15:04:19 +08:00
sk 288624a55b 房间真人数量统计错误 2024-09-10 15:04:11 +08:00
kxdd b57c5b2e41 Merge branch 'ma' into develop 2024-09-10 15:00:35 +08:00
kxdd 418b16d2e9 娃娃机状态修改 2024-09-10 14:59:36 +08:00
tomas 6869021d08 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-10 11:32:14 +08:00
tomas 6e16eb1d52 add billed code 2024-09-10 11:32:04 +08:00
by 76ba1ff7b7 娃娃机修改 2024-09-10 11:12:20 +08:00
sk 3b18460edb 房卡是否足够 2024-09-09 18:24:43 +08:00
sk 70673450df Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-09 17:55:39 +08:00
sk 3a7d3b9f2e 房卡返回问题 2024-09-09 17:55:13 +08:00
by 1961caad12 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-09 16:47:09 +08:00
by 96268bf86f 娃娃机屏蔽心跳检测 2024-09-09 16:46:58 +08:00
sk 4cfd64dbed Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-09 14:05:16 +08:00
sk 18fe6403b7 邀请活动增加绑定手机号积分 2024-09-09 14:04:53 +08:00
by 6c65a442db 娃娃机修改 2024-09-09 11:24:14 +08:00
sk d27a04020e 好友进房问题 2024-09-09 10:40:26 +08:00
sk eb791c364e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-09 10:25:54 +08:00
tomas 4ba65f9e87 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-09 10:25:12 +08:00
tomas e61cc19bce add slots 2024-09-09 10:24:59 +08:00
sk ea6ef0be41 房卡扣除问题 2024-09-09 10:24:37 +08:00
by 18f67b7d22 屏蔽自动向前走一步 2024-09-09 09:45:15 +08:00
by 1a14a35da9 下抓不走消息队列 2024-09-09 09:29:51 +08:00
sk 07b985693e 代码优化 2024-09-07 18:06:05 +08:00
kxdd 13042959c9 Merge branch 'ma' into develop 2024-09-07 17:37:50 +08:00
kxdd 7991a8044d 娃娃机状态调整 2024-09-07 17:37:22 +08:00
kxdd b46db9b36b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 16:59:19 +08:00