From 42f3d9188bb1428ed4978ca0974f49e754d7f7d1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Jan 2023 20:22:38 +0900 Subject: [PATCH 1/6] add a secret achievement --- locales/ja-JP.yml | 3 + .../backend/src/core/AchievementService.ts | 1 + packages/frontend/src/pages/about-misskey.vue | 122 +++++++++++------- packages/frontend/src/scripts/achievements.ts | 8 +- 4 files changed, 88 insertions(+), 46 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 57296b9857..cd4438fdeb 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1105,6 +1105,9 @@ _achievements: title: "I Love Misskey" description: "\"I ❤ #Misskey\"を投稿した" flavor: "Misskeyを使ってくださりありがとうございます！ by 開発チーム" + _foundTreasure: + title: "宝探し" + description: "隠されたお宝を発見した" _client30min: title: "ひとやすみ" description: "クライアントを起動してから30分以上経過した" diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts index be763e4629..2536ea34e1 100644 --- a/packages/backend/src/core/AchievementService.ts +++ b/packages/backend/src/core/AchievementService.ts @@ -62,6 +62,7 @@ const ACHIEVEMENT_TYPES = [ 'collectAchievements30', 'viewAchievements3min', 'iLoveMisskey', + 'foundTreasure', 'client30min', 'noteDeletedWithin1min', 'postedAtLateNight', diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index 1c3535a833..a6d4c60653 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -4,11 +4,14 @@
-
- -
Misskey
-
v{{ version }}
- +
+
+ +
Misskey
+
v{{ version }}
+ +
+
{{ i18n.ts._aboutMisskey.about }}
{{ i18n.ts.learnMore }} @@ -70,6 +73,8 @@ import { i18n } from '@/i18n'; import { defaultStore } from '@/store'; import * as os from '@/os'; import { definePageMetadata } from '@/scripts/page-metadata'; +import { claimAchievement, claimedAchievements } from '@/scripts/achievements'; +import { $i } from '@/account'; const patrons = [ 'まっちゃとーにゅ', @@ -152,6 +157,8 @@ const patrons = [ 'pixeldesu', ]; +let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure')); + let easterEggReady = false; let easterEggEmojis = $ref([]); let easterEggEngine = $ref(null); @@ -187,6 +194,11 @@ function iLoveMisskey() { }); } +function getTreasure() { + thereIsTreasure = false; + claimAchievement('foundTreasure'); +} + onBeforeUnmount(() => { if (easterEggEngine) { easterEggEngine.stop(); @@ -207,52 +219,72 @@ definePageMetadata({ .znqjceqz { > .about { position: relative; - text-align: center; - padding: 16px; border-radius: var(--radius); - &.playing { - &, * { - user-select: none; - } - - * { - will-change: transform; - } - - > .emoji { - visibility: visible; - } - } - - > .icon { - display: block; - width: 80px; - margin: 0 auto; - border-radius: 16px; - } - - > .misskey { - margin: 0.75em auto 0 auto; - width: max-content; - } - - > .version { - margin: 0 auto; - width: max-content; - opacity: 0.5; - } - - > .emoji { + > .treasure { position: absolute; - top: 0; + top: 55px; left: 0; - visibility: hidden; + right: 0; + margin: 0 auto; + width: min-content; + + > .treasureImg { + width: 25px; + vertical-align: bottom; + } + } + + > .container { + position: relative; + text-align: center; + padding: 16px; + + &.playing { + &, * { + user-select: none; + } + + * { + will-change: transform; + } + + > .emoji { + visibility: visible; + } + } + + > .icon { + display: block; + width: 80px; + margin: 0 auto; + border-radius: 16px; + position: relative; + z-index: 1; + } + + > .misskey { + margin: 0.75em auto 0 auto; + width: max-content; + } + + > .version { + margin: 0 auto; + width: max-content; + opacity: 0.5; + } > .emoji { - pointer-events: none; - font-size: 24px; - width: 24px; + position: absolute; + top: 0; + left: 0; + visibility: hidden; + + > .emoji { + pointer-events: none; + font-size: 24px; + width: 24px; + } } } } diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts index f511fce3ea..53a921418c 100644 --- a/packages/frontend/src/scripts/achievements.ts +++ b/packages/frontend/src/scripts/achievements.ts @@ -58,6 +58,7 @@ export const ACHIEVEMENT_TYPES = [ 'collectAchievements30', 'viewAchievements3min', 'iLoveMisskey', + 'foundTreasure', 'client30min', 'noteDeletedWithin1min', 'postedAtLateNight', @@ -331,6 +332,11 @@ export const ACHIEVEMENT_BADGES = { bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))', frame: 'silver', }, + 'foundTreasure': { + img: '/fluent-emoji/1f3c6.png', + bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))', + frame: 'gold', + }, 'client30min': { img: '/fluent-emoji/1f552.png', bg: 'linear-gradient(0deg, rgb(220 223 225), rgb(172 192 207))', @@ -437,7 +443,7 @@ export const ACHIEVEMENT_BADGES = { frame: 'bronze' | 'silver' | 'gold' | 'platinum'; }>; -export const claimedAchievements = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : []; +export const claimedAchievements: typeof ACHIEVEMENT_TYPES[number][] = ($i && $i.achievements) ? $i.achievements.map(x => x.name) : []; const claimingQueue = new Set(); From ede96eca28c670f67b225d6fdd691c6bc83e2ad4 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Jan 2023 20:25:10 +0900 Subject: [PATCH 2/6] :art: --- packages/frontend/src/pages/about-misskey.vue | 7 ++++++- packages/frontend/src/scripts/achievements.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index a6d4c60653..82f4e30a45 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -223,7 +223,7 @@ definePageMetadata({ > .treasure { position: absolute; - top: 55px; + top: 60px; left: 0; right: 0; margin: 0 auto; @@ -266,16 +266,21 @@ definePageMetadata({ > .misskey { margin: 0.75em auto 0 auto; width: max-content; + position: relative; + z-index: 1; } > .version { margin: 0 auto; width: max-content; opacity: 0.5; + position: relative; + z-index: 1; } > .emoji { position: absolute; + z-index: 1; top: 0; left: 0; visibility: hidden; diff --git a/packages/frontend/src/scripts/achievements.ts b/packages/frontend/src/scripts/achievements.ts index 53a921418c..8c59c92b14 100644 --- a/packages/frontend/src/scripts/achievements.ts +++ b/packages/frontend/src/scripts/achievements.ts @@ -334,7 +334,7 @@ export const ACHIEVEMENT_BADGES = { }, 'foundTreasure': { img: '/fluent-emoji/1f3c6.png', - bg: 'linear-gradient(0deg, rgb(255 77 77), rgb(247 155 214))', + bg: 'linear-gradient(0deg, rgb(197 69 192), rgb(2 112 155))', frame: 'gold', }, 'client30min': { From b906ff3fedf2ec420a057a6d2c851df2b7b77495 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Jan 2023 20:30:56 +0900 Subject: [PATCH 3/6] add an achievement --- locales/ja-JP.yml | 3 +++ packages/backend/src/core/AchievementService.ts | 1 + packages/frontend/src/pages/about.vue | 9 ++++++++- packages/frontend/src/scripts/achievements.ts | 7 +++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index cd4438fdeb..a241d54b47 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1128,6 +1128,9 @@ _achievements: _htl20npm: title: "流れるTL" description: "ホームタイムラインの流速が20npmを越す" + _viewInstanceChart: + title: "アナリスト" + description: "インスタンスのチャートを表示した" _outputHelloWorldOnScratchpad: title: "Hello, world!" description: "スクラッチパッドで hello world を出力した" diff --git a/packages/backend/src/core/AchievementService.ts b/packages/backend/src/core/AchievementService.ts index 2536ea34e1..5fd9c451ce 100644 --- a/packages/backend/src/core/AchievementService.ts +++ b/packages/backend/src/core/AchievementService.ts @@ -69,6 +69,7 @@ const ACHIEVEMENT_TYPES = [ 'postedAt0min0sec', 'selfQuote', 'htl20npm', + 'viewInstanceChart', 'outputHelloWorldOnScratchpad', 'open3windows', 'driveFolderCircularReference', diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 4d971c5a9f..e5b9aecc61 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -86,7 +86,7 @@