xcy
|
377b7553e2
|
Merge branch 'dev' into dev-leijichongzhi
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 11:51:18 +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 |
|
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 |
|
dy
|
1e46f70cd9
|
Merge branch 'feature/planb' into dev
|
2023-12-20 18:02:39 +08:00 |
|
dy
|
44be68a8ca
|
破冰礼包
|
2023-12-20 18:02:26 +08:00 |
|
dy
|
41799960e0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 17:49:15 +08:00 |
|
dy
|
56aa689a18
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-20 17:48:53 +08:00 |
|
dy
|
5b4e0cce65
|
消费竞赛
|
2023-12-20 17:48:42 +08:00 |
|
yushunrui
|
e09d057f32
|
fix:圣诞活动新增vip经验任务157
|
2023-12-20 17:47:37 +08:00 |
|
yushunrui
|
fcf79d7df0
|
fix:圣诞活动礼包改成每日重置
|
2023-12-20 17:32:31 +08:00 |
|
dy
|
2932cf071b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 16:44:55 +08:00 |
|
dy
|
8df2ccf160
|
Merge branch 'feature/planb' into dev
|
2023-12-20 16:44:44 +08:00 |
|
dy
|
fa88c44593
|
破冰礼包fix
|
2023-12-20 16:44:30 +08:00 |
|
yushunrui
|
c22d471260
|
fix:新增圣诞活动签到也加上经验
|
2023-12-20 16:39:29 +08:00 |
|
dy
|
2ade418245
|
Merge branch 'feature/xiaofeijingsai' into dev
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-20 16:08:20 +08:00 |
|
dy
|
4631cba0b3
|
消费竞赛
|
2023-12-20 16:07:59 +08:00 |
|
dy
|
b9db5098cc
|
Merge branch 'feature/planb' into dev
|
2023-12-20 11:28:35 +08:00 |
|
dy
|
1a6789b17b
|
破冰礼包
|
2023-12-20 11:27:25 +08:00 |
|
dy
|
cea27e9ea4
|
Merge branch 'master' into feature/planb
|
2023-12-19 22:31:20 +08:00 |
|
yushunrui
|
b0cc406d43
|
fix:圣诞活动充值不到账
|
2023-12-19 19:35:45 +08:00 |
|
dy
|
9844a5323a
|
Merge branch 'dev-tequan' into release
|
2023-12-19 19:27:54 +08:00 |
|
xcy
|
a969fb65df
|
fix:伙伴招募
|
2023-12-19 19:11:54 +08:00 |
|
xcy
|
4bdee9fc7c
|
fix:伙伴招募
|
2023-12-19 19:11:08 +08:00 |
|
xcy
|
8d765e5027
|
fix:伙伴招募修改条件至尊月卡
|
2023-12-19 19:00:42 +08:00 |
|
xcy
|
5969e32323
|
fix:伙伴招募修改条件至尊月卡
|
2023-12-19 19:00:11 +08:00 |
|
dy
|
3b12f760e1
|
Merge branch 'dev-tequan' into dev
|
2023-12-19 18:40:10 +08:00 |
|
dy
|
9257595264
|
Merge branch 'dev-tequan' into release
|
2023-12-19 18:39:27 +08:00 |
|
xcy
|
8b157a047a
|
fix:伙伴招募修改条件至尊月卡
|
2023-12-19 18:38:42 +08:00 |
|
dy
|
4c33bad9fb
|
Merge branch 'bugfix' into dev
|
2023-12-19 18:12:14 +08:00 |
|
xcy
|
070edf1cb5
|
fix:
修改伙伴招募的奖励领取条件
|
2023-12-19 18:00:29 +08:00 |
|
yushunrui
|
0326ceffd7
|
fix:圣诞任务增加圣诞经验字段
|
2023-12-19 17:38:59 +08:00 |
|
dy
|
1a703f1ecd
|
首充改为直购
|
2023-12-19 14:59:28 +08:00 |
|
dy
|
38e04d29ab
|
破冰礼包
|
2023-12-19 13:42:23 +08:00 |
|
xcy
|
0ac5246d5b
|
fix:
积天好礼bug
|
2023-12-18 21:22:01 +08:00 |
|
