MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-07 14:56:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename Quest to Android, small fixes

Browse Source
This commit is contained in:
Natsumi
2023-08-20 18:33:58 +12:00
parent 908714b2e1
commit f578984a06
4 changed files with 109 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+98 -28
View File
@@ -1076,7 +1076,7 @@ speechSynthesis.getVoices();
'<el-tooltip v-if="isValidInstance" placement="bottom">' + '<el-tooltip v-if="isValidInstance" placement="bottom">' +
'<div slot="content">' + '<div slot="content">' +
'<span><span style="color:#409eff">PC: </span>{{ platforms.standalonewindows }}</span></br>' + '<span><span style="color:#409eff">PC: </span>{{ platforms.standalonewindows }}</span></br>' +
'<span><span style="color:#67c23a">Quest: </span>{{ platforms.android }}</span></br>' + '<span><span style="color:#67c23a">Android: </span>{{ platforms.android }}</span></br>' +
'<span>{{ $t("dialog.user.info.instance_game_version") }} {{ gameServerVersion }}</span></br>' + '<span>{{ $t("dialog.user.info.instance_game_version") }} {{ gameServerVersion }}</span></br>' +
'<span v-if="queueEnabled">{{ $t("dialog.user.info.instance_queuing_enabled") }}</br></span>' + '<span v-if="queueEnabled">{{ $t("dialog.user.info.instance_queuing_enabled") }}</br></span>' +
'<span v-if="userList.length">{{ $t("dialog.user.info.instance_users") }}</br></span>' + '<span v-if="userList.length">{{ $t("dialog.user.info.instance_users") }}</br></span>' +
@@ -11366,12 +11366,6 @@ speechSynthesis.getVoices();
} }
if (data.avatarEyeHeight < 0) { if (data.avatarEyeHeight < 0) {
text = 'Photon bot has joined, invalid avatarEyeHeight'; text = 'Photon bot has joined, invalid avatarEyeHeight';
} else if (
data.user.last_platform === 'android' &&
platforms.length > 0 &&
!platforms.includes('android')
) {
var text = 'User joined as Quest in PC only world';
} }
if (text) { if (text) {
this.addEntryPhotonEvent({ this.addEntryPhotonEvent({
@@ -11435,15 +11429,6 @@ speechSynthesis.getVoices();
userId: user.id userId: user.id
}); });
ref = args.ref; ref = args.ref;
if (photonUser.last_platform !== ref.last_platform) {
this.addEntryPhotonEvent({
photonId,
text: `API/Photon platform mismatch ${ref.last_platform}/${photonUser.last_platform}`,
type: 'PhotonBot',
color: 'yellow',
created_at: Date.parse(gameLogDate)
});
}
} catch (err) { } catch (err) {
console.error(err); console.error(err);
ref = photonUser; ref = photonUser;
@@ -11530,7 +11515,7 @@ speechSynthesis.getVoices();
avatar.description = this.replaceBioSymbols(avatar.description); avatar.description = this.replaceBioSymbols(avatar.description);
var platform = ''; var platform = '';
if (user.last_platform === 'android') { if (user.last_platform === 'android') {
platform = 'Quest'; platform = 'Android';
} else if (user.last_platform === 'ios') { } else if (user.last_platform === 'ios') {
platform = 'iOS'; platform = 'iOS';
} else if (user.inVRMode) { } else if (user.inVRMode) {
@@ -16693,7 +16678,7 @@ speechSynthesis.getVoices();
this.currentInstanceWorld.inCache = true; this.currentInstanceWorld.inCache = true;
this.currentInstanceWorld.cacheSize = `${( this.currentInstanceWorld.cacheSize = `${(
cacheInfo.Item1 / 1048576 cacheInfo.Item1 / 1048576
).toFixed(2)} MiB`; ).toFixed(2)} MB`;
} }
}); });
this.getBundleDateSize(args.ref).then( this.getBundleDateSize(args.ref).then(
@@ -16720,7 +16705,7 @@ speechSynthesis.getVoices();
this.currentInstanceWorld.inCache = true; this.currentInstanceWorld.inCache = true;
this.currentInstanceWorld.cacheSize = `${( this.currentInstanceWorld.cacheSize = `${(
cacheInfo.Item1 / 1048576 cacheInfo.Item1 / 1048576
).toFixed(2)} MiB`; ).toFixed(2)} MB`;
} }
}); });
}); });
@@ -17391,7 +17376,7 @@ speechSynthesis.getVoices();
createdAt = version.created_at; createdAt = version.created_at;
fileSize = `${( fileSize = `${(
version.file.sizeInBytes / 1048576 version.file.sizeInBytes / 1048576
).toFixed(2)} MiB`; ).toFixed(2)} MB`;
break; break;
} }
} }
@@ -18004,7 +17989,7 @@ speechSynthesis.getVoices();
if (unityPackage.platform === 'standalonewindows') { if (unityPackage.platform === 'standalonewindows') {
platform = 'PC'; platform = 'PC';
} else if (unityPackage.platform === 'android') { } else if (unityPackage.platform === 'android') {
platform = 'Quest'; platform = 'Android';
} else if (unityPackage.platform) { } else if (unityPackage.platform) {
({ platform } = unityPackage); ({ platform } = unityPackage);
} }
@@ -18145,7 +18130,7 @@ speechSynthesis.getVoices();
if (version.version === fileVersion) { if (version.version === fileVersion) {
D.fileSize = `${( D.fileSize = `${(
version.file.sizeInBytes / 1048576 version.file.sizeInBytes / 1048576
).toFixed(2)} MiB`; ).toFixed(2)} MB`;
break; break;
} }
} }
@@ -18380,7 +18365,7 @@ speechSynthesis.getVoices();
if (unityPackage.platform === 'standalonewindows') { if (unityPackage.platform === 'standalonewindows') {
platform = 'PC'; platform = 'PC';
} else if (unityPackage.platform === 'android') { } else if (unityPackage.platform === 'android') {
platform = 'Quest'; platform = 'Android';
} else if (unityPackage.platform) { } else if (unityPackage.platform) {
({ platform } = unityPackage); ({ platform } = unityPackage);
} }
@@ -22276,7 +22261,7 @@ speechSynthesis.getVoices();
D.inCache = true; D.inCache = true;
D.cacheSize = `${(cacheInfo.Item1 / 1048576).toFixed( D.cacheSize = `${(cacheInfo.Item1 / 1048576).toFixed(
2 2
)} MiB`; )} MB`;
D.cachePath = cacheInfo.Item3; D.cachePath = cacheInfo.Item3;
} }
D.cacheLocked = cacheInfo.Item2; D.cacheLocked = cacheInfo.Item2;
@@ -22296,7 +22281,7 @@ speechSynthesis.getVoices();
D.inCache = true; D.inCache = true;
D.cacheSize = `${(cacheInfo.Item1 / 1048576).toFixed( D.cacheSize = `${(cacheInfo.Item1 / 1048576).toFixed(
2 2
)} MiB`; )} MB`;
D.cachePath = cacheInfo.Item3; D.cachePath = cacheInfo.Item3;
} }
D.cacheLocked = cacheInfo.Item2; D.cacheLocked = cacheInfo.Item2;
@@ -27684,17 +27669,17 @@ speechSynthesis.getVoices();
} }
var ref = args.json; var ref = args.json;
if (typeof ref.fileSize !== 'undefined') { if (typeof ref.fileSize !== 'undefined') {
ref._fileSize = `${(ref.fileSize / 1048576).toFixed(2)} MiB`; ref._fileSize = `${(ref.fileSize / 1048576).toFixed(2)} MB`;
} }
if (typeof ref.uncompressedSize !== 'undefined') { if (typeof ref.uncompressedSize !== 'undefined') {
ref._uncompressedSize = `${(ref.uncompressedSize / 1048576).toFixed( ref._uncompressedSize = `${(ref.uncompressedSize / 1048576).toFixed(
2 2
)} MiB`; )} MB`;
} }
if (typeof ref.avatarStats?.totalTextureUsage !== 'undefined') { if (typeof ref.avatarStats?.totalTextureUsage !== 'undefined') {
ref._totalTextureUsage = `${( ref._totalTextureUsage = `${(
ref.avatarStats.totalTextureUsage / 1048576 ref.avatarStats.totalTextureUsage / 1048576
).toFixed(2)} MiB`; ).toFixed(2)} MB`;
} }
$app.avatarDialog.fileAnalysis = buildTreeData(args.json); $app.avatarDialog.fileAnalysis = buildTreeData(args.json);
}); });
@@ -27747,6 +27732,91 @@ speechSynthesis.getVoices();
D.visible = true; D.visible = true;
}; };
// #endregion
// #region | Open common folders
$app.methods.openVrcxAppDataFolder = function () {
AppApi.OpenVrcxAppDataFolder().then((result) => {
if (result) {
this.$message({
message: 'Folder opened',
type: 'success'
});
} else {
this.$message({
message: "Folder dosn't exist",
type: 'error'
});
}
});
};
$app.methods.openVrcAppDataFolder = function () {
AppApi.OpenVrcAppDataFolder().then((result) => {
if (result) {
this.$message({
message: 'Folder opened',
type: 'success'
});
} else {
this.$message({
message: "Folder dosn't exist",
type: 'error'
});
}
});
};
$app.methods.openVrcPhotosFolder = function () {
AppApi.OpenVrcPhotosFolder().then((result) => {
if (result) {
this.$message({
message: 'Folder opened',
type: 'success'
});
} else {
this.$message({
message: "Folder dosn't exist",
type: 'error'
});
}
});
};
$app.methods.openVrcScreenshotsFolder = function () {
AppApi.OpenVrcScreenshotsFolder().then((result) => {
if (result) {
this.$message({
message: 'Folder opened',
type: 'success'
});
} else {
this.$message({
message: "Folder dosn't exist",
type: 'error'
});
}
});
};
$app.methods.openCrashVrcCrashDumps = function () {
AppApi.OpenCrashVrcCrashDumps().then((result) => {
if (result) {
this.$message({
message: 'Folder opened',
type: 'success'
});
} else {
this.$message({
message: "Folder dosn't exist",
type: 'error'
});
}
});
};
// #endregion
$app = new Vue($app); $app = new Vue($app);
window.$app = $app; window.$app = $app;
})(); })();
html/src/index.pug
+2 -2
View File
@@ -250,7 +250,7 @@ html
el-tag.x-tag-vip(v-if="userDialog.ref.$isModerator" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.user.tags.vrchat_team') }} el-tag.x-tag-vip(v-if="userDialog.ref.$isModerator" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.user.tags.vrchat_team') }}
el-tag.x-tag-vrcplus(v-if="userDialog.ref.$isVRCPlus" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") VRC+ el-tag.x-tag-vrcplus(v-if="userDialog.ref.$isVRCPlus" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") VRC+
el-tag.x-tag-platform-pc(v-if="userDialog.ref.last_platform === 'standalonewindows'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") PC el-tag.x-tag-platform-pc(v-if="userDialog.ref.last_platform === 'standalonewindows'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") PC
el-tag.x-tag-platform-quest(v-else-if="userDialog.ref.last_platform === 'android'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Quest el-tag.x-tag-platform-quest(v-else-if="userDialog.ref.last_platform === 'android'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Android
el-tag.x-tag-platform-ios(v-else-if="userDialog.ref.last_platform === 'ios'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") iOS el-tag.x-tag-platform-ios(v-else-if="userDialog.ref.last_platform === 'ios'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") iOS
el-tag.x-tag-platform-other(v-else-if="userDialog.ref.last_platform" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ userDialog.ref.last_platform }} el-tag.x-tag-platform-other(v-else-if="userDialog.ref.last_platform" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ userDialog.ref.last_platform }}
el-tag.name(v-if="userDialog.ref.$customTag" type="info" effect="plain" size="mini" v-text="userDialog.ref.$customTag" :style="{'color':userDialog.ref.$customTagColour, 'border-color':userDialog.ref.$customTagColour}" style="margin-right:5px;margin-top:5px") el-tag.name(v-if="userDialog.ref.$customTag" type="info" effect="plain" size="mini" v-text="userDialog.ref.$customTag" :style="{'color':userDialog.ref.$customTagColour, 'border-color':userDialog.ref.$customTagColour}" style="margin-right:5px;margin-top:5px")
@@ -579,7 +579,7 @@ html
el-tag(v-else-if="worldDialog.ref.releaseStatus === 'public'" type="success" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.public') }} el-tag(v-else-if="worldDialog.ref.releaseStatus === 'public'" type="success" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.public') }}
el-tag(v-else type="danger" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.private') }} el-tag(v-else type="danger" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.private') }}
el-tag.x-tag-platform-pc(v-if="worldDialog.isPC" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") PC el-tag.x-tag-platform-pc(v-if="worldDialog.isPC" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") PC
el-tag.x-tag-platform-quest(v-if="worldDialog.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Quest el-tag.x-tag-platform-quest(v-if="worldDialog.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Android
el-tag.x-tag-platform-ios(v-if="worldDialog.isIos" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") iOS el-tag.x-tag-platform-ios(v-if="worldDialog.isIos" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") iOS
el-tag(v-if="worldDialog.avatarScalingDisabled" type="warning" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.avatar_scaling_disabled') }} el-tag(v-if="worldDialog.avatarScalingDisabled" type="warning" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.avatar_scaling_disabled') }}
el-tag(v-if="worldDialog.ref.unityPackageUrl" type="success" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.future_proofing') }} el-tag(v-if="worldDialog.ref.unityPackageUrl" type="success" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.future_proofing') }}
html/src/mixins/tabs/playerList.pug
+4 -4
View File
@@ -16,7 +16,7 @@ mixin playerListTab()
el-tag(v-else-if="currentInstanceWorld.ref.releaseStatus === 'public'" type="success" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.world.tags.public') }} el-tag(v-else-if="currentInstanceWorld.ref.releaseStatus === 'public'" type="success" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.world.tags.public') }}
el-tag(v-else-if="currentInstanceWorld.ref.releaseStatus === 'private'" type="danger" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.world.tags.private') }} el-tag(v-else-if="currentInstanceWorld.ref.releaseStatus === 'private'" type="danger" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.world.tags.private') }}
el-tag.x-tag-platform-pc(v-if="currentInstanceWorld.isPC" type="info" effect="plain" size="mini" style="margin-right:5px") PC el-tag.x-tag-platform-pc(v-if="currentInstanceWorld.isPC" type="info" effect="plain" size="mini" style="margin-right:5px") PC
el-tag.x-tag-platform-quest(v-if="currentInstanceWorld.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px") Quest el-tag.x-tag-platform-quest(v-if="currentInstanceWorld.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px") Android
el-tag.x-tag-platform-ios(v-if="currentInstanceWorld.isIOS" type="info" effect="plain" size="mini" style="margin-right:5px") iOS el-tag.x-tag-platform-ios(v-if="currentInstanceWorld.isIOS" type="info" effect="plain" size="mini" style="margin-right:5px") iOS
el-tag(v-if="currentInstanceWorld.avatarScalingDisabled" type="warning" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.avatar_scaling_disabled') }} el-tag(v-if="currentInstanceWorld.avatarScalingDisabled" type="warning" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.avatar_scaling_disabled') }}
el-tag(type="info" effect="plain" size="mini" v-text="currentInstanceWorld.fileSize" style="margin-right:5px") el-tag(type="info" effect="plain" size="mini" v-text="currentInstanceWorld.fileSize" style="margin-right:5px")
@@ -112,7 +112,7 @@ mixin playerListTab()
span(v-else-if="scope.row.type === 'OnPlayerJoined'") span(v-else-if="scope.row.type === 'OnPlayerJoined'")
span(v-if="scope.row.platform === 'Desktop'" style="color:#409eff") Desktop&nbsp; span(v-if="scope.row.platform === 'Desktop'" style="color:#409eff") Desktop&nbsp;
span(v-else-if="scope.row.platform === 'VR'" style="color:#409eff") VR&nbsp; span(v-else-if="scope.row.platform === 'VR'" style="color:#409eff") VR&nbsp;
span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Quest&nbsp; span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Android&nbsp;
span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)") span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)")
| &nbsp; | &nbsp;
span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]&nbsp; span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]&nbsp;
@@ -183,7 +183,7 @@ mixin playerListTab()
span(v-else-if="scope.row.type === 'OnPlayerJoined'") span(v-else-if="scope.row.type === 'OnPlayerJoined'")
span(v-if="scope.row.platform === 'Desktop'" style="color:#409eff") Desktop&nbsp; span(v-if="scope.row.platform === 'Desktop'" style="color:#409eff") Desktop&nbsp;
span(v-else-if="scope.row.platform === 'VR'" style="color:#409eff") VR&nbsp; span(v-else-if="scope.row.platform === 'VR'" style="color:#409eff") VR&nbsp;
span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Quest&nbsp; span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Android&nbsp;
span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)") span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)")
| &nbsp; | &nbsp;
span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]&nbsp; span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]&nbsp;
@@ -232,7 +232,7 @@ mixin playerListTab()
template(v-once #default="scope") template(v-once #default="scope")
template(v-if="scope.row.ref.last_platform") template(v-if="scope.row.ref.last_platform")
span(v-if="scope.row.ref.last_platform === 'standalonewindows'" style="color:#409eff") PC span(v-if="scope.row.ref.last_platform === 'standalonewindows'" style="color:#409eff") PC
span(v-else-if="scope.row.ref.last_platform === 'android'" style="color:#67c23a") Q span(v-else-if="scope.row.ref.last_platform === 'android'" style="color:#67c23a") A
span(v-else-if="scope.row.ref.last_platform === 'ios'" style="color:#c7c7ce") iOS span(v-else-if="scope.row.ref.last_platform === 'ios'" style="color:#c7c7ce") iOS
span(v-else) {{ scope.row.ref.last_platform }} span(v-else) {{ scope.row.ref.last_platform }}
template(v-if="scope.row.inVRMode !== null") template(v-if="scope.row.inVRMode !== null")
html/src/mixins/tabs/settings.pug
+5 -5
View File
@@ -384,11 +384,11 @@ mixin settingsTab()
span.header {{ $t('view.settings.advanced.advanced.common_folders') }} span.header {{ $t('view.settings.advanced.advanced.common_folders') }}
div.options-container-item(style="margin-top:15px") div.options-container-item(style="margin-top:15px")
el-button-group el-button-group
el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcxAppDataFolder()") AppData (VRCX) el-button(size="small" icon="el-icon-folder" @click="openVrcxAppDataFolder()") AppData (VRCX)
el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcAppDataFolder()") AppData el-button(size="small" icon="el-icon-folder" @click="openVrcAppDataFolder()") AppData
el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcPhotosFolder()") Photos el-button(size="small" icon="el-icon-folder" @click="openVrcPhotosFolder()") Photos
el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcScreenshotsFolder()") Screenshots el-button(size="small" icon="el-icon-folder" @click="openVrcScreenshotsFolder()") Screenshots
el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenCrashVrcCrashDumps()") Crash Dumps el-button(size="small" icon="el-icon-folder" @click="openCrashVrcCrashDumps()") Crash Dumps
//- Advanced | Primary Password //- Advanced | Primary Password
div.options-container div.options-container
//- Advanced | Primary Password Header //- Advanced | Primary Password Header