Fix avatar analysis using wrong bundle type

This commit is contained in:
Natsumi
2025-02-28 11:25:01 +13:00
parent b50b4490b4
commit fade23d8be
+29 -9
View File
@@ -22871,9 +22871,12 @@ console.log(`isLinux: ${LINUX}`);
*/ */
API.getFileAnalysis = function (params) { API.getFileAnalysis = function (params) {
return this.call(`analysis/${params.fileId}/${params.version}`, { return this.call(
`analysis/${params.fileId}/${params.version}/${params.variant}`,
{
method: 'GET' method: 'GET'
}).then((json) => { }
).then((json) => {
var args = { var args = {
json, json,
params params
@@ -22884,7 +22887,10 @@ console.log(`isLinux: ${LINUX}`);
}; };
API.$on('FILE:ANALYSIS', function (args) { API.$on('FILE:ANALYSIS', function (args) {
if (!$app.avatarDialog.visible) { if (
!$app.avatarDialog.visible ||
$app.avatarDialog.id !== args.params.avatarId
) {
return; return;
} }
var ref = args.json; var ref = args.json;
@@ -22906,14 +22912,12 @@ console.log(`isLinux: ${LINUX}`);
$app.methods.getAvatarFileAnalysis = function () { $app.methods.getAvatarFileAnalysis = function () {
var D = this.avatarDialog; var D = this.avatarDialog;
var avatarId = D.ref.id;
var assetUrl = ''; var assetUrl = '';
var variant = 'security';
for (let i = D.ref.unityPackages.length - 1; i > -1; i--) { for (let i = D.ref.unityPackages.length - 1; i > -1; i--) {
var unityPackage = D.ref.unityPackages[i]; var unityPackage = D.ref.unityPackages[i];
if ( if (unityPackage.variant !== 'security') {
unityPackage.variant &&
// unityPackage.variant !== 'standard' &&
unityPackage.variant !== 'security'
) {
continue; continue;
} }
if ( if (
@@ -22924,6 +22928,22 @@ console.log(`isLinux: ${LINUX}`);
break; break;
} }
} }
if (!assetUrl) {
for (let i = D.ref.unityPackages.length - 1; i > -1; i--) {
var unityPackage = D.ref.unityPackages[i];
if (unityPackage.variant !== 'standard') {
continue;
}
if (
unityPackage.platform === 'standalonewindows' &&
this.compareUnityVersion(unityPackage.unitySortNumber)
) {
variant = 'standard';
assetUrl = unityPackage.assetUrl;
break;
}
}
}
if (!assetUrl) { if (!assetUrl) {
assetUrl = D.ref.assetUrl; assetUrl = D.ref.assetUrl;
} }
@@ -22936,7 +22956,7 @@ console.log(`isLinux: ${LINUX}`);
}); });
return; return;
} }
API.getFileAnalysis({ fileId, version }); API.getFileAnalysis({ fileId, version, variant, avatarId });
}; };
$app.methods.openFolderGeneric = function (path) { $app.methods.openFolderGeneric = function (path) {