Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions cc.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -577,13 +577,6 @@
"value": false,
"internal": false
},
"XIAOMI": {
"comment": "Running in the xiaomi's quick game.",
"type": "boolean",
"value": false,
"ccGlobal": true,
"internal": false
},
"ALIPAY": {
"comment": "Running in the alipay's mini game.",
"type": "boolean",
Expand Down Expand Up @@ -631,13 +624,6 @@
"ccGlobal": true,
"internal": false
},
"MIGU": {
"comment": "Running in the migu's quick game.",
"type": "boolean",
"value": false,
"ccGlobal": true,
"internal": false
},
"HONOR": {
"comment": "Running in the honor's quick game.",
"type": "boolean",
Expand Down Expand Up @@ -738,14 +724,14 @@
"MINIGAME": {
"comment": "Running in mini game.",
"type": "boolean",
"value": "$WECHAT || $WECHAT_MINI_PROGRAM || $XIAOMI || $ALIPAY || $TAOBAO || $TAOBAO_MINIGAME || $BYTEDANCE",
"value": "$WECHAT || $WECHAT_MINI_PROGRAM || $ALIPAY || $TAOBAO || $TAOBAO_MINIGAME || $BYTEDANCE",
"ccGlobal": true,
"internal": false
},
"RUNTIME_BASED": {
"comment": "Running in runtime based environment.",
"type": "boolean",
"value": "$OPPO || $VIVO || $HUAWEI || $MIGU || $HONOR || $COCOS_RUNTIME || $SUD || $SUDV2",
"value": "$OPPO || $VIVO || $HUAWEI || $HONOR || $COCOS_RUNTIME || $SUD || $SUDV2",
"ccGlobal": true,
"internal": false
},
Expand Down
4 changes: 1 addition & 3 deletions cocos/asset/asset-manager/download-dom-image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
THE SOFTWARE.
*/

import { XIAOMI } from 'internal:constants';
import { getError } from '../../core';
import { ccwindow } from '../../core/global-exports';

Expand All @@ -34,8 +33,7 @@ export default function downloadDomImage (
): HTMLImageElement {
const img = new ccwindow.Image();

// NOTE: on xiaomi platform, we need to force setting img.crossOrigin as 'anonymous'
if (ccwindow.location.protocol !== 'file:' || XIAOMI) {
if (ccwindow.location.protocol !== 'file:') {
img.crossOrigin = 'anonymous';
}

Expand Down
4 changes: 2 additions & 2 deletions cocos/asset/assets/image-asset.jsb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
THE SOFTWARE.
*/

import { ALIPAY, XIAOMI, JSB, TEST, EDITOR, NODEJS } from 'internal:constants';
import { ALIPAY, JSB, TEST, EDITOR, NODEJS } from 'internal:constants';
import { Format, FormatFeatureBit, deviceManager } from '../../gfx';
import { PixelFormat } from './asset-enum';
import { sys, macro, warnID, cclegacy } from '../../core';
Expand Down Expand Up @@ -54,7 +54,7 @@ function isImageBitmap (imageSource: any): boolean {
}

function isNativeImage (imageSource: ImageSource): imageSource is (HTMLImageElement | HTMLCanvasElement | ImageBitmap) {
if (ALIPAY || XIAOMI) {
if (ALIPAY) {
// We're unable to grab the constructors of Alipay native image or canvas object.
return !('_data' in imageSource);
}
Expand Down
4 changes: 2 additions & 2 deletions cocos/asset/assets/image-asset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// @ts-check
import { ccclass, override } from 'cc.decorator';
import { EDITOR, NODEJS, ALIPAY, XIAOMI, JSB, TEST, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM, BYTEDANCE } from 'internal:constants';
import { EDITOR, NODEJS, ALIPAY, JSB, TEST, 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';
Expand Down Expand Up @@ -163,7 +163,7 @@

// 返回该图像源是否是平台提供的图像对象。
function isNativeImage (imageSource: ImageSource): imageSource is (HTMLImageElement | HTMLCanvasElement | ImageBitmap) {
if (ALIPAY || TAOBAO || TAOBAO_MINIGAME || XIAOMI || WECHAT_MINI_PROGRAM || BYTEDANCE) {
if (ALIPAY || TAOBAO || TAOBAO_MINIGAME || WECHAT_MINI_PROGRAM || BYTEDANCE) {
// We're unable to grab the constructors of Alipay native image or canvas object.
return !('_data' in imageSource);
}
Expand Down Expand Up @@ -212,7 +212,7 @@
try {
// Create compressed file
// file header length
const fileHeaderLength = COMPRESSED_HEADER_LENGTH + COMPRESSED_MIPMAP_LEVEL_COUNT_LENGTH + files.length * COMPRESSED_MIPMAP_DATA_SIZE_LENGTH;

Check warning on line 215 in cocos/asset/assets/image-asset.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

This line has a length of 153. Maximum allowed is 150
let fileLength = 0;
for (const file of files) {
fileLength += file.byteLength;
Expand Down
2 changes: 1 addition & 1 deletion cocos/core/platform/deprecated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ replaceProperty(
sys,
'sys',
['UNKNOWN', 'EDITOR_PAGE', 'EDITOR_CORE', 'MOBILE_BROWSER', 'DESKTOP_BROWSER', 'WIN32', 'MACOS', 'IOS', 'ANDROID', 'OHOS',
'WECHAT_GAME', 'XIAOMI_QUICK_GAME', 'ALIPAY_MINI_GAME', 'BYTEDANCE_MINI_GAME',
'WECHAT_GAME', 'ALIPAY_MINI_GAME', 'BYTEDANCE_MINI_GAME',
'OPPO_MINI_GAME', 'VIVO_MINI_GAME', 'HUAWEI_QUICK_GAME'].map((item) => ({
name: item,
target: sys.Platform,
Expand Down
5 changes: 1 addition & 4 deletions pal/env/minigame/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

/* eslint-disable import/no-dynamic-require */
import { TAOBAO, TAOBAO_MINIGAME, WECHAT, WECHAT_MINI_PROGRAM, XIAOMI } from 'internal:constants';
import { TAOBAO, TAOBAO_MINIGAME, WECHAT, WECHAT_MINI_PROGRAM } from 'internal:constants';
import { checkPalIntegrity, withImpl } from '../../integrity-check';

declare const require: (path: string) => any;
Expand All @@ -37,9 +37,6 @@ export function findCanvas (): { frame: HTMLDivElement, container: HTMLDivElemen
}

export function loadJsFile (path: string): any {
if (XIAOMI) {
return require(`../../${path}`);
}
if (WECHAT || WECHAT_MINI_PROGRAM) {
return __wxRequire(path);
}
Expand Down
156 changes: 0 additions & 156 deletions pal/minigame/xiaomi.ts

This file was deleted.

2 changes: 0 additions & 2 deletions pal/system-info/enum-type/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export enum Platform {
// Minigame
WECHAT_GAME = 'WECHAT_GAME',
WECHAT_MINI_PROGRAM = 'WECHAT_MINI_PROGRAM',
XIAOMI_QUICK_GAME = 'XIAOMI_QUICK_GAME',
ALIPAY_MINI_GAME = 'ALIPAY_MINI_GAME',
TAOBAO_CREATIVE_APP = 'TAOBAO_CREATIVE_APP',
TAOBAO_MINI_GAME = 'TAOBAO_MINI_GAME',
Expand All @@ -49,7 +48,6 @@ export enum Platform {
OPPO_MINI_GAME = 'OPPO_MINI_GAME',
VIVO_MINI_GAME = 'VIVO_MINI_GAME',
HUAWEI_QUICK_GAME = 'HUAWEI_QUICK_GAME',
MIGU_MINI_GAME = 'MIGU_MINI_GAME',
HONOR_MINI_GAME = 'HONOR_MINI_GAME',
SUD_MINI_GAME = 'SUD_MINI_GAME',
SUDV2_MINI_GAME = 'SUDV2_MINI_GAME',
Expand Down
8 changes: 2 additions & 6 deletions pal/system-info/minigame/system-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
THE SOFTWARE.
*/

import { ALIPAY, BYTEDANCE, HUAWEI, OPPO, RUNTIME_BASED, SUD, SUDV2, VIVO, MIGU, HONOR, WECHAT, XIAOMI, DEBUG, TEST, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM } from 'internal:constants';
import { ALIPAY, BYTEDANCE, HUAWEI, OPPO, RUNTIME_BASED, SUD, SUDV2, VIVO, HONOR, WECHAT, DEBUG, TEST, TAOBAO, TAOBAO_MINIGAME, WECHAT_MINI_PROGRAM } from 'internal:constants';

Check warning on line 26 in pal/system-info/minigame/system-info.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

This line has a length of 176. Maximum allowed is 150
import { minigame, SystemInfo as MinigameSystemInfo } from 'pal/minigame';
import { IFeatureMap } from 'pal/system-info';
import { EventTarget } from '../../../cocos/core/event';
Expand All @@ -38,8 +38,6 @@
currentPlatform = Platform.WECHAT_GAME;
} else if (WECHAT_MINI_PROGRAM) {
currentPlatform = Platform.WECHAT_MINI_PROGRAM;
} else if (XIAOMI) {
currentPlatform = Platform.XIAOMI_QUICK_GAME;
} else if (ALIPAY) {
currentPlatform = Platform.ALIPAY_MINI_GAME;
} else if (TAOBAO) {
Expand All @@ -54,8 +52,6 @@
currentPlatform = Platform.VIVO_MINI_GAME;
} else if (HUAWEI) {
currentPlatform = Platform.HUAWEI_QUICK_GAME;
} else if (MIGU) {
currentPlatform = Platform.MIGU_MINI_GAME;
} else if (HONOR) {
currentPlatform = Platform.HONOR_MINI_GAME;
} else if (SUD) {
Expand Down Expand Up @@ -129,7 +125,7 @@
_cachedSystemInfo = originalGetSystemInfoSync.call(minigame);
});

minigame.getSystemInfoSync = function (): MinigameSystemInfo {

Check warning on line 128 in pal/system-info/minigame/system-info.ts

View workflow job for this annotation

GitHub Actions / Run ESLint

Unexpected unnamed function
return _cachedSystemInfo;
};

Expand Down Expand Up @@ -201,7 +197,7 @@

// init isMobile and platform
this.platform = currentPlatform;
// Some minigame platforms don't support getting the platform, such as runtime and Xiaomi, so this.os returns UNKNOWN.
// Some minigame platforms don't support getting the platform, such as runtime, so this.os returns UNKNOWN.
// Most platforms are mobile, so set UNKNOWN to mobile.
this.isMobile = this.os === OS.ANDROID || this.os === OS.IOS || this.os === OS.UNKNOWN;

Expand Down
6 changes: 2 additions & 4 deletions pal/wasm/wasm-minigame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
THE SOFTWARE.
*/

import { HUAWEI, TAOBAO_MINIGAME, WASM_SUBPACKAGE, XIAOMI } from 'internal:constants';
import { HUAWEI, TAOBAO_MINIGAME, WASM_SUBPACKAGE } from 'internal:constants';
import { minigame } from 'pal/minigame';
import { basename } from '../../cocos/core/utils/path';
import { checkPalIntegrity, withImpl } from '../integrity-check';
Expand Down Expand Up @@ -116,9 +116,7 @@ export function ensureWasmModuleReady (): Promise<void> {
*/
function getPlatformBinaryUrl (binaryUrl: string): Promise<string> {
return new Promise((resolve) => {
if (XIAOMI) {
resolve(`src/cocos-js/${binaryUrl}`);
} if (TAOBAO_MINIGAME && WASM_SUBPACKAGE) {
if (TAOBAO_MINIGAME && WASM_SUBPACKAGE) {
resolve(`__ccWasmAssetSubpkg__/${basename(binaryUrl)}`);
} else {
resolve(`cocos-js/${binaryUrl}`);
Expand Down
1 change: 0 additions & 1 deletion platforms/minigame/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Adapter for MiniGame platform
included platforms:
- WeChat
- Xiaomi
- Alipay
- ByteDance
- Taobao
Loading
Loading