duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-19 23:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/components/backgrounds/BackgroundsView.tsx
#	src/components/room/widgets/avatar-info/infostand/InfoStandWidgetUserView.tsx
This commit is contained in:
simoleo89
2026-05-19 20:40:07 +02:00
parent 989b132c6a de899c3138
commit 73b9f9319d
15 changed files with 429 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/room/widgets/AvatarInfoUser.ts
+1
View File
@@ -24,6 +24,7 @@ export class AvatarInfoUser implements IAvatarInfo
public standId: number = 0;
public overlayId: number = 0;
public cardBackgroundId: number = 0;
public borderId: number = 0;
public webID: number = 0;
public xp: number = 0;
public userType: number = -1;
src/api/room/widgets/AvatarInfoUtilities.ts
+1
View File
@@ -194,6 +194,7 @@ export class AvatarInfoUtilities
userInfo.standId = userData.stand;
userInfo.overlayId = userData.overlay;
userInfo.cardBackgroundId = userData.cardBackground ?? 0;
userInfo.borderId = (userData as any).borderId ?? 0;
userInfo.achievementScore = userData.activityPoints;
userInfo.webID = userData.webID;
userInfo.roomIndex = userData.roomIndex;