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

Show player count of current instance in user/world dialog

Browse Source
This commit is contained in:
Natsumi
2021-03-28 23:56:20 +13:00
parent 3aff3d4318
commit 6b4c71aafd
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
html/src/app.js
View File

@@ -3786,6 +3786,12 @@ speechSynthesis.getVoices();
notyFeed.splice(5);
sharedRepository.setArray('wristFeed', wristFeed);
sharedRepository.setArray('notyFeed', notyFeed);
if (this.userDialog.visible) {
this.applyUserDialogLocation();
}
if (this.worldDialog.visible) {
this.applyWorldDialogInstances();
}
this.playNoty(notyFeed);
feeds.pendingUpdate = false;
};
@@ -7522,7 +7528,15 @@ speechSynthesis.getVoices();
users.sort(compareByDisplayName);
D.users = users;
D.instance = {};
if (L.worldId) {
if (!L.worldId) {
return;
}
if (this.lastLocation.location === L.tag) {
D.instance = {
id: L.tag,
occupants: this.lastLocation.playerList.length
};
} else {
var applyInstance = function (instances) {
for (var [id, occupants] of instances) {
if (id === L.instanceId) {
@@ -8048,6 +8062,7 @@ speechSynthesis.getVoices();
};
instances[instance.id] = instance;
}
instances[instance.id].occupants = this.lastLocation.playerList.length;
var ref = API.cachedUsers.get(API.currentUser.id);
if (typeof ref === 'undefined') {
ref = API.currentUser;

2
html/src/index.pug
View File

@@ -987,7 +987,7 @@ html
div(v-if="userDialog.ref.location" style="display:flex;flex-direction:column;margin-bottom:10px;padding-bottom:10px;border-bottom:1px solid #eee")
div(style="flex:none")
location(:location="userDialog.ref.location")
template(#default v-if="userDialog.instance.occupants") ({{ userDialog.instance.occupants }})
template(#default v-if="userDialog.instance.occupants") ({{ userDialog.instance.occupants }})
launch(:location="userDialog.ref.location" style="margin-left:5px")
invite-yourself(:location="userDialog.ref.location" style="margin-left:5px")
.x-friend-list(style="flex:1;margin-top:10px")