Merge remote-tracking branch 'origin/master' into editor-agent-refactored

# Conflicts:
#	server-rs/crates/api-server/src/editor_generation_queue.rs
#	src/components/image-editor/ImageCanvasEditorView.test.tsx
#	src/components/image-editor/ImageCanvasEditorView.tsx
This commit is contained in:
2026-07-13 14:31:08 +08:00
486 changed files with 14293 additions and 4581 deletions
+23
View File
@@ -51,6 +51,15 @@ export type ProfileDashboardSummary = {
totalPlayTimeMs: number;
playedWorldCount: number;
updatedAt: string | null;
dailyFreePoints?: ProfileDailyFreePoints;
};
export type ProfileDailyFreePoints = {
dayKey: number;
grantedPoints: number;
remainingPoints: number;
resetsAt: string;
updatedAt: string;
};
export type ProfileWalletLedgerEntry = {
@@ -65,6 +74,8 @@ export type ProfileWalletLedgerEntry = {
| 'points_recharge'
| 'membership_period_grant'
| 'membership_period_reset'
| 'daily_free_grant'
| 'daily_free_reset'
| 'asset_operation_consume'
| 'asset_operation_refund'
| 'redeem_code_reward'
@@ -162,6 +173,16 @@ export type ProfileMembership = {
cyclePeriodDays: number;
};
export type ProfileMudPointBalance = {
totalPoints: number;
permanentPoints: number;
limitedPoints: number;
limitedExpiresAt: string | null;
dailyFreePoints: number;
dailyFreeResetPoints: number;
dailyFreeResetsAt: string;
};
export type ProfileRechargeOrder = {
orderId: string;
productId: string;
@@ -183,12 +204,14 @@ export type ProfileRechargeOrder = {
export type ProfileRechargeCenterResponse = {
walletBalance: number;
mudPointBalance?: ProfileMudPointBalance;
membership: ProfileMembership;
pointProducts: ProfileRechargeProduct[];
membershipProducts: ProfileRechargeProduct[];
benefits: ProfileMembershipBenefit[];
latestOrder: ProfileRechargeOrder | null;
hasPointsRecharged: boolean;
dailyFreePoints?: ProfileDailyFreePoints;
};
export type WechatMiniProgramPayParams = {