Commit Graph

285 Commits

Author SHA1 Message Date
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
by 8d9ef2a928 创建订单增加购买类型 2024-10-18 10:33:31 +08:00
tomas ce931c98b6 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-17 17:05:53 +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 8ee0093ccf 后台弹窗配置 2024-10-15 14:18:16 +08:00
tomas 2201f656f1 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-14 10:24:16 +08:00
tomas 5165221498 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-10-11 09:00:03 +08:00
sk e5378e46f9 首冲加赠是否翻倍 2024-10-10 17:50:19 +08:00
sk 4c4af75a76 客户端升级奖励 2024-10-10 15:27:21 +08:00
sk 948f90be29 客户端版本校验 2024-10-09 17:11:26 +08:00
sk d09d4a4284 大厅道具变更同步到游戏 2024-10-09 09:18:09 +08:00
tomas 29e9c7bfe8 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-28 08:52:34 +08:00
sk b1298fe25f 添加非首次登录标记 2024-09-27 15:27:16 +08:00
tomas b83a6d6d5b Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-27 10:49:56 +08:00
DESKTOP-45ANQ2C\unis 41a7fcfe92 娃娃卡添加兑换积分记录 2024-09-27 09:33:26 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
tomas d8398465be Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-26 08:58:26 +08:00
by ef7fdec1fb 娃娃兑换记录修改 2024-09-25 16:46:12 +08:00
by 532ff64d3b 商城兑换娃娃 2024-09-25 09:47:40 +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 9190e5a19b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-23 16:55:42 +08:00
sk df3c4d353e 添加竞技馆获奖记录查询接口 2024-09-23 16:43:35 +08:00
by 85e173f3f2 proto 2024-09-23 15:38: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
by e6aa0dd1a9 proto 2024-09-23 10:03:53 +08:00
by 020e9b9664 娃娃机后台配置 2024-09-23 09:58:33 +08:00
tomas d5d3c225f2 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-23 08:59:21 +08:00
by 68f0ac9f06 proto 2024-09-21 17:44:30 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +08:00
tomas 348b5fcb90 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-21 10:43:54 +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
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
kxdd 62981de6cf 娃娃机明细添加道具类型 2024-09-20 11:19:58 +08:00
tomas 365ba5edc8 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-19 19:08:56 +08:00
tomas 05a9c79dc1 Merge remote-tracking branch 'origin/develop' into dev_slots 2024-09-19 19:06:57 +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