Merge pull request #182 from MaaAssistantArknights/dev

Author: GalvinGao

.github/workflows/azure-deploy.yml

@@ -6,6 +6,10 @@ on:
       - main
       - dev
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   deploy:
     timeout-minutes: 20
@@ -17,11 +21,11 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
-          cache: "yarn"
+          node-version-file: '.node-version'
+          cache: 'yarn'
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --frozen-lockfile
 
       - name: Build
         run: yarn build:azure
@@ -32,9 +36,9 @@ jobs:
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_DESERT_0E46AFE00 }}
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          action: "upload"
-          production_branch: "main"
-          app_location: "dist"
-          api_location: ""
+          action: 'upload'
+          production_branch: 'main'
+          app_location: 'dist'
+          api_location: ''
           skip_app_build: true
           skip_api_build: true

.github/workflows/scripts-update.yml

@@ -1,14 +1,18 @@
-name: scripts-update
+name: Update Embedded Resources
 
 on:
-  # schedule:
-  #   - cron: '0 0 * * *'
+  schedule:
+    - cron: '41 16 * * *'
   workflow_dispatch:
 
 permissions:
   contents: write
   pull-requests: write
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   update:
     timeout-minutes: 20
@@ -20,11 +24,11 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: '.node-version'
           cache: 'yarn'
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --frozen-lockfile
 
       - name: Update static
         run: |

.node-version

@@ -0,0 +1 @@
+18

package.json

@@ -82,6 +82,7 @@
     "npm-run-all2": "^6.0.2",
     "pinyin": "^3.0.0-alpha.5",
     "prettier": "^2.7.1",
+    "simplebig": "^0.0.3",
     "tailwindcss": "^3.1.4",
     "typescript": "^4.6.3",
     "vite": "^4.2.1"

public/assets/operator-avatars/char_2012_typhon.png

@@ -1,29 +1,36 @@
-import { uniqBy } from 'lodash-es'
+import { uniq, uniqBy } from 'lodash-es'
 import fetch from 'node-fetch'
 import pinyin from 'pinyin'
+import simplebig from 'simplebig'
+
+function pinyinify(name: string) {
+  return [
+    pinyin(name, {
+      compact: true,
+      heteronym: true,
+      style: pinyin.STYLE_NORMAL,
+    }),
+    pinyin(name, {
+      compact: true,
+      heteronym: true,
+      style: pinyin.STYLE_FIRST_LETTER,
+    }),
+  ].flatMap((py) => py.map((el) => el.join('')))
+}
 
 function transformOperatorName(name: string) {
-  const cleanedName = name.replace(/[”“"]/g, '')
+  const cleanedSimplifiedName = name.replace(/[”“"]/g, '')
 
-  const fullPinyin = pinyin(cleanedName, {
-    compact: true,
-    heteronym: true,
-    style: pinyin.STYLE_NORMAL,
-  })
-  const partialPinyin = pinyin(cleanedName, {
-    compact: true,
-    heteronym: true,
-    style: pinyin.STYLE_FIRST_LETTER,
-  })
+  const traditional = simplebig.s2t(name) as string
+  const cleanedTraditional = traditional.replace(/[”“"]/g, '')
   return {
     name,
-    pron:
-      //  in: [[['a', 'mi', 'ya'], ['e', 'mi', 'ya']], [['a', 'm', 'y'], ['e', 'm', 'y']]]
-      [fullPinyin, partialPinyin]
-        // out: ['amiya', 'emiya', 'amy', 'emy']
-        .flatMap((py) => py.map((el) => el.join('')))
-        // out: 'amiya emiya amy emy'
-        .join(' '),
+    alias: uniq([
+      ...pinyinify(cleanedSimplifiedName),
+      traditional,
+      cleanedTraditional,
+      ...pinyinify(cleanedTraditional),
+    ]).join(' '),
   }
 }
 

public/assets/operator-avatars/char_341_sntlla.png

@@ -1,4 +1,5 @@
 import {
+  Button,
   Card,
   Drawer,
   DrawerSize,
@@ -11,6 +12,7 @@ import {
 import { Tooltip2 } from '@blueprintjs/popover2'
 
 import { useState } from 'react'
+import { handleCopyShortCode, handleDownloadJSON } from 'services/operation'
 
 import { RelativeTime } from 'components/RelativeTime'
 import { OperationRating } from 'components/viewer/OperationRating'
@@ -32,6 +34,7 @@ export const OperationCard = ({
 }) => {
   const levels = useLevels()?.data?.data || []
   const [drawerOpen, setDrawerOpen] = useState(false)
+
   return (
     <>
       <Drawer
@@ -52,9 +55,37 @@ export const OperationCard = ({
         onClick={() => setDrawerOpen(true)}
       >
         <div className="flex items-start">
-          <H4 className="inline-block pb-1 border-b-2 border-zinc-200 border-solid mb-2">
+          <H4 className="inline-block pb-1 border-b-2 border-zinc-200 border-solid mb-2 mr-2">
             {operationDoc.doc.title}
           </H4>
+          <Tooltip2
+            placement="bottom"
+            content={<div className="max-w-sm">下载原 JSON</div>}
+          >
+            <Button
+              small
+              className="mr-2 mb-2"
+              icon="download"
+              onClick={(e) => {
+                e.stopPropagation()
+                handleDownloadJSON(operationDoc)
+              }}
+            />
+          </Tooltip2>
+          <Tooltip2
+            placement="bottom"
+            content={<div className="max-w-sm">复制神秘代码</div>}
+          >
+            <Button
+              small
+              className="mb-2"
+              icon="clipboard"
+              onClick={(e) => {
+                e.stopPropagation()
+                handleCopyShortCode(operation)
+              }}
+            />
+          </Tooltip2>
           <div className="flex-1" />
           <div className="flex flex-col items-end">
             <div className="w-full flex justify-end text-zinc-500">

public/assets/operator-avatars/char_4102_threye.png

@@ -38,7 +38,7 @@ export const OperatorSelect: FC<OperatorSelectProps> = ({
   const fuse = useMemo(
     () =>
       new Fuse(OPERATORS, {
-        keys: ['name', 'pron', 'alt_name'],
+        keys: ['name', 'alias', 'alt_name'],
         threshold: 0.3,
       }),
     [],