Commit Graph

22 Commits

Author SHA1 Message Date
dy
46401b90ee fix 悬赏任务上限限制 2024-01-02 19:55:36 +08:00
dy
c3fa18c9b1 proto 2023-12-27 11:08:42 +08:00
dy
fd035faf86 元旦活动 2023-12-26 14:04:19 +08:00
dy
00804fa8c1 init 元旦活动 2023-12-25 13:48:18 +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
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
4a6a40403d fix: canReceive 接口添加玩家领取到的数额 2023-12-22 20:47:52 +08:00
xcy
377b7553e2 Merge branch 'dev' into dev-leijichongzhi
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-22 11:51:18 +08:00
xcy
c70c154099 feat:
累充礼包
2023-12-21 21:38:53 +08:00
2fc85853dc feat: 充值抢钻石活动 2023-12-21 21:14:13 +08:00
2ae2a1362d feat: 添加炫耀逻辑 2023-12-21 20:16:29 +08:00
dy
cea27e9ea4 Merge branch 'master' into feature/planb 2023-12-19 22:31:20 +08:00
dy
1a703f1ecd 首充改为直购 2023-12-19 14:59:28 +08:00
dy
38e04d29ab 破冰礼包 2023-12-19 13:42:23 +08:00
dy
6aadb030c5 周末礼包 2023-12-15 10:26:23 +08:00
dy
a189f77303 init 2023-12-15 10:25:44 +08:00
dy
4ba9b9f504 init 2023-12-15 10:25:39 +08:00
dy
bcab41c9bb proto 2023-12-14 11:38:15 +08:00
dy
e1f3e726b7 周末礼包 2023-12-14 11:06:54 +08:00
dy
312afa1b69 周末礼包 2023-12-14 11:04:16 +08:00
dy
aefd1d0052 init 2023-12-13 20:51:17 +08:00
DESKTOP-15R5JU0\legu
97e070ea81 init 2023-11-17 12:02:12 +08:00