Commit Graph

108 Commits

Author SHA1 Message Date
4a6a40403d fix: canReceive 接口添加玩家领取到的数额 2023-12-22 20:47:52 +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
36b15af077 fix: 添加 price 回参表示领取门槛 2023-12-22 16:34:54 +08:00
2a492a8919 fix: 修复玩家可以重复领取的 bug 2023-12-22 14:59:33 +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
76a04a34d5 fix: 修复 groups 配置取值错误的问题 2023-12-22 11:30:54 +08:00
4b190272b1 fix: 调整 remaining 计算规则 2023-12-22 10:11:24 +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
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
5969e32323 fix:伙伴招募修改条件至尊月卡 2023-12-19 19:00:11 +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
xcy
070edf1cb5 fix:
修改伙伴招募的奖励领取条件
2023-12-19 18:00:29 +08:00
xcy
db2286509c fix:
修改情报特权
2023-12-19 18:00:02 +08:00
dy
1a703f1ecd 首充改为直购 2023-12-19 14:59:28 +08:00
dy
d1b9aa476b Merge branch 'dev' into release
# Conflicts:
#	src/json/herogrow_ewai.json
#	src/json/huodong.json5
#	src/json/item.json
#	src/json/pay.json
2023-12-19 10:10:20 +08:00
xcy
91f14c69ce fix:红点 2023-12-18 21:31:51 +08:00
xcy
0ac5246d5b fix:
积天好礼bug
2023-12-18 21:22:01 +08:00
xcy
3cce7bbfc7 fix:
过滤没有充值得payid
2023-12-18 21:22:01 +08:00
xcy
50087cd543 fix:
十五天累计充值
2023-12-18 21:21:35 +08:00
xcy
d2ce3dd143 Merge branch 'dev-jitianhaoli' into dev
# Conflicts:
#	src/api_s2c/event/shiwuleichong/ApiOpen.ts
2023-12-18 21:18:10 +08:00
724f91fc36 公会战力优化 2023-12-18 21:17:30 +08:00
xcy
79fcc6ec85 Revert "feat: 1.推送礼包"
This reverts commit 5d9ece05
2023-12-18 20:09:56 +08:00
xcy
fe898ca42c Revert "fix:"
This reverts commit 4fc0da4a70.
2023-12-18 20:06:40 +08:00
xcy
893008c1e7 Revert "fix:"
This reverts commit d060004609.
2023-12-18 20:06:33 +08:00
xcy
fa7fbbfdd0 Revert "fix:"
This reverts commit a6fb04ce58.
2023-12-18 20:05:46 +08:00
xcy
b2c0d754a1 Revert "fix:"
This reverts commit 14ab1d45b8.
2023-12-18 20:05:32 +08:00
xcy
e57fad35d8 Revert "fix:"
This reverts commit 7e775e90e1.
2023-12-18 20:05:26 +08:00
xcy
28e4aca1f2 Revert "fix:"
This reverts commit 404bb9a7e5.
2023-12-18 20:04:52 +08:00
xcy
c8751956ef Revert "fix:"
This reverts commit 5679361eab.
2023-12-18 20:04:48 +08:00
xcy
9523f7c00d fix:
积天好礼bug
2023-12-18 20:00:49 +08:00
dy
a1b7cb1d7c Merge branch 'bugfix' into dev 2023-12-18 19:19:13 +08:00
dy
c8d6f7d433 修复充值经验任务计算,开服狂欢进度,优化dayPay查询 2023-12-18 19:12:51 +08:00
yushunrui
9882a28090 fix:处理圣诞活动免费次数bug 2023-12-18 16:16:11 +08:00
yushunrui
25a8e15ed3 task增加新的任务类型,154是圣诞小游戏挑战 155是每日任务最终宝箱奖励 2023-12-18 15:29:48 +08:00
dd34a1c3a4 equip去redis化 2023-12-18 15:27:10 +08:00
yushunrui
89b75bbf2b Merge remote-tracking branch 'origin/dev' into dev 2023-12-18 15:02:07 +08:00
yushunrui
30de992a62 圣诞活动增加异步按钮 2023-12-18 14:58:41 +08:00
dy
fdbf22f62f Merge branch 'bugfix' into dev 2023-12-18 14:47:13 +08:00