Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions src/components/tw-settings-modal/settings-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,20 @@ const settingDefinitions = {
id: 'mw.settingsModal.embedGitOnSaveHelp'
}
},
skipAssetLoading: {
label: {
defaultMessage: 'Ignore Costumes When Loading Projects',
description: 'Skip loading project assets so the project opens immediately',
id: 'mw.settingsModal.skipAssetLoading'
},
help: {
defaultMessage: 'Opens a project right away without waiting for its costumes and ' +
'sounds, then loads them gradually in the background. Sprites stay ' +
'invisible until their costumes arrive.',
description: 'Ignore Costumes When Loading Projects setting help',
id: 'mw.settingsModal.skipAssetLoadingHelp'
}
},
squareStageCorners: {
label: {
defaultMessage: 'Square Stage Corners',
Expand Down Expand Up @@ -678,6 +692,7 @@ const RealLayerIndexes = createBooleanSetting('RealLayerIndexes', settingDefinit
const EnableStageResize = createBooleanSetting('EnableStageResize', settingDefinitions.enableStageResize);
const WindowAnimation = createBooleanSetting('WindowAnimation', settingDefinitions.windowAnimation);
const ScriptLazyLoading = createBooleanSetting('ScriptLazyLoading', settingDefinitions.scriptLazyLoading);
const SkipAssetLoading = createBooleanSetting('SkipAssetLoading', settingDefinitions.skipAssetLoading);
const EmbedGitOnSave = createBooleanSetting('EmbedGitOnSave', settingDefinitions.embedGitOnSave);
const SquareStageCorners = createBooleanSetting('SquareStageCorners', settingDefinitions.squareStageCorners);
const HideDeleteButton = createBooleanSetting('HideDeleteButton', settingDefinitions.hideDeleteButton);
Expand Down Expand Up @@ -1372,6 +1387,13 @@ const pageConfigurations = {
onChange: props.onScriptLazyLoadingChange
})
},
{
component: SkipAssetLoading,
props: props => ({
value: props.skipAssetLoading,
onChange: props.onSkipAssetLoadingChange
})
},
{
component: EmbedGitOnSave,
props: props => ({
Expand Down Expand Up @@ -1762,6 +1784,8 @@ SettingsModalComponent.propTypes = {
windowAnimation: PropTypes.bool,
onWindowAnimationChange: PropTypes.func,
scriptLazyLoading: PropTypes.bool,
skipAssetLoading: PropTypes.bool,
onSkipAssetLoadingChange: PropTypes.func,
onScriptLazyLoadingChange: PropTypes.func,
embedGitOnSave: PropTypes.bool,
onEmbedGitOnSaveChange: PropTypes.func
Expand Down
19 changes: 18 additions & 1 deletion src/containers/tw-settings-modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {getVanillaPalette, setVanillaPalette} from '../lib/mw-vanilla-palette';
import {getEmbedGitOnSave, setEmbedGitOnSave} from '../lib/mw-embed-git-on-save';
import {getDisableCloudVariables, setDisableCloudVariables} from '../lib/mw-editor-defaults.js';
import LazyScratchBlocks from '../lib/tw-lazy-scratch-blocks';
import {getSkipAssetLoading, setSkipAssetLoading, applySkipAssetLoading} from '../lib/mw-skip-asset-loading';
import AddonHooks from '../addons/hooks.js';
import WindowManager from '../addons/window-system/window-manager';

Expand Down Expand Up @@ -81,6 +82,7 @@ class UsernameModal extends React.Component {
enableStageResize: safeGetItem('mw:enable-stage-resize') !== 'false',
windowAnimation: safeGetItem('mw:window-animation') !== 'false',
scriptLazyLoading: LazyScratchBlocks.isScriptLazyLoadingEnabled(),
skipAssetLoading: getSkipAssetLoading(),
hideOperatorArrows: getHideOperatorArrows(),
vanillaPalette: getVanillaPalette(),
embedGitOnSave: getEmbedGitOnSave(),
Expand Down Expand Up @@ -118,6 +120,7 @@ class UsernameModal extends React.Component {
'handleCloudVariableServerChange',
'handleWindowAnimationChange',
'handleScriptLazyLoadingChange',
'handleSkipAssetLoadingChange',
'handleHideOperatorArrowsChange',
'handleVanillaPaletteChange',
'handleEmbedGitOnSaveChange',
Expand All @@ -128,11 +131,17 @@ class UsernameModal extends React.Component {
'handleHideBackpackChange',

'handleTabStyleChange',
'handleTabLooksChange',
'handleLooksChange',
'handleWindowStyleChange'
]);
}

componentDidMount () {
// 持久化设置在编辑器重启后也要生效:state 初始化只读取了值,
// 必须在此把设置真正应用到 VM(否则开关形同虚设)
applySkipAssetLoading(this.props.vm);
}

handleFramerateChange (e) {
this.props.vm.setFramerate(e.target.checked ? 60 : 30);
}
Expand Down Expand Up @@ -348,6 +357,12 @@ class UsernameModal extends React.Component {
}
}

handleSkipAssetLoadingChange (e) {
const enabled = e.target.checked;
this.setState({skipAssetLoading: enabled});
setSkipAssetLoading(this.props.vm, enabled);
}

handleHideOperatorArrowsChange (e) {
this.setState({hideOperatorArrows: e.target.checked});
setHideOperatorArrows(e.target.checked);
Expand Down Expand Up @@ -451,6 +466,8 @@ class UsernameModal extends React.Component {
onWindowAnimationChange={this.handleWindowAnimationChange}
scriptLazyLoading={this.state.scriptLazyLoading}
onScriptLazyLoadingChange={this.handleScriptLazyLoadingChange}
skipAssetLoading={this.state.skipAssetLoading}
onSkipAssetLoadingChange={this.handleSkipAssetLoadingChange}
onHideOperatorArrowsChange={this.handleHideOperatorArrowsChange}
hideOperatorArrows={this.state.hideOperatorArrows}
onVanillaPaletteChange={this.handleVanillaPaletteChange}
Expand Down
52 changes: 52 additions & 0 deletions src/lib/mw-skip-asset-loading.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/**
* 「加载作品时忽略造型」核心逻辑
*
* 两级实现(按 VM 能力自动选择):
* 1. PineWarp fork VM:原生 vm.setLoadAssetsLazily(enabled)
* 2. Bilup VM(含 JIT 编译器的上游):配合 scratch-vm PR
* 「runtime.lazyAssetInstall flag」——设置标志后,sb3 解析器走
* installWithCurrentCostume 快速路径:作品打开只等当前造型就绪,
* 其余造型/声音后台装载,到达后经 requestTargetsUpdate 刷新 GUI。
*/
const STORAGE_KEY = 'mw:skip-asset-loading';

const getSkipAssetLoading = () => {
try {
return localStorage.getItem(STORAGE_KEY) === 'true';
} catch (err) {
return false;
}
};

const applySkipAssetLoading = vm => {
if (!vm) return;
const enabled = getSkipAssetLoading();
// 1) PineWarp fork VM 的原生 API
if (typeof vm.setLoadAssetsLazily === 'function') {
vm.setLoadAssetsLazily(enabled);
return;
}
// 2) Bilup VM:lazyAssetInstall 标志(需要配套的 scratch-vm PR)
try {
if (vm.runtime) {
vm.runtime.lazyAssetInstall = enabled;
}
} catch (err) {
// ignore
}
};

const setSkipAssetLoading = (vm, enabled) => {
try {
localStorage.setItem(STORAGE_KEY, enabled ? 'true' : 'false');
} catch (err) {
// ignore
}
applySkipAssetLoading(vm);
};

export {
getSkipAssetLoading,
applySkipAssetLoading,
setSkipAssetLoading
};
4 changes: 4 additions & 0 deletions src/lib/tw-translations/local-messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,10 @@ const localMessages = {
'tw.browserModal.webglDesktop': '你也可以试试在桌面端设置里打开「硬件加速」选项:',
'tw.browserModal.webglBrowser': '请使用较新版本的 Chrome、Firefox 或 Safari,并确保显卡驱动已更新。你也可以试试在浏览器设置里打开「图形加速」或「硬件加速」选项。',

// 设置窗口:加载作品时忽略造型
'mw.settingsModal.skipAssetLoading': '加载作品时忽略造型',
'mw.settingsModal.skipAssetLoadingHelp': '打开作品时跳过造型和声音的加载,直接进入编辑器,素材随后在后台逐步加载。素材加载完成前,角色会暂时不可见。',

// 字体兜底分类
'tw.fonts.fallback.sansSerif': '无衬线体',
'tw.fonts.fallback.serif': '衬线体',
Expand Down