Commit Graph

532 Commits

Author SHA1 Message Date
sk 6f700f9ef6 no message 2024-09-28 10:03:29 +08:00
sk fd14654c59 竞技馆和比赛场关闭斗鸡技能效果 2024-09-27 18:02:00 +08:00
sk 81417088fd Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 15:34:02 +08:00
sk b1298fe25f 添加非首次登录标记 2024-09-27 15:27:16 +08:00
DESKTOP-45ANQ2C\unis 74c36f4083 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 14:30:58 +08:00
DESKTOP-45ANQ2C\unis 6ac5d365d5 娃娃卡兑换积分记录修改 2024-09-27 14:30:52 +08:00
sk fcdb12669c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 14:09:35 +08:00
sk 3519bedc03 no message 2024-09-27 14:08:49 +08:00
sk 53f03c1081 no message 2024-09-27 11:36:12 +08:00
DESKTOP-45ANQ2C\unis 6ac1a91320 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-27 09:33:33 +08:00
DESKTOP-45ANQ2C\unis 41a7fcfe92 娃娃卡添加兑换积分记录 2024-09-27 09:33:26 +08:00
sk 8e25bb52b4 竞技馆系统房间 2024-09-27 09:02:15 +08:00
sk 7d8eaee2c2 竞技馆获奖假数据 2024-09-26 16:39:19 +08:00
sk 91bb5820f9 no message 2024-09-26 10:22:56 +08:00
sk 7861f1b7da no message 2024-09-26 09:18:49 +08:00
sk f28377dd05 no message 2024-09-25 18:27:55 +08:00
sk 867df580b5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 17:47:01 +08:00
by fb6fc3920f 获取娃娃商城兑换单独接口修改 2024-09-25 17:46:02 +08:00
sk 8ebad301f2 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-25 17:40:43 +08:00
by ef8cbfaedd 兑换记录修改 2024-09-25 17:38:13 +08:00
sk 52f8b6ad14 no message 2024-09-25 17:31:46 +08:00
by eb32e72916 娃娃兌換記錄 2024-09-25 17:04:26 +08:00
by ef7fdec1fb 娃娃兑换记录修改 2024-09-25 16:46:12 +08:00
sk 1d81754702 no message 2024-09-25 13:43:29 +08:00
sk d269955408 订单回调优化 2024-09-25 11:30:27 +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 5fd2c7c195 娃娃兑换 2024-09-24 17:03:44 +08:00
sk cd7c3ddebd 竞技馆官方房间配置 2024-09-23 18:32:50 +08:00
by 85e173f3f2 proto 2024-09-23 15:38:35 +08:00
sk ef6236e3a8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-23 14:59:40 +08:00
sk 5ab84bd13e 离线修改道具 2024-09-23 14:56:54 +08:00
by 3c00a7d873 兌換娃娃 2024-09-23 14:22:33 +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 bf1efc0139 娃娃兑换 2024-09-21 15:39:16 +08:00
sk 4c64b96429 解决冲突 2024-09-21 15:11:40 +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
by 3b024058be proto修改 2024-09-20 16:44:56 +08:00
sk 19ebda3832 Merge branch 'release' into develop 2024-09-20 16:36:32 +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 62e2885d05 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-09-20 11:24:53 +08:00