Commit Graph

71 Commits

Author SHA1 Message Date
DESKTOP-45ANQ2C\unis 027a2c6732 娃娃机添加日志 2024-09-26 17:21:38 +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
by b04d422d8b 娃娃机离线 踢出房间玩家 2024-09-24 16:36:39 +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
kxdd ae085ec661 娃娃机后台日志添加场景名字 2024-09-23 10:05:40 +08:00
kxdd 8952d98f7d 娃娃机推流修改 2024-09-21 17:07:47 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
kxdd 2141f00ba9 Merge branch 'ma' into develop 2024-09-21 11:52:02 +08:00
kxdd 2743f6cfb0 娃娃卡记录添加渠道信息 2024-09-21 11:51:53 +08:00
kxdd 193c7fc3d3 Merge branch 'ma' into develop 2024-09-20 17:58:34 +08:00
kxdd 81b529d13b 娃娃机添加每局日志记录 2024-09-20 17:58:10 +08:00
by 7d3613ee39 娃娃机配置 2024-09-20 16:07:10 +08:00
kxdd 8e156dba18 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-19 18:29:01 +08:00
kxdd 7d7f5804f1 Merge branch 'develop' into ma
# Conflicts:
#	common/constant.go
2024-09-19 18:27:45 +08:00
by 9cc5d30032 娃娃机配置信息 2024-09-19 18:26:27 +08:00
by 02dded9b9a 娃娃机配置信息 2024-09-19 18:22:35 +08:00
by 3c51f2794d 娃娃机配置 2024-09-19 18:11:38 +08:00
by 9aeb5c3d15 娃娃机调转方向 2024-09-18 09:50:06 +08:00
kxdd e7e08755a4 娃娃机道具消耗与获得 2024-09-13 18:18:01 +08:00
kxdd 9d584a8647 娃娃机下抓添加防卡死状态保护 2024-09-11 11:06:55 +08:00
kxdd 418b16d2e9 娃娃机状态修改 2024-09-10 14:59:36 +08:00
kxdd 7991a8044d 娃娃机状态调整 2024-09-07 17:37:22 +08:00
kxdd e690d8da76 Merge branch 'develop' into ma
# Conflicts:
#	gamesrv/clawdoll/action_clawdoll.go
2024-09-07 16:58:17 +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
by 759c989719 获取token 2024-09-07 10:43:36 +08:00
kxdd 8a19cd642f 娃娃机通知状态修改 2024-09-06 15:36:59 +08:00
kxdd 19dde360d6 Merge branch 'ma' into develop 2024-09-06 11:58:07 +08:00
kxdd 3ac3f2dea1 娃娃机获取视频token修改 2024-09-06 11:57:45 +08:00
kxdd 979645567e 合并代码 2024-09-06 10:08:29 +08:00
kxdd b74f284654 Merge branch 'ma' into develop
# Conflicts:
#	gamesrv/clawdoll/scenepolicy_clawdoll.go
2024-09-06 10:08:05 +08:00
kxdd 8f59f4d03a 娃娃机抓取后结果通知修改 2024-09-06 09:41:41 +08:00
kxdd 2869fb7e3f Merge branch 'ma' into develop 2024-09-05 14:46:34 +08:00
kxdd e1e805f9d8 娃娃机添加流禁止流恢复功能 2024-09-05 14:23:36 +08:00
by 68a8e010cf scene只能绑定对应的娃娃机编号 2024-09-05 10:28:43 +08:00
by fb8bfbde87 刪除log 2024-09-04 14:03:37 +08:00
kxdd 8514f22fc6 娃娃机修改 2024-09-04 11:18:04 +08:00
kxdd 27eb944329 娃娃机配置更新 2024-09-04 10:49:16 +08:00
kxdd c4d58262de 娃娃机添加流ID 2024-09-03 17:50:19 +08:00
kxdd 9ef1f9d896 娃娃机报错修改 2024-09-03 16:09:43 +08:00
kxdd ddcaa62f13 娃娃机修改 2024-09-03 15:10:41 +08:00
kxdd 6a9c6a988b 娃娃机获取token修改 2024-09-02 16:23:45 +08:00