Commit Graph

1059 Commits

Author SHA1 Message Date
sk 5ab84bd13e 离线修改道具 2024-09-23 14:56:54 +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
by e6aa0dd1a9 proto 2024-09-23 10:03:53 +08:00
by 020e9b9664 娃娃机后台配置 2024-09-23 09:58:33 +08:00
by 68f0ac9f06 proto 2024-09-21 17:44:30 +08:00
kxdd 8952d98f7d 娃娃机推流修改 2024-09-21 17:07:47 +08:00
by bf1efc0139 娃娃兑换 2024-09-21 15:39:16 +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
sk eaff0f1308 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-21 11:10:45 +08:00
by ac8b4ee47d 娃娃机屏蔽无用代码 2024-09-21 10:41:13 +08:00
by 254af4e5fb 娃娃机屏蔽无用代码 2024-09-21 10:37:14 +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 9660136ef0 娃娃机配置 2024-09-20 17:16:25 +08:00
sk 57c58b2fb2 修复v卡掉落问题 2024-09-20 16:53:10 +08:00
by 3b024058be proto修改 2024-09-20 16:44:56 +08:00
by 2749862be9 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-20 16:36:38 +08:00
sk 19ebda3832 Merge branch 'release' into develop 2024-09-20 16:36:32 +08:00
by 4581f41fb8 proto 2024-09-20 16:36:25 +08:00
sk 2c6ea1c7e2 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-20 16:36:22 +08:00
by 7d3613ee39 娃娃机配置 2024-09-20 16:07:10 +08:00
sk bc5df2cd0f 商品分类添加显示位置配置 2024-09-20 15:14:27 +08:00
sk 12c38f535b 竞技馆房间列表同步 2024-09-20 14:42:21 +08:00
by 67a5912db5 更新配置表 2024-09-20 13:44:37 +08:00
by 62e2885d05 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-20 11:24:53 +08:00
by fc08fc56be 娃娃机 2024-09-20 11:24:40 +08:00
sk 9a1bdb10c7 no message 2024-09-20 11:23:18 +08:00
kxdd 62981de6cf 娃娃机明细添加道具类型 2024-09-20 11:19:58 +08:00
sk 96f87f8b62 修复绑定手机积分和竞技馆对局记录 2024-09-20 11:11:27 +08:00
sk 2b0f7b1e28 修复绑定手机积分和竞技馆对局记录 2024-09-20 10:23:01 +08:00
sk 522b284dd6 no message 2024-09-20 08:28:01 +08:00
sk 3dab56c03a 修改日志级别 2024-09-20 08:11:53 +08:00
sk 0ff33ee6a4 恢复代码 2024-09-20 07:21:07 +08:00
sk d9d78d2f13 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-19 18:36:04 +08:00
sk ff7452d335 客户端日志添加渠道信息 2024-09-19 18:35:30 +08:00
by 4d30e087c6 娃娃兌換記錄修改 2024-09-19 18:33:27 +08:00
by 24dd497af4 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-19 18:31:23 +08:00
by f2497b77d3 娃娃兌換記錄修改 2024-09-19 18:31:12 +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
kxdd be57df77a1 娃娃机娃娃卡获取明细 2024-09-19 18:22:36 +08:00
by 02dded9b9a 娃娃机配置信息 2024-09-19 18:22:35 +08:00
by 3c51f2794d 娃娃机配置 2024-09-19 18:11:38 +08:00
sk fafc946f75 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-19 17:20:52 +08:00
sk 0e84e74049 Merge branch 'develop' into release 2024-09-19 17:20:41 +08:00