Update favorite limits

This commit is contained in:
Natsumi
2022-08-10 18:11:03 +12:00
parent 2e18d3615d
commit 87e3b0a923
2 changed files with 14 additions and 24 deletions
+12 -24
View File
@@ -3340,7 +3340,7 @@ speechSynthesis.getVoices();
}; };
API.buildFavoriteGroups = function () { API.buildFavoriteGroups = function () {
// 192 = ['group_0', 'group_1', 'group_2'] x 64 // 450 = ['group_0', 'group_1', 'group_2'] x 150
this.favoriteFriendGroups = []; this.favoriteFriendGroups = [];
for (var i = 0; i < 3; ++i) { for (var i = 0; i < 3; ++i) {
this.favoriteFriendGroups.push({ this.favoriteFriendGroups.push({
@@ -3349,12 +3349,12 @@ speechSynthesis.getVoices();
type: 'friend', type: 'friend',
name: `group_${i}`, name: `group_${i}`,
displayName: `Group ${i + 1}`, displayName: `Group ${i + 1}`,
capacity: 64, capacity: 150,
count: 0, count: 0,
visibility: 'private' visibility: 'private'
}); });
} }
// 256 = ['worlds1', 'worlds2', 'worlds3', 'worlds4'] x 64 // 400 = ['worlds1', 'worlds2', 'worlds3', 'worlds4'] x 100
this.favoriteWorldGroups = []; this.favoriteWorldGroups = [];
for (var i = 0; i < 4; ++i) { for (var i = 0; i < 4; ++i) {
this.favoriteWorldGroups.push({ this.favoriteWorldGroups.push({
@@ -3363,31 +3363,23 @@ speechSynthesis.getVoices();
type: 'world', type: 'world',
name: `worlds${i + 1}`, name: `worlds${i + 1}`,
displayName: `Group ${i + 1}`, displayName: `Group ${i + 1}`,
capacity: 64, capacity: 100,
count: 0, count: 0,
visibility: 'private' visibility: 'private'
}); });
} }
// 100 = ['avatars1'] x 25 // 350 = ['avatars1', ...] x 50
// Favorite Avatars (0/25) // Favorite Avatars (0/50)
// VRC+ Group 1 (0/25) // VRC+ Group 1..5 (0/50)
// VRC+ Group 2 (0/25)
// VRC+ Group 3 (0/25)
var avatarGroupNames = [
'Favorite Avatars',
'VRC+ Group 1',
'VRC+ Group 2',
'VRC+ Group 3'
];
this.favoriteAvatarGroups = []; this.favoriteAvatarGroups = [];
for (var i = 0; i < 4; ++i) { for (var i = 0; i < 6; ++i) {
this.favoriteAvatarGroups.push({ this.favoriteAvatarGroups.push({
assign: false, assign: false,
key: `avatar:avatars${i + 1}`, key: `avatar:avatars${i + 1}`,
type: 'avatar', type: 'avatar',
name: `avatars${i + 1}`, name: `avatars${i + 1}`,
displayName: avatarGroupNames[i], displayName: `Group ${i + 1}`,
capacity: 25, capacity: 50,
count: 0, count: 0,
visibility: 'private' visibility: 'private'
}); });
@@ -3410,9 +3402,7 @@ speechSynthesis.getVoices();
for (var group of groups) { for (var group of groups) {
if (group.assign === false && group.name === ref.name) { if (group.assign === false && group.name === ref.name) {
group.assign = true; group.assign = true;
if (ref.type !== 'avatar') { group.displayName = ref.displayName;
group.displayName = ref.displayName;
}
group.visibility = ref.visibility; group.visibility = ref.visibility;
ref.$groupRef = group; ref.$groupRef = group;
assigns.add(ref.id); assigns.add(ref.id);
@@ -3439,9 +3429,7 @@ speechSynthesis.getVoices();
group.assign = true; group.assign = true;
group.key = `${group.type}:${ref.name}`; group.key = `${group.type}:${ref.name}`;
group.name = ref.name; group.name = ref.name;
if (ref.type !== 'avatar') { group.displayName = ref.displayName;
group.displayName = ref.displayName;
}
ref.$groupRef = group; ref.$groupRef = group;
assigns.add(ref.id); assigns.add(ref.id);
break; break;
+2
View File
@@ -578,6 +578,8 @@ html
template(slot="title") template(slot="title")
span(v-text="group.displayName" style="font-weight:bold;font-size:14px;margin-left:10px") span(v-text="group.displayName" style="font-weight:bold;font-size:14px;margin-left:10px")
span(style="color:#909399;font-size:12px;margin-left:10px") {{ group.count }}/{{ group.capacity }} span(style="color:#909399;font-size:12px;margin-left:10px") {{ group.count }}/{{ group.capacity }}
el-tooltip(placement="top" content="Rename" :disabled="hideTooltips")
el-button(@click.stop="changeFavoriteGroupName(group)" size="mini" icon="el-icon-edit" circle style="margin-left:10px")
el-tooltip(placement="right" content="Clear" :disabled="hideTooltips") el-tooltip(placement="right" content="Clear" :disabled="hideTooltips")
el-button(@click.stop="clearFavoriteGroup(group)" size="mini" icon="el-icon-delete" circle style="margin-left:5px") el-button(@click.stop="clearFavoriteGroup(group)" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
.x-friend-list(v-if="group.count" style="margin-top:10px") .x-friend-list(v-if="group.count" style="margin-top:10px")