Commit Graph

235 Commits

Author SHA1 Message Date
tomas 984a501087 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-18 09:06:28 +08:00
sk 6240e08abe 竞技馆对局记录 2024-09-14 17:43:23 +08:00
tomas 9d164f86da Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-14 09:00:24 +08:00
sk f8a55ec7ba tienlen开发模式控牌 2024-09-13 18:19:44 +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
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
tomas d79718f0f2 fix protoid 2024-09-10 16:20:40 +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 3a7d3b9f2e 房卡返回问题 2024-09-09 17:55:13 +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
by 18f67b7d22 屏蔽自动向前走一步 2024-09-09 09:45:15 +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
kxdd e690d8da76 Merge branch 'develop' into ma
# Conflicts:
#	gamesrv/clawdoll/action_clawdoll.go
2024-09-07 16:58:17 +08:00
sk 152c60e35f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 16:58:08 +08:00
sk 4eee248f20 竞技馆房间解散问题 2024-09-07 16:58:01 +08:00
by d61a153948 投币后向前移动一下 2024-09-07 16:22:12 +08:00
kxdd f26cb4d2ff 娃娃机playing判定修改 2024-09-07 16:08:46 +08:00
by 7099975e9e 客户端请求token 2024-09-07 14:48:44 +08:00
by 1d98a31bf4 token修改 2024-09-07 14:29:34 +08:00
by 83d5ec05fb 生成token修改 2024-09-07 14:04:44 +08:00
kxdd de339225d2 娃娃机获取token修改 2024-09-07 11:58:40 +08:00
by d34473c688 token 2024-09-07 11:40:04 +08:00
by 59eb4ecc22 token 2024-09-07 11:17:33 +08:00
sk 053db5b83a Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 10:46:47 +08:00
sk 1b67a44d63 竞技馆牌局记录 2024-09-07 10:46:34 +08:00
by 759c989719 获取token 2024-09-07 10:43:36 +08:00
sk cb4b51b4aa 竞技馆游戏记录 2024-09-07 10:03:50 +08:00
tomas 94794a4e7c Merge remote-tracking branch 'origin/develop' into dev_slots
# Conflicts:
#	public
2024-09-07 09:00:20 +08:00
sk 67a85f6535 竞技房间没人解散 2024-09-06 17:28:10 +08:00