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

photon emojis, player list icons Friend/Master/Timeout

Browse Source
This commit is contained in:
Natsumi
2021-11-23 00:29:29 +13:00
parent 73a23e2c38
commit ce068e558c
2 changed files with 94 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+84 -11
View File
@@ -8084,6 +8084,66 @@ speechSynthesis.getVoices();
'CallUdonMethod' 'CallUdonMethod'
]; ];
$app.data.photonEmojis = [
'Angry',
'Blushing',
'Crying',
'Frown',
'Hand Wave',
'Hang Ten',
'In Love',
'Jack O Lantern',
'Kiss',
'Laugh',
'Skull',
'Smile',
'Spooky Ghost',
'Stoic',
'Sunglasses',
'Thinking',
'Thumbs Down',
'Thumbs Up',
'Tongue Out',
'Wow',
'Bats',
'Cloud',
'Fire',
'Snow Fall',
'Snowball',
'Splash',
'Web',
'Beer',
'Candy',
'Candy Cane',
'Candy Corn',
'Champagne',
'Drink',
'Gingerbread',
'Ice Cream',
'Pineapple',
'Pizza',
'Tomato',
'Beachball',
'Coal',
'Confetti',
'Gift',
'Gifts',
'Life Ring',
'Mistletoe',
'Money',
'Neon Shades',
'Sun Lotion',
'Boo',
'Broken Heart',
'Exclamation',
'Go',
'Heart',
'Music Note',
'Question',
'Stop',
'Zzz'
];
$app.methods.startLobbyWatcherLoop = function () { $app.methods.startLobbyWatcherLoop = function () {
if (!this.photonLobbyWatcherLoop) { if (!this.photonLobbyWatcherLoop) {
this.photonLobbyWatcherLoop = true; this.photonLobbyWatcherLoop = true;
@@ -8126,7 +8186,7 @@ speechSynthesis.getVoices();
var timeSinceLastEvent = dtNow - Date.parse(dt); var timeSinceLastEvent = dtNow - Date.parse(dt);
if (timeSinceLastEvent > this.photonLobbyTimeoutThreshold) { if (timeSinceLastEvent > this.photonLobbyTimeoutThreshold) {
var joinTime = this.photonLobbyJointime.get(id); var joinTime = this.photonLobbyJointime.get(id);
if (!joinTime || joinTime + 60000 < dtNow) { if (!joinTime || joinTime + 120000 < dtNow) {
// wait 1min for user to load in // wait 1min for user to load in
var displayName = ''; var displayName = '';
var userId = ''; var userId = '';
@@ -8179,18 +8239,17 @@ speechSynthesis.getVoices();
filteredHudTimeout.push(item); filteredHudTimeout.push(item);
} }
}); });
AppApi.ExecuteVrOverlayFunction(
'updateHudTimeout',
JSON.stringify(filteredHudTimeout)
);
} else { } else {
AppApi.ExecuteVrOverlayFunction( var filteredHudTimeout = hudTimeout;
'updateHudTimeout',
JSON.stringify(hudTimeout)
);
} }
AppApi.ExecuteVrOverlayFunction(
'updateHudTimeout',
JSON.stringify(filteredHudTimeout)
);
} }
this.photonLobbyTimeout = hudTimeout; this.photonLobbyTimeout = hudTimeout;
this.getCurrentInstanceUserList();
} }
this.photonBotCheck(event7List); this.photonBotCheck(event7List);
}); });
@@ -8600,6 +8659,8 @@ speechSynthesis.getVoices();
var text = 'Beep'; var text = 'Beep';
} else if (data.EventType === 'ReloadAvatarNetworkedRPC') { } else if (data.EventType === 'ReloadAvatarNetworkedRPC') {
var text = 'AvatarReset'; var text = 'AvatarReset';
} else if (data.EventType === 'SpawnEmojiRPC') {
var text = `SpawnEmoji ${this.photonEmojis[data.Data]}`;
} else { } else {
var eventData = ''; var eventData = '';
if (data.Data) { if (data.Data) {
@@ -10648,7 +10709,7 @@ speechSynthesis.getVoices();
'VRCX_legendColorOverride', 'VRCX_legendColorOverride',
this.legendColorOverride this.legendColorOverride
); );
API.cachedUsers.forEach((ref, id) => { API.cachedUsers.forEach((ref) => {
API.applyUserTrustLevel(ref); API.applyUserTrustLevel(ref);
}); });
}; };
@@ -12222,6 +12283,7 @@ speechSynthesis.getVoices();
var pushUser = function (ref) { var pushUser = function (ref) {
var photonId = ''; var photonId = '';
var masterId = 0; var masterId = 0;
var isFriend = false;
$app.photonLobbyCurrent.forEach((ref1, id) => { $app.photonLobbyCurrent.forEach((ref1, id) => {
if (masterId === 0 || masterId > id) { if (masterId === 0 || masterId > id) {
masterId = id; masterId = id;
@@ -12243,11 +12305,22 @@ speechSynthesis.getVoices();
if (photonId === masterId) { if (photonId === masterId) {
isMaster = true; isMaster = true;
} }
var timeoutTime = 0;
if (typeof ref.id !== 'undefined') {
isFriend = $app.friends.has(ref.id);
$app.photonLobbyTimeout.forEach((ref1) => {
if (ref1.userId === ref.id) {
timeoutTime = ref1.time;
}
});
}
users.push({ users.push({
ref, ref,
timer: ref.$location_at, timer: ref.$location_at,
photonId, photonId,
isMaster isMaster,
isFriend,
timeoutTime
}); });
// get block, mute // get block, mute
}; };
html/src/index.pug
+10 -2
View File
@@ -104,19 +104,27 @@ html
div(style="margin-top:5px") div(style="margin-top:5px")
span(v-show="currentInstanceWorld.name !== currentInstanceWorld.description" v-text="currentInstanceWorld.description" style="font-size:12px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2") span(v-show="currentInstanceWorld.name !== currentInstanceWorld.description" v-text="currentInstanceWorld.description" style="font-size:12px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2")
div.current-instance-table div.current-instance-table
data-tables(v-bind="currentInstanceUserList" @sort-change="updateTimers" @row-click="selectCurrentInstanceRow" style="margin-top:10px;cursor:pointer") data-tables(v-bind="currentInstanceUserList" @row-click="selectCurrentInstanceRow" style="margin-top:10px;cursor:pointer")
el-table-column(label="Avatar" width="60" prop="photo") el-table-column(label="Avatar" width="60" prop="photo")
template(v-once #default="scope") template(v-once #default="scope")
template(v-if="userImage(scope.row.ref)") template(v-if="userImage(scope.row.ref)")
el-popover(placement="right" height="500px" trigger="hover") el-popover(placement="right" height="500px" trigger="hover")
img.friends-list-avatar(slot="reference" v-lazy="userImage(scope.row.ref)") img.friends-list-avatar(slot="reference" v-lazy="userImage(scope.row.ref)")
img.friends-list-avatar(v-lazy="userImageFull(scope.row.ref)" style="height:500px;cursor:pointer" @click="openExternalLink(userImageFull(scope.row.ref))") img.friends-list-avatar(v-lazy="userImageFull(scope.row.ref)" style="height:500px;cursor:pointer" @click="openExternalLink(userImageFull(scope.row.ref))")
el-table-column(label="Timer" width="90" prop="timer" sortable) el-table-column(label="Timer" width="80" prop="timer" sortable)
template(v-once #default="scope") template(v-once #default="scope")
timer(:epoch="scope.row.timer") timer(:epoch="scope.row.timer")
el-table-column(label="Photon Id" width="100" prop="photonId" sortable) el-table-column(label="Photon Id" width="100" prop="photonId" sortable)
template(v-once #default="scope") template(v-once #default="scope")
span(v-text="scope.row.photonId") span(v-text="scope.row.photonId")
el-table-column(label="Icons" prop="isMaster" width="100")
template(v-once #default="scope")
el-tooltip(v-if="scope.row.isMaster" placement="left" content="Instance Master")
span 👑
el-tooltip(v-if="scope.row.isFriend" placement="left" content="Friend")
span 💚
el-tooltip(v-if="scope.row.timeoutTime" placement="left" content="Timeout")
span(style="color:red") 🔴{{ scope.row.timeoutTime }}s
el-table-column(label="Display Name" min-width="140" prop="ref.displayName") el-table-column(label="Display Name" min-width="140" prop="ref.displayName")
template(v-once #default="scope") template(v-once #default="scope")
span(v-text="scope.row.ref.displayName" :class="scope.row.ref.$trustColor") span(v-text="scope.row.ref.displayName" :class="scope.row.ref.$trustColor")