Merge branch 'dev'

MakinoharaShoko · MakinoharaShoko · commit 622e9dd9f8a5 · 2023-11-14T20:48:24.000+08:00
diff --git a/packages/origine2/src/config/info.ts b/packages/origine2/src/config/info.ts
@@ -4,6 +4,6 @@ export interface Info {
 }
 
 export const __INFO: Info = {
-  version: '4.4.6.3',
+  version: '4.4.6.4',
   buildTime: '2023-10-28T09:57:19.863Z', // 编译时会通过 version-sync.js 自动更新
 };
diff --git a/packages/origine2/src/pages/editor/EditorSidebar/EditorSidebar.tsx b/packages/origine2/src/pages/editor/EditorSidebar/EditorSidebar.tsx
@@ -42,7 +42,9 @@ export default function EditorSideBar() {
     const prevX = document.body.style.getPropertyValue("--sidebar-width");
     prevXvalue = parseInt(prevX.substring(0, prevX.length - 2), 10);
     isMouseDown = true;
-    document.getElementById("gamePreviewIframe")!.style.zIndex = '-1';
+    const previewFrame = document.getElementById("gamePreviewIframe");
+    if(previewFrame)
+      previewFrame.style.zIndex = '-1';
   };
 
   const handleDrag = (event: MouseEvent) => {
@@ -61,7 +63,9 @@ export default function EditorSideBar() {
       localStorage.setItem('sidebar-width', prevXvalue.toString());
     },10);
     isMouseDown = false;
-    document.getElementById("gamePreviewIframe")!.style.zIndex = '0';
+    const previewFrame = document.getElementById("gamePreviewIframe");
+    if(previewFrame)
+      previewFrame.style.zIndex = '0';
   };
 
   useEffect(() => {
diff --git a/packages/origine2/src/pages/editor/GraphicalEditor/GraphicalEditor.tsx b/packages/origine2/src/pages/editor/GraphicalEditor/GraphicalEditor.tsx
@@ -104,9 +104,9 @@ export default function GraphicalEditor(props: IGraphicalEditorProps) {
                 const sentenceConfig = sentenceEditorConfig.find((e) => e.type === sentence.command) ?? sentenceEditorDefault;
                 const SentenceEditor = sentenceConfig.component;
                 return <Draggable key={sentence.content + sentence.commandRaw + i}
-                  draggableId={sentence.content + sentence.commandRaw + i} index={i}>
+                  draggableId={sentence.content + sentence.commandRaw + i}  index={i}>
                   {(provided, snapshot) => (
-                    <div className={styles.sentenceEditorWrapper} key={sentence.commandRaw + sentence.content + i}
+                    <div className={styles.sentenceEditorWrapper} key={sentence.commandRaw + sentence.content + i + 'inner'}
                       ref={provided.innerRef}
                       {...provided.draggableProps}
                     >
diff --git a/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/ChangeCallScene.tsx b/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/ChangeCallScene.tsx
@@ -26,7 +26,7 @@ export default function ChangeCallScene(props: ISentenceEditorProps) {
           }} extName={[".txt"]} />
         </>
       </CommonOptions>
-      <CommonOptions key="1" title={t('options.call.title')}>
+      <CommonOptions key="2" title={t('options.call.title')}>
         <TerreToggle title="" onChange={(newValue) => {
           isCallScene.set(newValue);
           submit();
diff --git a/packages/terre2/assets/templates/WebGAL_Template/assets/index-85ab9814.js b/packages/terre2/assets/templates/WebGAL_Template/assets/index-85ab9814.js
diff --git a/packages/terre2/assets/templates/WebGAL_Template/assets/initRegister-12a42e02.js b/packages/terre2/assets/templates/WebGAL_Template/assets/initRegister-12a42e02.js
diff --git a/packages/terre2/assets/templates/WebGAL_Template/game/video/.gitkeep b/packages/terre2/assets/templates/WebGAL_Template/game/video/.gitkeep
diff --git a/packages/terre2/assets/templates/WebGAL_Template/index.html b/packages/terre2/assets/templates/WebGAL_Template/index.html
@@ -9,7 +9,7 @@
   <title>WebGAL</title>
   <meta name="viewport"
         content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
-  <script type="module" crossorigin src="./assets/index-adb30695.js"></script>
+  <script type="module" crossorigin src="./assets/index-85ab9814.js"></script>
   <link rel="stylesheet" href="./assets/index-51db1e72.css">
 </head>
 <body>
diff --git a/packages/terre2/src/main.ts b/packages/terre2/src/main.ts
@@ -20,7 +20,7 @@ async function bootstrap() {
 }
 
 bootstrap().then(() => {
-  console.log(`WebGAL Terre 4.4.6.3 starting at ${process.cwd()}`);
+  console.log(`WebGAL Terre 4.4.6.4 starting at ${process.cwd()}`);
   if ((process?.env?.NODE_ENV ?? '') !== 'development')
     _open('http://localhost:3001');
 });

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ export interface Info {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`export const __INFO: Info = {`
`7`		`- version: '4.4.6.3',`
	`7`	`+ version: '4.4.6.4',`
`8`	`8`	`buildTime: '2023-10-28T09:57:19.863Z', // 编译时会通过 version-sync.js 自动更新`
`9`	`9`	`};`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ async function bootstrap() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`bootstrap().then(() => {`
`23`		- console.log(`WebGAL Terre 4.4.6.3 starting at ${process.cwd()}`);
	`23`	+ console.log(`WebGAL Terre 4.4.6.4 starting at ${process.cwd()}`);
`24`	`24`	`if ((process?.env?.NODE_ENV ?? '') !== 'development')`
`25`	`25`	`_open('http://localhost:3001');`
`26`	`26`	`});`