MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 14:53:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix VRC launch again

Browse Source
This commit is contained in:
Natsumi
2022-09-27 10:34:19 +13:00
parent e885a18a80
commit 36d5bdbf5e
2 changed files with 77 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
html/src/app.js
View File

@@ -8844,6 +8844,20 @@ speechSynthesis.getVoices();
$app.data.photonEventTableFilter = ''; $app.data.photonEventTableFilter = '';
$app.data.photonEventTableTypeFilter = []; $app.data.photonEventTableTypeFilter = [];
$app.data.photonEventTableTypeOverlayFilter = [];
$app.data.photonEventTableTypeFilterList = [
'Event',
'OnPlayerJoined',
'OnPlayerLeft',
'AvatarChange',
'ChangeStatus',
'PortalSpawn',
'DeletedPortal',
'ChatBoxMessage',
'Moderation',
'PhotonMasterMigrate',
'PhotonBot'
];
$app.methods.photonEventTableFilterChange = function () { $app.methods.photonEventTableFilterChange = function () {
this.photonEventTable.filters[0].value = this.photonEventTableFilter; this.photonEventTable.filters[0].value = this.photonEventTableFilter;
@@ -8859,6 +8873,10 @@ speechSynthesis.getVoices();
'VRCX_photonEventTypeFilter', 'VRCX_photonEventTypeFilter',
JSON.stringify(this.photonEventTableTypeFilter) JSON.stringify(this.photonEventTableTypeFilter)
); );
configRepository.setString(
'VRCX_photonEventTypeOverlayFilter',
JSON.stringify(this.photonEventTableTypeOverlayFilter)
);
}; };
$app.data.photonEventTable = { $app.data.photonEventTable = {
@@ -8926,8 +8944,8 @@ speechSynthesis.getVoices();
}; };
this.photonEventTable.data.unshift(feed); this.photonEventTable.data.unshift(feed);
if ( if (
this.photonEventTableTypeFilter.length > 0 && this.photonEventTableTypeOverlayFilter.length > 0 &&
!this.photonEventTableTypeFilter.includes(feed.type) !this.photonEventTableTypeOverlayFilter.includes(feed.type)
) { ) {
return; return;
} }
@@ -9313,27 +9331,38 @@ speechSynthesis.getVoices();
} else if (eventData.EventName === 'ConfigurePortal') { } else if (eventData.EventName === 'ConfigurePortal') {
var shortName = eventData.Data[0]; var shortName = eventData.Data[0];
var displayName = this.getDisplayNameFromPhotonId(senderId); var displayName = this.getDisplayNameFromPhotonId(senderId);
API.getInstanceFromShortName({shortName}).then((args) => { var ref = {
var location = args.json.location; id: this.getUserIdFromPhotonId(senderId),
var newShortName = args.json.shortName; displayName
var ref = { };
id: this.getUserIdFromPhotonId(senderId), API.getInstanceFromShortName({shortName})
displayName .then((args) => {
}; var location = args.json.location;
var portalType = 'Secure'; var newShortName = args.json.shortName;
if (shortName === newShortName) { var portalType = 'Secure';
portalType = 'Unlocked'; if (shortName === newShortName) {
} portalType = 'Unlocked';
this.parsePhotonPortalSpawn( }
datetime, this.parsePhotonPortalSpawn(
location, datetime,
ref, location,
portalType, ref,
newShortName, portalType,
senderId newShortName,
); senderId
return args; );
}); return args;
})
.catch(() => {
this.parsePhotonPortalSpawn(
datetime,
location,
ref,
'Error',
shortName,
senderId
);
});
return; return;
} else if (eventData.EventName === '_SendOnSpawn') { } else if (eventData.EventName === '_SendOnSpawn') {
return; return;
@@ -9400,21 +9429,23 @@ speechSynthesis.getVoices();
shortName, shortName,
photonId photonId
) { ) {
var L = API.parseLocation(instanceId); var worldName = shortName;
var name = instanceId; if (instanceId) {
try { var L = API.parseLocation(instanceId);
var args = await API.getCachedWorld({ try {
worldId: L.worldId var args = await API.getCachedWorld({
}); worldId: L.worldId
name = args.ref.name; });
} catch (err) {} worldName = args.ref.name;
} catch (err) {}
}
this.addEntryPhotonEvent({ this.addEntryPhotonEvent({
photonId, photonId,
text: `${portalType} PortalSpawn to ${name}`, text: `${portalType} PortalSpawn to ${worldName}`,
type: 'PortalSpawn', type: 'PortalSpawn',
shortName, shortName,
location: instanceId, location: instanceId,
worldName: name, worldName,
created_at created_at
}); });
this.addPhotonEventToGameLog({ this.addPhotonEventToGameLog({
@@ -9424,7 +9455,7 @@ speechSynthesis.getVoices();
location: this.lastLocation.location, location: this.lastLocation.location,
userId: ref.id, userId: ref.id,
instanceId, instanceId,
worldName: name worldName
}); });
}; };
@@ -11766,6 +11797,11 @@ speechSynthesis.getVoices();
$app.data.photonEventTablePrevious.filters[1].value = $app.data.photonEventTablePrevious.filters[1].value =
$app.data.photonEventTableTypeFilter; $app.data.photonEventTableTypeFilter;
} }
if (configRepository.getString('VRCX_photonEventTypeOverlayFilter')) {
$app.data.photonEventTableTypeOverlayFilter = JSON.parse(
configRepository.getString('VRCX_photonEventTypeOverlayFilter')
);
}
// App: Profile + Settings // App: Profile + Settings
@@ -16126,11 +16162,11 @@ speechSynthesis.getVoices();
$app.methods.launchGame = function (location, shortName) { $app.methods.launchGame = function (location, shortName) {
var D = this.launchDialog; var D = this.launchDialog;
var args = ''; var args = [];
if (shortName) { if (shortName) {
args = `vrchat://launch?id=${location}&shortName=${shortName}`; args.push(`vrchat://launch?id=${location}&shortName=${shortName}`);
} else { } else {
args = `vrchat://launch?id=${location}`; args.push(`vrchat://launch?id=${location}`);
} }
var {launchArguments, vrcLaunchPathOverride} = this.launchOptionsDialog; var {launchArguments, vrcLaunchPathOverride} = this.launchOptionsDialog;
if (launchArguments) { if (launchArguments) {

5
html/src/index.pug
View File

@@ -187,7 +187,7 @@ html
div.photon-event-table(v-if="photonLoggingEnabled") div.photon-event-table(v-if="photonLoggingEnabled")
div(style="position:absolute;margin-left:195px;z-index:1") div(style="position:absolute;margin-left:195px;z-index:1")
el-select(v-model="photonEventTableTypeFilter" @change="photonEventTableFilterChange" multiple clearable collapse-tags style="flex:1" placeholder="Filter") el-select(v-model="photonEventTableTypeFilter" @change="photonEventTableFilterChange" multiple clearable collapse-tags style="flex:1" placeholder="Filter")
el-option(v-once v-for="type in ['AvatarChange', 'ChangeStatus', 'PortalSpawn', 'DeletedPortal', 'ChatBoxMessage', 'Event', 'PhotonMasterMigrate', 'PhotonBot', 'OnPlayerJoined', 'OnPlayerLeft', 'Moderation']" :key="type" :label="type" :value="type") el-option(v-once v-for="type in photonEventTableTypeFilterList" :key="type" :label="type" :value="type")
el-input(v-model="photonEventTableFilter" @input="photonEventTableFilterChange" placeholder="Search" clearable style="width:150px;margin-left:10px") el-input(v-model="photonEventTableFilter" @input="photonEventTableFilterChange" placeholder="Search" clearable style="width:150px;margin-left:10px")
el-tooltip(placement="bottom" content="VRCX Companion Status" :disabled="hideTooltips") el-tooltip(placement="bottom" content="VRCX Companion Status" :disabled="hideTooltips")
div(style="display:inline-block;margin-left:15px;font-size:14px;vertical-align:text-top;margin-top:1px") div(style="display:inline-block;margin-left:15px;font-size:14px;vertical-align:text-top;margin-top:1px")
@@ -1326,6 +1326,9 @@ html
el-radio-button(label="VIP") el-radio-button(label="VIP")
el-radio-button(label="Friends") el-radio-button(label="Friends")
el-radio-button(label="Everyone") el-radio-button(label="Everyone")
div.options-container-item
el-select(v-model="photonEventTableTypeOverlayFilter" @change="photonEventTableFilterChange" multiple clearable collapse-tags style="flex:1" placeholder="Filter")
el-option(v-once v-for="type in photonEventTableTypeFilterList" :key="type" :label="type" :value="type")
span.sub-header User timeout HUD span.sub-header User timeout HUD
div.options-container-item div.options-container-item
span.name Enable span.name Enable