4.6.3

.gitignore

@@ -12,10 +12,6 @@ package-lock.json
 /steam/depot_build_*.vdf
 !/steam/app_build_TEMPLATE.vdf
 !/steam/depot_build_TEMPLATE.vdf
-packages/origine2/src/locales/en.js
-packages/origine2/src/locales/ja.js
-packages/origine2/src/locales/zhCn.js
-packages/origine2/src/locales/en.ts
-packages/origine2/src/locales/ja.ts
-packages/origine2/src/locales/zhCn.ts
+packages/origine2/src/locales/*.js
+packages/origine2/src/locales/*.ts
 .claude

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-terre",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "private": true,
   "scripts": {
     "dev": "concurrently \"yarn dev:terre\" \"yarn dev:origine\" \"yarn dev:start-dev-server\"",

packages/origine2/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webgal-origine-2",
   "private": true,
-  "version": "4.6.2",
+  "version": "4.6.3",
   "license": "MPL-2.0",
   "scripts": {
     "sync:editor-preview-protocol": "yarn workspace @webgal/editor-preview-protocol build",
@@ -63,7 +63,7 @@
     "sass": "^1.51.0",
     "swr": "^2.2.4",
     "uuid": "^13.0.0",
-    "webgal-parser": "4.6.2",
+    "webgal-parser": "4.6.3",
     "zustand": "^4.5.2"
   },
   "devDependencies": {

packages/origine2/src/App.tsx

@@ -7,6 +7,7 @@ import useEditorStore from './store/useEditorStore';
 import useLanguage from './hooks/useLanguage';
 import { initMonaco } from '@/utils/initMonaco';
 import { useHashRouter, RouterPage } from '@/router';
+import { TrashToaster } from '@/hooks/useTrashFailedToast';
 
 function App() {
   useEffect(() => {
@@ -32,6 +33,7 @@ function App() {
   return (
     <div className="App" key={appKeyLang}>
       <RouterPage page={page} />
+      <TrashToaster />
     </div>
   );
 }

packages/origine2/src/components/AppSettings/AppSettingsDialog.tsx

@@ -36,6 +36,8 @@ import {
   NavigationFilled,
   NavigationRegular,
   Settings20Regular,
+  ArchiveFilled,
+  ArchiveRegular,
 } from '@fluentui/react-icons';
 import { Platte } from '@icon-park/react';
 import { ReactNode, useEffect, useState } from 'react';
@@ -132,6 +134,8 @@ export function SettingsShortcutGrid({ onOpenSettings }: { onOpenSettings?: () =
   const isCascaderDelimitersCustomizable = useEditorStore.use.isCascaderDelimitersCustomizable();
   const updateIsCascaderDelimitersCustomizable = useEditorStore.use.updateIsCascaderDelimitersCustomizable();
   const updateCascaderDelimiters = useEditorStore.use.updateCascaderDelimiters();
+  const isTrash = useEditorStore.use.isTrash();
+  const updateIsTrash = useEditorStore.use.updateIsTrash();
 
   return (
     <div className={styles.grid}>
@@ -211,6 +215,13 @@ export function SettingsShortcutGrid({ onOpenSettings }: { onOpenSettings?: () =
           if (!next) updateCascaderDelimiters(['/']);
         }}
       />
+      <SettingTile
+        icon={isTrash ? <ArchiveFilled /> : <ArchiveRegular />}
+        title={t`回收站`}
+        description={isTrash ? t`已启用，删除操作会移动到回收站` : t`已禁用，删除操作会永久删除`}
+        active={isTrash}
+        onClick={() => updateIsTrash(!isTrash)}
+      />
     </div>
   );
 }

packages/origine2/src/components/Assets/Assets.tsx

@@ -57,6 +57,7 @@ import { t } from '@lingui/macro';
 import Upload from './Upload';
 import naturalCompare from 'natural-compare-lite';
 import useEditorStore from '@/store/useEditorStore';
+import useTrashFailedToast from '@/hooks/useTrashFailedToast';
 
 export interface IFile {
   extName: string;
@@ -133,7 +134,8 @@ export default function Assets({
   const updateSortBy = useEditorStore.use.updateSortBy();
   const sortOrder = useEditorStore.use.sortOrder();
   const updateSortOrder = useEditorStore.use.updateSortOrder();
-  const isTrash = false;
+  const isTrash = useEditorStore.use.isTrash();
+  const toastTrashFailed = useTrashFailedToast();
 
   const currentPath = useValue([...basePath, ...selectedFilePath.slice(0, -1)]);
   const currentFullPath = useMemo(() => [...rootPath, ...currentPath.value], [currentPath.value]);
@@ -309,7 +311,12 @@ export default function Assets({
 
   const handleDeleteFile = async (source: string) => {
     if (isTrash) {
-      await api.assetsControllerTrashFileOrDir({ source });
+      try {
+        await api.assetsControllerTrashFileOrDir({ source });
+      } catch {
+        toastTrashFailed();
+        return;
+      }
     } else {
       await api.assetsControllerDeleteFileOrDir({ source });
     }

packages/origine2/src/config/highlighting/hl.json

@@ -245,8 +245,62 @@
         }
       }
     },
+    "continuation-arguments": {
+      "comment": "多行语句的参数续行，ie `  -kwarg0=val0 -kwarg1`。行首空白提供了 argument-list 需要的分隔空格",
+      "match": "^(\\s+\\-(?:\\\\.|[^\\n;])*)($|(?<!\\\\);.*?$)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#argument-list"
+            }
+          ]
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#comment-line"
+            }
+          ]
+        }
+      }
+    },
+    "continuation-text": {
+      "comment": "多行语句的文本续行，ie `  |第二段文字 -hold`",
+      "match": "^\\s+(\\|)((?:\\\\.|[^\\n;])*)($|(?<!\\\\);.*?$)",
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#operator"
+            }
+          ]
+        },
+        "2": {
+          "patterns": [
+            {
+              "include": "#utterance"
+            }
+          ]
+        },
+        "3": {
+          "patterns": [
+            {
+              "include": "#comment-line"
+            }
+          ]
+        }
+      }
+    },
     "statement": {
       "patterns": [
+        {
+          "comment": "续行必须排在普通语句之前，否则会被当成对白正文",
+          "include": "#continuation-arguments"
+        },
+        {
+          "include": "#continuation-text"
+        },
         {
           "include": "#character-colon"
         },

packages/origine2/src/hooks/usePresetTargetOptions.ts

@@ -0,0 +1,20 @@
+import { useMemo } from "react";
+import { t } from "@lingui/macro";
+
+/**
+ * 预设的效果目标，按立绘在舞台上从左到右的顺序排列
+ * @param includeStage 是否包含舞台画面
+ */
+export const usePresetTargetOptions = (includeStage = true) => {
+  return useMemo(() => new Map<string, string>([
+    [ "fig-left", t`左侧立绘` ],
+    [ "fig-left14", t`左侧 1/4 立绘` ],
+    [ "fig-left13", t`左侧 1/3 立绘` ],
+    [ "fig-center", t`中间立绘` ],
+    [ "fig-right13", t`右侧 1/3 立绘` ],
+    [ "fig-right14", t`右侧 1/4 立绘` ],
+    [ "fig-right", t`右侧立绘` ],
+    [ "bg-main", t`背景图片` ],
+    ...(includeStage ? [[ "stage-main", t`舞台画面` ] as [string, string]] : []),
+  ]), [includeStage]);
+};

packages/origine2/src/hooks/useTrashFailedToast.tsx

@@ -0,0 +1,21 @@
+import { Toast, ToastBody, Toaster, ToastTitle, useToastController } from '@fluentui/react-components';
+import { t } from '@lingui/macro';
+
+const trashToasterId = 'trash-toaster';
+
+/** 挂载在应用根部，供各处的删除操作复用 */
+export const TrashToaster = () => <Toaster toasterId={trashToasterId} />;
+
+/** 移动到回收站失败时的提示，引导用户关闭回收站功能后重试 */
+export default function useTrashFailedToast() {
+  const { dispatchToast } = useToastController(trashToasterId);
+
+  return () =>
+    dispatchToast(
+      <Toast>
+        <ToastTitle>{t`移动到回收站失败`}</ToastTitle>
+        <ToastBody>{t`可在设置中关闭回收站功能后重试，此时删除将不可恢复`}</ToastBody>
+      </Toast>,
+      { intent: 'error' },
+    );
+}