Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: backlog record async #616

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4bff74a
feat(ci): Retrieve the Node.js version from package.json
A-kirami Dec 1, 2024
757f44b
upgrade Node.js version
A-kirami Dec 1, 2024
5ce5395
Merge pull request #596 from A-kirami/ci/node-version-file
MakinoharaShoko Dec 4, 2024
a6c8df8
build(deps): bump angular-expressions from 1.2.1 to 1.4.3
dependabot[bot] Dec 10, 2024
b4e055c
Merge pull request #597 from OpenWebGAL/dependabot/npm_and_yarn/angul…
MakinoharaShoko Dec 14, 2024
f63423a
feat: Rename "中文" to "简体中文" for better clarity
ArlenFuture Dec 16, 2024
49224f4
Merge pull request #601 from ArlenFuture/dev
MakinoharaShoko Dec 16, 2024
add78de
fix: update panic overlay text
MakinoharaShoko Dec 20, 2024
3534bdd
Update PanicYoozle.tsx
MakinoharaShoko Dec 20, 2024
e356dad
feat: returnToTitle and executeCommand ws command
ClodLingxi Nov 28, 2024
e5788a8
Add TEMP_SCENE in debugProtocol.ts
ClodLingxi Nov 28, 2024
7c54ba2
feat: TEMP_SCENE in debugProtocol.ts, DebugCommand.EXE_COMMAND Could …
ClodLingxi Nov 28, 2024
dfb4f31
review: finish 12-1 review
ClodLingxi Dec 5, 2024
5e27a17
fix: useless changes in pr/593
MakinoharaShoko Dec 10, 2024
18d7cc2
refactor ws func
MakinoharaShoko Dec 14, 2024
71abe36
Merge pull request #610 from ClodLingxi/feat-more-command-type-bfg
MakinoharaShoko Dec 22, 2024
4e10a86
fix: handle spine with .json, fix spine pivot problem
MakinoharaShoko Dec 22, 2024
53a883a
Merge pull request #613 from ClodLingxi/dev
MakinoharaShoko Dec 22, 2024
46059a6
fix: transform inherit problem
MakinoharaShoko Dec 24, 2024
541cff4
fix: demo game assets
MakinoharaShoko Dec 24, 2024
45bb627
fix: duration 0 problem #592
MakinoharaShoko Dec 24, 2024
7110d0a
move spine to a separate file
MakinoharaShoko Dec 24, 2024
8d88572
remove spine package
MakinoharaShoko Dec 24, 2024
f3085e6
bug: fix backlog record
ClodLingxi Dec 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-demo-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 16
node-version-file: package.json
cache: 'yarn'

# 安装依赖
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 16
node-version-file: package.json
cache: 'yarn'

# 安装依赖
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@
"packages/*"
]
},
"private": true
"private": true,
"engines": {
"node": "18"
}
}
3 changes: 1 addition & 2 deletions packages/webgal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@emotion/css": "^11.11.2",
"@icon-park/react": "^1.4.2",
"@reduxjs/toolkit": "^1.8.1",
"angular-expressions": "^1.1.5",
"angular-expressions": "^1.4.3",
"axios": "^0.28.0",
"cloudlogjs": "^1.0.9",
"i18next": "^22.4.15",
Expand All @@ -22,7 +22,6 @@
"modern-css-reset": "^1.4.0",
"pixi-filters": "^4.2.0",
"pixi-live2d-display-webgal": "^0.5.8",
"pixi-spine": "^3.1.2",
"pixi.js": "^6.3.0",
"popmotion": "^11.0.5",
"react": "^17.0.2",
Expand Down
3 changes: 2 additions & 1 deletion packages/webgal/src/Core/Modules/animationFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ import cloneDeep from 'lodash/cloneDeep';
import { baseTransform } from '@/store/stageInterface';
import { generateTimelineObj } from '@/Core/controller/stage/pixi/animations/timeline';
import { WebGAL } from '@/Core/WebGAL';
import PixiStage from '@/Core/controller/stage/pixi/PixiController';

export function getAnimationObject(animationName: string, target: string, duration: number) {
const effect = WebGAL.animationManager.getAnimations().find((ani) => ani.name === animationName);
if (effect) {
const mappedEffects = effect.effects.map((effect) => {
const targetSetEffect = webgalStore.getState().stage.effects.find((e) => e.target === target);
const newEffect = cloneDeep({ ...(targetSetEffect?.transform ?? baseTransform), duration: 0 });
Object.assign(newEffect, effect);
PixiStage.assignTransform(newEffect, effect);
newEffect.duration = effect.duration;
return newEffect;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { stopFast } from '@/Core/controller/gamePlay/fastSkip';
import { setEbg } from '@/Core/gameScripts/changeBg/setEbg';

export const backToTitle = () => {
if (webgalStore.getState().GUI.showTitle) return;
const dispatch = webgalStore.dispatch;
stopAllPerform();
stopAuto();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ISceneEntry } from '@/Core/Modules/scene';
import { IBacklogItem } from '@/Core/Modules/backlog';
import { SYSTEM_CONFIG } from '@/config';
import { WebGAL } from '@/Core/WebGAL';
import {callBackFunctionOfUpdate, updateFigureFlag, useSetFigure} from "@/Stage/MainStage/useSetFigure";

export const whenChecker = (whenValue: string | undefined): boolean => {
if (whenValue === undefined) {
Expand Down Expand Up @@ -150,7 +151,10 @@ export const scriptExecutor = () => {
// 保存 backlog
if (isSaveBacklog) {
// WebGAL.backlogManager.isSaveBacklogNext = true;
WebGAL.backlogManager.saveCurrentStateToBacklog();
const saveFunction = () => WebGAL.backlogManager.saveCurrentStateToBacklog();
if (updateFigureFlag) {
callBackFunctionOfUpdate.push(saveFunction);
} else saveFunction();
}
}, 0);
WebGAL.sceneManager.sceneData.currentSentenceId++;
Expand Down
Loading
Loading