Commit Graph

211 Commits

Author SHA1 Message Date
dy
944ef41d5d 达摩献礼 2023-12-27 09:51:37 +08:00
dy
8503a65c1f yuandan fun 2023-12-26 20:04:05 +08:00
dy
f50f6de933 yuandan 2023-12-26 19:49:46 +08:00
dy
08d0bed291 元旦活动 2023-12-26 17:33:48 +08:00
dy
21994f214a 元旦fix 2023-12-26 16:53:43 +08:00
dy
ae0a5c6882 fix元旦 2023-12-26 16:33:31 +08:00
dy
bfc9ff369c fix元旦 2023-12-26 16:20:59 +08:00
dy
72ff17ba0b 元旦活动 2023-12-26 15:26:58 +08:00
dy
9b6d29ddf2 元旦活动,娃娃机 2023-12-26 14:30:10 +08:00
dy
fd035faf86 元旦活动 2023-12-26 14:04:19 +08:00
dy
d5ef0b3187 yuandan 2023-12-26 09:40:15 +08:00
dy
1d6143794c 元旦活动 2023-12-25 17:13:59 +08:00
dy
00804fa8c1 init 元旦活动 2023-12-25 13:48:18 +08:00
xcy
f8298f08e9 fix:
修复邮件
2023-12-23 01:35:48 +08:00
xcy
862052e827 fix:
修复邮件
2023-12-23 01:11:45 +08:00
xcy
e49861bcaf fix:
修复邮件
2023-12-23 00:46:08 +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
dy
a4a84aba24 Merge remote-tracking branch 'origin/feature/dadian' into release 2023-12-22 22:40:03 +08:00
xcy
474246463c Merge remote-tracking branch 'origin/pushgift' into release
# Conflicts:
#	src/api_s2c/pushgift/ApiOpen.ts
#	src/public/fight.ts
#	src/public/pushgift.ts
#	src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
#	src/shared/protocols/serviceProto.ts
2023-12-22 22:18:56 +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
dy
7f60477a86 游戏内打点 2023-12-22 18:18:10 +08:00
xcy
4c9ad23bc1 fix:
添加接口
2023-12-22 18:04:56 +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
xcy
753dd8decb fix:
异步查库改为同步插库
2023-12-22 16:06:57 +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