diff --git a/Version b/Version index 86fb650..f9f89f5 100644 --- a/Version +++ b/Version @@ -1 +1 @@ -3.3.7 +3.3.10 \ No newline at end of file diff --git a/aklive2d.js b/aklive2d.js index 5332b5a..3539aa3 100644 --- a/aklive2d.js +++ b/aklive2d.js @@ -5,20 +5,18 @@ import { fork } from 'child_process'; import getConfig from './libs/config.js' import ProjectJson from './libs/project_json.js' import EnvGenerator from './libs/env_generator.js' -import { write, rmdir, copy, writeSync, copyDir, readSync } from './libs/file.js' +import { write, rmdir, copy, writeSync, copyDir } from './libs/file.js' import AssetsProcessor from './libs/assets_processor.js' import init from './libs/initializer.js' import directory from './libs/directory.js' import { appendReadme } from './libs/append.js' +import { increase } from './libs/version.js'; import Background from './libs/background.js' import CharwordTable from './libs/charword_table.js'; async function main() { global.__projetRoot = path.dirname(fileURLToPath(import.meta.url)) - global.__config = { - ...getConfig(), - version: readSync(path.join(__projetRoot, 'Version')) - } + global.__config = getConfig() const op = process.argv[2] let OPERATOR_NAMES = process.argv.slice(3); @@ -39,6 +37,7 @@ async function main() { for (const [key, _] of Object.entries(__config.operators)) { OPERATOR_NAMES.push(key) } + increase(__projetRoot) break case 'preview': assert(OPERATOR_NAMES.length !== 0, 'Please set the operator name.') @@ -176,7 +175,7 @@ async function main() { value: __config.operators[OPERATOR_NAME].link }, { key: "version", - value: __config.version + value: __config.version.showcase }, { key: "title", value: __config.operators[OPERATOR_NAME].title diff --git a/config.yaml b/config.yaml index fae7b77..7952649 100644 --- a/config.yaml +++ b/config.yaml @@ -21,6 +21,9 @@ share: title: zh-CN: "明日方舟:" en-US: "Arknights: " +directory: + title: AKLive2D + voice: jp/CN_037.ogg operators: chen: !include config/chen.yaml dusk: !include config/dusk.yaml diff --git a/directory/.env b/directory/.env index 6a0ab7e..8229cde 100644 --- a/directory/.env +++ b/directory/.env @@ -1 +1,3 @@ -VITE_APP_TITLE="AKLive2D" \ No newline at end of file +VITE_APP_TITLE=AKLive2D +VITE_VERSION=0.5.5 +VITE_APP_VOICE_URL=jp/CN_037.ogg \ No newline at end of file diff --git a/directory/Version b/directory/Version new file mode 100644 index 0000000..ad83b1b --- /dev/null +++ b/directory/Version @@ -0,0 +1 @@ +0.5.6 \ No newline at end of file diff --git a/directory/src/App.css b/directory/src/App.css index cf34d27..57c1de6 100644 --- a/directory/src/App.css +++ b/directory/src/App.css @@ -4,6 +4,7 @@ :root { --text-color: rgba(255, 255, 255, 0.87); + --text-color-full: #fff; --secondary-text-color: #686a72; --date-color: rgba(255, 255, 255, 0.2); --border-color: #707070; @@ -17,7 +18,7 @@ font-family: "Geometos", "Noto Sans SC", sans-serif; font-size: 16px; - line-height: 1.1em; + line-height: 1.2em; font-weight: 400; color: var(--text-color); diff --git a/directory/src/component/dropdown.css b/directory/src/component/dropdown.css index 226da17..4f25334 100644 --- a/directory/src/component/dropdown.css +++ b/directory/src/component/dropdown.css @@ -4,13 +4,13 @@ user-select: none; z-index: 2; padding: 0.5rem; + cursor: pointer; } .dropdown .text { display: flex; flex-direction: row; align-items: center; - cursor: pointer; } .dropdown .content { @@ -18,6 +18,9 @@ } .dropdown .icon { + position: absolute; + bottom: 0.5rem; + right: -0.1rem; width: 0.5em; height: 0.5em; display: inline-block; @@ -27,10 +30,10 @@ border-right: 0.15em solid var(--text-color); border-top: 0.15em solid var(--text-color); transform: translate(0, -0.15em) rotate(-45deg); - transition: all cubic-bezier(0.65, 0.05, 0.36, 1) 0.3s; } -.dropdown .icon.active { +.dropdown.active .icon, +.dropdown:hover .icon { animation: icon-flash 2s cubic-bezier(0.65, 0.05, 0.36, 1) infinite; } @@ -55,7 +58,7 @@ visibility: hidden; } -.dropdown .menu.active { +.dropdown.active .menu { visibility: visible; opacity: 1; z-index: 2; @@ -76,7 +79,9 @@ transition: color cubic-bezier(0.65, 0.05, 0.36, 1) 0.3s; } -.dropdown .menu .item:hover, .dropdown .menu .item:focus, .dropdown .menu .item.active { +.dropdown .menu .item:hover, +.dropdown .menu .item:focus, +.dropdown .menu .item.active { color: var(--link-highlight-color); } diff --git a/directory/src/component/dropdown.jsx b/directory/src/component/dropdown.jsx index 5a0600b..88774bb 100644 --- a/directory/src/component/dropdown.jsx +++ b/directory/src/component/dropdown.jsx @@ -1,6 +1,5 @@ import { - useState, - useEffect + useState } from 'react' import './dropdown.css' @@ -13,15 +12,15 @@ export default function Dropdown(props) { return ( <> -
+
toggleDropdown()} > {props.text} - +
-