Commit Graph

9 Commits

Author SHA1 Message Date
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
eed6dd1b8f fix: 添加红点及玩家发奖 2023-12-22 17:06:19 +08:00
xcy
c70c154099 feat:
累充礼包
2023-12-21 21:38:53 +08:00
dy
1a6789b17b 破冰礼包 2023-12-20 11:27:25 +08:00
dy
8b15048d0f 周末礼包红点 2023-12-15 10:27:43 +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