Commit Graph

951 Commits

Author SHA1 Message Date
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
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
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
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 0b91f46fd8 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-07 14:29:50 +08:00
by 1d98a31bf4 token修改 2024-09-07 14:29:34 +08:00
sk d769605d09 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-07 14:16:31 +08:00
sk 8174e6c406 商店购买备注 2024-09-07 14:15:56 +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
by 9b5dff5f96 上分不走消息隊列 2024-09-07 10:22:55 +08:00
sk cb4b51b4aa 竞技馆游戏记录 2024-09-07 10:03:50 +08:00
sk 1cc5d4f226 添加水池配置 2024-09-07 09:19:51 +08:00
sk ad3e8d4b9f Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-06 18:33:42 +08:00
sk 4da55c9588 游戏中同步实时金币 2024-09-06 18:33:28 +08:00
lihailiang f467753242 Merge branch 'develop' into ma
# Conflicts:
#	.gitmodules
2024-09-06 18:22:21 +08:00
kxdd 8c8ee30ef8 Merge branch 'develop' into ma
# Conflicts:
#	public
2024-09-06 18:20:54 +08:00
by 7889c982ea 娃娃機修改 2024-09-06 18:06:40 +08:00
by 895c673e65 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-06 17:30:39 +08:00
by 892a61aa47 log 2024-09-06 17:30:28 +08:00