Merge remote-tracking branch 'duckie/main' into merge-duckie-main-2026-05-06

# Conflicts:
#	packages/communication/src/messages/parser/room/unit/RoomUnitInfoParser.ts
#	packages/communication/src/messages/parser/user/data/UserProfileParser.ts
#	packages/events/src/session/RoomSessionUserFigureUpdateEvent.ts
#	packages/session/src/handler/RoomUsersHandler.ts

packages/session/src/RoomSession.ts

@@ -97,9 +97,9 @@ export class RoomSession implements IRoomSession
         else GetCommunication().connection.send(new RoomUnitTypingStopComposer());
     }
 	
-	public sendBackgroundMessage(backgroundImage: number, backgroundStand: number, backgroundOverlay: number): void
+	public sendBackgroundMessage(backgroundImage: number, backgroundStand: number, backgroundOverlay: number, backgroundCard: number = 0): void
     {
-        GetCommunication().connection.send(new RoomUnitBackgroundComposer(backgroundImage, backgroundStand, backgroundOverlay));
+        GetCommunication().connection.send(new RoomUnitBackgroundComposer(backgroundImage, backgroundStand, backgroundOverlay, backgroundCard));
     }
 
     public sendMottoMessage(motto: string): void

packages/session/src/RoomSessionManager.ts

@@ -29,7 +29,6 @@ export class RoomSessionManager implements IRoomSessionManager, IRoomHandlerList
 
     public async init(): Promise<void>
     {
-        console.log('[RoomSessionManager] init() called');
         this.createHandlers();
         this.processPendingSession();
         this.setupReconnectListener();

packages/session/src/RoomUserData.ts

@@ -19,6 +19,7 @@ export class RoomUserData implements IRoomUserData
 	private _background: number;
     private _stand: number;
     private _overlay: number;
+    private _cardBackground: number;
     private _webID: number = 0;
     private _groupID: number = 0;
     private _groupStatus: number = 0;
@@ -88,6 +89,16 @@ export class RoomUserData implements IRoomUserData
         this._overlay = k;
     }
 
+    public get cardBackground(): number
+    {
+        return this._cardBackground;
+    }
+
+    public set cardBackground(k: number)
+    {
+        this._cardBackground = k;
+    }
+
     public get name(): string
     {
         return this._name;

packages/session/src/UserDataManager.ts

@@ -169,7 +169,7 @@ export class UserDataManager implements IUserDataManager
         userData.displayOrder = displayOrder;
     }
 	
-	public updateBackground(roomIndex: number, background: number, stand: number, overlay: number): void
+	public updateBackground(roomIndex: number, background: number, stand: number, overlay: number, cardBackground: number = 0): void
     {
         const userData = this.getUserDataByIndex(roomIndex);
 
@@ -178,6 +178,7 @@ export class UserDataManager implements IUserDataManager
         userData.background = background;
         userData.stand = stand;
         userData.overlay = overlay;
+        userData.cardBackground = cardBackground;
     }
 
     public updateAchievementScore(roomIndex: number, score: number): void

packages/session/src/handler/RoomUsersHandler.ts

@@ -64,7 +64,8 @@ export class RoomUsersHandler extends BaseHandler
                 userData.displayOrder = user.displayOrder;
 				userData.background = user.background;
                 userData.stand = user.stand;
-                userData.overlay = user.overlay;									  
+                userData.overlay = user.overlay;
+                userData.cardBackground = user.cardBackground;
                 userData.activityPoints = user.activityPoints;
                 userData.figure = user.figure;
                 userData.type = user.userType;
@@ -114,9 +115,9 @@ export class RoomUsersHandler extends BaseHandler
         session.userDataManager.updateCustomization(parser.unitId, parser.nickIcon || '', parser.prefixText || '', parser.prefixColor || '', parser.prefixIcon || '', parser.prefixEffect || '', parser.prefixFont || '', parser.displayOrder || 'icon-prefix-name');
         session.userDataManager.updateAchievementScore(parser.unitId, parser.achievementScore);
 		
-		session.userDataManager.updateBackground(parser.unitId, parser.backgroundId, parser.standId, parser.overlayId);
+		session.userDataManager.updateBackground(parser.unitId, parser.backgroundId, parser.standId, parser.overlayId, parser.cardBackgroundId);
 
-        GetEventDispatcher().dispatchEvent(new RoomSessionUserFigureUpdateEvent(session, parser.unitId, parser.figure, parser.gender, parser.motto, parser.achievementScore, parser.backgroundId, parser.standId, parser.overlayId, parser.nickIcon || '', parser.prefixText || '', parser.prefixColor || '', parser.prefixIcon || '', parser.prefixEffect || '', parser.prefixFont || '', parser.displayOrder || 'icon-prefix-name'));
+        GetEventDispatcher().dispatchEvent(new RoomSessionUserFigureUpdateEvent(session, parser.unitId, parser.figure, parser.gender, parser.motto, parser.achievementScore, parser.backgroundId, parser.standId, parser.overlayId, parser.cardBackgroundId, parser.nickIcon || '', parser.prefixText || '', parser.prefixColor || '', parser.prefixIcon || '', parser.prefixEffect || '', parser.prefixFont || '', parser.displayOrder || 'icon-prefix-name'));
 
     }