update: readme

.github/workflows/deploy.yml

@@ -0,0 +1,29 @@
+name: Build and Deploy
+on:
+  push:
+    branches: [main]
+permissions:
+  contents: write
+jobs:
+  build-and-deploy:
+    concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
+        run: |
+          pnpm install
+          pnpm xlsx2json
+          pnpm build
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: template # The folder the action should deploy.

.github/workflows/node.js.yml

@@ -1,31 +0,0 @@
-# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: Node.js CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.x, 16.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: npm install
-    - run: npm run build --if-present
-    - run: npm test

.gitignore

@@ -108,3 +108,6 @@ utils/xlsxTransform-*
 /.idea
 
 __localStorage.json
+
+template/public
+public/data

.vscode/launch.json

@@ -4,40 +4,15 @@
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "Launch Chrome",
-            "request": "launch",
-            "type": "pwa-chrome",
-            "url": "http://127.0.0.1:8000/public/index.html",
-            "webRoot": "${workspaceFolder}"
-        },
         {
             "type": "node",
             "request": "launch",
             "name": "test",
             "program": "${workspaceFolder}/test",
             "skipFiles": [
-                "<node_internals>/**"
+                "<node_internals>/**",
+                "**/node_modumes/**"
             ]
         },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "xlsx2json",
-            "program": "${workspaceFolder}/node_modules/v-transform/src/index.js",
-            "args": ["transform", "jobs/xlsx2json/config.json"],
-            "skipFiles": [
-                "<node_internals>/**"
-            ]
-        },
-        {
-            "name": "Attach by Process ID",
-            "processId": "${command:PickProcess}",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node"
-        },
     ]
 }

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "cSpell.words": [
-        "Laya"
-    ]
-}

CNAME

@@ -1 +0,0 @@
-liferestart.syaro.io

README-zh_CN.md

@@ -24,7 +24,7 @@ cd my-project
 2. 进入目录安装依赖。
 
 ```bash
-yarn install
+pnpm install
 ```
 
 或者
@@ -36,7 +36,7 @@ npm install
 3. 启动本地服务器。
 
 ```bash
-yarn dev
+pnpm dev
 ```
 
 或者
@@ -45,7 +45,7 @@ yarn dev
 npm run dev
 ```
 
-4. 启动完成后会自动打开浏览器访问 [http://localhost:8081/view/index.html](http://localhost:8081/view/index.html)。
+4. 启动完成后会自动打开浏览器访问 [http://localhost:5173](http://localhost:5173)。
 
 </details>
 

README.md

@@ -24,7 +24,7 @@ cd my-project
 2. Installation dependence.
 
 ```bash
-yarn install
+pnpm install
 ```
 
 Or
@@ -36,7 +36,7 @@ npm install
 3. Start local server.
 
 ```bash
-yarn dev
+pnpm dev
 ```
 
 Or
@@ -45,7 +45,7 @@ Or
 npm run dev
 ```
 
-4. After the startup is complete, will automatically open a browser and visit [http://localhost:8081/view/index.html](http://localhost:8081/view/index.html).
+4. After the startup is complete, open a browser and visit [http://localhost:5173](http://localhost:5173).
 </details>
 
 <details>

index.html

@@ -17,8 +17,6 @@
         <meta http-equiv="Cache-Control" content="no-siteapp"/>
         <font-face font-family="方正像素12" src="fonts/方正像素12.ttf"/>
         <title>Life Restart</title>
-    </head>
-    <body style="background:black">
         <!--以下引用了常用类库，如果不使用，可以删除-->
 
         <!--核心包，封装了显示对象渲染，事件，时间管理，时间轴动画，缓动，消息交互,socket，本地存储，鼠标触摸，声音，加载，颜色滤镜，位图字体等-->
@@ -67,8 +65,8 @@
          <!-- 物理引擎matter.js -->
         <!--自定义的js(src文件夹下)文件自动添加到下面jsfile模块标签里面里，js的顺序可以手动修改，修改后保留修改的顺序，新增加的js会默认依次追加到标签里-->
         <!--删除标签，ide不会自动添加js文件，请谨慎操作-->
-        <!--jsfile--startTag-->
+
-        <script type="module" src="../src/index.js"></script>
+        <script type="module" src="src/index.js"></script>
-        <!--jsfile--endTag-->
+    </head>
-    </body>
+    <body style="background:black"></body>
 </html>

jobs/xlsx2json/config.json

@@ -1,19 +0,0 @@
-{
-    "configurations": [
-        {
-            "source": [
-                "../../data/specialthanks-afd.xlsx",
-                "../../data/specialthanks-dun.xlsx"
-            ],
-            "target": "../../public/data"
-        },
-        {
-            "source": "../../data/zh-cn",
-            "target": "../../public/data/zh-cn"
-        },
-        {
-            "source": "../../data/en-us",
-            "target": "../../public/data/en-us"
-        }
-    ]
-}

laya/pages/view/CyberTheme/CyberMain.ui

@@ -1,8 +1,8 @@
 {
     "x":0,
     "type":"View",
-    "selectedBox":1,
+    "selectedBox":93,
-    "selecteID":12,
+    "selecteID":94,
     "props":{"y":1218,"x":562,"width":1125,"sceneColor":"#000000","sceneBg":"laya/views/view/CyberTheme/CyberMain.png","runtime":"Laya.runtime.ViewBase","height":2436,"anchorY":0.5,"anchorX":0.5},
     "nodeParent":-1,
     "label":"View",
@@ -548,14 +548,13 @@
             "props":{"width":1,"left":0,"height":1,"bottom":0},
             "nodeParent":1,
             "label":"Box",
-            "isOpen":true,
+            "isOpen":false,
             "isDirectory":true,
             "isAniNode":true,
             "hasChild":true,
             "compId":85,
             "child":[
                 {
-                    "x":30,
                     "type":"Box",
                     "props":{"y":-175,"x":100,"width":160,"var":"btnGithub","runtime":"Laya.runtime.ScaleButton","name":"btnGithub","height":160,"anchorY":0.5,"anchorX":0.5},
                     "nodeParent":85,
@@ -580,7 +579,6 @@
                         }]
                 },
                 {
-                    "x":30,
                     "type":"Box",
                     "props":{"y":-355,"x":100,"width":160,"var":"btnDiscord","runtime":"Laya.runtime.ScaleButton","name":"btnDiscord","height":160,"anchorY":0.5,"anchorX":0.5},
                     "nodeParent":85,
@@ -611,14 +609,13 @@
             "props":{"right":0,"bottom":0},
             "nodeParent":1,
             "label":"Box",
-            "isOpen":true,
+            "isOpen":false,
             "isDirectory":true,
             "isAniNode":true,
             "hasChild":true,
             "compId":88,
             "child":[
                 {
-                    "x":30,
                     "type":"Box",
                     "props":{"y":-300,"x":-100,"width":110,"runtime":"Laya.runtime.ScaleButton","height":110,"anchorY":0.5,"anchorX":0.5},
                     "nodeParent":88,
@@ -630,7 +627,6 @@
                     "compId":90,
                     "child":[
                         {
-                            "x":45,
                             "type":"Box",
                             "props":{"width":110,"var":"btnSaveLoad","runtime":"Laya.runtime.ColorfulBox","name":"btnSmall","height":110,"centerY":0,"centerX":0,"anchorY":0.5,"anchorX":0.5},
                             "nodeParent":90,
@@ -642,7 +638,6 @@
                             "compId":91,
                             "child":[
                                 {
-                                    "x":60,
                                     "type":"Image",
                                     "props":{"width":80,"skin":"images/icons/icon_save.png","height":80,"centerY":0,"centerX":0},
                                     "nodeParent":91,
@@ -657,7 +652,6 @@
                         }]
                 },
                 {
-                    "x":30,
                     "type":"Box",
                     "props":{"y":-175,"x":-100,"width":110,"runtime":"Laya.runtime.ScaleButton","height":110,"anchorY":0.5,"anchorX":0.5},
                     "nodeParent":88,
@@ -669,7 +663,6 @@
                     "compId":89,
                     "child":[
                         {
-                            "x":45,
                             "type":"Box",
                             "props":{"width":110,"var":"btnThemes","runtime":"Laya.runtime.ColorfulBox","name":"btnThemes","height":110,"centerY":0,"centerX":0,"anchorY":0.5,"anchorX":0.5},
                             "nodeParent":89,
@@ -694,6 +687,32 @@
                                 }]
                         }]
                 }]
+        },
+        {
+            "x":15,
+            "type":"Box",
+            "props":{"x":572,"var":"banner","centerX":0,"bottom":100,"anchorY":1,"anchorX":0.5},
+            "nodeParent":1,
+            "label":"Box(banner)",
+            "isOpen":true,
+            "isDirectory":true,
+            "isAniNode":true,
+            "hasChild":true,
+            "compId":93,
+            "child":[
+                {
+                    "x":30,
+                    "type":"Label",
+                    "props":{"text":"UI_Banner","fontSize":40,"font":"方正像素12","color":"#00fffd"},
+                    "nodeParent":93,
+                    "label":"Label",
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":94,
+                    "child":[
+                        ]
+                }]
         }],
     "animations":[
         {

laya/pages/view/DefaultTheme/Main.ui

@@ -1,8 +1,8 @@
 {
     "x":0,
     "type":"View",
-    "selectedBox":99,
+    "selectedBox":101,
-    "selecteID":100,
+    "selecteID":102,
     "props":{"y":1218,"x":562,"width":1125,"sceneColor":"#000000","runtime":"Laya.runtime.ViewBase","height":2436,"anchorY":0.5,"anchorX":0.5},
     "nodeParent":-1,
     "label":"View",
@@ -276,6 +276,32 @@
                     "child":[
                         ]
                 }]
+        },
+        {
+            "x":15,
+            "type":"Box",
+            "props":{"x":562,"var":"banner","centerX":0,"bottom":100,"anchorY":1,"anchorX":0.5},
+            "nodeParent":1,
+            "label":"Box(banner)",
+            "isOpen":true,
+            "isDirectory":true,
+            "isAniNode":true,
+            "hasChild":true,
+            "compId":101,
+            "child":[
+                {
+                    "x":30,
+                    "type":"Label",
+                    "props":{"text":"UI_Banner","name":"title","fontSize":40,"font":"SimHei","color":"#ffffff"},
+                    "nodeParent":101,
+                    "label":"Label(title)",
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":102,
+                    "child":[
+                        ]
+                }]
         }],
     "animations":[
         {

package.json

@@ -1,24 +1,19 @@
 {
     "name": "life_restart",
     "type": "module",
-    "bin": "repl/index.js",
+    "main": "repl/index.js",
-    "version": "2.0.0",
+    "version": "2.1.0",
+    "author": "Vick Scarlet <vick@syaro.io>",
     "scripts": {
-        "test": "node test",
+        "xlsx2json": "vt transform -d public \"data/**/*.xlsx\"",
-        "xlsxTransform": "vt transform data",
+        "dev": "vite",
-        "xlsx2json": "vt transform jobs/xlsx2json/config.json",
+        "build": "vite build",
-        "dev": "webpack serve --open /view/index.html",
+        "start": "vite preview",
-        "build": "webpack --mode production"
+        "test": "vitest"
     },
     "devDependencies": {
-        "@babel/core": "^7.15.4",
+        "v-transform": "^2.1.1",
-        "@babel/preset-env": "^7.15.4",
+        "vite": "^6.2.5",
-        "babel-loader": "^8.2.2",
+        "vitest": "^3.1.1"
-        "core-js": "^3.17.2",
-        "html-webpack-plugin": "^5.5.0",
-        "v-transform": "^1.0.2",
-        "webpack": "^5.64.4",
-        "webpack-cli": "^4.8.0",
-        "webpack-dev-server": "^4.1.0"
     }
 }

public/index.html

@@ -1 +0,0 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><meta name="description" content="やり直すんだ。そして、次はうまくやる。"/><meta name="keywords" content="人生重开模拟器 liferestart life restart remake 人生重来"/><meta name="renderer" content="webkit"/><meta name="apple-mobile-web-app-capable" content="yes"/><meta name="full-screen" content="true"/><meta name="x5-fullscreen" content="true"/><meta name="360-fullscreen" content="true"/><meta name="theme-color" content="#157878"/><meta name="laya" screenorientation="landscape"/><meta http-equiv="expires" content="0"/><meta http-equiv="Cache-Control" content="no-siteapp"/><title>Life Restart</title><script src="libs/laya/min/laya.core.min.js"></script><script src="libs/laya/min/laya.webgl.min.js"></script><script src="libs/laya/min/laya.filter.min.js"></script><script src="libs/laya/min/laya.particle.min.js"></script><script src="libs/laya/min/laya.ui.min.js"></script><script defer="defer" src="chunk/main.76985.js"></script></head><body style="background:black"></body></html>

repl/index.js

@@ -1,28 +1,40 @@
-import App from './app.js';
+import { fileURLToPath } from 'url'
-import { readFile, writeFile } from 'fs/promises';
+import { dirname } from 'path'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+import App from './app.js'
+import { readFile, writeFile } from 'fs/promises'
 
 async function main() {
-
     try {
-        globalThis.localStorage = JSON.parse(await readFile('__localStorage.json'));
+        globalThis.localStorage = JSON.parse(
+            await readFile(__dirname + '/__localStorage.json')
+        )
     } catch (e) {
-        globalThis.localStorage = {};
+        globalThis.localStorage = {}
     }
-    localStorage.getItem = key => localStorage[key]===void 0? null: localStorage[key];
+    localStorage.getItem = key =>
-    localStorage.setItem = (key, value) => (localStorage[key] = value);
+        localStorage[key] === void 0 ? null : localStorage[key]
+    localStorage.setItem = (key, value) => (localStorage[key] = value)
 
-    globalThis.dumpLocalStorage = async ()=>await writeFile('__localStorage.json', JSON.stringify( global.localStorage))
+    globalThis.dumpLocalStorage = async () =>
+        await writeFile(
+            __dirname + '/__localStorage.json',
+            JSON.stringify(global.localStorage)
+        )
 
-    const app = new App();
+    const app = new App()
     app.io(
         repl => process.stdin.on('data', data => repl(data.toString().trim())),
         (data, isRepl) => process.stdout.write(`${data}${isRepl ? '\n>' : ''}`),
         code => process.exit(code)
     )
-    await app.initial();
+    await app.initial()
 }
 
-main();
+main()
 
 // process.stdin.setRawMode(true);
 

src/app.js

@@ -17,7 +17,7 @@ globalThis.goto = async tag => {
     switch (tag) {
         case 'github': url = 'https://github.com/VickScarlet/lifeRestart'; break;
         case 'discord': url = 'https://discord.gg/U3qrf49NMQ'; break;
-        case 'sponsor_afd': url = 'https://afdian.net/@LifeRestart'; break;
+        case 'sponsor_afd': url = 'https://afdian.com/a/LifeRestart'; break;
         case 'sponsor_ddf': url = 'https://dun.mianbaoduo.com/@vickscarlet'; break;
     }
     try {

src/functions/condition.js

@@ -43,7 +43,7 @@ function parseCondition(condition) {
     return conditions;
 }
 
-function checkCondition(property, condition) {
+export function checkCondition(property, condition) {
     const conditions = parseCondition(condition);
     return checkParsedConditions(property, conditions);
 }
@@ -113,7 +113,7 @@ function checkProp(property, condition) {
     }
 }
 
-function extractMaxTriggers(condition) {
+export function extractMaxTriggers(condition) {
     // Assuming only age related talents can be triggered multiple times.
     const RE_AGE_CONDITION = /AGE\?\[([0-9\,]+)\]/;
     const match_object = RE_AGE_CONDITION.exec(condition);
@@ -125,5 +125,3 @@ function extractMaxTriggers(condition) {
     const age_list = match_object[1].split(",");
     return age_list.length;
 }
-
-export { checkCondition, extractMaxTriggers };

src/functions/condition.spec.js

@@ -0,0 +1,103 @@
+import { expect, test, describe } from 'vitest'
+import { checkCondition } from './condition'
+
+function withProp(prop) {
+    const p = {
+        get(key) {
+            return prop[key]
+        },
+    }
+    return condition => checkCondition(p, condition)
+}
+
+describe('condition', () => {
+    const check = withProp({
+        n1: 0,
+        n2: -10,
+        n3: 10,
+        nl1: [1, 2, 3],
+        nl2: [0],
+        nl3: [],
+    })
+    test('gt(>)', () => {
+        expect(check('n3>11')).toBe(false)
+        expect(check('n3>10')).toBe(false)
+        expect(check('n3>9')).toBe(true)
+    })
+    test('gte(>=)', () => {
+        expect(check('n3>=11')).toBe(false)
+        expect(check('n3>=10')).toBe(true)
+        expect(check('n3>=9')).toBe(true)
+    })
+    test('lt(<)', () => {
+        expect(check('n3<9')).toBe(false)
+        expect(check('n3<10')).toBe(false)
+        expect(check('n3<11')).toBe(true)
+    })
+    test('lte(<=)', () => {
+        expect(check('n3<=9')).toBe(false)
+        expect(check('n3<=10')).toBe(true)
+        expect(check('n3<=11')).toBe(true)
+    })
+    test('eq(=)', () => {
+        expect(check('n3=9')).toBe(false)
+        expect(check('n3=10')).toBe(true)
+        expect(check('n3=11')).toBe(false)
+        expect(check('nl1=0')).toBe(false)
+        expect(check('nl1=1')).toBe(true)
+        expect(check('nl1=2')).toBe(true)
+        expect(check('nl1=3')).toBe(true)
+    })
+    test('ne(!=)', () => {
+        expect(check('n3!=9')).toBe(true)
+        expect(check('n3!=10')).toBe(false)
+        expect(check('n3!=11')).toBe(true)
+        expect(check('nl1!=0')).toBe(true)
+        expect(check('nl1!=1')).toBe(false)
+        expect(check('nl1!=2')).toBe(false)
+        expect(check('nl1!=3')).toBe(false)
+    })
+    test('in(?)', () => {
+        expect(check('n3?[1,2,3]')).toBe(false)
+        expect(check('n3?[10,11,12]')).toBe(true)
+        expect(check('nl1?[0,1]')).toBe(true)
+        expect(check('nl2?[1,2,3]')).toBe(false)
+        expect(check('nl3?[1,2,3]')).toBe(false)
+        expect(check('nl2?[]')).toBe(false)
+        expect(check('nl3?[]')).toBe(false)
+    })
+    test('notin(!)', () => {
+        expect(check('n3![1,2,3]')).toBe(true)
+        expect(check('n3![10,11,12]')).toBe(false)
+        expect(check('nl1![0,1]')).toBe(false)
+        expect(check('nl2![1,2,3]')).toBe(true)
+        expect(check('nl3![1,2,3]')).toBe(true)
+        expect(check('nl2![]')).toBe(true)
+        expect(check('nl3![]')).toBe(true)
+    })
+    test('and(&)', () => {
+        expect(check('n1>=0&n2<0')).toBe(true)
+        expect(check('n2>0&n3>0')).toBe(false)
+        expect(check('n2<0&n3<0')).toBe(false)
+        expect(check('n2<0&n3>0')).toBe(true)
+        expect(check('n1=0&n2<0&n3>0')).toBe(true)
+        expect(check('n1=0&n2>0&n3>0')).toBe(false)
+    })
+    test('or(|)', () => {
+        expect(check('n1>=0|n2<0')).toBe(true)
+        expect(check('n2>0|n3>0')).toBe(true)
+        expect(check('n2<0|n3<0')).toBe(true)
+        expect(check('n2<0|n3>0')).toBe(true)
+        expect(check('n2>0|n3<0')).toBe(false)
+        expect(check('n1=0|n2<0|n3>0')).toBe(true)
+        expect(check('n1=0|n2>0|n3>0')).toBe(true)
+        expect(check('n1!=0|n2>0|n3<0')).toBe(false)
+    })
+    test('mix', () => {
+        expect(check('(n1=0|n2<0|n3>0)&(n1=0|n2>0|n3>0)')).toBe(true)
+        expect(check('(n1=0|n2<0|n3>0)&(n1!=0|n2>0|n3<0)')).toBe(false)
+        expect(check('n1=0|n2<0|n3>0&n1!=0|n2>0|n3<0')).toBe(true)
+        expect(check('(n1>0|n1?[-10,0])&(n2>0|n3![0,1])')).toBe(true)
+        expect(check('(n1>0&n1?[-10,0])|(n2<0&n3![0,1])')).toBe(true)
+    })
+})

src/i18n/en-us.js

@@ -31,6 +31,7 @@ export default ({
     UI_Thanks: 'Thx',
     UI_Achievement: 'Achv',
     UI_Cyber_Theme_Art_Design: 'UI Design by 晰晰',
+    UI_Banner: '作者的新作《纸上谈亲》已上线小程序\n微信/抖音搜索“纸上谈亲”即可游玩～',
 
     UI_Title_Talent: 'Talent Draw',
     UI_Talent_Draw: '!10 Pulls!',

src/i18n/zh-cn.js

@@ -33,6 +33,7 @@ export default ({
     UI_Thanks: '感谢',
     UI_Achievement: '成就',
     UI_Cyber_Theme_Art_Design: 'UI 设计 by 晰晰',
+    UI_Banner: '作者的新作《纸上谈亲》已上线小程序\n微信/抖音搜索“纸上谈亲”即可游玩～',
 
     UI_Title_Talent: '天赋抽卡',
     UI_Talent_Draw: '10连抽！',

src/modules/life.js

@@ -54,7 +54,7 @@ class Life {
         this.#specialThanks = specialThanks;
 
         const total = {
-            [this.PropertyTypes.TACEV]: this.#achievement.initial({achievements}),
+            [this.PropertyTypes.TACHV]: this.#achievement.initial({achievements}),
             [this.PropertyTypes.TEVT]: this.#event.initial({events}),
             [this.PropertyTypes.TTLT]: this.#talent.initial({talents}),
         };

src/ui/themes/cyber/main.js

@@ -30,6 +30,7 @@ export default class CyberMain extends ui.view.CyberTheme.CyberMainUI {
     }
 
     init() {
+        this.banner.visible =
         this.btnDiscord.visible =
         this.btnAchievement.visible =
         this.btnThanks.visible = !!core.times;

src/ui/themes/default/main.js

@@ -17,6 +17,7 @@ export default class Main extends ui.view.DefaultTheme.MainUI {
     }
 
     init() {
+        this.banner.visible =
         this.btnDiscord.visible =
         this.btnAchievement.visible =
         this.btnThanks.visible = !!core.times;

src/ui/uiManager.js

@@ -1,19 +1,19 @@
-import Views from './themes/views.js';
+import Views from './views.js'
 export default class UIManager {
     constructor(stage) {
-        UIManager.#views = Views;
+        UIManager.#views = Views
 
         if (!stage) {
-            stage = Laya.stage;
+            stage = Laya.stage
         }
-        this.#stage = stage;
+        this.#stage = stage
 
-        stage.addChild(this.#viewLayer);
+        stage.addChild(this.#viewLayer)
-        this.#viewLayer.zOrder = 1;
+        this.#viewLayer.zOrder = 1
-        stage.addChild(this.#dialogLayer);
+        stage.addChild(this.#dialogLayer)
-        this.#dialogLayer.zOrder = 2;
+        this.#dialogLayer.zOrder = 2
-        stage.addChild(this.#popupLayer);
+        stage.addChild(this.#popupLayer)
-        this.#popupLayer.zOrder = 3;
+        this.#popupLayer.zOrder = 3
         this.#viewLayer.top =
             this.#viewLayer.bottom =
             this.#viewLayer.left =
@@ -29,332 +29,369 @@ export default class UIManager {
             this.#dialogMask.top =
             this.#dialogMask.bottom =
             this.#dialogMask.left =
-        this.#dialogMask.right = 0;
+            this.#dialogMask.right =
-        this.#dialogMask.graphics.drawRect(0, 0, 5000, 5000, '#000000');
+                0
-        this.#dialogMask.alpha = 0.4;
+        this.#dialogMask.graphics.drawRect(0, 0, 5000, 5000, '#000000')
+        this.#dialogMask.alpha = 0.4
         this.#dialogMask.on(Laya.Event.CLICK, this, () => {
-            this.#dialogStack[this.#dialogStack.length - 1]?.close?.();
+            this.#dialogStack[this.#dialogStack.length - 1]?.close?.()
         })
     }
 
-    static #instance = {};
+    static #instance = {}
-    static #views;
+    static #views
-    #stage;
+    #stage
-    #loading;
+    #loading
-    #currentView;
+    #currentView
-    #viewLayer = new Laya.Panel();
+    #viewLayer = new Laya.Panel()
-    #dialogLayer = new Laya.Panel();
+    #dialogLayer = new Laya.Panel()
-    #popupLayer = new Laya.Panel();
+    #popupLayer = new Laya.Panel()
-    #dialogMask = new Laya.Sprite();
+    #dialogMask = new Laya.Sprite()
-    #viewMap = new Map();
+    #viewMap = new Map()
-    #class = new Map();
+    #class = new Map()
-    #dialogStack = [];
+    #dialogStack = []
 
     static get inst() {
-        return this.getInstance();
+        return this.getInstance()
     }
-    static getInstance(name="default") {
+    static getInstance(name = 'default') {
-        return this.#instance[name] || (this.#instance[name] = new UIManager());
+        return this.#instance[name] || (this.#instance[name] = new UIManager())
     }
 
     static get pages() {
-        return this.#views.pages;
+        return this.#views.pages
     }
 
     static get popups() {
-        return this.#views.popups;
+        return this.#views.popups
     }
 
     static theme(theme, prop) {
-        return this.#views.themes[theme][prop];
+        return this.#views.themes[theme][prop]
     }
 
     async setLoading(loading) {
-        const className = this.#pages[loading];
+        const className = this.#pages[loading]
-        const view = await this.getView(className, null, null, loading);
+        const view = await this.getView(className, null, null, loading)
-        view.top = view.bottom = view.left = view.right = 0;
+        view.top = view.bottom = view.left = view.right = 0
-        view.zOrder = 4;
+        view.zOrder = 4
-        this.#loading = view;
+        this.#loading = view
     }
 
     async switchView(viewName, args, actions) {
-        const className = this.#pages[viewName];
+        const className = this.#pages[viewName]
         // get view instance
-        const view = await this.getView(className, args, actions?.load, viewName, 'pages');
+        const view = await this.getView(
+            className,
+            args,
+            actions?.load,
+            viewName,
+            'pages'
+        )
 
-        view.top = view.bottom = view.left = view.right = 0;
+        view.top = view.bottom = view.left = view.right = 0
         // close current view
-        this.clearAllDialog();
+        this.clearAllDialog()
-        await this.#currentView?.__close?.(view);
+        await this.#currentView?.__close?.(view)
-        await this.#currentView?.close?.(view);
+        await this.#currentView?.close?.(view)
-        this.#viewLayer.removeChildren();
+        this.#viewLayer.removeChildren()
 
         // open new view
-        await view.init?.(args);
+        await view.init?.(args)
 
-        this.#currentView = view;
+        this.#currentView = view
-        this.#viewLayer.addChild(view);
+        this.#viewLayer.addChild(view)
 
-        view.__close = actions?.close;
+        view.__close = actions?.close
-        await actions?.open?.(view);
+        await actions?.open?.(view)
-        await view.show?.();
+        await view.show?.()
     }
 
     async getView(className, args, preload, viewName, type) {
         // check if view is already loaded
-        let view = await this.#viewMap.get(className);
+        let view = await this.#viewMap.get(className)
 
-        let timeout;
+        let timeout
         if (this.#loading) {
             timeout = setTimeout(
                 () => this.#stage.addChild(this.#loading),
                 3000
-            );
+            )
         }
-        const onProgress = this.#loading?.onProgress;
+        const onProgress = this.#loading?.onProgress
 
         if (!view) {
             // load view
-            const ViewClass = await this.loadView(className);
+            const ViewClass = await this.loadView(className)
-            const resourceList = await ViewClass.load?.(args);
+            const resourceList = await ViewClass.load?.(args)
-            const scanedResourceList = this.#loading? this.scanResource(ViewClass.uiView): [];
+            const scanedResourceList = this.#loading
+                ? this.scanResource(ViewClass.uiView)
+                : []
             if (preload) {
-                preload = [].concat(preload).concat(scanedResourceList);
+                preload = [].concat(preload).concat(scanedResourceList)
             } else {
-                preload = scanedResourceList;
+                preload = scanedResourceList
             }
-            await this.loadRes(resourceList, preload, onProgress);
+            await this.loadRes(resourceList, preload, onProgress)
 
             // create view
-            view = new ViewClass();
+            view = new ViewClass()
             // add view to map
-            this.#viewMap.set(className, view);
+            this.#viewMap.set(className, view)
         } else {
             // load resource
-            const resourceList = await view.constructor.load?.(args);
+            const resourceList = await view.constructor.load?.(args)
-            await this.loadRes(resourceList, preload, onProgress);
+            await this.loadRes(resourceList, preload, onProgress)
         }
-        if(timeout) clearTimeout(timeout);
+        if (timeout) clearTimeout(timeout)
-        this.#loading?.removeSelf();
+        this.#loading?.removeSelf()
 
-        this.#config(view, viewName, type);
+        this.#config(view, viewName, type)
         // return view
-        return view;
+        return view
     }
 
     async loadView(className) {
         // load view
-        if(this.#class.has(className)) return this.#class.get(className);
+        if (this.#class.has(className)) return this.#class.get(className)
-        const c = (await import(`./themes/${className}.js`)).default;
+        const views = import.meta.glob('./themes/**/*.js')
-        this.#class.set(className, c);
+        const view = (await views[`./themes/${className}.js`]()).default
-        return c;
+        this.#class.set(className, view)
+        return view
     }
 
     async loadRes(resourceList, preload, onProgress) {
-        const cnt = (resourceList?.length || 0)
+        const cnt = (resourceList?.length || 0) + (preload?.length || 0)
-            +(preload?.length || 0);
         if (resourceList && resourceList.length) {
-            const s = resourceList.length / cnt;
+            const s = resourceList.length / cnt
-            await Laya.promises.loader.load(resourceList, Laya.Handler.create(null, prg=>onProgress?.(prg*s)));
+            await Laya.promises.loader.load(
+                resourceList,
+                Laya.Handler.create(null, prg => onProgress?.(prg * s))
+            )
         }
         if (preload && preload.length) {
-            const s = 1 - preload.length / cnt;
+            const s = 1 - preload.length / cnt
-            const l = preload.length / cnt;
+            const l = preload.length / cnt
-            await Laya.promises.loader.load(preload, Laya.Handler.create(null, prg=>onProgress?.(prg*l+s)));
+            await Laya.promises.loader.load(
+                preload,
+                Laya.Handler.create(null, prg => onProgress?.(prg * l + s))
+            )
         }
     }
 
     #showDialogStack() {
         if (this.#dialogStack.length == 0) {
-            this.#dialogLayer.visible = false;
+            this.#dialogLayer.visible = false
-            return;
+            return
         }
-        this.#dialogLayer.visible = true;
+        this.#dialogLayer.visible = true
         this.#dialogStack.forEach((dialog, i) => {
-            this.#dialogLayer.addChild(dialog);
+            this.#dialogLayer.addChild(dialog)
-            dialog.zOrder = i;
+            dialog.zOrder = i
         })
-        this.#dialogLayer.addChild(this.#dialogMask);
+        this.#dialogLayer.addChild(this.#dialogMask)
-        const l = this.#dialogStack.length;
+        const l = this.#dialogStack.length
-        this.#dialogMask.zOrder = l -1;
+        this.#dialogMask.zOrder = l - 1
-        this.#dialogStack[l -1].zOrder = l;
+        this.#dialogStack[l - 1].zOrder = l
     }
 
     async showDialog(dialogName, args, actions) {
-        const className = this.#pages[dialogName];
+        const className = this.#pages[dialogName]
-        const dialog = await this.getView(className, args, actions?.load, dialogName, 'pages');
+        const dialog = await this.getView(
+            className,
+            args,
+            actions?.load,
+            dialogName,
+            'pages'
+        )
 
-        const index = this.#dialogStack.indexOf(dialog);
+        const index = this.#dialogStack.indexOf(dialog)
         if (index != -1) {
-            this.#dialogStack.splice(index, 1);
+            this.#dialogStack.splice(index, 1)
         }
-        this.#dialogStack.push(dialog);
+        this.#dialogStack.push(dialog)
-        dialog.init?.(args);
+        dialog.init?.(args)
-        dialog.centerX = dialog.centerY = 0;
+        dialog.centerX = dialog.centerY = 0
-        this.#showDialogStack();
+        this.#showDialogStack()
 
-        const open = actions?.open || (async () => {
+        const open =
-            dialog.scaleX = 0;
+            actions?.open ||
-            dialog.scaleY = 0;
+            (async () => {
-            await Laya.promises.Tween.to(dialog, { scaleX: 1, scaleY: 1 }, 300, Laya.Ease.backOut);
+                dialog.scaleX = 0
-        });
+                dialog.scaleY = 0
-        await open(dialog);
+                await Laya.promises.Tween.to(
-        dialog.mouseThrough = true;
+                    dialog,
-        dialog.mouseEnabled = true;
+                    { scaleX: 1, scaleY: 1 },
+                    300,
+                    Laya.Ease.backOut
+                )
+            })
+        await open(dialog)
+        dialog.mouseThrough = true
+        dialog.mouseEnabled = true
         dialog.close = async () => {
             if (actions?.close) {
-                await actions.close();
+                await actions.close()
             } else {
-                await Laya.promises.Tween.to(dialog, { scaleX: 0, scaleY: 0 }, 300, Laya.Ease.strongIn);
+                await Laya.promises.Tween.to(
+                    dialog,
+                    { scaleX: 0, scaleY: 0 },
+                    300,
+                    Laya.Ease.strongIn
+                )
             }
-            const index = this.#dialogStack.indexOf(dialog);
+            const index = this.#dialogStack.indexOf(dialog)
             if (index != -1) {
-                this.#dialogStack.splice(index, 1);
+                this.#dialogStack.splice(index, 1)
             }
-            this.#showDialogStack();
+            this.#showDialogStack()
         }
 
-        this.#dialogLayer.addChild(dialog);
+        this.#dialogLayer.addChild(dialog)
     }
 
     async popup(type, args) {
-        const className = this.#popups[type];
+        const className = this.#popups[type]
-        const popup = await this.getView(className, args, null, type, 'popups');
+        const popup = await this.getView(className, args, null, type, 'popups')
-        this.#popupLayer.addChild(popup);
+        this.#popupLayer.addChild(popup)
-        await popup.popup(args, this.#popupLayer);
+        await popup.popup(args, this.#popupLayer)
-        this.#popupLayer.removeChild(popup);
+        this.#popupLayer.removeChild(popup)
     }
 
     clearAllDialog() {
-        this.#dialogStack = [];
+        this.#dialogStack = []
-        this.#showDialogStack();
+        this.#showDialogStack()
     }
 
     #config(view, key, type) {
-        const config = this.#configs?.[type]?.[key];
+        const config = this.#configs?.[type]?.[key]
-        if(!config) return;
+        if (!config) return
-        if(view.config && view.config(config)) return;
+        if (view.config && view.config(config)) return
         const applyConfig = (target, config) => {
-            if(!target) return;
+            if (!target) return
             if (typeof config == 'string') {
-                config = this.#configs?.class?.[config];
+                config = this.#configs?.class?.[config]
+            }
+            $_.deepMapSet(target, config)
         }
-            $_.deepMapSet(target, config);
-        };
 
         if (config.names)
             for (const name in config.names)
-                this.#deepGetChildsByName(view, name)
+                this.#deepGetChildsByName(view, name).forEach(child =>
-                    .forEach(child => applyConfig(child, config.names[name]));
+                    applyConfig(child, config.names[name])
+                )
 
         if (config.vars)
             for (const key in config.vars)
-                applyConfig(view[key], config.vars[key]);
+                applyConfig(view[key], config.vars[key])
-
     }
 
     #deepGetChildsByName(parent, name) {
-        const list = [];
+        const list = []
-        if(!parent || !parent._childs) return list;
+        if (!parent || !parent._childs) return list
 
         for (const child of parent._childs) {
-            if(child.name == name) list.push(child);
+            if (child.name == name) list.push(child)
-            if(child._childs) list.push(...this.#deepGetChildsByName(child, name));
+            if (child._childs)
+                list.push(...this.#deepGetChildsByName(child, name))
         }
-        return list;
+        return list
     }
 
     #cutPath(path) {
-        path = ''+path;
+        path = '' + path
-        let index = path.length;
+        let index = path.length
         do {
-            index --;
+            index--
             if (path[index] == '.') {
-                break;
+                break
             }
         } while (index > 0)
-        return [
+        return [path.substring(0, index), path.substring(index, path.length)]
-            path.substring(0, index),
-            path.substring(index, path.length)
-        ];
     }
 
     #subSkin(skin, type) {
-        if(!skin || !skin.replace(/\s/g, '')) return [];
+        if (!skin || !skin.replace(/\s/g, '')) return []
         switch (type) {
             case 'ProgressBar':
-                return [ skin, ...this.#progressBarSkin(skin) ];
+                return [skin, ...this.#progressBarSkin(skin)]
             case 'ScrollBar':
-                return [ skin, ...this.#scrollBarSkin(skin) ];
+                return [skin, ...this.#scrollBarSkin(skin)]
             default:
                 return [skin]
         }
     }
 
     #progressBarSkin(skin) {
-        if(!skin.replace(/\s/g, '')) return [];
+        if (!skin.replace(/\s/g, '')) return []
-        let p = this.#cutPath(skin);
+        let p = this.#cutPath(skin)
-        return [`${p[0]}$bar${p[1]}`];
+        return [`${p[0]}$bar${p[1]}`]
     }
 
     #scrollBarSkin(skin) {
-        if(!skin.replace(/\s/g, '')) return [];
+        if (!skin.replace(/\s/g, '')) return []
-        let p = this.#cutPath(skin);
+        let p = this.#cutPath(skin)
         return [
             `${p[0]}$bar${p[1]}`,
             `${p[0]}$up${p[1]}`,
-            `${p[0]}$down${p[1]}`
+            `${p[0]}$down${p[1]}`,
-        ];
+        ]
     }
 
     scanResource(uiView) {
-        if(!uiView) return [];
+        if (!uiView) return []
-        const resourceList = [];
+        const resourceList = []
 
-        resourceList.push(...this.#subSkin(uiView.props?.skin, uiView.type));
+        resourceList.push(...this.#subSkin(uiView.props?.skin, uiView.type))
-        resourceList.push(...this.#subSkin(uiView.props?.hScrollBarSkin, 'ScrollBar'));
+        resourceList.push(
-        resourceList.push(...this.#subSkin(uiView.props?.vScrollBarSkin, 'ScrollBar'));
+            ...this.#subSkin(uiView.props?.hScrollBarSkin, 'ScrollBar')
+        )
+        resourceList.push(
+            ...this.#subSkin(uiView.props?.vScrollBarSkin, 'ScrollBar')
+        )
 
         uiView.child?.forEach(child => {
-            resourceList.push(...this.scanResource(child));
+            resourceList.push(...this.scanResource(child))
-        });
+        })
 
-        return resourceList;
+        return resourceList
     }
 
     get currentView() {
-        return this.#currentView;
+        return this.#currentView
     }
 
     get currentDialog() {
-        return this.#dialogStack[this.#dialogStack.length -1];
+        return this.#dialogStack[this.#dialogStack.length - 1]
     }
 
     get theme() {
-        return localStorage.getItem('theme');
+        return localStorage.getItem('theme')
     }
     set theme(value) {
-        localStorage.setItem('theme', value);
+        localStorage.setItem('theme', value)
-        this.#stage.bgColor = this.#configs.bgColor;
+        this.#stage.bgColor = this.#configs.bgColor
-        document?.querySelector?.('meta[name="theme-color"]')?.setAttribute?.('content', this.#configs.bgColor);
+        document
+            ?.querySelector?.('meta[name="theme-color"]')
+            ?.setAttribute?.('content', this.#configs.bgColor)
     }
 
     get #pages() {
-        return UIManager.theme(this.theme, 'pages');
+        return UIManager.theme(this.theme, 'pages')
     }
     get #popups() {
-        return UIManager.theme(this.theme, 'popups');
+        return UIManager.theme(this.theme, 'popups')
     }
     get #configs() {
-        return UIManager.theme(this.theme, 'configs');
+        return UIManager.theme(this.theme, 'configs')
     }
     get common() {
-        return this.#configs.common;
+        return this.#configs.common
     }
     gradeColor(grade) {
-        return this.common.grade[grade];
+        return this.common.grade[grade]
     }
     gradeFilter(grade) {
-        return this.common.filter[grade];
+        return this.common.filter[grade]
     }
 }

src/ui/views.js

@@ -10,32 +10,32 @@ const pages = {
     THEMES: 'THEMES',
     SAVELOAD: 'SAVELOAD',
     MODE: 'MODE',
-    CELEBRITY: 'CELEBRITY'
+    CELEBRITY: 'CELEBRITY',
-};
+}
 
 const popups = {
     ACHIEVEMENT: 'POPUP_ACHIEVEMENT',
     MESSAGE: 'POPUP_MESSAGE',
-};
+}
 
 const cyber = {
     pages: {
-        [pages.LOADING]: "loading",
+        [pages.LOADING]: 'loading',
-        [pages.MAIN]: "cyber/main",
+        [pages.MAIN]: 'cyber/main',
-        [pages.TALENT]: "cyber/talent",
+        [pages.TALENT]: 'cyber/talent',
-        [pages.PROPERTY]: "cyber/property",
+        [pages.PROPERTY]: 'cyber/property',
-        [pages.TRAJECTORY]: "cyber/trajectory",
+        [pages.TRAJECTORY]: 'cyber/trajectory',
-        [pages.SUMMARY]: "cyber/summary",
+        [pages.SUMMARY]: 'cyber/summary',
-        [pages.ACHIEVEMENT]: "cyber/achievement",
+        [pages.ACHIEVEMENT]: 'cyber/achievement',
-        [pages.THANKS]: "default/thanks",
+        [pages.THANKS]: 'default/thanks',
         [pages.THEMES]: 'themes',
         [pages.SAVELOAD]: 'saveload',
         [pages.MODE]: 'cyber/mode',
         [pages.CELEBRITY]: 'cyber/celebrity',
     },
     popups: {
-        [popups.ACHIEVEMENT]: "cyber/popup/achievementPopup",
+        [popups.ACHIEVEMENT]: 'cyber/popup/achievementPopup',
-        [popups.MESSAGE]: "message",
+        [popups.MESSAGE]: 'message',
     },
     configs: {
         bgColor: '#04131f',
@@ -47,18 +47,8 @@ const cyber = {
                 hoverStroke: '#ffa500',
             },
             defaultFontColor: '#cccccc',
-            grade: [
+            grade: ['#cccccc', '#55fffe', '#b17cff', '#ffce45'],
-                '#cccccc',
+            filter: ['#ccccccff', '#55fffeff', '#b17cffff', '#ffce45ff'],
-                '#55fffe',
-                '#b17cff',
-                '#ffce45',
-            ],
-            filter: [
-                '#ccccccff',
-                '#55fffeff',
-                '#b17cffff',
-                '#ffce45ff',
-            ],
             gradeBlk: [
                 {
                     visible: false,
@@ -78,7 +68,7 @@ const cyber = {
                     hoverColor: '#ffce45',
                     visible: true,
                 },
-            ]
+            ],
         },
         pages: {
             [pages.MAIN]: {
@@ -97,7 +87,7 @@ const cyber = {
                         lineWidth: 0,
                         radius: 100,
                     },
-                }
+                },
             },
             [pages.THANKS]: {
                 vars: {
@@ -147,7 +137,7 @@ const cyber = {
                         hoverLabel: '#ffffff',
                         radius: 80,
                     },
-                }
+                },
             },
             [pages.SAVELOAD]: {
                 vars: {
@@ -184,31 +174,31 @@ const cyber = {
                         radius: 80,
                         defaultLabel: '#ffffff',
                         hoverLabel: '#ffffff',
-                    }
-                }
                     },
-        }
+                },
-    }
+            },
+        },
+    },
 }
 
 const dark = {
     pages: {
-        [pages.LOADING]: "loading",
+        [pages.LOADING]: 'loading',
-        [pages.MAIN]: "default/main",
+        [pages.MAIN]: 'default/main',
-        [pages.TALENT]: "default/talent",
+        [pages.TALENT]: 'default/talent',
-        [pages.PROPERTY]: "default/property",
+        [pages.PROPERTY]: 'default/property',
-        [pages.TRAJECTORY]: "default/trajectory",
+        [pages.TRAJECTORY]: 'default/trajectory',
-        [pages.SUMMARY]: "default/summary",
+        [pages.SUMMARY]: 'default/summary',
-        [pages.ACHIEVEMENT]: "default/achievement",
+        [pages.ACHIEVEMENT]: 'default/achievement',
-        [pages.THANKS]: "default/thanks",
+        [pages.THANKS]: 'default/thanks',
         [pages.THEMES]: 'themes',
         [pages.SAVELOAD]: 'saveload',
         [pages.MODE]: 'default/mode',
         [pages.CELEBRITY]: 'default/celebrity',
     },
     popups: {
-        [popups.ACHIEVEMENT]: "default/popup/achievementPopup",
+        [popups.ACHIEVEMENT]: 'default/popup/achievementPopup',
-        [popups.MESSAGE]: "message",
+        [popups.MESSAGE]: 'message',
     },
     configs: {
         bgColor: '#222831',
@@ -248,18 +238,8 @@ const dark = {
                 hoverColor: '#ffc500',
                 hoverStroke: '#ffa500',
             },
-            grade: [
+            grade: ['#cccccc', '#55fffe', '#b17cff', '#ffce45'],
-                '#cccccc',
+            filter: ['#ccccccff', '#55fffeff', '#b17cffff', '#ffce45ff'],
-                '#55fffe',
-                '#b17cff',
-                '#ffce45',
-            ],
-            filter: [
-                '#ccccccff',
-                '#55fffeff',
-                '#b17cffff',
-                '#ffce45ff',
-            ],
             card: [
                 {
                     normal: {
@@ -281,7 +261,7 @@ const dark = {
                         hoverLabel: '#3b3b3b',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
                 },
                 {
                     normal: {
@@ -303,7 +283,7 @@ const dark = {
                         hoverLabel: '#3b3b3b',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
                 },
                 {
                     normal: {
@@ -325,7 +305,7 @@ const dark = {
                         hoverLabel: '#3b3b3b',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
                 },
                 {
                     normal: {
@@ -347,8 +327,8 @@ const dark = {
                         hoverLabel: '#3b3b3b',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
-                }
+                },
             ],
             summary: [
                 {
@@ -360,7 +340,8 @@ const dark = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 2,
                     radius: 0,
-                },{
+                },
+                {
                     defaultColor: '#6495ed',
                     defaultStroke: '#f8f8f8',
                     defaultLabel: '#eeeeee',
@@ -369,7 +350,8 @@ const dark = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 2,
                     radius: 0,
-                },{
+                },
+                {
                     defaultColor: '#e2a7ff',
                     defaultStroke: '#f8f8f8',
                     defaultLabel: '#eeeeee',
@@ -388,7 +370,7 @@ const dark = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 2,
                     radius: 0,
-                }
+                },
             ],
             achievement: [
                 {
@@ -400,7 +382,8 @@ const dark = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 4,
                     radius: 0,
-                },{
+                },
+                {
                     defaultColor: '#6495ed',
                     defaultStroke: '#f8f8f8',
                     defaultLabel: '#eeeeee',
@@ -409,7 +392,8 @@ const dark = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 4,
                     radius: 0,
-                },{
+                },
+                {
                     defaultColor: '#e2a7ff',
                     defaultStroke: '#f8f8f8',
                     defaultLabel: '#eeeeee',
@@ -428,7 +412,7 @@ const dark = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 4,
                     radius: 0,
-                }
+                },
             ],
             characterItem: {
                 name: {
@@ -488,7 +472,7 @@ const dark = {
             },
             font_default: {
                 color: '#eeeeee',
-            }
+            },
         },
         pages: {
             [pages.MAIN]: {
@@ -512,14 +496,14 @@ const dark = {
                 names: {
                     title: 'title',
                     btnSmall: 'btn_small',
-                }
+                },
             },
             [pages.TALENT]: {
                 vars: {
                     btnDrawCard: 'btn_main',
                     btnNext: 'btn_main',
                     title: 'title',
-                }
+                },
             },
             [pages.PROPERTY]: {
                 vars: {
@@ -530,9 +514,9 @@ const dark = {
                 names: {
                     font_default: 'font_default',
                     property: {
-                        colorFilter: '#eeeeeeff'
+                        colorFilter: '#eeeeeeff',
-                    }
+                    },
-                }
+                },
             },
             [pages.TRAJECTORY]: {
                 vars: {
@@ -548,8 +532,8 @@ const dark = {
                         radius: 4,
                     },
                     boxSpeed: {
-                        colorFilter: '#ffffffff'
+                        colorFilter: '#ffffffff',
-                    }
+                    },
                 },
                 names: {
                     propertyBox: {
@@ -571,8 +555,8 @@ const dark = {
                         hoverLabel: '#222831',
                         lineWidth: 0,
                         radius: 4,
-                    }
+                    },
-                }
+                },
             },
             [pages.SUMMARY]: {
                 vars: {
@@ -581,7 +565,7 @@ const dark = {
                 },
                 names: {
                     font_default: 'font_default',
-                }
+                },
             },
             [pages.ACHIEVEMENT]: {
                 vars: {
@@ -591,7 +575,7 @@ const dark = {
                 names: {
                     font_default: 'font_default',
                     title: 'title',
-                }
+                },
             },
             [pages.THANKS]: {
                 vars: {
@@ -632,7 +616,7 @@ const dark = {
                         hoverLabel: '#ffffff',
                         radius: 80,
                     },
-                }
+                },
             },
             [pages.SAVELOAD]: {
                 vars: {
@@ -669,20 +653,20 @@ const dark = {
                         radius: 80,
                         defaultLabel: '#ffffff',
                         hoverLabel: '#ffffff',
-                    }
+                    },
-                }
+                },
             },
             [pages.MODE]: {
                 names: {
                     font_default: 'font_default',
                     btn: 'btn_main',
-                }
+                },
             },
             [pages.CELEBRITY]: {
                 vars: {
                     btnRetry: 'btn_main',
                     btnNext: 'btn_main2',
-                }
+                },
             },
         },
         popups: {
@@ -693,31 +677,31 @@ const dark = {
                         defaultStroke: '#84ff55',
                         hoverColor: '#292a28',
                         hoverStroke: '#84ff55',
-                    }
+                    },
-                }
+                },
-            }
+            },
-        }
+        },
-    }
+    },
 }
 
 const light = {
     pages: {
-        [pages.LOADING]: "loading",
+        [pages.LOADING]: 'loading',
-        [pages.MAIN]: "default/main",
+        [pages.MAIN]: 'default/main',
-        [pages.TALENT]: "default/talent",
+        [pages.TALENT]: 'default/talent',
-        [pages.PROPERTY]: "default/property",
+        [pages.PROPERTY]: 'default/property',
-        [pages.TRAJECTORY]: "default/trajectory",
+        [pages.TRAJECTORY]: 'default/trajectory',
-        [pages.SUMMARY]: "default/summary",
+        [pages.SUMMARY]: 'default/summary',
-        [pages.ACHIEVEMENT]: "default/achievement",
+        [pages.ACHIEVEMENT]: 'default/achievement',
-        [pages.THANKS]: "default/thanks",
+        [pages.THANKS]: 'default/thanks',
         [pages.THEMES]: 'themes',
         [pages.SAVELOAD]: 'saveload',
         [pages.MODE]: 'default/mode',
         [pages.CELEBRITY]: 'default/celebrity',
     },
     popups: {
-        [popups.ACHIEVEMENT]: "default/popup/achievementPopup",
+        [popups.ACHIEVEMENT]: 'default/popup/achievementPopup',
-        [popups.MESSAGE]: "message",
+        [popups.MESSAGE]: 'message',
     },
     configs: {
         bgColor: '#ffffff',
@@ -757,18 +741,8 @@ const light = {
                 hoverColor: '#ffc500',
                 hoverStroke: '#ffa500',
             },
-            grade: [
+            grade: ['#000000', '#55fffe', '#b17cff', '#ffce45'],
-                '#000000',
+            filter: ['#000000ff', '#55fffeff', '#b17cffff', '#ffce45ff'],
-                '#55fffe',
-                '#b17cff',
-                '#ffce45',
-            ],
-            filter: [
-                '#000000ff',
-                '#55fffeff',
-                '#b17cffff',
-                '#ffce45ff',
-            ],
             card: [
                 {
                     normal: {
@@ -790,7 +764,7 @@ const light = {
                         hoverLabel: '#ffffff',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
                 },
                 {
                     normal: {
@@ -812,7 +786,7 @@ const light = {
                         hoverLabel: '#ffffff',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
                 },
                 {
                     normal: {
@@ -834,7 +808,7 @@ const light = {
                         hoverLabel: '#ffffff',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
                 },
                 {
                     normal: {
@@ -856,8 +830,8 @@ const light = {
                         hoverLabel: '#ffffff',
                         lineWidth: 4,
                         radius: 4,
-                    }
+                    },
-                }
+                },
             ],
             summary: [
                 {
@@ -869,7 +843,8 @@ const light = {
                     hoverLabel: '#ffffff',
                     lineWidth: 4,
                     radius: 4,
-                },{
+                },
+                {
                     defaultColor: '#6495ed',
                     defaultStroke: '#f8f8f8',
                     defaultLabel: '#ffffff',
@@ -878,7 +853,8 @@ const light = {
                     hoverLabel: '#666666',
                     lineWidth: 4,
                     radius: 4,
-                },{
+                },
+                {
                     defaultColor: '#e2a7ff',
                     defaultStroke: '#f8f8f8',
                     defaultLabel: '#ffffff',
@@ -887,7 +863,8 @@ const light = {
                     hoverLabel: '#666666',
                     lineWidth: 4,
                     radius: 4,
-                },{
+                },
+                {
                     defaultColor: '#ffa07a',
                     defaultStroke: '#f8f8f8',
                     defaultLabel: '#ffffff',
@@ -908,7 +885,8 @@ const light = {
                     hoverLabel: '#efefef',
                     lineWidth: 4,
                     radius: 0,
-                },{
+                },
+                {
                     defaultColor: '#6495ed',
                     defaultStroke: '#cccccc',
                     defaultLabel: '#eeeeee',
@@ -917,7 +895,8 @@ const light = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 4,
                     radius: 0,
-                },{
+                },
+                {
                     defaultColor: '#e2a7ff',
                     defaultStroke: '#cccccc',
                     defaultLabel: '#eeeeee',
@@ -926,7 +905,8 @@ const light = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 4,
                     radius: 0,
-                },{
+                },
+                {
                     defaultColor: '#ffa07a',
                     defaultStroke: '#cccccc',
                     defaultLabel: '#eeeeee',
@@ -935,7 +915,7 @@ const light = {
                     hoverLabel: '#3b3b3b',
                     lineWidth: 4,
                     radius: 0,
-                }
+                },
             ],
             characterItem: {
                 name: {
@@ -995,7 +975,7 @@ const light = {
             },
             font_default: {
                 color: '#000000',
-            }
+            },
         },
         pages: {
             [pages.MAIN]: {
@@ -1019,14 +999,14 @@ const light = {
                 names: {
                     title: 'title',
                     btnSmall: 'btn_small',
-                }
+                },
             },
             [pages.TALENT]: {
                 vars: {
                     btnDrawCard: 'btn_main',
                     btnNext: 'btn_main',
                     title: 'title',
-                }
+                },
             },
             [pages.PROPERTY]: {
                 vars: {
@@ -1037,9 +1017,9 @@ const light = {
                 names: {
                     font_default: 'font_default',
                     property: {
-                        colorFilter: '#000000ff'
+                        colorFilter: '#000000ff',
-                    }
+                    },
-                }
+                },
             },
             [pages.TRAJECTORY]: {
                 vars: {
@@ -1055,8 +1035,8 @@ const light = {
                         radius: 4,
                     },
                     boxSpeed: {
-                        colorFilter: '#666666ff'
+                        colorFilter: '#666666ff',
-                    }
+                    },
                 },
                 names: {
                     propertyBox: {
@@ -1078,8 +1058,8 @@ const light = {
                         hoverLabel: '#222831',
                         lineWidth: 0,
                         radius: 4,
-                    }
+                    },
-                }
+                },
             },
             [pages.SUMMARY]: {
                 vars: {
@@ -1088,7 +1068,7 @@ const light = {
                 },
                 names: {
                     font_default: 'font_default',
-                }
+                },
             },
             [pages.ACHIEVEMENT]: {
                 vars: {
@@ -1098,7 +1078,7 @@ const light = {
                 names: {
                     font_default: 'font_default',
                     title: 'title',
-                }
+                },
             },
             [pages.THANKS]: {
                 vars: {
@@ -1120,7 +1100,7 @@ const light = {
                         hoverStroke: '#dc76a9',
                         hoverLabel: '#ffffff',
                         radius: 4,
-                    }
+                    },
                 },
             },
             [pages.THEMES]: {
@@ -1139,7 +1119,7 @@ const light = {
                         hoverLabel: '#ffffff',
                         radius: 80,
                     },
-                }
+                },
             },
             [pages.SAVELOAD]: {
                 vars: {
@@ -1176,20 +1156,20 @@ const light = {
                         radius: 80,
                         defaultLabel: '#ffffff',
                         hoverLabel: '#ffffff',
-                    }
+                    },
-                }
+                },
             },
             [pages.MODE]: {
                 names: {
                     font_default: 'font_default',
                     btn: 'btn_main',
-                }
+                },
             },
             [pages.CELEBRITY]: {
                 vars: {
                     btnRetry: 'btn_main',
                     btnNext: 'btn_main2',
-                }
+                },
             },
         },
         popups: {
@@ -1201,14 +1181,13 @@ const light = {
                         hoverColor: '#ffffff',
                         hoverStroke: '#84ff55',
                         lineWidth: 1,
-                    }
+                    },
-                }
+                },
+            },
+        },
+    },
 }
 
-        }
+const themes = { default: dark, cyber, dark, light }
-    }
-}
 
-const themes = { default: dark, cyber, dark, light };
+export default { themes, pages, popups }
-
-export default { themes, pages, popups };

template/_layouts/default.html

@@ -2,10 +2,7 @@
 <html lang="{{ site.lang | default: "en-US" }}">
   <head>
     <meta charset="UTF-8">
-    <script data-ad-client="ca-pub-9857163863537600" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 {% seo %}
-    <link rel="preconnect" href="https://fonts.gstatic.com">
-    <link rel="preload" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700&display=swap" as="style" type="text/css" crossorigin>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#157878">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -18,8 +15,7 @@
     <header class="page-header" role="banner">
       <h1 class="project-name">{{ page.title | default: site.title | default: site.github.repository_name }}</h1>
       <h2 class="project-tagline">{{ page.description | default: site.description | default: site.github.project_tagline }}</h2>
-      <a href="/view/" class="btn">RESTART</a>
+      <a href="/public/" class="btn">RESTART</a>
-      <a href="/view/test.html" class="btn">Source Version</a>
       {% if site.github.is_project_page %}
         <a href="{{ site.github.repository_url }}" class="btn">View on GitHub</a>
       {% endif %}

template/index.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
-        <meta name="description" content="やり直すんだ。そして、次はうまくやる。"/>
-        <meta name="keywords" content="人生重开模拟器 liferestart life restart remake 人生重来"/>
-        <meta name="renderer" content="webkit"/>
-        <meta name="apple-mobile-web-app-capable" content="yes"/>
-        <meta name="full-screen" content="true"/>
-        <meta name="x5-fullscreen" content="true"/>
-        <meta name="360-fullscreen" content="true"/>
-        <meta name="theme-color" content="#157878"/>
-        <meta name="laya" screenorientation ="landscape"/>
-        <meta http-equiv="expires" content="0"/>
-        <meta http-equiv="Cache-Control" content="no-siteapp"/>
-        <title>Life Restart</title>
-        <script type="text/javascript" src="libs/laya/min/laya.core.min.js"></script>
-        <script type="text/javascript" src="libs/laya/min/laya.webgl.min.js"></script>
-        <script type="text/javascript" src="libs/laya/min/laya.filter.min.js"></script>
-        <script type="text/javascript" src="libs/laya/min/laya.particle.min.js"></script>
-        <script type="text/javascript" src="libs/laya/min/laya.ui.min.js"></script>
-    </head>
-    <body style="background:black"></body>
-</html>

template/view/index.html

@@ -7,10 +7,8 @@
         <meta name="description" content="やり直すんだ。そして、次はうまくやる。"/>
         <meta name="keywords" content="人生重开模拟器 liferestart life restart remake 人生重来"/>
         <title>Life Restart</title>
-    </head>
-    <body>
         <script language="javascript" type="text/javascript">
             window.location.href="/public/index.html";
         </script>
-    </body>
+    </head>
 </html>

test/index.js

@@ -1,74 +0,0 @@
-import { readFile } from 'fs/promises';
-import Life from '../src/life.js'
-
-globalThis.json = async fileName => JSON.parse(await readFile(`data/${fileName}.json`));
-
-globalThis.localStorage = {};
-localStorage.getItem = key => localStorage[key]===void 0? null: localStorage[key];
-localStorage.setItem = (key, value) => (localStorage[key] = value);
-
-
-globalThis.$$eventMap = new Map();
-globalThis.$$event = (tag, data) => {
-    const listener = $$eventMap.get(tag);
-    if(listener) listener.forEach(fn=>fn(data));
-}
-globalThis.$$on = (tag, fn) => {
-    let listener = $$eventMap.get(tag);
-    if(!listener) {
-        listener = new Set();
-        $$eventMap.set(tag, listener);
-    }
-    listener.add(fn);
-}
-globalThis.$$off = (tag, fn) => {
-    const listener = $$eventMap.get(tag);
-    if(listener) listener.delete(fn);
-}
-
-async function debug() {
-
-    const life = new Life();
-    await life.initial();
-
-    life.restart({
-        CHR: 5,                     // 颜值 charm CHR
-        INT: 5,                     // 智力 intelligence INT
-        STR: 5,                     // 体质 strength STR
-        MNY: 5,                     // 家境 money MNY
-        SPR: 5,                     // 快乐 spirit SPR
-        // AGE: 100,
-        TLT: [1134, 1048, 1114],    // 天赋 talent TLT
-    });
-    const lifeTrajectory = [];
-    let trajectory;
-    do{
-        try{
-            trajectory = life.next();
-        } catch(e) {
-            console.error(e);
-            // debugger
-            throw e;
-        }
-        lifeTrajectory.push(trajectory);
-        const { age, content } = trajectory;
-        console.debug(
-            `---------------------------------`,
-            `\n-- ${age} 岁\n   `,
-            content.map(
-                ({type, description, rate, name, postEvent}) => {
-                    switch(type) {
-                        case 'TLT':
-                            return `天赋【${name}】发动：${description}`;
-                        case 'EVT':
-                            return description + (postEvent?`\n    ${postEvent}`:'');
-                    }
-                }
-            ).join('\n    ')
-        );
-        if(age == 60) debugger
-    } while(!trajectory.isEnd)
-    // debugger;
-}
-
-debug();

vite.config.js

@@ -0,0 +1,7 @@
+/** @type {import('vite').UserConfig} */
+export default {
+    base: './',
+    build: {
+        outDir: 'template/public',
+    },
+}

webpack.config.cjs

@@ -1,56 +0,0 @@
-const path = require('path');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-
-module.exports = {
-  mode: 'production',
-  entry: './src/index.js',
-  devtool: 'eval-cheap-module-source-map',
-  devServer: {
-    static: [
-      {
-        directory: path.join(__dirname, 'public'),
-        publicPath: '/public',
-      },
-      {
-        directory: path.join(__dirname, 'view'),
-        publicPath: '/view',
-      },
-      {
-        directory: path.join(__dirname, 'src'),
-        publicPath: '/src',
-      },
-    ],
-  },
-  output: {
-    path: path.resolve(__dirname, 'public/chunk'),
-    filename: '[name].[chunkhash:5].js',
-    clean: true,
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      template: 'template/index.html',
-      filename: '../index.html',
-    }),
-  ],
-  module: {
-    rules: [{
-      test: /\.js$/,
-      exclude: /node_modules/,
-      use: {
-        loader: 'babel-loader',
-        options: {
-          presets: [
-            [
-              '@babel/preset-env',
-              {
-                "targets": "> 0.25%, not dead",
-                "useBuiltIns": "usage",
-                "corejs": "3.8.3",
-              }
-            ]
-          ]
-        }
-      }
-    }]
-  }
-};