diff --git a/packages-user/entry-client/src/create.ts b/packages-user/entry-client/src/create.ts index 4d15a84..19dc306 100644 --- a/packages-user/entry-client/src/create.ts +++ b/packages-user/entry-client/src/create.ts @@ -1,9 +1,7 @@ import { Mota } from '@user/entry-data'; import * as Client from '@motajs/client'; import * as ClientBase from '@motajs/client-base'; -import * as Common from '@motajs/common'; import * as LegacyClient from '@motajs/legacy-client'; -import * as LegacyCommon from '@motajs/legacy-common'; import * as LegacySystem from '@motajs/legacy-system'; import * as LegacyUI from '@motajs/legacy-ui'; import * as Render from '@motajs/render'; @@ -26,9 +24,7 @@ export function create() { Mota.register('@motajs/client', Client); Mota.register('@motajs/client-base', ClientBase); - Mota.register('@motajs/common', Common); Mota.register('@motajs/legacy-client', LegacyClient); - Mota.register('@motajs/legacy-common', LegacyCommon); Mota.register('@motajs/legacy-system', LegacySystem); Mota.register('@motajs/legacy-ui', LegacyUI); Mota.register('@motajs/render', Render); diff --git a/packages-user/entry-data/src/create.ts b/packages-user/entry-data/src/create.ts index 4f04e5e..b52b60e 100644 --- a/packages-user/entry-data/src/create.ts +++ b/packages-user/entry-data/src/create.ts @@ -1,4 +1,6 @@ import { Mota } from './mota'; +import * as Common from '@motajs/common'; +import * as LegacyCommon from '@motajs/legacy-common'; import * as DataBase from '@user/data-base'; import * as DataFallback from '@user/data-fallback'; import * as DataState from '@user/data-state'; @@ -8,6 +10,8 @@ import * as LegacyPluginData from '@user/legacy-plugin-data'; export function create() { DataBase.loading.once('registered', createModule); + Mota.register('@motajs/common', Common); + Mota.register('@motajs/legacy-common', LegacyCommon); Mota.register('@user/data-base', DataBase); Mota.register('@user/data-fallback', DataFallback); Mota.register('@user/data-state', DataState); diff --git a/packages/legacy-common/src/resource.ts b/packages/legacy-common/src/resource.ts index 4381ee3..3d27bfd 100644 --- a/packages/legacy-common/src/resource.ts +++ b/packages/legacy-common/src/resource.ts @@ -610,16 +610,6 @@ export async function loadCompressedResource() { }); const list: CompressedLoadList = JSON.parse(data.data); - // const d = data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d; - // 对于bgm,直接按照原来的方式加载即可 - // d.main.bgms.forEach(v => { - // const res = LoadTask.add('audio', `audio/${v}`); - // Mota.r(() => { - // res.once('loadStart', res => { - // Mota.require('var', 'bgm').add(`bgms.${v}`, res.resource!); - // }); - // }); - // }); // 对于区域内容,按照zip格式进行加载,然后解压处理 const autotiles: Partial, HTMLImageElement>> = {}; @@ -716,7 +706,7 @@ export async function loadCompressedResource() { document.fonts.add( new FontFace(name.slice(0, -4), font) ); - } else if (usage === 'sound') { + } else if (usage === 'sound' && main.mode === 'play') { const { soundPlayer } = Mota.require( '@user/client-modules' ); diff --git a/public/_server/editor.js b/public/_server/editor.js index fbbd9e6..973ed96 100644 --- a/public/_server/editor.js +++ b/public/_server/editor.js @@ -173,17 +173,7 @@ editor.prototype.init = function (callback) { editor.airwallImg = new Image(); editor.airwallImg.src = './project/materials/airwall.png'; - var xhr = new XMLHttpRequest(); - xhr.open('GET', 'index.html', true); - xhr.onload = function () { - if (xhr.status != 200) { - alert("HTTP " + xhr.status); - return; - } - var str = xhr.response.split(''); - if (str.length != 3) window.onerror("index.html格式不正确"); - editor.dom.gameInject.innerHTML = str[1]; - + var execute = function() { var cvs = ['bg', 'event', 'event2', 'fg'].map(function(e) { return document.getElementById(e); }); @@ -197,7 +187,7 @@ editor.prototype.init = function (callback) { var mainScript = document.createElement('script'); mainScript.onload = function() { - + var useCompress = main.useCompress; main.useCompress = false; @@ -303,17 +293,14 @@ editor.prototype.init = function (callback) { mainScript.id = "mainScript"; mainScript.src = "main.js"; editor.dom.gameInject.appendChild(mainScript); - }; - xhr.onabort = xhr.ontimeout = xhr.onerror = function () { - alert("无法访问index.html"); } - + editor.config = new editor_config(); editor.config.load(function() { var theme = editor.config.get('theme', 'editor_color'); document.getElementById('color_css').href = '_server/css/' + theme + '.css'; editor.dom.editorTheme.value = theme; - xhr.send(); + execute(); }); } diff --git a/public/editor.html b/public/editor.html index 9b6f4b1..56f669a 100644 --- a/public/editor.html +++ b/public/editor.html @@ -450,7 +450,151 @@ - +