Commit Graph

139 Commits

Author SHA1 Message Date
dy
f9989cf002 自选礼包 2023-12-27 10:17:38 +08:00
c323a9e255 fix: 修复抢红包日志列表长度限制未生效的问题 2023-12-25 11:06:45 +08:00
dy
38c1b28f9c Merge remote-tracking branch 'origin/dev-leijichongzhi' into release
# Conflicts:
#	src/api_s2c/hongdian/ApiGet.ts
#	src/api_s2c/pushgift/ApiOpen.ts
#	src/globalListener.ts
#	src/module/collection_event.ts
#	src/public/pushgift.ts
#	src/shared/protocols/hongdian/PtlGet.ts
#	src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:50:59 +08:00
dy
eabcc57242 Merge remote-tracking branch 'origin/dev-meirilibao' into release 2023-12-22 22:43:24 +08:00
dy
5ed699a64a Merge remote-tracking branch 'origin/feature/xiaofeijingsai' into release
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:43:08 +08:00
dy
75e921dbc2 Merge remote-tracking branch 'origin/feature/planb' into release
# Conflicts:
#	src/api_s2c/hongdian/ApiGet.ts
#	src/module/collection_event.ts
#	src/shared/protocols/hongdian/PtlGet.ts
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:42:44 +08:00
dy
466d02221d Merge remote-tracking branch 'origin/feature/pay_for_diamond' into release
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:40:40 +08:00
c304a6d8cc fix: 已领取的玩家添加gotAmount 字段 2023-12-22 21:23:13 +08:00
4a6a40403d fix: canReceive 接口添加玩家领取到的数额 2023-12-22 20:47:52 +08:00
dy
7fc9b0564f 每日礼包领取免费 2023-12-22 20:26:25 +08:00
bcca0ebbab fix: 修复最大总额计算错误的 bug 2023-12-22 20:13:18 +08:00
7eb34f872d fix: 调整可领取红包的判断逻辑 2023-12-22 19:26:18 +08:00
02dccd18a7 fix: 修复细节问题 2023-12-22 19:00:11 +08:00
40774138d2 fix: 将活动改为跨服活动 2023-12-22 18:27:46 +08:00
eed6dd1b8f fix: 添加红点及玩家发奖 2023-12-22 17:06:19 +08:00
dy
c3ba3934d4 消费竞赛定时器发奖,每天0点5分检测活动 结束 2023-12-22 16:49:21 +08:00
36b15af077 fix: 添加 price 回参表示领取门槛 2023-12-22 16:34:54 +08:00
2a492a8919 fix: 修复玩家可以重复领取的 bug 2023-12-22 14:59:33 +08:00
xcy
6526d386c4 feat:
累充礼包
2023-12-22 14:33:43 +08:00
86910e7ad7 debug: 添加玩家领取记录的日志输出 2023-12-22 14:05:15 +08:00
c5817b4acf fix: 添加玩家领取记录的 upsert 选项 2023-12-22 13:57:02 +08:00
06062716ef fix: 调整领取时查询的条件表达式 2023-12-22 13:40:13 +08:00
e0a624adba fix: 添加领取日志信息 2023-12-22 12:11:20 +08:00
xcy
377b7553e2 Merge branch 'dev' into dev-leijichongzhi
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-22 11:51:18 +08:00
dy
6e67ae6441 Merge branch 'master' into feature/xiaofeijingsai 2023-12-22 11:39:29 +08:00
dy
f17f4182a9 消费竞赛定时器 2023-12-22 11:39:17 +08:00
ce9238ccdb Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 11:31:31 +08:00
76a04a34d5 fix: 修复 groups 配置取值错误的问题 2023-12-22 11:30:54 +08:00
e660adb95c Merge branch 'feature/pay_for_diamond' into dev 2023-12-22 10:15:44 +08:00
4b190272b1 fix: 调整 remaining 计算规则 2023-12-22 10:11:24 +08:00
xcy
c70c154099 feat:
累充礼包
2023-12-21 21:38:53 +08:00
2fc85853dc feat: 充值抢钻石活动 2023-12-21 21:14:13 +08:00
ba8653dca9 fix: 添加领取数额的最大值配置 2023-12-21 21:08:22 +08:00
6808b53dd4 fix: 允许玩家领取到的钻石数小于配置的最低档位额度 2023-12-21 20:33:47 +08:00
2ae2a1362d feat: 添加炫耀逻辑 2023-12-21 20:16:29 +08:00
82b4b61725 feat: 抢红包分钻石接口 初版 2023-12-21 19:52:19 +08:00
dy
5bf5f59bfa Merge branch 'feature/xiaofeijingsai' into dev 2023-12-21 17:49:19 +08:00
yushunrui
4690254453 fix:圣诞活动修改异步按钮逻辑 2023-12-21 16:42:43 +08:00
yushunrui
48038d1b07 fix:圣诞活动新增vip经验任务157 2023-12-21 16:42:41 +08:00
yushunrui
ad439d0b14 fix:圣诞活动礼包改成每日重置 2023-12-21 16:42:40 +08:00
yushunrui
5ec8b60e99 fix:新增圣诞活动签到也加上经验 2023-12-21 16:42:39 +08:00
yushunrui
1b222a9fc6 fix:圣诞活动充值不到账 2023-12-21 16:41:32 +08:00
yushunrui
80908e5a46 fix:圣诞任务增加圣诞经验字段 2023-12-21 16:41:31 +08:00
dy
6cb39ad523 消费竞赛limit 2023-12-20 21:08:06 +08:00
dy
463c272089 Merge branch 'feature/planb' into dev 2023-12-20 20:07:22 +08:00
dy
d3ebfdcc02 Merge branch 'feature/xiaofeijingsai' into dev 2023-12-20 20:07:20 +08:00
yushunrui
772993260e fix:圣诞活动修改异步按钮逻辑 2023-12-25 19:30:55 +08:00
dy
97d1ddb142 破冰 2023-12-20 20:06:52 +08:00
dy
fd3c13d2b5 消耗竞赛 2023-12-20 20:05:40 +08:00
dy
6953349058 消费竞赛 2023-12-20 18:21:43 +08:00