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

Changes and fixes

Browse Source 
Remove nonce (rip)
Current instance avatar change on wrist feed
Ignore non-standard unity package variants
Remove GPUFix
This commit is contained in:
Natsumi
2023-11-13 21:37:42 +13:00
parent 25f47f9a1e
commit 7bb5c8ea45
6 changed files with 126 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
html/src/app.js
View File

@@ -2593,7 +2593,6 @@ speechSynthesis.getVoices();
secureName: '',
shortName: '',
world: {},
nonce: '',
users: [], // only present when you're the owner
clientNumber: '',
photonRegion: '',
@@ -9249,7 +9248,8 @@ speechSynthesis.getVoices();
var userMap = {
displayName: ctx.displayName,
userId: ctx.userId,
joinTime: Date.parse(ctx.created_at)
joinTime: Date.parse(ctx.created_at),
lastAvatar: ''
};
this.lastLocation.playerList.set(ctx.displayName, userMap);
if (this.friends.has(ctx.userId)) {
@@ -9967,7 +9967,8 @@ speechSynthesis.getVoices();
var userMap = {
displayName: gameLog.displayName,
userId,
joinTime
joinTime,
lastAvatar: ''
};
this.lastLocation.playerList.set(gameLog.displayName, userMap);
if (userId) {
@@ -10024,16 +10025,13 @@ speechSynthesis.getVoices();
database.addGamelogJoinLeaveToDatabase(entry);
break;
case 'player-left':
if (!this.lastLocation.playerList.has(gameLog.displayName)) {
var ref = this.lastLocation.playerList.get(gameLog.displayName);
if (typeof ref === 'undefined') {
break;
}
var time = 0;
var ref = this.lastLocation.playerList.get(gameLog.displayName);
if (typeof ref !== 'undefined') {
time = Date.now() - ref.joinTime;
this.lastLocation.playerList.delete(gameLog.displayName);
this.lastLocation.friendList.delete(gameLog.displayName);
}
var time = Date.now() - ref.joinTime;
this.lastLocation.playerList.delete(gameLog.displayName);
this.lastLocation.friendList.delete(gameLog.displayName);
this.photonLobbyAvatars.delete(userId);
this.updateVRLastLocation();
this.getCurrentInstanceUserList();
@@ -10167,6 +10165,30 @@ speechSynthesis.getVoices();
}
}
break;
case 'avatar-change':
var ref = this.lastLocation.playerList.get(gameLog.displayName);
if (
this.photonLoggingEnabled ||
typeof ref === 'undefined' ||
ref.lastAvatar === gameLog.avatarName
) {
break;
}
if (!ref.lastAvatar) {
ref.lastAvatar = gameLog.avatarName;
this.lastLocation.playerList.set(gameLog.displayName, ref);
break;
}
ref.lastAvatar = gameLog.avatarName;
this.lastLocation.playerList.set(gameLog.displayName, ref);
var entry = {
created_at: gameLog.dt,
type: 'AvatarChange',
userId,
name: gameLog.avatarName,
displayName: gameLog.displayName
};
break;
case 'vrcx':
// VideoPlay(PyPyDance) "https://jd.pypy.moe/api/v1/videos/jr1NX4Jo8GE.mp4",0.1001,239.606,"0905 : [J-POP] 【まなこ】金曜日のおはよう 踊ってみた (vernities)"
var type = gameLog.data.substr(0, gameLog.data.indexOf(' '));
@@ -10279,7 +10301,11 @@ speechSynthesis.getVoices();
$app.methods.silentSeachUser = function (displayName) {
var playerListRef = this.lastLocation.playerList.get(displayName);
if (!this.gameLogApiLoggingEnabled || playerListRef.userId) {
if (
!this.gameLogApiLoggingEnabled ||
!playerListRef ||
playerListRef.userId
) {
return;
}
if (this.debugGameLog) {
@@ -11870,6 +11896,12 @@ speechSynthesis.getVoices();
}
if (!avatar.assetUrl && unityPackages.length > 0) {
for (var unityPackage of unityPackages) {
if (
unityPackage.variant &&
unityPackage.variant !== 'standard'
) {
continue;
}
if (unityPackage.platform === 'standalonewindows') {
avatar.assetUrl = unityPackage.assetUrl;
}
@@ -14524,16 +14556,12 @@ speechSynthesis.getVoices();
);
$app.data.isStartAsMinimizedState = false;
$app.data.isCloseToTray = false;
$app.data.gpuFix = false;
VRCXStorage.Get('VRCX_StartAsMinimizedState').then((result) => {
$app.isStartAsMinimizedState = result === 'true';
});
VRCXStorage.Get('VRCX_CloseToTray').then((result) => {
$app.isCloseToTray = result === 'true';
});
VRCXStorage.Get('VRCX_GPUFix').then((result) => {
$app.gpuFix = result === 'true';
});
if (configRepository.getBool('VRCX_CloseToTray')) {
// move back to JSON
$app.data.isCloseToTray = configRepository.getBool('VRCX_CloseToTray');
@@ -14550,7 +14578,6 @@ speechSynthesis.getVoices();
this.isStartAsMinimizedState.toString()
);
VRCXStorage.Set('VRCX_CloseToTray', this.isCloseToTray.toString());
VRCXStorage.Set('VRCX_GPUFix', this.gpuFix.toString());
AppApi.SetStartup(this.isStartAtWindowsStartup);
};
$app.data.photonEventOverlay = configRepository.getBool(
@@ -16918,6 +16945,12 @@ speechSynthesis.getVoices();
var isIos = false;
if (typeof unityPackages === 'object') {
for (var unityPackage of unityPackages) {
if (
unityPackage.variant &&
unityPackage.variant !== 'standard'
) {
continue;
}
if (unityPackage.platform === 'standalonewindows') {
isPC = true;
} else if (unityPackage.platform === 'android') {
@@ -17541,6 +17574,9 @@ speechSynthesis.getVoices();
var fileSize = '';
for (let i = ref.unityPackages.length - 1; i > -1; i--) {
var unityPackage = ref.unityPackages[i];
if (unityPackage.variant && unityPackage.variant !== 'standard') {
continue;
}
if (
unityPackage.platform === 'standalonewindows' &&
this.compareUnityVersion(unityPackage.unityVersion)
@@ -18298,6 +18334,7 @@ speechSynthesis.getVoices();
if (
!assetUrl &&
unityPackage.platform === 'standalonewindows' &&
unityPackage.variant === 'standard' &&
this.compareUnityVersion(unityPackage.unityVersion)
) {
assetUrl = unityPackage.assetUrl;
@@ -18560,6 +18597,12 @@ speechSynthesis.getVoices();
var platforms = [];
if (ref.unityPackages) {
for (var unityPackage of ref.unityPackages) {
if (
unityPackage.variant &&
unityPackage.variant !== 'standard'
) {
continue;
}
var platform = 'PC';
if (unityPackage.platform === 'standalonewindows') {
platform = 'PC';
@@ -19032,9 +19075,6 @@ speechSynthesis.getVoices();
} else if (D.region === 'Japan') {
tags.push(`~region(jp)`);
}
if (D.accessType !== 'public' && D.accessType !== 'group') {
tags.push(`~nonce(${window.crypto.randomUUID()})`);
}
if (D.accessType !== 'invite' && D.accessType !== 'friends') {
D.strict = false;
}
@@ -22915,6 +22955,9 @@ speechSynthesis.getVoices();
var assetUrl = '';
for (var i = ref.unityPackages.length - 1; i > -1; i--) {
var unityPackage = ref.unityPackages[i];
if (unityPackage.variant && unityPackage.variant !== 'standard') {
continue;
}
if (
unityPackage.platform === 'standalonewindows' &&
this.compareUnityVersion(unityPackage.unityVersion)
@@ -23078,6 +23121,9 @@ speechSynthesis.getVoices();
var assetUrl = '';
for (var i = ref.unityPackages.length - 1; i > -1; i--) {
var unityPackage = ref.unityPackages[i];
if (unityPackage.variant && unityPackage.variant !== 'standard') {
continue;
}
if (
unityPackage.platform === 'standalonewindows' &&
this.compareUnityVersion(unityPackage.unityVersion)
@@ -23196,6 +23242,12 @@ speechSynthesis.getVoices();
var unityPackages = this.avatarDialog.ref.unityPackages;
for (let i = unityPackages.length - 1; i > -1; i--) {
var unityPackage = unityPackages[i];
if (
unityPackage.variant &&
unityPackage.variant !== 'standard'
) {
continue;
}
if (
unityPackage.platform === 'standalonewindows' &&
this.compareUnityVersion(unityPackage.unityVersion)
@@ -28685,6 +28737,9 @@ speechSynthesis.getVoices();
var assetUrl = '';
for (let i = D.ref.unityPackages.length - 1; i > -1; i--) {
var unityPackage = D.ref.unityPackages[i];
if (unityPackage.variant && unityPackage.variant !== 'standard') {
continue;
}
if (
unityPackage.platform === 'standalonewindows' &&
this.compareUnityVersion(unityPackage.unityVersion)