Merge 6f63d63cff into 5d1b623230

Squashed commit of the following:

commit f8724b9ffd
Author: Vick Scarlet <scarlet_vick@outlook.com>
Date:   Sat Jan 29 01:08:39 2022 +0800

    update event

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log

.github/workflows/fe.cdDaily.yaml

@@ -0,0 +1,74 @@
+name: FE Project CI
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'version'
+        required: false
+        default: '1.0.0'
+      oss_region:
+        description: 'oss region'
+        required: true
+        default: 'oss-cn-shanghai'
+      oss_bucket:
+        description: 'oss bucket'
+        required: true
+        default: ''
+      oss_path:
+        description: 'oss path'
+        required: false
+        default: ''
+      upload_path:
+        description: 'upload path'
+        required: true
+        default: './build'
+      pure_static_project:
+        description: 'project is a static project'
+        required: true
+        default: 'false'
+      compile_command:
+        description: 'code compile command'
+        required: true
+        default: 'true'
+
+jobs:
+  pre-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: check package.json
+        run: ${{github.event.inputs.pure_static_project}} || ( test -f ./package.json && exit 0 || (echo 'package.json is not exist!' && exit 1))
+
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.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 }}
+
+      - name: install deps and build
+        run: ${{github.event.inputs.pure_static_project}} || ${{github.event.inputs.compile_command}}
+
+      - name: deploy to oss
+        id: upload_to_oss
+        uses: AliyunWorkbench/workbench-oss@1.0.0
+        with:
+          ACCESS_KEY: ${{ secrets.AK }}
+          ACCESS_SECRET: ${{ secrets.SK }}
+          OSS_REGION: ${{github.event.inputs.oss_region}}
+          OSS_BUCKET: ${{github.event.inputs.oss_bucket}}
+          OSS_PATH: ${{github.event.inputs.oss_path}}
+          UPLOAD_PATH: ${{github.event.inputs.upload_path}}
+
+

.github/workflows/node.js.yml

@@ -0,0 +1,31 @@
+# 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

@@ -104,3 +104,7 @@ dist
 .tern-port
 
 utils/xlsxTransform-*
+
+/.idea
+
+__localStorage.json

.vscode/launch.json

@@ -4,6 +4,13 @@
     // 欲了解更多信息，请访问: 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",
@@ -16,12 +23,21 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "xlsxTransform",
-            "program": "${workspaceFolder}/utils/xlsxTransform.js",
-            "args": ["data"],
+            "name": "xlsx2json",
+            "program": "${workspaceFolder}/node_modules/v-transform/src/index.js",
+            "args": ["transform", "-s", "4", "-d", "public", "data/**/*.xlsx"],
             "skipFiles": [
                 "<node_internals>/**"
             ]
-        }
+        },
+        {
+            "name": "Attach by Process ID",
+            "processId": "${command:PickProcess}",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node"
+        },
     ]
 }

.vscode/settings.json

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

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:alpine
+
+ENV NPM_CONFIG_LOGLEVEL info
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+
+RUN npm install
+
+COPY . .
+
+EXPOSE 8080
+CMD ["yarn", "dev"]
+

README-zh_CN.md

@@ -0,0 +1,72 @@
+# Life Restart
+
+<a href="https://discord.gg/U3qrf49NMQ"><img src="https://img.shields.io/discord/883382868427014255?color=%23FEE75C&label=Discord&logo=discord&logoColor=white&style=for-the-badge" /></a>
+
+[English](./README.md) | 简体中文
+
+## 简介
+
+- Game Life Restart
+
+## 使用
+
+<details>
+<summary><strong>网页版</strong></summary>
+<br />
+
+1. 下载项目代码。
+
+```bash
+git clone https://github.com/VickScarlet/lifeRestart.git my-project
+cd my-project
+```
+
+2. 进入目录安装依赖。
+
+```bash
+yarn install
+```
+
+或者
+
+```bash
+npm install
+```
+
+3. 启动本地服务器。
+
+```bash
+yarn dev
+```
+
+或者
+
+```bash
+npm run dev
+```
+
+4. 启动完成后会自动打开浏览器访问 [http://localhost:8081/view/index.html](http://localhost:8081/view/index.html)。
+
+</details>
+
+<details>
+<summary><strong>控制台版本</strong></summary>
+<br />
+
+```bash
+node repl
+```
+
+</details>
+
+## 其他版本
+
+<details>
+<summary><strong>版本列表</strong></summary>
+<br />
+
+- Cocos版：[gameall3d/LifeRestart_Cocos](https://github.com/gameall3d/LifeRestart_Cocos)
+
+</details>
+
+> 更多信息请参考 [官网文档](https://liferestart.syaro.io/)。

README.md

@@ -1,2 +1,71 @@
-# lifeRestart
-Game Life Restart
+# Life Restart
+
+<a href="https://discord.gg/U3qrf49NMQ"><img src="https://img.shields.io/discord/883382868427014255?color=%23FEE75C&label=Discord&logo=discord&logoColor=white&style=for-the-badge" /></a>
+
+English | [简体中文](./README-zh_CN.md)
+
+## Introduction
+
+- Game Life Restart
+
+## Usage
+
+<details>
+<summary><strong>Web Version</strong></summary>
+<br />
+
+1. Clone project code.
+
+```bash
+git clone git@github.com:VickScarlet/lifeRestart.git my-project
+cd my-project
+```
+
+2. Installation dependence.
+
+```bash
+yarn install
+```
+
+Or
+
+```bash
+npm install
+```
+
+3. Start local server.
+
+```bash
+yarn dev
+```
+
+Or
+
+```bash
+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).
+</details>
+
+<details>
+<summary><strong>Command Line Version</strong></summary>
+<br />
+
+```bash
+node repl
+```
+
+</details>
+
+## Other Version
+
+<details>
+<summary><strong>Versions</strong></summary>
+<br />
+
+- Cocos Ver: [gameall3d/LifeRestart_Cocos](https://github.com/gameall3d/LifeRestart_Cocos)
+
+</details>
+
+> More instructions at [documentation](https://liferestart.syaro.io/).

_layouts/default.html

@@ -2,7 +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>
@@ -19,6 +19,7 @@
       <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="/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 %}

build.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+# 前端应用存在NPM依赖时的默认编译脚本
+npm install
+npm run build

index.md

@@ -1,3 +1,5 @@
 # Life Restart
 
 やり直すんだ。そして、次はうまくやる。[RESTART](view/index.html)
+
+<iframe src="https://discord.com/widget?id=883382868427014255&theme=dark" width="350" height="500" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>

jsconfig.json

@@ -0,0 +1,12 @@
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=759670
+	// for the documentation about the jsconfig.json format
+	"compilerOptions": {
+		"target": "es5"
+	},
+	"exclude": [
+		"node_modules",
+		"public",
+		"view"
+	]
+}

laya/.laya

@@ -0,0 +1,37 @@
+<project version="0.9.8">
+   <asynRes>img,temp,sound      </asynRes>
+   <unDealRes>embed      </unDealRes>
+   <resTypes>png,jpg   </resTypes>
+   <resExportPath>public/images/atlas   </resExportPath>
+   <asynResExportPath>public   </asynResExportPath>
+   <codeExportPath>src/ui   </codeExportPath>
+   <codeImports><![CDATA[import laya.ui.*;
+import laya.display.*; ]]>   </codeImports>
+   <codeImportsJS><![CDATA[var View=laya.ui.View;
+var Dialog=laya.ui.Dialog;]]>   </codeImportsJS>
+   <uiType>0   </uiType>
+   <uiExportPath>public/ui.json   </uiExportPath>
+   <boxTypes>Box,List,Tab,RadioGroup,ViewStack,Panel,HBox,VBox,Tree,Sprite   </boxTypes>
+   <pageTypes>View,Dialog   </pageTypes>
+   <shareResPath/>
+   <codeType>2   </codeType>
+   <resCanCompress/>
+   <resPublishQuality>80      </resPublishQuality>
+   <langPath/>
+   <defaultFont/>
+   <codeImportsTS><![CDATA[import View=laya.ui.View;
+import Dialog=laya.ui.Dialog;]]>   </codeImportsTS>
+   <textureWidth>2048   </textureWidth>
+   <textureHeight>2048   </textureHeight>
+   <picWidth>512   </picWidth>
+   <picHeight>512   </picHeight>
+   <power2>false   </power2>
+   <trimempty>false   </trimempty>
+   <codeViewExportPath>src/view   </codeViewExportPath>
+   <picType>0   </picType>
+   <atlasType>1   </atlasType>
+   <atlasScale/>
+   <copyRes>true   </copyRes>
+   <dataCompact>true   </dataCompact>
+   <ver>0.9.9 beta   </ver>
+</project>