Skip to content

Commit 87ef152

Browse files
Merge pull request #655 from OpenWebGAL/dev
4.5.12
2 parents f01d4f0 + 45cc854 commit 87ef152

File tree

37 files changed

+971
-260
lines changed

37 files changed

+971
-260
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
"private": true,
2525
"engines": {
2626
"node": "18"
27-
}
27+
},
28+
"packageManager": "[email protected]"
2829
}

packages/parser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webgal-parser",
3-
"version": "4.5.2",
3+
"version": "4.5.12",
44
"description": "WebGAL script parser",
55
"scripts": {
66
"test": "vitest",

packages/parser/src/config/scriptConfig.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export const SCRIPT_CONFIG = [
3131
{ scriptString: 'setAnimation', scriptType: commandType.setAnimation },
3232
{ scriptString: 'playEffect', scriptType: commandType.playEffect },
3333
{ scriptString: 'applyStyle', scriptType: commandType.applyStyle },
34+
{ scriptString: 'wait', scriptType: commandType.wait },
3435
];
3536
export const ADD_NEXT_ARG_LIST = [
3637
commandType.bgm,

packages/parser/src/interface/sceneInterface.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ export enum commandType {
3737
setTransform,
3838
setTransition,
3939
getUserInput,
40-
applyStyle
40+
applyStyle,
41+
wait
4142
}
4243

4344
/**

packages/webgal/.npmignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
*
3+
!dist/index.html
4+
!dist/assets/**
5+
!dist/webgal-serviceworker.js
6+
!package.json
7+
!README.md
8+
!LICENSE

packages/webgal/LICENSE

Lines changed: 373 additions & 0 deletions
Large diffs are not rendered by default.

packages/webgal/index.html

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,37 @@
215215
</script>
216216
<script type="module" src="/src/main.tsx"></script>
217217
<!--<script type="module" src="/src/Core/util/resize.ts"></script>-->
218-
<!--<script src="lib/live2d.min.js"></script>-->
219-
<!--<script src="lib/live2dcubismcore.min.js"></script>-->
218+
<script>
219+
function loadScript(url) {
220+
return new Promise((resolve, reject) => {
221+
const script = document.createElement('script');
222+
script.src = url;
223+
script.onload = () => resolve(`Loaded: ${url}`);
224+
script.onerror = (error) => reject(`Failed to load: ${url}`);
225+
document.head.appendChild(script);
226+
});
227+
}
228+
229+
async function loadLive2D() {
230+
try {
231+
// 尝试加载 Live2D SDK,
232+
// 只有在用户自行取得 Live2D 许可并放到下面的目录时,这里才可能加载成功。
233+
// 本项目 **没有** 引入 Live2D SDK
234+
// Attempt to load the Live2D SDK.
235+
// This will only succeed if the user has obtained a Live2D license and placed it in the directory below.
236+
// This project **does not** include the Live2D SDK.
237+
// Live2D SDK の読み込みを試みます。
238+
// ユーザーが Live2D ライセンスを取得し、以下のディレクトリに配置した場合のみ、読み込みが成功します。
239+
// このプロジェクトには Live2D SDK は**含まれていません**
240+
await loadScript('lib/live2d.min.js');
241+
await loadScript('lib/live2dcubismcore.min.js');
242+
console.log('Both Live2D scripts loaded successfully.');
243+
} catch (error) {
244+
console.error(error);
245+
}
246+
}
247+
loadLive2D();
248+
</script>
220249
<script>
221250
let enterPromise = new Promise(res => window.enterPromise = res);
222251
let renderPromise = new Promise(res => window.renderPromise = res);

packages/webgal/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
"name": "webgal",
3-
"private": true,
4-
"version": "4.5.11",
2+
"name": "webgal-engine",
3+
"version": "4.5.12",
54
"scripts": {
65
"dev": "vite --host --port 3000",
76
"build": "cross-env NODE_ENV=production tsc && vite build --base=./",

packages/webgal/public/game/config.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Game_key:0f87dstRg;
33
Title_img:WebGAL_New_Enter_Image.png;
44
Title_bgm:s_Title.mp3;
55
Game_Logo:WebGalEnter.png;
6+
Enable_Appreciation:true;

packages/webgal/public/game/template/Stage/TextBox/textbox.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,5 @@
150150
}
151151

152152
.text {
153-
line-height: 1.9em;
154153
overflow: hidden;
155154
}

0 commit comments

Comments
 (0)