Merge branch 'v3.8.5' of https://github.com/cocos/cocos-engine into 3…

…85-gfx-copyTextureToTexture
cocos · Jul 2, 2024 · ce703d4 · ce703d4
2 parents 1e4f032 + 6cdd39a
commit ce703d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/run_test_cases.yml b/.github/workflows/run_test_cases.yml
@@ -19,10 +19,8 @@ jobs:
   Win-RunTestCases:
     if: |
       contains(github.event.pull_request.body, '[X] needs automatic test cases check') ||
-      (
-        contains(github.event.comment.body, '@cocos-robot run test cases') &&
-        contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-      )
+      contains(github.event.comment.body, '@cocos-robot run test cases')
+
     runs-on: self-hosted-win
 
     steps:

diff --git a/cocos/asset/asset-manager/factory.ts b/cocos/asset/asset-manager/factory.ts
@@ -111,6 +111,7 @@ export class Factory {
         '.image': createImageAsset,
         '.pvr': createImageAsset,
         '.pkm': createImageAsset,
+        '.astc': createImageAsset,
 
         // Txt
         '.txt': createTextAsset,

diff --git a/cocos/core/effect-settings.ts b/cocos/core/effect-settings.ts
@@ -33,7 +33,7 @@ export class EffectSettings {
         }
         return new Promise((resolve, reject) => {
             if (!HTML5 && !path.startsWith('http')) {
-                fsUtils.readArrayBuffer(path, (err: Error, arrayBuffer: ArrayBuffer) => {
+                globalThis.fsUtils.readArrayBuffer(path, (err: Error, arrayBuffer: ArrayBuffer) => {
                     if (err) {
                         reject(err);
                         return;

diff --git a/pal/audio/minigame/player-web.ts b/pal/audio/minigame/player-web.ts
@@ -168,7 +168,7 @@ export class AudioPlayerWeb implements OperationQueueable {
                 return;
             }
             // TODO: use pal/fs
-            fsUtils.readArrayBuffer(url, (err: Error, arrayBuffer: ArrayBuffer) => {
+            globalThis.fsUtils.readArrayBuffer(url, (err: Error, arrayBuffer: ArrayBuffer) => {
                 if (err) {
                     reject(err);
                     return;