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

Fixes

Browse Source
This commit is contained in:
Natsumi
2022-10-01 02:14:13 +13:00
parent 36d5bdbf5e
commit ce25e3f18d
4 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+43 -28
View File
@@ -9072,6 +9072,7 @@ speechSynthesis.getVoices();
inVRMode: user.inVRMode, inVRMode: user.inVRMode,
avatarEyeHeight: user.avatarEyeHeight avatarEyeHeight: user.avatarEyeHeight
}); });
this.photonUserJoin(id, user.avatarDict, gameLogDate);
} }
} else { } else {
this.parsePhotonUser( this.parsePhotonUser(
@@ -9093,6 +9094,11 @@ speechSynthesis.getVoices();
data.Parameters[251].inVRMode data.Parameters[251].inVRMode
); );
} }
this.photonUserJoin(
data.Parameters[253],
data.Parameters[251].avatarDict,
gameLogDate
);
} }
break; break;
case 42: case 42:
@@ -9335,34 +9341,40 @@ speechSynthesis.getVoices();
id: this.getUserIdFromPhotonId(senderId), id: this.getUserIdFromPhotonId(senderId),
displayName displayName
}; };
API.getInstanceFromShortName({shortName}) workerTimers.setTimeout(() => {
.then((args) => { // Delay to fix 404? lol
var location = args.json.location; API.getInstanceFromShortName({shortName})
var newShortName = args.json.shortName; .then((args) => {
var portalType = 'Secure'; var location = args.json.location;
if (shortName === newShortName) { var newShortName = args.json.shortName;
portalType = 'Unlocked'; var portalType = 'Secure';
} if (shortName === newShortName) {
this.parsePhotonPortalSpawn( portalType = 'Unlocked';
datetime, }
location, this.parsePhotonPortalSpawn(
ref, datetime,
portalType, location,
newShortName, ref,
senderId portalType,
); newShortName,
return args; senderId
}) );
.catch(() => { return args;
this.parsePhotonPortalSpawn( })
datetime, .catch(() => {
location, this.parsePhotonPortalSpawn(
ref, datetime,
'Error', '',
shortName, ref,
senderId 'Error',
); shortName,
}); senderId
);
this.failedGetRequests.delete(
`instances/s/${shortName}`
);
});
}, 1000);
return; return;
} else if (eventData.EventName === '_SendOnSpawn') { } else if (eventData.EventName === '_SendOnSpawn') {
return; return;
@@ -18707,6 +18719,9 @@ speechSynthesis.getVoices();
}; };
$app.methods.checkVRChatCache = async function (ref) { $app.methods.checkVRChatCache = async function (ref) {
if (!ref.unityPackages) {
return [-1, 0];
}
var cacheDir = await this.getVRChatCacheDir(); var cacheDir = await this.getVRChatCacheDir();
var assetUrl = ''; var assetUrl = '';
for (var i = ref.unityPackages.length - 1; i > -1; i--) { for (var i = ref.unityPackages.length - 1; i > -1; i--) {
html/src/app.scss
+1
View File
@@ -100,6 +100,7 @@
.el-dialog__body { .el-dialog__body {
padding: 20px; padding: 20px;
word-break: unset;
} }
.el-dialog__footer > .el-button + .el-button { .el-dialog__footer > .el-button + .el-button {
html/src/index.pug
+4 -4
View File
@@ -226,7 +226,7 @@ html
span(v-else-if="scope.row.previousStatus === 'ask me'") Ask Me span(v-else-if="scope.row.previousStatus === 'ask me'") Ask Me
span(v-else-if="scope.row.previousStatus === 'busy'") Do Not Disturb span(v-else-if="scope.row.previousStatus === 'busy'") Do Not Disturb
span(v-else) Offline span(v-else) Offline
i.x-user-status(:class="statusClass(scope.row.previousStatus)" style="margin-left:10px") i.x-user-status(:class="statusClass(scope.row.previousStatus)" style="margin-left:5px")
span span
i.el-icon-right i.el-icon-right
el-tooltip(placement="top") el-tooltip(placement="top")
@@ -237,7 +237,7 @@ html
span(v-else-if="scope.row.status === 'busy'") Do Not Disturb span(v-else-if="scope.row.status === 'busy'") Do Not Disturb
span(v-else) Offline span(v-else) Offline
i.x-user-status(:class="statusClass(scope.row.status)") i.x-user-status(:class="statusClass(scope.row.status)")
span(v-if="scope.row.statusDescription !== scope.row.previousStatusDescription" v-text="scope.row.statusDescription" style="margin-left:10px") span(v-if="scope.row.statusDescription !== scope.row.previousStatusDescription" v-text="scope.row.statusDescription" style="margin-left:5px")
span.x-link(v-else-if="scope.row.type === 'PortalSpawn'" @click="showWorldDialog(scope.row.location, scope.row.shortName)") span.x-link(v-else-if="scope.row.type === 'PortalSpawn'" @click="showWorldDialog(scope.row.location, scope.row.shortName)")
| PortalSpawn #[location(:location="scope.row.location" :hint="scope.row.worldName" :link="false")] | PortalSpawn #[location(:location="scope.row.location" :hint="scope.row.worldName" :link="false")]
span(v-else-if="scope.row.type === 'ChatBoxMessage'") span(v-else-if="scope.row.type === 'ChatBoxMessage'")
@@ -279,7 +279,7 @@ html
span(v-else-if="scope.row.previousStatus === 'ask me'") Ask Me span(v-else-if="scope.row.previousStatus === 'ask me'") Ask Me
span(v-else-if="scope.row.previousStatus === 'busy'") Do Not Disturb span(v-else-if="scope.row.previousStatus === 'busy'") Do Not Disturb
span(v-else) Offline span(v-else) Offline
i.x-user-status(:class="statusClass(scope.row.previousStatus)" style="margin-left:10px") i.x-user-status(:class="statusClass(scope.row.previousStatus)" style="margin-left:5px")
span span
i.el-icon-right i.el-icon-right
el-tooltip(placement="top") el-tooltip(placement="top")
@@ -290,7 +290,7 @@ html
span(v-else-if="scope.row.status === 'busy'") Do Not Disturb span(v-else-if="scope.row.status === 'busy'") Do Not Disturb
span(v-else) Offline span(v-else) Offline
i.x-user-status(:class="statusClass(scope.row.status)") i.x-user-status(:class="statusClass(scope.row.status)")
span(v-if="scope.row.statusDescription !== scope.row.previousStatusDescription" v-text="scope.row.statusDescription" style="margin-left:10px") span(v-if="scope.row.statusDescription !== scope.row.previousStatusDescription" v-text="scope.row.statusDescription" style="margin-left:5px")
span.x-link(v-else-if="scope.row.type === 'PortalSpawn'" @click="showWorldDialog(scope.row.location, scope.row.shortName)") span.x-link(v-else-if="scope.row.type === 'PortalSpawn'" @click="showWorldDialog(scope.row.location, scope.row.shortName)")
| PortalSpawn #[location(:location="scope.row.location" :hint="scope.row.worldName" :link="false")] | PortalSpawn #[location(:location="scope.row.location" :hint="scope.row.worldName" :link="false")]
span(v-else-if="scope.row.type === 'ChatBoxMessage'") span(v-else-if="scope.row.type === 'ChatBoxMessage'")
html/src/vr.pug
-2
View File
@@ -465,8 +465,6 @@ html
template(v-else-if="feed.type === 'OnPlayerJoined'") template(v-else-if="feed.type === 'OnPlayerJoined'")
span(style="margin-left:10px") has joined - span(style="margin-left:10px") has joined -
span(v-text="feed.avatar.name" style="margin-left:10px") span(v-text="feed.avatar.name" style="margin-left:10px")
span(v-if="feed.avatar.releaseStatus === 'public'" style="margin-left:10px;color:#67c23a") (Public)
span(v-else-if="feed.avatar.releaseStatus === 'private'" style="margin-left:10px;color:#e6a23c") (Private)
span(v-else-if="feed.color === 'yellow'" v-text="feed.text" style="color:yellow;margin-left:10px") span(v-else-if="feed.color === 'yellow'" v-text="feed.text" style="color:yellow;margin-left:10px")
span(v-else style="margin-left:10px" v-text="feed.text") span(v-else style="margin-left:10px" v-text="feed.text")
template(v-if="feed.combo > 1") template(v-if="feed.combo > 1")