duckietm/Nitro_Render_V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro_Render_V3.git synced 2026-06-19 15:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Dev' into feat/react19-event-bus

Browse Source 
# Conflicts:
#	packages/session/src/UserDataManager.ts
This commit is contained in:
simoleo89
2026-05-19 20:33:54 +02:00
parent 221f186d61 4b7d04d0b8
commit 4be09c6c62
11 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/session/src/RoomSession.ts
+2 -2
View File
@@ -97,9 +97,9 @@ export class RoomSession implements IRoomSession
else GetCommunication().connection.send(new RoomUnitTypingStopComposer());
}
public sendBackgroundMessage(backgroundImage: number, backgroundStand: number, backgroundOverlay: number, backgroundCard: number = 0): void
public sendBackgroundMessage(backgroundImage: number, backgroundStand: number, backgroundOverlay: number, backgroundCard: number = 0, backgroundBorder: number = 0): void
{
GetCommunication().connection.send(new RoomUnitBackgroundComposer(backgroundImage, backgroundStand, backgroundOverlay, backgroundCard));
GetCommunication().connection.send(new RoomUnitBackgroundComposer(backgroundImage, backgroundStand, backgroundOverlay, backgroundCard, backgroundBorder));
}
public sendMottoMessage(motto: string): void
packages/session/src/RoomUserData.ts
+11
View File
@@ -20,6 +20,7 @@ export class RoomUserData implements IRoomUserData
private _stand: number;
private _overlay: number;
private _cardBackground: number;
private _borderId: number = 0;
private _webID: number = 0;
private _groupID: number = 0;
private _groupStatus: number = 0;
@@ -99,6 +100,16 @@ export class RoomUserData implements IRoomUserData
this._cardBackground = k;
}
public get borderId(): number
{
return this._borderId;
}
public set borderId(k: number)
{
this._borderId = k;
}
public get name(): string
{
return this._name;
packages/session/src/UserDataManager.ts
+2 -1
View File
@@ -201,7 +201,7 @@ export class UserDataManager implements IUserDataManager
this.invalidateRoomUserListSnapshot();
}
public updateBackground(roomIndex: number, background: number, stand: number, overlay: number, cardBackground: number = 0): void
public updateBackground(roomIndex: number, background: number, stand: number, overlay: number, cardBackground: number = 0, borderId: number = 0): void
{
const userData = this.getUserDataByIndex(roomIndex);
@@ -211,6 +211,7 @@ export class UserDataManager implements IUserDataManager
userData.stand = stand;
userData.overlay = overlay;
userData.cardBackground = cardBackground;
userData.borderId = borderId;
this.invalidateRoomUserListSnapshot();
}
packages/session/src/handler/RoomUsersHandler.ts
+3 -2
View File
@@ -66,6 +66,7 @@ export class RoomUsersHandler extends BaseHandler
userData.stand = user.stand;
userData.overlay = user.overlay;
userData.cardBackground = user.cardBackground;
userData.borderId = user.borderId;
userData.activityPoints = user.activityPoints;
userData.figure = user.figure;
userData.type = user.userType;
@@ -115,9 +116,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, parser.cardBackgroundId);
session.userDataManager.updateBackground(parser.unitId, parser.backgroundId, parser.standId, parser.overlayId, parser.cardBackgroundId, parser.borderId);
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'));
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', parser.borderId));
}