Merge branch 'dev'

MakinoharaShoko · MakinoharaShoko · commit 6419a23fcca8 · 2024-09-01T11:50:47.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webgal-terre",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "private": true,
   "scripts": {
     "dev": "concurrently \"yarn dev:terre\" \"yarn dev:origine\" \"yarn dev:start-dev-server\"",
diff --git a/packages/origine2/package.json b/packages/origine2/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webgal-origine-2",
   "private": true,
-  "version": "4.5.6",
+  "version": "4.5.7",
   "license": "MPL-2.0",
   "scripts": {
     "dev": "lingui extract && lingui compile --typescript && vite --host",
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.5.6',
+  version: '4.5.7',
   buildTime: '2024-08-17T14:10:41.796Z', // 编译时会通过 version-sync.js 自动更新
 };
diff --git a/packages/terre2/assets/templates/WebGAL_Template/assets/index-d949e7f1.js b/packages/terre2/assets/templates/WebGAL_Template/assets/index-d949e7f1.js
diff --git a/packages/terre2/assets/templates/WebGAL_Template/assets/index-d949e7f1.js.map b/packages/terre2/assets/templates/WebGAL_Template/assets/index-d949e7f1.js.map
diff --git a/packages/terre2/assets/templates/WebGAL_Template/assets/initRegister-0e5b8dcf.js b/packages/terre2/assets/templates/WebGAL_Template/assets/initRegister-0e5b8dcf.js
diff --git a/packages/terre2/assets/templates/WebGAL_Template/assets/initRegister-0e5b8dcf.js.map b/packages/terre2/assets/templates/WebGAL_Template/assets/initRegister-0e5b8dcf.js.map
diff --git a/packages/terre2/assets/templates/WebGAL_Template/game/template/template.json b/packages/terre2/assets/templates/WebGAL_Template/game/template/template.json
@@ -1,4 +1,4 @@
 {
   "name":"Default Template",
-  "webgal-version":"4.5.6"
+  "webgal-version":"4.5.7"
 }
diff --git a/packages/terre2/assets/templates/WebGAL_Template/index.html b/packages/terre2/assets/templates/WebGAL_Template/index.html
@@ -7,7 +7,7 @@
   <link rel="manifest" href="./manifest.json" />
   <!--    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>-->
   <title>WebGAL</title>
-  <script type="module" crossorigin src="./assets/index-cb16cf2a.js"></script>
+  <script type="module" crossorigin src="./assets/index-d949e7f1.js"></script>
   <link rel="stylesheet" href="./assets/index-e85ba9eb.css">
 </head>
 
diff --git a/packages/terre2/package.json b/packages/terre2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webgal-terre-2",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "",
   "author": "",
   "private": true,
diff --git a/packages/terre2/src/main.ts b/packages/terre2/src/main.ts
@@ -8,7 +8,7 @@ import { env } from 'process';
 import { WsAdapter } from '@nestjs/platform-ws';
 
 let WEBGAL_PORT = 3000; // default port
-export const version_number = `4.5.6`;
+export const version_number = `4.5.7`;
 if (env.WEBGAL_PORT) {
   WEBGAL_PORT = Number.parseInt(env.WEBGAL_PORT);
 }
diff --git a/releasenote.md b/releasenote.md
@@ -12,7 +12,7 @@
 
 #### 修复
 
-4.5.6 修复：无法从状态中获取到对应 key 的变量时，返回 {key} 以避免变换不生效
+4.5.7 修复：无法从状态中获取到对应 key 的变量时，返回 {key} 以避免变换不生效
 
 修复引擎的若干错误
 
@@ -31,7 +31,7 @@ Reapply template after game creation
 
 #### Fixes
 
-4.5.6 Fix: When the corresponding key variable cannot be obtained from the state, return {key} to avoid ineffective transformation.
+4.5.7 Fix: When the corresponding key variable cannot be obtained from the state, return {key} to avoid ineffective transformation.
 
 Fix several bugs in the engine
 
@@ -51,7 +51,7 @@ Fix several bugs in the engine
 
 #### 修正
 
-4.5.6 修正：状態から対応する key の変数が取得できない場合、{key} を返すようにし、変換が無効になるのを回避しました
+4.5.7 修正：状態から対応する key の変数が取得できない場合、{key} を返すようにし、変換が無効になるのを回避しました
 
 エンジンのいくつかのバグを修正
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webgal-terre",`
`3`		`- "version": "4.5.6",`
	`3`	`+ "version": "4.5.7",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "concurrently \"yarn dev:terre\" \"yarn dev:origine\" \"yarn dev:start-dev-server\"",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webgal-origine-2",`
`3`	`3`	`"private": true,`
`4`		`- "version": "4.5.6",`
	`4`	`+ "version": "4.5.7",`
`5`	`5`	`"license": "MPL-2.0",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"dev": "lingui extract && lingui compile --typescript && vite --host",`
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.5.6',`
	`7`	`+ version: '4.5.7',`
`8`	`8`	`buildTime: '2024-08-17T14:10:41.796Z', // 编译时会通过 version-sync.js 自动更新`
`9`	`9`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"Default Template",`
`3`		`- "webgal-version":"4.5.6"`
	`3`	`+ "webgal-version":"4.5.7"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webgal-terre-2",`
`3`		`- "version": "4.5.6",`
	`3`	`+ "version": "4.5.7",`
`4`	`4`	`"description": "",`
`5`	`5`	`"author": "",`
`6`	`6`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { env } from 'process';`
`8`	`8`	`import { WsAdapter } from '@nestjs/platform-ws';`
`9`	`9`
`10`	`10`	`let WEBGAL_PORT = 3000; // default port`
`11`		-export const version_number = `4.5.6`;
	`11`	+export const version_number = `4.5.7`;
`12`	`12`	`if (env.WEBGAL_PORT) {`
`13`	`13`	`WEBGAL_PORT = Number.parseInt(env.WEBGAL_PORT);`
`14`	`14`	`}`