[v3.8.5] Fix that bytedance platform adapter code hacked cc.ImageAsse…

…t.data. (#17825)
cocos · Nov 8, 2024 · 8904950 · 8904950
1 parent c914c67
commit 8904950
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/cocos/asset/assets/image-asset.ts b/cocos/asset/assets/image-asset.ts
@@ -24,7 +24,7 @@
 
 // @ts-check
 import { ccclass, override } from 'cc.decorator';
-import { EDITOR, ALIPAY, XIAOMI, JSB, TEST, BAIDU, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM } from 'internal:constants';
+import { EDITOR, ALIPAY, XIAOMI, JSB, TEST, BAIDU, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM, BYTEDANCE } from 'internal:constants';
 import { Device, Format, FormatFeatureBit, deviceManager } from '../../gfx';
 import { Asset } from './asset';
 import { PixelFormat } from './asset-enum';
@@ -163,7 +163,7 @@ function fetchImageSource (imageSource: ImageSource): HTMLCanvasElement | HTMLIm
 
 // 返回该图像源是否是平台提供的图像对象。
 function isNativeImage (imageSource: ImageSource): imageSource is (HTMLImageElement | HTMLCanvasElement | ImageBitmap) {
-    if (ALIPAY || TAOBAO || TAOBAO_MINIGAME || XIAOMI || BAIDU || WECHAT_MINI_PROGRAM) {
+    if (ALIPAY || TAOBAO || TAOBAO_MINIGAME || XIAOMI || BAIDU || WECHAT_MINI_PROGRAM || BYTEDANCE) {
         // We're unable to grab the constructors of Alipay native image or canvas object.
         return !('_data' in imageSource);
     }

diff --git a/platforms/minigame/platforms/bytedance/wrapper/engine/ImageAsset.js b/platforms/minigame/platforms/bytedance/wrapper/engine/ImageAsset.js
diff --git a/platforms/minigame/platforms/bytedance/wrapper/engine/index.js b/platforms/minigame/platforms/bytedance/wrapper/engine/index.js
@@ -2,4 +2,3 @@ require('../fs-utils');
 require('../../../../common/engine/index');
 require('./VideoPlayer');
 require('./Label');
-require('./ImageAsset');