diff --git a/src/App.vue b/src/App.vue index 22a5bdc3..e6e81198 100644 --- a/src/App.vue +++ b/src/App.vue @@ -137,3 +137,9 @@ const needsUpdate = (latestStr: string) => { + + diff --git a/src/components/CustomSwitch.vue b/src/components/CustomSwitch.vue index 95ff7850..3bbcd111 100644 --- a/src/components/CustomSwitch.vue +++ b/src/components/CustomSwitch.vue @@ -25,8 +25,4 @@ const valueChange = () => { - + diff --git a/src/components/CustomUIDInput.vue b/src/components/CustomUIDInput.vue index eb3e6f91..0f674019 100644 --- a/src/components/CustomUIDInput.vue +++ b/src/components/CustomUIDInput.vue @@ -25,8 +25,4 @@ defineEmits(['submit', 'update:modelValue']) - + diff --git a/src/components/DialogListItem.vue b/src/components/DialogListItem.vue index 09bb8043..90b6498f 100644 --- a/src/components/DialogListItem.vue +++ b/src/components/DialogListItem.vue @@ -18,8 +18,4 @@ const props = defineProps({ - + diff --git a/src/components/LauncherBanner.vue b/src/components/LauncherBanner.vue index 09843982..9719b9d8 100644 --- a/src/components/LauncherBanner.vue +++ b/src/components/LauncherBanner.vue @@ -27,8 +27,4 @@ const openLink = (url: string) => { - + diff --git a/src/components/LauncherPosts.vue b/src/components/LauncherPosts.vue index c983ad19..6bbfa427 100644 --- a/src/components/LauncherPosts.vue +++ b/src/components/LauncherPosts.vue @@ -46,10 +46,6 @@ const openLink = (url: string) => { + diff --git a/src/components/LoadingIcon.vue b/src/components/LoadingIcon.vue index 5586e0f6..1819eb8b 100644 --- a/src/components/LoadingIcon.vue +++ b/src/components/LoadingIcon.vue @@ -16,10 +16,6 @@ defineProps({ + diff --git a/src/components/MyDropdown.vue b/src/components/MyDropdown.vue index ebbefec5..0a64a9e4 100644 --- a/src/components/MyDropdown.vue +++ b/src/components/MyDropdown.vue @@ -114,10 +114,6 @@ const onMouseLeave = () => { + diff --git a/src/components/MyTooltip.vue b/src/components/MyTooltip.vue index 742a171c..4a02950c 100644 --- a/src/components/MyTooltip.vue +++ b/src/components/MyTooltip.vue @@ -89,10 +89,6 @@ const onMouseLeave = () => { + diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index ec9b6734..0a299654 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -48,7 +48,7 @@ "mainBgDialog_filter": "Image", "mainpage_title": "miHoYo miXeD Launcher", "mainpage_buttonText": "Launch {game}", - "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=en-us&launcher_id=10", + "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=en-us&launcher_id=10", "gs_enkaLangCode": "en", "gs_emptyPlayerTip": "Player details will be displayed here", "gs_showcaseTip": "Player details unavailable, please enable 'Show Character Details' in game and try again.", diff --git a/src/i18n/fr_FR.json b/src/i18n/fr_FR.json index c5130af4..f0db6e2e 100644 --- a/src/i18n/fr_FR.json +++ b/src/i18n/fr_FR.json @@ -48,7 +48,7 @@ "mainBgDialog_filter": "Image", "mainpage_title": "miHoYo miXeD Launcher", "mainpage_buttonText": "Lancer {game}", - "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=fr-fr&launcher_id=10", + "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=fr-fr&launcher_id=10", "gs_enkaLangCode": "fr", "gs_emptyPlayerTip": "Les détails du joueur s'afficheront ici", "gs_showcaseTip": "Les détails du joueur ne sont pas disponibles, veuillez activer 'Afficher les détails du personnage' dans le jeu et réessayez.", diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index bd7f1501..91f3b4da 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -48,7 +48,7 @@ "mainBgDialog_filter": "画像", "mainpage_title": "miHoYo miXeD ランチャー", "mainpage_buttonText": "{game}を起動!", - "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ja-jp&launcher_id=10", + "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ja-jp&launcher_id=10", "gs_enkaLangCode": "ja", "gs_emptyPlayerTip": "キャラの詳細がここに表示されます", "gs_showcaseTip": "キャラの詳細情報が利用できません。ゲーム内で「キャラクターの詳細を表示」を有効にして、もう一度お試しください。", diff --git a/src/i18n/ru_RU.json b/src/i18n/ru_RU.json index 6a5e2ff8..5ae46dd2 100644 --- a/src/i18n/ru_RU.json +++ b/src/i18n/ru_RU.json @@ -48,7 +48,7 @@ "mainBgDialog_filter": "Изображение", "mainpage_title": "Запуск miHoYo miXeD", "mainpage_buttonText": "Запустить {game}", - "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ru-ru&launcher_id=10", + "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ru-ru&launcher_id=10", "gs_enkaLangCode": "ru", "gs_emptyPlayerTip": "Информация о игроке будет отображена здесь", "gs_showcaseTip": "Информация о игроке недоступна. Включите 'Отображение деталей персонажей' в игре и попробуйте снова.", diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json index 55da9bbd..86dfb086 100644 --- a/src/i18n/zh_CN.json +++ b/src/i18n/zh_CN.json @@ -48,7 +48,7 @@ "mainBgDialog_filter": "图片", "mainpage_title": "米哈游聚合启动器", "mainpage_buttonText": "{game}启动", - "genshin_launcherContentsUrl": "https://sdk-static.mihoyo.com/hk4e_cn/mdk/launcher/api/content?filter_adv=false&key=eYd89JmJ&language=zh-cn&launcher_id=18", + "gs_launcherContentsUrl": "https://sdk-static.mihoyo.com/hk4e_cn/mdk/launcher/api/content?filter_adv=false&key=eYd89JmJ&language=zh-cn&launcher_id=18", "gs_enkaLangCode": "chs", "gs_emptyPlayerTip": "此处将显示角色的详细信息", "gs_showcaseTip": "当前暂无详细信息,请在游戏内打开“显示角色详情”后再试。", diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json index 577d0908..6b401c81 100644 --- a/src/i18n/zh_TW.json +++ b/src/i18n/zh_TW.json @@ -48,7 +48,7 @@ "mainBgDialog_filter": "圖片", "mainpage_title": "米哈游聚合啓動器", "mainpage_buttonText": "{game}啓動", - "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=zh-tw&launcher_id=10", + "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=zh-tw&launcher_id=10", "gs_enkaLangCode": "cht", "gs_emptyPlayerTip": "此處將顯示角色的詳細信息", "gs_showcaseTip": "當前暫無詳細信息,請在游戲内打開”顯示角色詳情“后再試。", diff --git a/src/pages/GenshinPage/GenshinPage.vue b/src/pages/GamePage.vue similarity index 62% rename from src/pages/GenshinPage/GenshinPage.vue rename to src/pages/GamePage.vue index 4dfa1026..c413504f 100644 --- a/src/pages/GenshinPage/GenshinPage.vue +++ b/src/pages/GamePage.vue @@ -1,26 +1,62 @@ - - - - diff --git a/src/pages/MainPage.vue b/src/pages/MainPage.vue index 790a2ad2..318b797e 100644 --- a/src/pages/MainPage.vue +++ b/src/pages/MainPage.vue @@ -218,10 +218,6 @@ const resetPic = () => { + diff --git a/src/pages/StarRailPage/Components/SRImportDialog.vue b/src/pages/StarRailPage/Components/SRImportDialog.vue index e222081e..1c715dc0 100644 --- a/src/pages/StarRailPage/Components/SRImportDialog.vue +++ b/src/pages/StarRailPage/Components/SRImportDialog.vue @@ -140,10 +140,6 @@ const onDialogOk = () => { diff --git a/src/pages/tmpPage.vue b/src/pages/tmpPage.vue index fc32df91..2ff3613d 100644 --- a/src/pages/tmpPage.vue +++ b/src/pages/tmpPage.vue @@ -5,7 +5,12 @@ import { useRoute, useRouter } from 'vue-router' const router = useRouter() const route = useRoute() onMounted(() => { - router.push(route.query.from as string) + router.push({ + name: 'gamepage', + query: { + game: route.query.from as string, + }, + }) }) diff --git a/src/router/router.ts b/src/router/router.ts index 759b1825..2a17fa01 100644 --- a/src/router/router.ts +++ b/src/router/router.ts @@ -1,8 +1,6 @@ import * as VueRouter from 'vue-router' import MainPage from '../pages/MainPage.vue' -import StarRailPage from '../pages/StarRailPage/StarRailPage.vue' -import GenshinPage from '../pages/GenshinPage/GenshinPage.vue' -import Honkai3Page from '../pages/Honkai3Page/Honkai3Page.vue' +import GamePage from '../pages/GamePage.vue' import SettingsPage from '../pages/SettingsPage/SettingsPage.vue' import tmpPage from '../pages/tmpPage.vue' @@ -15,19 +13,9 @@ const router = VueRouter.createRouter({ component: MainPage, }, { - name: 'gspage', - path: '/gspage', - component: GenshinPage, - }, - { - name: 'srpage', - path: '/srpage', - component: StarRailPage, - }, - { - name: 'hipage', - path: '/hipage', - component: Honkai3Page, + name: 'gamepage', + path: '/gamepage', + component: GamePage, }, { name: 'settingsPage', diff --git a/src/style.css b/src/style.css index dbb12bd5..60a455f0 100644 --- a/src/style.css +++ b/src/style.css @@ -45,7 +45,6 @@ h1 { button { border-radius: 8px; - border: 1px solid transparent; padding: 0.6em 1.2em; font-size: 1em; font-weight: 500; @@ -55,15 +54,6 @@ button { transition: border-color 0.25s; } -button:hover { - border-color: #646cff; -} - -/* button:focus, -button:focus-visible { - outline: 4px auto -webkit-focus-ring-color; -} */ - code { background-color: #1a1a1a; padding: 2px 4px; diff --git a/tailwind.config.js b/tailwind.config.js index 72b38ead..1e13ee9d 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,11 +1,8 @@ /** @type {import('tailwindcss').Config} */ module.exports = { - content: [ - "./index.html", - "./src/**/*.{html,js,ts,vue}", - ], - theme: { - extend: {}, - }, - plugins: [], -}; + content: ['./index.html', './src/**/*.{html,js,ts,vue}'], + theme: { + extend: {}, + }, + plugins: [], +}