Merge branch 'v3.8.0' of github.com:cocos/cocos-engine into v3.8.0-4-…

…group-0625
cocos · Jun 26, 2023 · 33a66c3 · 33a66c3
2 parents 736742f + 1090830
commit 33a66c3
Showing 1 changed file with 30 additions and 2 deletions.
diff --git a/pal/wasm/wasm-minigame.ts b/pal/wasm/wasm-minigame.ts
@@ -22,8 +22,7 @@
  THE SOFTWARE.
 */
 
-// fsUtils is defined in engine-adapter
-declare const fsUtils: any;
+import { OPPO } from 'internal:constants';
 
 export function instantiateWasm (wasmUrl: string, importObject: WebAssembly.Imports): Promise<any> {
     wasmUrl = `cocos-js/${wasmUrl}`;
@@ -32,6 +31,20 @@ export function instantiateWasm (wasmUrl: string, importObject: WebAssembly.Impo
 
 export function fetchBuffer (binaryUrl: string): Promise<ArrayBuffer> {
     return new Promise<ArrayBuffer>((resolve, reject) => {
+        // fsUtils is defined in engine-adapter
+        const fsUtils = globalThis.fsUtils;
+        if (OPPO) {
+            getBinaryUrlOnOPPO(binaryUrl).then((url) => {
+                fsUtils.readArrayBuffer(url, (err, arrayBuffer) => {
+                    if (err) {
+                        reject(err);
+                        return;
+                    }
+                    resolve(arrayBuffer);
+                });
+            }).catch((e) => {});
+            return;
+        }
         fsUtils.readArrayBuffer(`cocos-js/${binaryUrl}`, (err, arrayBuffer) => {
             if (err) {
                 reject(err);
@@ -41,3 +54,18 @@ export function fetchBuffer (binaryUrl: string): Promise<ArrayBuffer> {
         });
     });
 }
+
+// On OPPO platform, we put binary assets in cocos-library directory when using separate engine.
+function getBinaryUrlOnOPPO (binaryUrl: string): Promise<string> {
+    return new Promise((resolve) => {
+        const urlInCocosJS = `cocos-js/${binaryUrl}`;
+        // fsUtils is defined in engine-adapter
+        globalThis.fsUtils.exists(urlInCocosJS, (isExists: boolean) => {
+            if (isExists) {
+                resolve(urlInCocosJS);
+            } else {
+                resolve(`cocos-library/${binaryUrl}`);
+            }
+        });
+    });
+}