From e080cf17a7e88d1302860cd66e67a33b02e05c38 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 29 Dec 2023 16:01:34 +0800 Subject: [PATCH] Bytedance mini-game WASM support for both android and iOS platforms. (#16644) --- pal/system-info/minigame/system-info.ts | 11 ++++++++++- .../platforms/bytedance/wrapper/builtin/index.js | 5 ++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pal/system-info/minigame/system-info.ts b/pal/system-info/minigame/system-info.ts index 4af29eefaa..f24b47051a 100644 --- a/pal/system-info/minigame/system-info.ts +++ b/pal/system-info/minigame/system-info.ts @@ -64,6 +64,9 @@ if (WECHAT) { let isVersionGreaterOrEqualTo; if (BYTEDANCE) { isVersionGreaterOrEqualTo = function isVersionGreaterOrEqualTo (versionA: string, versionB: string): boolean { + if (!versionA || !versionB) { + return false; + } // Split the version number string into an array of integers function parseVersion (version: string): number[] { return version.split('.').map((part: string) => parseInt(part, 10)); @@ -167,9 +170,15 @@ class SystemInfo extends EventTarget { } if (BYTEDANCE) { + let minSDKVersionSupportWasm = ''; + if (this.os === OS.ANDROID) { + minSDKVersionSupportWasm = '3.9.0'; + } else if (this.os === OS.IOS) { + minSDKVersionSupportWasm = '3.8.0'; + } // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error TTWebAssembly is defined if bytedance client supports wasm. - if (isVersionGreaterOrEqualTo(minigameSysInfo.SDKVersion, '3.7.0') && typeof TTWebAssembly === 'object') { + if (isVersionGreaterOrEqualTo(minigameSysInfo.SDKVersion, minSDKVersionSupportWasm) && typeof TTWebAssembly === 'object') { return true; } } diff --git a/platforms/minigame/platforms/bytedance/wrapper/builtin/index.js b/platforms/minigame/platforms/bytedance/wrapper/builtin/index.js index 1a5f237c4b..f1dc5822cd 100644 --- a/platforms/minigame/platforms/bytedance/wrapper/builtin/index.js +++ b/platforms/minigame/platforms/bytedance/wrapper/builtin/index.js @@ -57,9 +57,8 @@ if (!GameGlobal.__isAdapterInjected) { GameGlobal.__isAdapterInjected = true; inject(); } -//NOTE: Don't override global `WebAssembly` variable since bytedance platform has a bug that will cause TTWebAssembly.instantiate fails. -// So we add our own `CCWebAssembly` variable here. -global.CCWebAssembly = global.TTWebAssembly; + +global.WebAssembly = global.CCWebAssembly = global.TTWebAssembly; require('../../../../common/xmldom/dom-parser'); require('../unify');