Commit Graph

517 Commits

Author SHA1 Message Date
sk 5a67d8f073 修改十三张记分显示 2024-12-04 10:06:59 +08:00
sk 3f35e67a40 创建游戏对局记录缓存对象 2024-12-03 15:08:08 +08:00
tomas fd43d57ca4 fix betmode 2024-12-03 14:14:12 +08:00
tomas e13e239897 add mouse 2024-12-03 11:22:12 +08:00
tomas 2ab2ffafdd Merge remote-tracking branch 'origin/develop' into dev_slots 2024-12-03 11:13:33 +08:00
tomas db73856059 fix tiger 2024-12-03 11:13:17 +08:00
sk bdac067402 添加十三张预选牌功能 2024-12-02 17:53:07 +08:00
sk c7ca731c33 牌局记录 2024-12-02 16:29:40 +08:00
sk 744d52226c 修改十三张打枪时长 2024-12-02 15:58:56 +08:00
sk 0fe7ee6d4c fix 十三张牌局记录税收比例 2024-12-02 14:11:39 +08:00
sk 5d90c143c8 Merge branch 'sk' into develop 2024-12-02 14:06:40 +08:00
sk 1477611d4a fix游戏时长 2024-12-02 14:06:15 +08:00
sk 73157b41cf Merge branch 'sk' into develop 2024-12-02 13:44:41 +08:00
sk fbc14799c1 修改牌局记录 2024-12-02 13:44:26 +08:00
sk 6b83e85469 Merge branch 'sk' into develop 2024-12-02 13:17:13 +08:00
sk fe88981e9d 修改牌局记录 2024-12-02 13:06:07 +08:00
tomas 83db9ddddc fix ox 营收 2024-12-02 10:44:26 +08:00
tomas 5dcd4175f9 add cm goo proto and mouse.go 2024-12-02 10:40:19 +08:00
tomas 126f9579c5 fix ox 营收 2024-12-02 10:26:47 +08:00
sk 1ade65ba36 Revert "十三张比牌时间增加"
This reverts commit de7712d4e3.
2024-11-29 11:10:49 +08:00
sk de7712d4e3 十三张比牌时间增加 2024-11-29 10:53:33 +08:00
sk 61515fb4e0 十三张有倒水比牌加1秒 2024-11-29 09:17:59 +08:00
sk 3c72d93448 修改fortune牌局记录 2024-11-28 17:48:56 +08:00
sk 345e4db7a5 修改兔子拉霸游戏记录 2024-11-28 17:45:25 +08:00
sk bcb97edff2 修改兔子拉霸游戏记录 2024-11-28 16:39:46 +08:00
sk d96cc23c84 修改兔子拉霸游戏记录 2024-11-28 15:48:39 +08:00
sk dd43f9ea1e 修复牌库发牌问题 2024-11-25 17:49:26 +08:00
sk 44cf7fb7b2 十三张超时配置 2024-11-23 16:06:55 +08:00
sk 68f2a3bb80 十三张玩家状态同步 2024-11-23 15:56:40 +08:00
sk 053484de8e 十三张比牌时间 2024-11-23 11:25:59 +08:00
sk 196d211fff 十三张阶段时间可配置 2024-11-22 16:08:34 +08:00
sk 3840ec99a2 十三张开牌前允许加入游戏 2024-11-22 14:24:59 +08:00
tomas aaf417c9fe Merge remote-tracking branch 'origin/develop' into dev_slots 2024-11-19 13:38:20 +08:00
tomas f1b86a3913 data up 2024-11-19 13:33:06 +08:00
sk 46ad7ea75f 玩家游戏记录上报 2024-11-19 10:29:34 +08:00
sk 1d89a8c36e 格式化代码 2024-11-15 15:29:00 +08:00
sk 29a264d789 Merge branch 'develop' into release 2024-11-14 17:33:32 +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
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
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 2f3fa1d739 Merge branch 'develop' into release 2024-11-12 16:58:09 +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
tomas c5922dc4fa add 11 2024-11-11 11:51:36 +08:00
sk 8aaf1b40f3 rename 2024-11-11 11:44:20 +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 14f8211ea1 修复房间解散失败问题 2024-11-09 14:03:27 +08:00
sk 30714f03a3 Merge branch 'develop' into release 2024-11-08 11:33:43 +08:00
tomas 211cd3dfcc respin fix val 2024-11-08 11:26:50 +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 40257f34a1 Merge branch 'develop' into release 2024-11-08 09:15:10 +08:00
tomas 09ea901321 addcoin fix dragon 2024-11-08 09:09:44 +08:00
sk 31ea4d698a Merge branch 'develop' into release 2024-11-04 11:11:04 +08:00
tomas 5e8572632a add proto 2024-11-04 10:31:45 +08:00
tomas 636082a69b surewin 2024-11-04 09:39:35 +08:00
sk a128325e09 解决冲突 2024-11-01 11:55:43 +08:00
tomas a10ff0ecc7 fix coin 2024-10-30 16:36:29 +08:00
sk eb7d3f00c8 Merge branch 'develop' into release 2024-10-29 14:47:05 +08:00
sk 30cd6ef592 tienlen结算后可以离开房间 2024-10-29 17:44:38 +08:00
sk 84a9e39a26 tienlen结算后可以离开房间 2024-10-29 17:09:36 +08:00
tomas 11dddfcec5 fix totalout 2024-10-29 13:36:58 +08:00
sk 27c4fc5bf9 竞技馆添加赢家信息 2024-10-29 10:44:17 +08:00
sk d8a6246f93 竞技馆中奖广播 2024-10-29 10:11:33 +08:00
sk 17d216e07c 解决冲突 2024-10-25 18:01:56 +08:00
tomas 64b6af0313 fix init coin 2024-10-25 14:57:40 +08:00
tomas e7f37542cb needcoid val fix 2024-10-25 11:57:11 +08:00
by 8ab8cbacfe 邀请积分排行榜修改 2024-10-25 10:56:55 +08:00
tomas 07e252aa1d add rabbitlog 2024-10-24 13:03:49 +08:00
tomas 662c0beaa7 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-24 13:03:17 +08:00
by 0d2c090dc8 随机次数修改 2024-10-24 11:33:03 +08:00
by 1e426d20a1 tienlen纯随机发牌 2024-10-24 10:08:16 +08:00
sk c8a39f2d1f 解决冲突 2024-10-23 10:56:07 +08:00
sk 52d3b46f6e 竞技馆抽奖活动 2024-10-23 10:53:40 +08:00
tomas 4ed1048131 limt coin 2024-10-23 10:51:41 +08:00
tomas 90fa5e63a9 spin and leave limit 2024-10-23 10:02:10 +08:00
tomas 61fee546df del log 2024-10-22 17:55:41 +08:00
tomas d92c2e1a43 fix coin 2024-10-22 16:03:23 +08:00
tomas 0d132fa803 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-22 10:23:13 +08:00
DESKTOP-45ANQ2C\unis e13dc580b6 解决冲突 2024-10-21 15:38:46 +08:00
DESKTOP-45ANQ2C\unis 944dba45d8 娃娃机添加日志 2024-10-21 15:15:12 +08:00
DESKTOP-45ANQ2C\unis 5807aebce0 娃娃机添加日志 2024-10-21 15:13:22 +08:00
DESKTOP-45ANQ2C\unis 521a1e1c58 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 14:48:37 +08:00
DESKTOP-45ANQ2C\unis 7343ab7ec0 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 14:42:29 +08:00
DESKTOP-45ANQ2C\unis dde83e46a6 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 14:30:53 +08:00
DESKTOP-45ANQ2C\unis 147f956857 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-21 13:54:36 +08:00
tomas c387511e68 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-21 10:37:47 +08:00
DESKTOP-45ANQ2C\unis 43a04acdff 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001302
2024-10-18 17:43:32 +08:00
tomas 259519bae5 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-18 13:34:38 +08:00
DESKTOP-45ANQ2C\unis 083dccffb9 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-18 11:48:26 +08:00
DESKTOP-45ANQ2C\unis 1ad97c27a7 【娃娃机抓取概率公式】
https://www.tapd.cn/31044302/prong/stories/view/1131044302001001287
2024-10-18 11:48:04 +08:00
tomas 104ed2fbba update rabbit bet 2024-10-18 10:01:29 +08:00
tomas 53e02f9c1f Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-18 09:23:41 +08:00
by 9196e235d8 发牌调控还原 使用之前的发牌模式 2024-10-17 17:33:30 +08:00
sk ce1e3d4474 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-10-17 17:09:16 +08:00
sk c7cdb49a7b 修复游戏服同步道具问题 2024-10-17 17:07:41 +08:00
tomas ce931c98b6 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-17 17:05:53 +08:00
tomas 99f899e0c0 canchange 2024-10-17 17:05:36 +08:00
by 79636e8619 删除测试代码 2024-10-17 14:18:48 +08:00
by d2c6d702e8 测试随机发牌代码 2024-10-17 13:59:56 +08:00
sk aa42eb224c 解决冲突 2024-10-17 09:20:02 +08:00
sk 4947685627 no message 2024-10-15 16:22:39 +08:00
sk db3f7bee67 添加调控开关 2024-10-15 16:15:04 +08:00
by 05329478ad 禁流修改 2024-10-15 11:13:09 +08:00
tomas 2201f656f1 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-14 10:24:16 +08:00
DESKTOP-45ANQ2C\unis 2693793aa9 娃娃机结果通知修改 2024-10-12 17:46:23 +08:00
sk 98289116a3 抽奖活动协议 2024-10-12 13:33:40 +08:00
tomas 5165221498 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-11 09:00:03 +08:00
DESKTOP-45ANQ2C\unis 03c6852edd 娃娃机结算结果修改 2024-10-10 11:52:37 +08:00
DESKTOP-45ANQ2C\unis a125f5f959 娃娃机结算结果修改 2024-10-10 10:31:45 +08:00
DESKTOP-45ANQ2C\unis b0eb952494 娃娃机结算结果修改 2024-10-09 14:49:21 +08:00
sk d09d4a4284 大厅道具变更同步到游戏 2024-10-09 09:18:09 +08:00
tomas 94e998f790 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-09 08:52:32 +08:00
sk ae3e9d8fd6 rabbitmq优化 2024-10-08 11:07:56 +08:00
tomas 9770425fba up bet val 2024-09-29 17:31:50 +08:00
tomas f63c327ffa Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-29 17:29:03 +08:00
DESKTOP-45ANQ2C\unis a48a9fede4 娃娃卡下抓获得娃娃卡改回正常抓取 2024-09-28 18:31:09 +08:00
tomas 57d45bd879 log 2024-09-28 11:11:50 +08:00
tomas 29e9c7bfe8 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-28 08:52:34 +08:00
sk fd14654c59 竞技馆和比赛场关闭斗鸡技能效果 2024-09-27 18:02:00 +08:00
sk 2ed8885e18 竞技馆炸弹扣分问题 2024-09-27 11:38:02 +08:00
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
tomas 489eb61805 main add rabbit 2024-09-27 10:50:25 +08:00
tomas b83a6d6d5b Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-27 10:49:56 +08:00
sk 0519dbf82b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 09:28:57 +08:00
sk 824b161a46 象棋调试功能 2024-09-27 09:16:22 +08:00
DESKTOP-45ANQ2C\unis 027a2c6732 娃娃机添加日志 2024-09-26 17:21:38 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
sk 91bb5820f9 no message 2024-09-26 10:22:56 +08:00
tomas d8398465be Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-26 08:58:26 +08:00
kxdd bc5c3c3324 娃娃机视频流自动关闭打开 2024-09-25 15:37:45 +08:00
kxdd ad8b3fe1ce Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 09:22:48 +08:00
kxdd 36a7a61178 娃娃机添加抓取记录 2024-09-25 09:22:39 +08:00
sk 6684dbcec6 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-24 18:32:14 +08:00
sk b4cebfd687 竞技馆系统房间功能 2024-09-24 18:32:00 +08:00
by b04d422d8b 娃娃机离线 踢出房间玩家 2024-09-24 16:36:39 +08:00
sk cd7c3ddebd 竞技馆官方房间配置 2024-09-23 18:32:50 +08:00
sk df3c4d353e 添加竞技馆获奖记录查询接口 2024-09-23 16:43:35 +08:00
sk 4b8f6e6274 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-23 11:30:37 +08:00
sk 72b8f927b0 登录后根据道具记录恢复道具数量 2024-09-23 11:29:36 +08:00
kxdd ae085ec661 娃娃机后台日志添加场景名字 2024-09-23 10:05:40 +08:00
tomas d5d3c225f2 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-23 08:59:21 +08:00
kxdd 8952d98f7d 娃娃机推流修改 2024-09-21 17:07:47 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00