Merge 6f63d63cff into 5d1b623230

.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}}
+
+

.vscode/launch.json

@@ -25,7 +25,7 @@
             "request": "launch",
             "name": "xlsx2json",
             "program": "${workspaceFolder}/node_modules/v-transform/src/index.js",
-            "args": ["transform", "jobs/xlsx2json/config.json"],
+            "args": ["transform", "-s", "4", "-d", "public", "data/**/*.xlsx"],
             "skipFiles": [
                 "<node_internals>/**"
             ]

build.sh

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

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":48,"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

@@ -7,7 +7,7 @@
         "test": "node test",
         "xlsxTransform": "vt transform data",
         "xlsx2json": "vt transform -s 4 -d public data/**/*.xlsx",
-        "dev": "webpack serve --open /view/index.html",
+        "dev": "webpack serve --open /public/dev.html",
         "build": "webpack --mode production"
     },
     "devDependencies": {

public/data/en-us/events.json

@@ -6275,7 +6275,7 @@
     },
     "10775": {
         "id": 10775,
-        "event": "【绝密消息】2024.7.31，策划时隔两年再次更新了部分游戏文案",
+        "event": "【绝密消息】作者的新作《纸上谈亲》上线小程序啦，是一个相亲模拟器，微信/抖音搜索“纸上谈亲”即可游玩~",
         "grade": 2,
         "include": "TLT?[1112]",
         "exclude": "EVT?[10775]"
@@ -6303,7 +6303,7 @@
     },
     "10779": {
         "id": 10779,
-        "event": "【绝密消息】不会吧，2024年了居然还有人在人生重开？",
+        "event": "【绝密消息】不会吧，2025年了居然还有人在人生重开？",
         "grade": 2,
         "include": "TLT?[1112]",
         "exclude": "EVT?[10779]"

public/data/zh-cn/events.json

@@ -6275,7 +6275,7 @@
     },
     "10775": {
         "id": 10775,
-        "event": "【绝密消息】2024.7.31，策划时隔两年再次更新了部分游戏文案",
+        "event": "【绝密消息】作者的新作《纸上谈亲》上线小程序啦，是一个相亲模拟器，微信/抖音搜索“纸上谈亲”即可游玩~",
         "grade": 2,
         "include": "TLT?[1112]",
         "exclude": "EVT?[10775]"
@@ -6303,7 +6303,7 @@
     },
     "10779": {
         "id": 10779,
-        "event": "【绝密消息】不会吧，2024年了居然还有人在人生重开？",
+        "event": "【绝密消息】不会吧，2025年了居然还有人在人生重开？",
         "grade": 2,
         "include": "TLT?[1112]",
         "exclude": "EVT?[10779]"

public/index.html

@@ -1 +1 @@
-<!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>
+<!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.c3703.js"></script></head><body style="background:black"></body></html>

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/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;