Commit Graph

1634 Commits

Author SHA1 Message Date
sk 29a264d789 Merge branch 'develop' into release 2024-11-14 17:33:32 +08:00
sk 009e3bbc70 Merge branch 'develop' into release 2024-11-17 15:23:35 +08:00
sk 0585fe236d 修复登出时间错误 2024-11-17 15:20:35 +08:00
sk dfe093b03e no message 2024-11-14 15:23:40 +08:00
sk 3bcc944417 tienlen房卡场不能中途离开 2024-11-14 15:09:38 +08:00
sk f989492019 tienlen房卡场不能中途离开 2024-11-14 15:07:51 +08:00
sk 10ce982a14 tienlen房卡场不能中途离开 2024-11-14 14:26:31 +08:00
sk 1db15bd6f3 no message 2024-11-14 11:54:38 +08:00
DESKTOP-AFIIIDT\Administrator 62f31c2460 up main ox 2024-11-14 11:41:25 +08:00
DESKTOP-AFIIIDT\Administrator 68e84e6233 up main ttiger 2024-11-14 11:39:46 +08:00
sk d3f276f0bf 兑换优化 2024-11-14 11:13:47 +08:00
sk 28b6cb6a85 抽奖活动机器人发奖调整 2024-11-13 11:17:07 +08:00
tomas f9605e9f26 add tiger game test 2024-11-13 10:11:12 +08:00
tomas f47cddc7c1 add tiger proto 2024-11-13 10:10:13 +08:00
sk f0e18b16d0 删除测试代码 2024-11-13 09:22:01 +08:00
sk 1f6bb826c9 Merge branch 'develop' into release 2024-11-12 18:05:56 +08:00
sk 3cc2aa1ac6 隐藏关闭的竞技馆房间 2024-11-12 18:03:39 +08:00
sk 2f3fa1d739 Merge branch 'develop' into release 2024-11-12 16:58:09 +08:00
sk 1acfab2ac7 修复jwt超时设置 2024-11-12 16:47:37 +08:00
sk 3eb997c7c3 隐藏关闭的竞技馆配置房间 2024-11-12 16:13:13 +08:00
sk 310156dd35 兑换商城地址 2024-11-12 15:56:27 +08:00
sk 90e11a0dad 兑换商城地址 2024-11-12 15:08:16 +08:00
sk 4da947cd56 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-12 13:11:40 +08:00
sk d1afed32c2 缓存优化 2024-11-12 10:51:04 +08:00
tomas 64c5617bd8 Merge branch 'develop' into dev_slots 2024-11-11 11:59:42 +08:00
tomas c5922dc4fa add 11 2024-11-11 11:51:36 +08:00
sk 8aaf1b40f3 rename 2024-11-11 11:44:20 +08:00
sk 71f6b0246b 竞技馆引导 2024-11-11 11:37:32 +08:00
tomas f8e8a34780 fix basebet 2024-11-11 11:36:21 +08:00
tomas 872d46a580 fix import 2024-11-11 11:33:45 +08:00
tomas b7b38d53ae add cm 2024-11-11 11:30:51 +08:00
sk efb440d6a9 Merge branch 'develop' into release 2024-11-11 10:09:24 +08:00
sk a9d67662b3 gamedata空指针 2024-11-09 14:09:39 +08:00
sk 14f8211ea1 修复房间解散失败问题 2024-11-09 14:03:27 +08:00
sk 19b4f0447b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-08 14:51:09 +08:00
sk 752ef5d6e0 no message 2024-11-08 14:50:21 +08:00
sk 8866473467 no message 2024-11-08 14:38:39 +08:00
sk 970db216f4 兑换问题 2024-11-08 14:25:53 +08:00
sk 81a0e50bca mongoctl工具 2024-11-08 11:55:33 +08:00
sk 94ad9f9835 网页登录 2024-11-08 11:51:23 +08:00
sk 30714f03a3 Merge branch 'develop' into release 2024-11-08 11:33:43 +08:00
sk 2b800c1e8b 修改.gitlab-ci.yml 2024-11-08 11:32:36 +08:00
sk 559f48d018 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-11-08 11:28:23 +08:00
sk 0932715970 修改脚本 2024-11-08 11:28:13 +08:00
tomas 211cd3dfcc respin fix val 2024-11-08 11:26:50 +08:00
tomas 3b364a545e Merge remote-tracking branch 'origin/develop' into dev_slots 2024-11-08 10:47:41 +08:00
tomas bab26915f2 ox fix 2024-11-08 10:44:37 +08:00
tomas 8fd017f1b0 freespin sts fix 2024-11-08 10:40:38 +08:00
sk c3ff0dc8ef 关闭等级排行榜 2024-11-08 10:40:36 +08:00
sk 40257f34a1 Merge branch 'develop' into release 2024-11-08 09:15:10 +08:00