diff --git a/.gitignore b/.gitignore index c99f8f4..9fe15ab 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ dist.rar *.h5route index.cjs !public/swap/*.h5save -_bundle \ No newline at end of file +_bundle +out \ No newline at end of file diff --git a/package.json b/package.json index a32345d..c39a248 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "dev": "ts-node-esm script/dev.ts", - "build": "vue-tsc && vite build && ts-node-esm script/build.ts", + "build": "vue-tsc && vite build && ts-node-esm script/build.ts 0 1 1", "build-gh": "vue-tsc && vite build --base=/HumanBreak/ && ts-node-esm script/build.ts 1", "build-local": "vue-tsc && vite build --base=/ && ts-node-esm script/build.ts 1", "preview": "vite preview", @@ -32,6 +32,7 @@ "@rollup/plugin-babel": "^6.0.3", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.2", + "@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-terser": "^0.4.3", "@rollup/plugin-typescript": "^11.1.1", "@types/babel__core": "^7.20.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e4aa44..eb81504 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -48,6 +48,9 @@ devDependencies: '@rollup/plugin-node-resolve': specifier: ^15.0.2 version: 15.0.2(rollup@3.23.0) + '@rollup/plugin-replace': + specifier: ^5.0.2 + version: 5.0.2(rollup@3.23.0) '@rollup/plugin-terser': specifier: ^0.4.3 version: 0.4.3(rollup@3.23.0) @@ -1735,6 +1738,20 @@ packages: rollup: 3.23.0 dev: true + /@rollup/plugin-replace@5.0.2(rollup@3.23.0): + resolution: {integrity: sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.23.0) + magic-string: 0.27.0 + rollup: 3.23.0 + dev: true + /@rollup/plugin-terser@0.4.3(rollup@3.23.0): resolution: {integrity: sha512-EF0oejTMtkyhrkwCdg0HJ0IpkcaVg1MMSf2olHb2Jp+1mnLM04OhjpJWGma4HobiDTF0WCyViWuvadyE9ch2XA==} engines: {node: '>=14.0.0'} diff --git a/public/main.js b/public/main.js index f3e4941..32b5245 100644 --- a/public/main.js +++ b/public/main.js @@ -218,6 +218,13 @@ function main() { this.__VERSION_CODE__ = 510; this.timestamp = 0; + + // 远程资源地址，在线游戏中，塔本体不包含任何资源，只包含源码，从而可以降低游戏本体的体积并平均分担资源包体积 + // 从而可以优化加载并避免网站发布的大小限制 + this.USE_RESORCE = false; + this.RESOURCE_URL = ''; + this.RESOURCE_SYMBOL = ''; + this.RESOURCE_INDEX = {}; } // >>>> body end diff --git a/script/build.ts b/script/build.ts index c354a50..c769650 100644 --- a/script/build.ts +++ b/script/build.ts @@ -8,6 +8,12 @@ import rollupBabel from '@rollup/plugin-babel'; import terser from '@rollup/plugin-terser'; import resolve from '@rollup/plugin-node-resolve'; import commonjs from '@rollup/plugin-commonjs'; +import { splitResorce } from './resource.js'; +import compressing from 'compressing'; + +const map = !!Number(process.argv[2]); +const resorce = !!Number(process.argv[3]); +const compress = !!Number(process.argv[4]); (async function () { const timestamp = Date.now(); @@ -44,7 +50,7 @@ import commonjs from '@rollup/plugin-commonjs'; }); }) ); - if (process.argv[2] !== '1') await fs.remove('./dist/maps/'); + if (!map) await fs.remove('./dist/maps/'); // 在线查看什么都看不到，这编辑器难道还需要留着吗？ await fs.remove('./dist/_server'); await fs.remove('./dist/editor.html'); @@ -60,13 +66,11 @@ import commonjs from '@rollup/plugin-commonjs'; const project = await fs.readdir('./public/project'); const floors = await fs.readdir('./public/project/floors'); const assets = await fs.readdir('./dist/assets/'); - const plugin = await fs.readdir('./public/project/plugin'); const all = [ ...libs.map(v => `./public/libs/${v}`), ...project.map(v => `./public/project/${v}`), ...floors.map(v => `./public/project/floors/${v}`), - ...assets.map(v => `./dist/assets/${v}`), - ...plugin.map(v => `./public/project/plugin/${v}`) + ...assets.map(v => `./dist/assets/${v}`) ]; for await (const dir of all) { const stat = await fs.stat(dir); @@ -112,7 +116,7 @@ import commonjs from '@rollup/plugin-commonjs'; }) ]); } catch (e) { - await fs.copy('./public/project/fonts', './dist/project/fonts'); + console.log('字体压缩失败'); } // 3. 压缩js插件 @@ -142,8 +146,6 @@ import commonjs from '@rollup/plugin-commonjs'; await fs.remove('./dist/project/plugin/'); } catch (e) { - console.log(e); - console.log('压缩插件失败'); } @@ -170,4 +172,15 @@ import commonjs from '@rollup/plugin-commonjs'; try { await fs.copy('./LICENSE', './dist/LICENSE'); } catch {} + + // 6. 资源分离 + if (resorce) { + await splitResorce(compress); + } + + // 7. 压缩本体 + if (compress) { + await fs.ensureDir('./out'); + await compressing.zip.compressDir('./dist', './out/dist.zip'); + } })(); diff --git a/script/md_5.ts b/script/md_5.ts deleted file mode 100644 index 3d73280..0000000 --- a/script/md_5.ts +++ /dev/null @@ -1,215 +0,0 @@ -const hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */ -const chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */ - -// ---------- md5码 - -/* - * * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message - * * Digest Algorithm, as defined in RFC 1321. - * * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002. - * * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet - * * Distributed under the BSD License - * * See http://pajhome.org.uk/crypt/md5 for more info. - * */ - -/* - * * Configurable letiables. You may need to tweak these to be compatible with - * * the server-side, but the defaults work in most cases. - * */ - -/* - * * These are the functions you'll usually want to call - * * They take string arguments and return either hex or base-64 encoded strings - * */ -export function hex_md5(s: string) { - return binl2hex(core_md5(str2binl(s), s.length * chrsz)); -} - -/* - * * Calculate the MD5 of an array of little-endian words, and a bit length - * */ -function core_md5(x: any[], len: number) { - /* append padding */ - x[len >> 5] |= 0x80 << len % 32; - x[(((len + 64) >>> 9) << 4) + 14] = len; - - let a = 1732584193; - let b = -271733879; - let c = -1732584194; - let d = 271733878; - - for (let i = 0; i < x.length; i += 16) { - const olda = a; - const oldb = b; - const oldc = c; - const oldd = d; - - a = md5_ff(a, b, c, d, x[i + 0], 7, -680876936); - d = md5_ff(d, a, b, c, x[i + 1], 12, -389564586); - c = md5_ff(c, d, a, b, x[i + 2], 17, 606105819); - b = md5_ff(b, c, d, a, x[i + 3], 22, -1044525330); - a = md5_ff(a, b, c, d, x[i + 4], 7, -176418897); - d = md5_ff(d, a, b, c, x[i + 5], 12, 1200080426); - c = md5_ff(c, d, a, b, x[i + 6], 17, -1473231341); - b = md5_ff(b, c, d, a, x[i + 7], 22, -45705983); - a = md5_ff(a, b, c, d, x[i + 8], 7, 1770035416); - d = md5_ff(d, a, b, c, x[i + 9], 12, -1958414417); - c = md5_ff(c, d, a, b, x[i + 10], 17, -42063); - b = md5_ff(b, c, d, a, x[i + 11], 22, -1990404162); - a = md5_ff(a, b, c, d, x[i + 12], 7, 1804603682); - d = md5_ff(d, a, b, c, x[i + 13], 12, -40341101); - c = md5_ff(c, d, a, b, x[i + 14], 17, -1502002290); - b = md5_ff(b, c, d, a, x[i + 15], 22, 1236535329); - - a = md5_gg(a, b, c, d, x[i + 1], 5, -165796510); - d = md5_gg(d, a, b, c, x[i + 6], 9, -1069501632); - c = md5_gg(c, d, a, b, x[i + 11], 14, 643717713); - b = md5_gg(b, c, d, a, x[i + 0], 20, -373897302); - a = md5_gg(a, b, c, d, x[i + 5], 5, -701558691); - d = md5_gg(d, a, b, c, x[i + 10], 9, 38016083); - c = md5_gg(c, d, a, b, x[i + 15], 14, -660478335); - b = md5_gg(b, c, d, a, x[i + 4], 20, -405537848); - a = md5_gg(a, b, c, d, x[i + 9], 5, 568446438); - d = md5_gg(d, a, b, c, x[i + 14], 9, -1019803690); - c = md5_gg(c, d, a, b, x[i + 3], 14, -187363961); - b = md5_gg(b, c, d, a, x[i + 8], 20, 1163531501); - a = md5_gg(a, b, c, d, x[i + 13], 5, -1444681467); - d = md5_gg(d, a, b, c, x[i + 2], 9, -51403784); - c = md5_gg(c, d, a, b, x[i + 7], 14, 1735328473); - b = md5_gg(b, c, d, a, x[i + 12], 20, -1926607734); - - a = md5_hh(a, b, c, d, x[i + 5], 4, -378558); - d = md5_hh(d, a, b, c, x[i + 8], 11, -2022574463); - c = md5_hh(c, d, a, b, x[i + 11], 16, 1839030562); - b = md5_hh(b, c, d, a, x[i + 14], 23, -35309556); - a = md5_hh(a, b, c, d, x[i + 1], 4, -1530992060); - d = md5_hh(d, a, b, c, x[i + 4], 11, 1272893353); - c = md5_hh(c, d, a, b, x[i + 7], 16, -155497632); - b = md5_hh(b, c, d, a, x[i + 10], 23, -1094730640); - a = md5_hh(a, b, c, d, x[i + 13], 4, 681279174); - d = md5_hh(d, a, b, c, x[i + 0], 11, -358537222); - c = md5_hh(c, d, a, b, x[i + 3], 16, -722521979); - b = md5_hh(b, c, d, a, x[i + 6], 23, 76029189); - a = md5_hh(a, b, c, d, x[i + 9], 4, -640364487); - d = md5_hh(d, a, b, c, x[i + 12], 11, -421815835); - c = md5_hh(c, d, a, b, x[i + 15], 16, 530742520); - b = md5_hh(b, c, d, a, x[i + 2], 23, -995338651); - - a = md5_ii(a, b, c, d, x[i + 0], 6, -198630844); - d = md5_ii(d, a, b, c, x[i + 7], 10, 1126891415); - c = md5_ii(c, d, a, b, x[i + 14], 15, -1416354905); - b = md5_ii(b, c, d, a, x[i + 5], 21, -57434055); - a = md5_ii(a, b, c, d, x[i + 12], 6, 1700485571); - d = md5_ii(d, a, b, c, x[i + 3], 10, -1894986606); - c = md5_ii(c, d, a, b, x[i + 10], 15, -1051523); - b = md5_ii(b, c, d, a, x[i + 1], 21, -2054922799); - a = md5_ii(a, b, c, d, x[i + 8], 6, 1873313359); - d = md5_ii(d, a, b, c, x[i + 15], 10, -30611744); - c = md5_ii(c, d, a, b, x[i + 6], 15, -1560198380); - b = md5_ii(b, c, d, a, x[i + 13], 21, 1309151649); - a = md5_ii(a, b, c, d, x[i + 4], 6, -145523070); - d = md5_ii(d, a, b, c, x[i + 11], 10, -1120210379); - c = md5_ii(c, d, a, b, x[i + 2], 15, 718787259); - b = md5_ii(b, c, d, a, x[i + 9], 21, -343485551); - - a = safe_add(a, olda); - b = safe_add(b, oldb); - c = safe_add(c, oldc); - d = safe_add(d, oldd); - } - return Array(a, b, c, d); -} - -/* - * * These functions implement the four basic operations the algorithm uses. - * */ -function md5_cmn(q: number, a: any, b: any, x: any, s: any, t: any) { - return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b); -} -function md5_ff( - a: number, - b: number, - c: number, - d: number, - x: any, - s: number, - t: number -) { - return md5_cmn((b & c) | (~b & d), a, b, x, s, t); -} -function md5_gg( - a: number, - b: number, - c: number, - d: number, - x: any, - s: number, - t: number -) { - return md5_cmn((b & d) | (c & ~d), a, b, x, s, t); -} -function md5_hh( - a: number, - b: number, - c: number, - d: number, - x: any, - s: number, - t: number -) { - return md5_cmn(b ^ c ^ d, a, b, x, s, t); -} -function md5_ii( - a: number, - b: number, - c: number, - d: number, - x: any, - s: number, - t: number -) { - return md5_cmn(c ^ (b | ~d), a, b, x, s, t); -} - -/* - * * Add integers, wrapping at 2^32. This uses 16-bit operations internally - * * to work around bugs in some JS interpreters. - * */ -function safe_add(x: number, y: number) { - const lsw = (x & 0xffff) + (y & 0xffff); - const msw = (x >> 16) + (y >> 16) + (lsw >> 16); - return (msw << 16) | (lsw & 0xffff); -} - -/* - * * Bitwise rotate a 32-bit number to the left. - * */ -function bit_rol(num: number, cnt: number) { - return (num << cnt) | (num >>> (32 - cnt)); -} - -/* - * * Convert a string to an array of little-endian words - * * If chrsz is ASCII, characters >255 have their hi-byte silently ignored. - * */ -function str2binl(str: string) { - let bin = Array(); - let mask = (1 << chrsz) - 1; - for (let i = 0; i < str.length * chrsz; i += chrsz) - bin[i >> 5] |= (str.charCodeAt(i / chrsz) & mask) << i % 32; - return bin; -} - -/* - * * Convert an array of little-endian words to a hex string. - * */ -function binl2hex(binarray: string | any[]) { - let hex_tab = hexcase ? '0123456789ABCDEF' : '0123456789abcdef'; - let str = ''; - for (let i = 0; i < binarray.length * 4; i++) { - str += - hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8 + 4)) & 0xf) + - hex_tab.charAt((binarray[i >> 2] >> ((i % 4) * 8)) & 0xf); - } - return str; -} diff --git a/script/resource.ts b/script/resource.ts new file mode 100644 index 0000000..5925074 --- /dev/null +++ b/script/resource.ts @@ -0,0 +1,53 @@ +import fs from 'fs-extra'; +import { uniqueSymbol } from './utils.js'; +import { extname, resolve } from 'path'; + +type ResorceType = + | 'bgm' + | 'sound' + | 'autotiles' + | 'images' + | 'materials' + | 'tilesets' + | 'animates' + | 'fonts'; + +let resorceIndex = 0; +const compress: ResorceType[] = [ + 'sound', + 'animates', + 'autotiles', + 'images', + 'materials', + 'tilesets' +]; + +const SYMBOL = uniqueSymbol(); +const MAX_SIZE = 100 * (1 << 20); + +let totalSize = 0; + +export async function splitResorce(compress: boolean = false) { + const folder = await fs.stat('./dist'); + totalSize = folder.size; + if (totalSize < MAX_SIZE) return; + + await fs.ensureDir('./dist-resource'); + await doSplit(compress); +} + +async function sortDir(dir: string, ext?: string[]) { + const path = await fs.readdir(dir); + const stats: fs.Stats[] = []; + + for await (const one of path) { + if (ext && !ext.includes(extname(one))) continue; + const stat = await fs.stat(resolve(dir, one)); + if (!stat.isFile()) continue; + stats.push(stat); + } + + return stats.sort((a, b) => b.size - a.size); +} + +async function doSplit(compress: boolean) {} diff --git a/script/update.ts b/script/update.ts deleted file mode 100644 index dda1548..0000000 --- a/script/update.ts +++ /dev/null @@ -1,91 +0,0 @@ -import axios from 'axios'; -import fs from 'fs/promises'; -import fss from 'fs'; -import FormData from 'form-data'; -import compressing from 'compressing'; -import { hex_md5 } from './md_5.js'; - -const id = 1000; // 用户id -const password = 'password'; // 密码 - -(async function () { - // 压缩 - await compressing.zip.compressDir('./dist', './dist.zip'); - - const name = ( - (() => { - const data = fss.readFileSync('./public/project/data.js', 'utf-8'); - const json = JSON.parse( - data - .split(/(\n|\r\n)/) - .slice(1) - .join('\n') - ); - return json; - })() as { firstData: Record } - ).firstData.name; - - const pass = hex_md5(password); - // 登录 - const res = await axios.postForm( - 'https://h5mota.com/backend/user/login.php', - { - nid: id, - npass: pass - } - ); - if (res.data.code === 0) console.log('登录成功'); - else return console.log('登录失败'); - - const data = await axios.post( - 'https://h5mota.com/up2cos/getData.php', - void 0, - { - headers: { - 'Access-Control-Allow-Origin': '*', - Cookie: `id=${id}; password=${pass}` - } - } - ); - if (data.data.code !== 1) return console.log('获取自助更新信息失败'); - - const tower = data.data.list.find((v: { name: string }) => v.name === name); - - if (!tower) return console.log('你还没有发过这个塔'); - - const stat = await fs.stat('./dist.zip'); - let size = ''; - size = `${stat.size}B`; - if (stat.size > 1024) size = `${(stat.size / 1024).toFixed(2)}KB`; - if (stat.size > 1024 ** 2) size = `${(stat.size / 1024 ** 2).toFixed(2)}MB`; - if (stat.size > 1024 ** 3) size = `${(stat.size / 1024 ** 3).toFixed(2)}GB`; - - const stream = fss.createReadStream('./dist.zip'); - - const form = new FormData(); - form.append('type', 'upload'); - form.append('name', name); - form.append('comment', tower.text); - form.append('file', stream); - - const headers = form.getHeaders(); // 获取headers - const [err, length] = await new Promise( - (res: (v: [Error | null, number]) => void) => - form.getLength((e, l) => res([e, l])) - ); - if (err) return console.log('获取content-length失败'); - headers['content-length'] = length; - headers['cookie'] = `id=${id}; password=${pass}`; - - console.log(`开始上传, 文件大小: ${size}`); - const ans = await axios.post( - 'https://h5mota.com/up2cos/setData.php', - form, - { - headers - } - ); - if (ans.data.error === 0 && ans.data.upload === true && ans.data.code === 1) - console.log('上传成功'); - else throw new Error(`上传失败, 失败信息: ${ans.data}`); -})(); diff --git a/script/utils.ts b/script/utils.ts new file mode 100644 index 0000000..2517d98 --- /dev/null +++ b/script/utils.ts @@ -0,0 +1,3 @@ +export function uniqueSymbol() { + return Math.ceil(Math.random() * 0xefffffff + 0x10000000).toString(16); +} diff --git a/src/core/loader/load.ts b/src/core/loader/load.ts new file mode 100644 index 0000000..ad99c16 --- /dev/null +++ b/src/core/loader/load.ts @@ -0,0 +1,30 @@ +import axios, { AxiosRequestConfig } from 'axios'; + +class LoadTask { + loaded: boolean = false; + promise?: Promise; + url: string; + config?: AxiosRequestConfig; + + constructor(url: string, config?: AxiosRequestConfig) { + this.url = url; + this.config = config; + } + + load() { + if (this.promise) return this.promise; + + return (this.promise = axios.get(this.url, this.config)); + } + + static list: Promise[] = []; + static push(...tasks: LoadTask[]) { + this.list.push(...tasks.map(v => v.load())); + } + + static onEnd(): Promise { + return Promise.all(LoadTask.list) as Promise; + } +} + +export default function load() {} diff --git a/src/data/settings.json b/src/data/settings.json index b9a8f39..f6bdaba 100644 --- a/src/data/settings.json +++ b/src/data/settings.json @@ -71,5 +71,15 @@ "desc": [ "开启后，会在画面内以类似状态栏的盒子的形式显示当前已学习的怪物技能。" ] + }, + "betterLoad": { + "text": "优化加载", + "desc": [ + "开启后游戏将对加载进行优化，缩短进入游戏时的加载时长，而在游戏中对资源进行部分性按需加载，从而对加载进行优化。", + "该设置不会影响你的正常游戏。", + "
", + "
", + "注：修改后刷新页面起效。" + ] } } diff --git a/src/initPlugin.ts b/src/initPlugin.ts index df12276..695dba0 100644 --- a/src/initPlugin.ts +++ b/src/initPlugin.ts @@ -18,6 +18,7 @@ import completion, { floors } from './plugin/completion'; import path from './plugin/fx/path'; import gameCanvas from './plugin/fx/gameCanvas'; import noise from './plugin/fx/noise'; +import load from './core/loader/load'; function forward() { const toForward: any[] = [ @@ -44,24 +45,23 @@ function forward() { ]; // 初始化所有插件，并转发到core上 - (async function () { - for (const data of toForward) { - for (const name in data) { - const d = data[name as keyof typeof data]; - if (!(name in core.plugin)) { - // @ts-ignore - core.plugin[name as keyof PluginDeclaration] = d; - } - if (!(d instanceof Function)) continue; - if (name in core) continue; - if (name.startsWith('_')) continue; + for (const data of toForward) { + for (const name in data) { + const d = data[name as keyof typeof data]; + if (!(name in core.plugin)) { // @ts-ignore - core[name as ForwardKeys] = d; + core.plugin[name as keyof PluginDeclaration] = d; } + if (!(d instanceof Function)) continue; + if (name in core) continue; + if (name.startsWith('_')) continue; + // @ts-ignore + core[name as ForwardKeys] = d; } + } - console.log('插件转发完成！'); - })(); + console.log('插件转发完成！'); + load(); Object.values(floors).forEach((v, i) => { const from = core.floorIds.indexOf(v[0]); diff --git a/src/plugin/game/damage.ts b/src/plugin/game/damage.ts index 5b3299f..efdb522 100644 --- a/src/plugin/game/damage.ts +++ b/src/plugin/game/damage.ts @@ -19,7 +19,6 @@ interface EnemyInfo { atkBuff: number; defBuff: number; hpBuff: number; - together: number; enemy: Enemy; } @@ -202,7 +201,6 @@ export class DamageEnemy { atkBuff: 0, defBuff: 0, hpBuff: 0, - together: 0, enemy: this.enemy }; this.needCalculate = true; @@ -322,9 +320,13 @@ export class DamageEnemy { const square7: HaloFn[] = []; const square5: HaloFn[] = []; + // 抱团 if (speical.includes(8)) { square5.push((e, enemy) => { - if (e === this.info) e.together += enemy.together ?? 0; + if (e.special.includes(8)) { + e.atkBuff += enemy.together ?? 0; + e.defBuff += enemy.together ?? 0; + } }); this.providedHalo.push(8); } @@ -424,6 +426,7 @@ export class DamageEnemy { calMapDamage(damage?: Record) { damage ??= {}; + if (!has(this.x) || !has(this.y)) return damage; return damage; } @@ -436,7 +439,7 @@ const realStatus: (keyof HeroStatus)[] = ['atk', 'def']; /** * 主动技能列表 */ -const skills = [ +const skills: [unlock: string, condition: string][] = [ ['bladeOn', 'blade'], ['shieldOn', 'shield'] ];