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

New PEG-based Parser #555

Open
wants to merge 1,809 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
1809 commits
Select commit Hold shift + click to select a range
a9fa5fe
update parser build
MakinoharaShoko Jan 20, 2024
1cf0d5d
update version number
MakinoharaShoko Jan 21, 2024
fb2cef0
Merge pull request #450 from OpenWebGAL/dev
MakinoharaShoko Jan 21, 2024
a428c03
add command receive from terre
MakinoharaShoko Jan 21, 2024
af6c819
feat: enhance performance of backlog
MakinoharaShoko Jan 24, 2024
dd8c8f5
fix: iOS resize problem
MakinoharaShoko Jan 27, 2024
4b85267
fix: timeline func problem of scale and transform
MakinoharaShoko Jan 27, 2024
6136809
update version
MakinoharaShoko Jan 27, 2024
322df19
Merge pull request #454 from OpenWebGAL/dev
MakinoharaShoko Jan 27, 2024
6f7441c
build(deps-dev): bump vite from 4.5.1 to 4.5.2
dependabot[bot] Jan 27, 2024
44b98f8
fix: remove useless script config
MakinoharaShoko Jan 28, 2024
ada59c8
refactor: 优化script配置构造结构
yuyi919 Jan 28, 2024
b258e11
format: 格式化parser代码
yuyi919 Jan 28, 2024
0bd9e42
refactor: 重构优化解析commandType
yuyi919 Jan 28, 2024
68c358a
Merge branch 'OpenWebGAL:main' into refactoring
yuyi919 Jan 28, 2024
cdecfc8
refactor: 开放直接传入Map,但仍可以传递Array
yuyi919 Jan 28, 2024
d62c8ab
fix: 修补类型关联便于重构
yuyi919 Jan 28, 2024
aee09e3
Merge branch 'refactoring' of https://github.com/yuyi919/WebGAL into …
yuyi919 Jan 28, 2024
0b20eab
fix: eslint error and typo
MakinoharaShoko Jan 28, 2024
987e9f9
Merge branch 'pr/456' into dev
MakinoharaShoko Jan 28, 2024
6cee0b0
Update match.ts
MakinoharaShoko Jan 29, 2024
34a28c1
fix: wheel as fast
MakinoharaShoko Jan 29, 2024
28e996c
feat: basic infrastructure for UI customization
MakinoharaShoko Feb 8, 2024
d363375
fix: scss parser
MakinoharaShoko Feb 8, 2024
f748dbf
fix: do not block auto when effect sound loops
MakinoharaShoko Feb 13, 2024
30e163b
refactor: event system
MakinoharaShoko Feb 14, 2024
4f06759
feat: style update message handler
MakinoharaShoko Feb 14, 2024
ffd1639
feat: update menu UI
MakinoharaShoko Feb 14, 2024
bc44611
feat: add menu button checked state style
MakinoharaShoko Feb 14, 2024
22a560e
Merge pull request #444 from OpenWebGAL/dependabot/npm_and_yarn/follo…
MakinoharaShoko Feb 15, 2024
0f60c93
Merge pull request #449 from OpenWebGAL/dependabot/npm_and_yarn/vite-…
MakinoharaShoko Feb 15, 2024
e8b9904
adjust cg and menu panel style
MakinoharaShoko Feb 16, 2024
e161e67
feat: textbox and title UI customize config
MakinoharaShoko Feb 16, 2024
075c50b
Merge pull request #461 from OpenWebGAL/new-ui
MakinoharaShoko Feb 16, 2024
46bd964
Update initializeScript.ts
MakinoharaShoko Feb 16, 2024
ca30bca
fix: extra cg page number count
MakinoharaShoko Feb 17, 2024
40e1d99
add template config file
MakinoharaShoko Feb 17, 2024
fab8532
feat: apply style command
MakinoharaShoko Feb 17, 2024
518aa1e
feat: auto full screen after entering game
nini22P Feb 19, 2024
01fd4b4
Merge pull request #463 from nini22P/dev
nini22P Feb 19, 2024
e0ac15a
feat: improved full screen
nini22P Feb 20, 2024
0ccb1e0
Merge pull request #464 from nini22P/dev
nini22P Feb 20, 2024
39e3c22
feat: press Esc not exit full screen (FireFox and Safari not support)
nini22P Feb 21, 2024
dc17fba
Merge pull request #465 from nini22P/dev
nini22P Feb 21, 2024
8b17a9d
Move keyboard to useHotkey
nini22P Feb 21, 2024
0b36de0
Merge pull request #466 from nini22P/dev
nini22P Feb 21, 2024
24b7330
fix: title style
MakinoharaShoko Feb 21, 2024
c33e2a0
Remove window change detection to update status after exiting full sc…
nini22P Mar 2, 2024
23ced63
ios line break
MakinoharaShoko Mar 2, 2024
3124964
fix: iOS line break and delay
MakinoharaShoko Mar 2, 2024
de2083d
fix: backlog line break
MakinoharaShoko Mar 2, 2024
7e481d7
fix: vocal not play problem
MakinoharaShoko Mar 2, 2024
2e9c5c4
Merge pull request #472 from OpenWebGAL/ios-text
MakinoharaShoko Mar 2, 2024
8fa74b1
fix: can not continue game after calling 'end'
MakinoharaShoko Mar 2, 2024
cf2e677
Merge branch 'dev' of https://github.com/OpenWebGAL/WebGAL into dev
MakinoharaShoko Mar 2, 2024
ee79063
update version
MakinoharaShoko Mar 2, 2024
5b9b137
Merge pull request #473 from OpenWebGAL/dev
MakinoharaShoko Mar 2, 2024
e180c3f
build(deps): bump axios from 0.26.1 to 0.28.0
dependabot[bot] Mar 2, 2024
9d939bc
Merge pull request #467 from OpenWebGAL/dependabot/npm_and_yarn/axios…
MakinoharaShoko Mar 3, 2024
cd67aef
Merge pull request #474 from OpenWebGAL/add-spine-suuport
MakinoharaShoko Mar 3, 2024
fb4ef20
feat: when expression supports logical operators
MakinoharaShoko Mar 4, 2024
ff29415
add product hunt
MakinoharaShoko Mar 7, 2024
bf9250a
refactor: saves storage
MakinoharaShoko Mar 16, 2024
658ef4f
fix: figure and animation target convert to string
MakinoharaShoko Mar 21, 2024
daf5232
update version number
MakinoharaShoko Mar 24, 2024
f33258d
Merge pull request #481 from OpenWebGAL/dev
MakinoharaShoko Mar 24, 2024
1bfcf3b
fix: save page load from storage
MakinoharaShoko Mar 24, 2024
25f63fb
update parser
MakinoharaShoko Mar 26, 2024
7514700
update parser
MakinoharaShoko Mar 26, 2024
bf5a94c
Update package.json
MakinoharaShoko Mar 26, 2024
4c0f907
feat: update websocket route
MakinoharaShoko Mar 27, 2024
0ad55d1
fix: ws port
MakinoharaShoko Mar 27, 2024
32b6348
fix: update scss hide landing page
MakinoharaShoko Mar 30, 2024
ab001ea
update landing page
MakinoharaShoko Mar 30, 2024
613ba93
fix: shockwave
MakinoharaShoko Apr 2, 2024
72e0926
fix: soften
MakinoharaShoko Apr 2, 2024
f38c3e4
feat: screen constants, fix: iOS font problem.
MakinoharaShoko Apr 2, 2024
4538322
fix: English translation
MakinoharaShoko Apr 3, 2024
a292691
fix: parser scss bug
MakinoharaShoko Apr 14, 2024
4f9be48
feat: add stage object tyle
MakinoharaShoko Apr 20, 2024
5b55ffc
enhance template textbox stylesheet
MakinoharaShoko May 3, 2024
59110a2
feat: separate textbox bg and text.
MakinoharaShoko May 3, 2024
07bdc9f
Update textbox.scss
MakinoharaShoko May 3, 2024
9eb7185
update version number
MakinoharaShoko May 3, 2024
a637840
Update releasenote.md
MakinoharaShoko May 3, 2024
744ada3
Merge pull request #490 from OpenWebGAL/dev
MakinoharaShoko May 3, 2024
99900b6
perf: use "includes" instead of "forEach".
woai3c May 7, 2024
ffb4954
Merge pull request #491 from woai3c/main
MakinoharaShoko May 7, 2024
10a3261
feat: use alpha filter instead of alpha
MakinoharaShoko May 9, 2024
7e60cc0
fix: convert transform for alpha filter
MakinoharaShoko May 9, 2024
fa2ef74
fix: moc3 problem
MakinoharaShoko May 10, 2024
2a85a57
Merge pull request #492 from OpenWebGAL/use-alpha-filter
MakinoharaShoko May 10, 2024
269896b
fix: use true scene name in "sync with terre"
MakinoharaShoko May 11, 2024
1c1e6fb
update version number
MakinoharaShoko May 19, 2024
ccf9411
Update releasenote.md
MakinoharaShoko May 19, 2024
fba1978
Merge pull request #494 from OpenWebGAL/dev
MakinoharaShoko May 19, 2024
3d479f4
fix: textbox offset left can not modify when miniavatar on
MakinoharaShoko Jun 2, 2024
0f7b710
脚本内容部分增加trim 处理
xiaoxustudio Jun 10, 2024
a198914
脚本内容部分增加trim 处理
xiaoxustudio Jun 10, 2024
2062622
Merge branch 'dev' of https://github.com/xiaoxustudio/WebGAL into dev
xiaoxustudio Jun 10, 2024
1132597
条件判断语法增加异常处理
xiaoxustudio Jun 10, 2024
c1634a1
空值修复
xiaoxustudio Jun 12, 2024
771a384
Merge pull request #501 from xiaoxustudio/dev1
MakinoharaShoko Jun 12, 2024
1d996d4
fix: change log level in prod mode
MakinoharaShoko Jun 13, 2024
9656d65
fix: experimental add escape of semi
MakinoharaShoko Jun 13, 2024
21d16cf
perf: 🎈 use texture swap
Jun 14, 2024
bda8a2f
Merge branch 'dev' into dev
MakinoharaShoko Jun 14, 2024
f79f5f5
feat: experimental fast preview
MakinoharaShoko Jun 14, 2024
5b47c98
Merge pull request #502 from Ocyss/dev
MakinoharaShoko Jun 15, 2024
d62d80b
feat: Spine background
bromine0x23 Jun 8, 2024
eeda865
fix: use if instead of loop, remove useless logs
MakinoharaShoko Jun 15, 2024
dc6bf37
Merge pull request #504 from bromine0x23/main
MakinoharaShoko Jun 15, 2024
c3ec7df
fix: improve Japanese translations
reosablo Jun 15, 2024
5deff53
Merge pull request #505 from reosablo/feature/fix-japanese-translations
MakinoharaShoko Jun 15, 2024
8886f70
update version
MakinoharaShoko Jun 15, 2024
75b2bf2
Merge pull request #506 from OpenWebGAL/dev
MakinoharaShoko Jun 15, 2024
1825734
Update README.md
MakinoharaShoko Jun 22, 2024
9b11622
Update README_EN.md
MakinoharaShoko Jun 22, 2024
f44f3ce
Update README_JP.md
MakinoharaShoko Jun 22, 2024
28efdb3
Update README_KO.md
MakinoharaShoko Jun 22, 2024
ee01f3b
Update README_FR.md
MakinoharaShoko Jun 22, 2024
5503927
feat: text enhance syntax
MakinoharaShoko Jun 23, 2024
d2084be
update pixi-l2d-display deps
MakinoharaShoko Jun 24, 2024
70ff3ba
fix: choose component abstract
MakinoharaShoko Jun 24, 2024
671f156
在into、textbox上增加对常用的符号转义
xiaoxustudio Jun 28, 2024
74a31c7
setVar增加获取游戏运行属性,可用于调试游戏等操作
xiaoxustudio Jun 29, 2024
f7b5915
fix: memory leak, prefetch error handle
MakinoharaShoko Jun 29, 2024
82c10c0
fix: scene async problem
MakinoharaShoko Jun 29, 2024
8a0382e
fix: scene fetch error handle
MakinoharaShoko Jun 29, 2024
1a2f460
feat: add choose comp custom UI
MakinoharaShoko Jun 30, 2024
b660f5b
update version
MakinoharaShoko Jun 30, 2024
ea0f06b
Merge pull request #509 from OpenWebGAL/dev
MakinoharaShoko Jun 30, 2024
6de3cee
Merge branch 'dev' into dev1
xiaoxustudio Jun 30, 2024
6533bab
Merge branch 'dev1' of https://github.com/xiaoxustudio/WebGAL into dev29
xiaoxustudio Jul 1, 2024
06b9728
add test txt file
xiaoxustudio Jul 1, 2024
d8b4df2
Merge branch 'OpenWebGAL:main' into dev1
xiaoxustudio Jul 1, 2024
8feddc6
split test files
MakinoharaShoko Jul 2, 2024
d4e737b
修复useEscape解析失败
xiaoxustudio Jul 2, 2024
7131627
Merge branch 'dev1' of https://github.com/xiaoxustudio/WebGAL into dev1
xiaoxustudio Jul 2, 2024
d6dcbc8
Merge pull request #508 from xiaoxustudio/dev1
MakinoharaShoko Jul 3, 2024
de4458c
增加ConfigData
xiaoxustudio Jul 5, 2024
bbc5ea5
Merge branch 'dev29' into dev
xiaoxustudio Jul 5, 2024
4314a6c
use record as the type of ConfigData
MakinoharaShoko Jul 6, 2024
9009477
Reference PR 510
xiaoxustudio Jul 7, 2024
1975f83
Merge branch 'dev' of https://github.com/xiaoxustudio/WebGAL into dev
xiaoxustudio Jul 7, 2024
99e42d2
move test script entry
MakinoharaShoko Jul 7, 2024
c81a09b
Reference PR 510 (2)
xiaoxustudio Jul 7, 2024
35d9871
Merge branch 'dev' of https://github.com/xiaoxustudio/WebGAL into dev
xiaoxustudio Jul 7, 2024
b10cff5
Fixed bug where globalVariable is empty
xiaoxustudio Jul 7, 2024
e7fbcc5
fix: game config handler
MakinoharaShoko Jul 8, 2024
cd61809
fix: lint, setVar, infoFetcher
MakinoharaShoko Jul 8, 2024
a6794f0
fix: optimize setVar
MakinoharaShoko Jul 8, 2024
c238449
fix: sperate stage and userData when get sys vars
MakinoharaShoko Jul 8, 2024
17f7a98
fix: demo var script
MakinoharaShoko Jul 8, 2024
34f1487
Merge pull request #510 from xiaoxustudio/dev
MakinoharaShoko Jul 8, 2024
dbd00b9
update version
MakinoharaShoko Jul 20, 2024
b9c57d9
Merge pull request #512 from OpenWebGAL/dev
MakinoharaShoko Jul 20, 2024
ac0bdc9
fix: bgm playing problem, info fetcher
MakinoharaShoko Jul 21, 2024
6436fb8
fix: enhance script managed global var
MakinoharaShoko Jul 21, 2024
765fbf1
fix: info fetcher
MakinoharaShoko Jul 21, 2024
60b0342
Merge branch 'dev'
MakinoharaShoko Jul 21, 2024
4404c9b
fix: match style-alltext.
MakinoharaShoko Jul 22, 2024
e579085
update readme
MakinoharaShoko Jul 23, 2024
e30949b
fix: '-concat' option animation error in new line
MakinoharaShoko Jul 28, 2024
cc96ded
fix: ruby not display when style defined
MakinoharaShoko Aug 3, 2024
86bb608
feat: impl -continue arg
MakinoharaShoko Aug 16, 2024
2352066
fix: hold problem of intro
MakinoharaShoko Aug 16, 2024
3be9b36
fix: performList 神秘问题
MakinoharaShoko Aug 16, 2024
95db67a
fix: say delay calculate
MakinoharaShoko Aug 16, 2024
09bdd8a
fix: restoreScene 中的竞争状态
MakinoharaShoko Aug 19, 2024
a8815a9
fix: delete closed free figure
MakinoharaShoko Aug 19, 2024
abf79e1
fix: var value handle
hundun000 Aug 22, 2024
f76b6d1
feat:使得文本拓展语法对角色名称有效
None-44 Aug 22, 2024
c8e1593
fix:修复setVar进行compile字符串时异常
xiaoxustudio Aug 22, 2024
e5aaee6
add try catch
MakinoharaShoko Aug 22, 2024
7799f2f
Merge pull request #534 from xiaoxustudio/dev
MakinoharaShoko Aug 22, 2024
c08e62d
Merge branch 'dev' into dev-hundun/fixVarShow
MakinoharaShoko Aug 22, 2024
9935d3d
enhance getValueFromState
MakinoharaShoko Aug 22, 2024
73d39f6
fix: check is variable name
MakinoharaShoko Aug 22, 2024
febaf4e
Merge pull request #532 from hundun000/dev-hundun/fixVarShow
MakinoharaShoko Aug 22, 2024
5cca9be
fix: variable regexp
MakinoharaShoko Aug 22, 2024
08bf353
fix: fig and bg live animation key
MakinoharaShoko Aug 22, 2024
e0554ca
fix: logo image
MakinoharaShoko Aug 24, 2024
7b35bba
update version
MakinoharaShoko Aug 24, 2024
04506a0
Merge pull request #535 from OpenWebGAL/dev
MakinoharaShoko Aug 24, 2024
62e0d25
build(deps): bump micromatch from 4.0.5 to 4.0.8
dependabot[bot] Aug 24, 2024
f18d9d6
fix: return {key} when did not get value from state
MakinoharaShoko Aug 30, 2024
4191171
Update releasenote.md
MakinoharaShoko Aug 30, 2024
5ad7d97
Merge pull request #545 from OpenWebGAL/dev
MakinoharaShoko Aug 30, 2024
28b40c6
update readme
MakinoharaShoko Aug 30, 2024
64c6898
feat: add simulate vocal animation
MakinoharaShoko Aug 31, 2024
77e20d8
update simulate argo
MakinoharaShoko Aug 31, 2024
664168e
fix: simulation algo
MakinoharaShoko Aug 31, 2024
a41e9c4
fix: use key when setting var
MakinoharaShoko Sep 1, 2024
37bfddd
fix: get var problem
MakinoharaShoko Sep 1, 2024
0039ce1
update version
MakinoharaShoko Sep 1, 2024
1214127
Merge branch 'dev'
MakinoharaShoko Sep 1, 2024
9b85b7c
fix:修复姓名框错误显示并改正角色名称默认样式
None-44 Sep 3, 2024
e38ab42
feat: can override bounds
MakinoharaShoko Sep 6, 2024
3fd1b19
fix: enhance value do not effect when at first of line
MakinoharaShoko Sep 8, 2024
33a841e
Merge pull request #533 from None-44/dev
MakinoharaShoko Sep 8, 2024
6e0ab80
build(deps): bump express from 4.18.1 to 4.20.0 in /packages/server
dependabot[bot] Sep 16, 2024
1eb63a1
build(deps-dev): bump vite from 4.5.3 to 4.5.5
dependabot[bot] Sep 18, 2024
3e80091
fix: check stage obj exist when update effects
MakinoharaShoko Sep 19, 2024
41cca41
feat: add break line process
MakinoharaShoko Sep 21, 2024
acd5356
fix: preprocessor
MakinoharaShoko Sep 21, 2024
3e4e43c
export func in index
MakinoharaShoko Sep 21, 2024
6b47b85
fix: multi empty line handle
MakinoharaShoko Sep 21, 2024
44bd8ba
move the original parser to legacy folder & rename package
tinyAdapter Sep 21, 2024
f2f4d23
feat: new parser implementation using PEG (Peggy)
tinyAdapter Sep 21, 2024
a5e5d36
fix: downgrade tsx package
tinyAdapter Sep 21, 2024
3d3ac3e
fix: migrate to the latest parser code base
tinyAdapter Sep 21, 2024
11f0a9a
build(deps-dev): bump rollup from 3.29.4 to 3.29.5
dependabot[bot] Sep 26, 2024
5ca0555
Merge pull request #547 from OpenWebGAL/add-simulate-vocal-ani
MakinoharaShoko Oct 1, 2024
a5a9d0f
Merge pull request #548 from OpenWebGAL/fix-bounds-l2d
MakinoharaShoko Oct 1, 2024
bdf8cb7
Merge pull request #557 from OpenWebGAL/dependabot/npm_and_yarn/rollu…
MakinoharaShoko Oct 1, 2024
8aaee61
Merge pull request #552 from OpenWebGAL/dependabot/npm_and_yarn/vite-…
MakinoharaShoko Oct 1, 2024
db81a13
Merge pull request #551 from OpenWebGAL/dependabot/npm_and_yarn/packa…
MakinoharaShoko Oct 1, 2024
58fc90a
Merge pull request #536 from OpenWebGAL/dependabot/npm_and_yarn/micro…
MakinoharaShoko Oct 1, 2024
66fef26
build(deps): bump body-parser from 1.20.2 to 1.20.3
dependabot[bot] Oct 1, 2024
9490ea8
build(deps): bump path-to-regexp from 0.1.7 to 0.1.10
dependabot[bot] Oct 1, 2024
9318e70
Merge pull request #537 from OpenWebGAL/fix-stage-obj-exit-animation
MakinoharaShoko Oct 15, 2024
5f1934b
Merge pull request #561 from OpenWebGAL/dependabot/npm_and_yarn/path-…
MakinoharaShoko Oct 15, 2024
616a82c
Merge pull request #560 from OpenWebGAL/dependabot/npm_and_yarn/body-…
MakinoharaShoko Oct 15, 2024
04c7aee
Merge branch 'main' into dev
MakinoharaShoko Oct 15, 2024
6eea82f
feat: set figure z-index use argument `zIndex`
MakinoharaShoko Oct 15, 2024
d5f5d0a
优化富文本显示排版
RinPV2 Oct 17, 2024
64390dc
feat: rewrite preprocessor & add force-multiline
tinyAdapter Oct 19, 2024
1b3f3f9
test: parser: multiline
tinyAdapter Oct 19, 2024
5181a3d
fix: remove line height limit of single segment of line
MakinoharaShoko Oct 22, 2024
fe03456
fix: basic style of .TextBox_textElement should be same.
MakinoharaShoko Oct 22, 2024
51cb753
Merge pull request #568 from RinPV2/dev
MakinoharaShoko Oct 22, 2024
29a685a
fix: temporary disable source map
MakinoharaShoko Oct 25, 2024
71a7e85
update version
MakinoharaShoko Oct 28, 2024
0b261ef
Merge pull request #572 from OpenWebGAL/dev
MakinoharaShoko Oct 28, 2024
d304fdb
fix: textbox style
MakinoharaShoko Oct 28, 2024
159d3c5
Fix say script to replace spaces with \u00a0
MakinoharaShoko Oct 31, 2024
825d420
Merge pull request #575 from OpenWebGAL/MakinoharaShoko/fix-say-script
MakinoharaShoko Nov 2, 2024
e8a6763
fix: unmount perform function issue #576
MakinoharaShoko Nov 2, 2024
4201216
fix: perform duplicate problem
MakinoharaShoko Nov 3, 2024
6ed6bce
fix: An issue where multiple performance records were unexpectedly st…
MakinoharaShoko Nov 4, 2024
1203d6f
fix: only l2d can set paramY of mouth
MakinoharaShoko Nov 4, 2024
fad6941
update version
MakinoharaShoko Nov 4, 2024
de42509
feat: add configs to control panic function enable
MakinoharaShoko Nov 9, 2024
5cfd5a7
feat: allow user manual forward `intro`
MakinoharaShoko Nov 9, 2024
2481de3
Merge pull request #570 from tinyAdapter/process-line-break
MakinoharaShoko Nov 12, 2024
49f97e6
Merge pull request #558 from OpenWebGAL/process-line-break
MakinoharaShoko Nov 12, 2024
1700bf0
Merge branch 'dev' into pr/555
MakinoharaShoko Nov 12, 2024
9a18aef
Update package.json
MakinoharaShoko Nov 12, 2024
5cc1c7b
fix: temporary restore old parser
MakinoharaShoko Nov 12, 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
Prev Previous commit
Next Next commit
fix: unmount perform function issue #576
MakinoharaShoko committed Nov 2, 2024
commit e8a67633b9b3bce0de5e072551c5b8d203c47868
11 changes: 9 additions & 2 deletions packages/webgal/src/Core/Modules/perform/performController.ts
Original file line number Diff line number Diff line change
@@ -50,12 +50,19 @@ export class PerformController {
if (!e.isHoldOn && e.performName === name) {
e.stopFunction();
clearTimeout(e.stopTimeout as unknown as number);
/**
* 在演出列表里删除演出对象的操作必须在调用 goNextWhenOver 之前
* 因为 goNextWhenOver 会调用 nextSentence,而 nextSentence 会清除目前未结束的演出
* 那么 nextSentence 函数就会删除这个演出,但是此时,在这个上下文,i 已经被确定了
* 所以 goNextWhenOver 后的代码会多删东西,解决方法就是在调用 goNextWhenOver 前先删掉这个演出对象
* 此问题对所有 goNextWhenOver 属性为真的演出都有影响,但只有 2 个演出有此问题
*/
this.performList.splice(i, 1);
i--;
if (e.goNextWhenOver) {
// nextSentence();
this.goNextWhenOver();
}
this.performList.splice(i, 1);
i--;
}
}
} else {
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ export const nextSentence = () => {
if (!e.isHoldOn) {
if (e.goNextWhenOver) {
isGoNext = true;
}
} // 先检查是不是要跳过收集
if (!e.skipNextCollect) {
// 由于提前结束使用的不是 unmountPerform 标准 API,所以不会触发两次 nextSentence
e.stopFunction();