Skip to content

Commit 5f6d204

Browse files
star-estar-e
committed
revert
1 parent f538598 commit 5f6d204

142 files changed

Lines changed: 272 additions & 8428 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/generate-oh-sdk-cache.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
id: cache-oh-sdk
2323
uses: actions/cache@v4
2424
env:
25-
cache-name: cache-oh-sdk-21
25+
cache-name: cache-oh-sdk-15
2626
with:
2727
path: ${{ steps.oh-sdk-cache-dir-path.outputs.dir }}
2828
key: ${{ runner.os }}-build-${{ env.cache-name }}
@@ -33,11 +33,11 @@ jobs:
3333
run: |
3434
if [ ! -d "$HOME/openharmony" ]; then
3535
mkdir -p $HOME/openharmony
36-
echo "Download commandline-tools-linux-x64-6.0.1.246.zip ..."
37-
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.001
38-
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.002
39-
echo "Unzip commandline-tools-linux-x64-6.0.1.246.zip ..."
40-
7z x commandline-tools-linux-x64-6.0.1.246.zip.001 -o$HOME/openharmony > /dev/null
36+
echo "Download commandline-tools-linux-x64-5.0.13.200.zip ..."
37+
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.001
38+
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.002
39+
echo "Unzip commandline-tools-linux-x64-5.0.13.200.zip ..."
40+
7z x commandline-tools-linux-x64-5.0.13.200.zip.001 -o$HOME/openharmony > /dev/null
4141
cd $HOME/openharmony
4242
ls -l
4343
cd command-line-tools

‎.github/workflows/native-compile-platforms.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ jobs:
296296
297297
- name: Install libgl1
298298
run: |
299-
sudo apt-get update
300299
sudo apt-get install -y libgl1
301300
302301
- name: Checking libGL.so.1
@@ -329,7 +328,7 @@ jobs:
329328
id: cache-oh-sdk
330329
uses: actions/cache@v4
331330
env:
332-
cache-name: cache-oh-sdk-21
331+
cache-name: cache-oh-sdk-13
333332
with:
334333
path: ${{ steps.oh-sdk-cache-dir-path.outputs.dir }}
335334
key: ${{ runner.os }}-build-${{ env.cache-name }}
@@ -348,11 +347,11 @@ jobs:
348347
run: |
349348
if [ ! -d "$HOME/openharmony" ]; then
350349
mkdir -p $HOME/openharmony
351-
echo "Download commandline-tools-linux-x64-6.0.1.246.zip ..."
352-
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.001
353-
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-21/commandline-tools-linux-x64-6.0.1.246.zip.002
354-
echo "Unzip commandline-tools-linux-x64-6.0.1.246.zip ..."
355-
7z x commandline-tools-linux-x64-6.0.1.246.zip.001 -o$HOME/openharmony > /dev/null
350+
echo "Download commandline-tools-linux-x64-5.0.13.200.zip ..."
351+
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.001
352+
wget -q https://github.com/cocos/oh-sdk-for-ci/releases/download/api-15/commandline-tools-linux-x64-5.0.13.200.zip.002
353+
echo "Unzip commandline-tools-linux-x64-5.0.13.200.zip ..."
354+
7z x commandline-tools-linux-x64-5.0.13.200.zip.001 -o$HOME/openharmony > /dev/null
356355
cd $HOME/openharmony
357356
ls -l
358357
cd command-line-tools

‎@types/pal/minigame.d.ts‎

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,6 @@ declare module 'pal/minigame' {
6969
getDeviceInfo(): DeviceInfo;
7070
getWindowInfo(): WindowInfo;
7171
getAppBaseInfo(): AppBaseInfo;
72-
73-
// interace for douyin live play feature
74-
checkFeedSubscribeStatus(opt: subscribeOptions): void;
75-
requestFeedSubscribe(opt: reqSubscribeOptions): void;
76-
getLaunchOptionsSync(): LaunchOptions;
77-
reportScene(opt: reportOption): void;
78-
onFeedStatusChange(cb: (type: string) => void): void;
79-
offFeedStatusChange(cb?: (type: string) => void): void;
80-
storeFeedData(opt: storeFeedDataOptions): void;
81-
getFeedData(opt: getFeedDataOptions): void;
82-
83-
setEnableDebug? (parm: DebugParameter): void;
84-
notifyMiniProgramPlayableStatus? (parm: notiOptions): void;
8572
}
8673

8774
interface WeChatAPI {
@@ -358,92 +345,3 @@ interface LoadSubpackageTaskOnProgressUpdateListenerResult {
358345
totalBytesExpectedToWrite: number;
359346
totalBytesWritten: number;
360347
}
361-
362-
interface subscribeOptions {
363-
scene: number;
364-
allScene: boolean;
365-
type: string;
366-
success?: (successObj: commonSuccessObj) => void,
367-
fail?: (failObj: commonFailObj) => void,
368-
complete?: () => void,
369-
}
370-
interface reqSubscribeOptions {
371-
scene: number;
372-
contentIDs: string[];
373-
allScene: boolean;
374-
type: string;
375-
success?: (successObj: commonSuccessObj) => void,
376-
fail?: (failObj: commonFailObj) => void,
377-
complete?: () => void,
378-
}
379-
380-
interface LaunchOptions {
381-
query: LaunchOptionQuery;
382-
scene: string;
383-
extra: LaunchOptionExtra;
384-
}
385-
386-
interface LaunchOptionExtra {
387-
aid: object;
388-
appId: string;
389-
mpVersion: string;
390-
launch_from: string;
391-
}
392-
393-
interface LaunchOptionQuery {
394-
ad_params: any;
395-
feed_game_scene: any;
396-
feed_game_channel: any;
397-
feed_game_content_id: any;
398-
feed_game_extra: any;
399-
}
400-
interface reportOption {
401-
costTime: number; //ms
402-
sceneId: number;
403-
dimension: object;
404-
metric: object;
405-
success?: (successObj: commonSuccessObj) => void,
406-
fail?: (failObj: commonFailObj) => void,
407-
complete?: () => void,
408-
}
409-
interface commonSuccessObj {
410-
errMsg: string,
411-
data: object,
412-
}
413-
interface commonFailObj {
414-
errMsg: string,
415-
}
416-
417-
interface storeFeedDataOptions {
418-
scene: string;
419-
extra: string;
420-
status: number;
421-
contentID: string;
422-
leftValue: number;//ms
423-
operator: string;
424-
rightValue: number;//ms
425-
success?: (successObj: {errMsg: string}) => void,
426-
fail?: (failObj: commonFailObj) => void,
427-
complete?: () => void,
428-
}
429-
430-
interface getFeedDataOptions {
431-
scene: string;
432-
contentID: string;
433-
success?: (successObj: {errMsg: string, extra: string, status: number}) => void,
434-
fail?: (failObj: commonFailObj) => void,
435-
complete?: () => void,
436-
}
437-
438-
interface DebugParameter {
439-
enableDebug: boolean,
440-
success?: () => void,
441-
fail?: (err: any) => void,
442-
complete?: () => void,
443-
}
444-
445-
interface notiOptions {
446-
success?: () => void,
447-
fail?: (err: any) => void,
448-
complete?: () => void,
449-
}

‎cc.config.json‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -434,20 +434,6 @@
434434
"pal/wasm": "pal/wasm/wasm-minigame.ts"
435435
}
436436
},
437-
{
438-
"test": "context.buildTimeConstants && context.buildTimeConstants.NODEJS",
439-
"isVirtualModule": true,
440-
"overrides": {
441-
"pal/minigame": "pal/minigame/non-minigame.ts",
442-
"pal/audio": "pal/audio/nodejs/player.ts",
443-
"pal/system-info": "pal/system-info/nodejs/system-info.ts",
444-
"pal/screen-adapter": "pal/screen-adapter/nodejs/screen-adapter.ts",
445-
"pal/input": "pal/input/nodejs/index.ts",
446-
"pal/env": "pal/env/nodejs/env.ts",
447-
"pal/pacer": "pal/pacer/pacer-nodejs.ts",
448-
"pal/wasm": "pal/wasm/wasm-nodejs.ts"
449-
}
450-
},
451437
{
452438
"test": "context.buildTimeConstants && context.buildTimeConstants.NOT_PACK_PHYSX_LIBS",
453439
"isVirtualModule": false,
@@ -652,20 +638,6 @@
652638
"ccGlobal": true,
653639
"internal": false
654640
},
655-
"SUD": {
656-
"comment": "Running in the sud's quick game.",
657-
"type": "boolean",
658-
"value": false,
659-
"ccGlobal": true,
660-
"internal": false
661-
},
662-
"NODEJS": {
663-
"comment": "Running in the Node.js environment.",
664-
"type": "boolean",
665-
"value": false,
666-
"ccGlobal": true,
667-
"internal": false
668-
},
669641
"EDITOR": {
670642
"comment": "Running in the editor.",
671643
"type": "boolean",

‎cocos/2d/assets/sprite-atlas.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
THE SOFTWARE.
2424
*/
2525

26-
import { EDITOR, NODEJS, TEST } from 'internal:constants';
26+
import { EDITOR, TEST } from 'internal:constants';
2727
import { ccclass, serializable, editable } from 'cc.decorator';
2828
import { Asset } from '../../asset/assets';
2929
import { SpriteFrame } from './sprite-frame';
@@ -112,7 +112,7 @@ export class SpriteAtlas extends Asset {
112112
* @deprecated since v3.5.0, this is an engine private interface that will be removed in the future.
113113
*/
114114
public _serialize (ctxForExporting: any): any {
115-
if (EDITOR || NODEJS || TEST) {
115+
if (EDITOR || TEST) {
116116
const frames: string[] = [];
117117
for (const key in this.spriteFrames) {
118118
const spriteFrame = this.spriteFrames[key];

‎cocos/2d/assets/sprite-frame.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727

2828
import { ccclass } from 'cc.decorator';
29-
import { EDITOR, NODEJS, TEST, BUILD } from 'internal:constants';
29+
import { EDITOR, TEST, BUILD } from 'internal:constants';
3030
import { Rect, Size, Vec2, Vec3, Vec4, cclegacy, errorID, warnID, js, v3, mat4, rect, v4, v2, size } from '../../core';
3131
import { Asset } from '../../asset/assets/asset';
3232
import { TextureBase } from '../../asset/assets/texture-base';
@@ -649,7 +649,7 @@ export class SpriteFrame extends Asset {
649649
constructor (name?: string) {
650650
super(name);
651651

652-
if (EDITOR || NODEJS) {
652+
if (EDITOR) {
653653
// Atlas asset uuid
654654
this._atlasUuid = '';
655655
}
@@ -1200,7 +1200,7 @@ export class SpriteFrame extends Asset {
12001200
* @deprecated since v3.5.0, this is an engine private interface that will be removed in the future.
12011201
*/
12021202
public _serialize (ctxForExporting: any): any {
1203-
if (EDITOR || TEST || NODEJS) {
1203+
if (EDITOR || TEST) {
12041204
const rect = { x: this._rect.x, y: this._rect.y, width: this._rect.width, height: this._rect.height };
12051205
const offset = { x: this._offset.x, y: this._offset.y };
12061206
const originalSize = this._originalSize;
@@ -1298,7 +1298,7 @@ export class SpriteFrame extends Asset {
12981298
}
12991299
}
13001300

1301-
if (EDITOR || NODEJS) {
1301+
if (EDITOR) {
13021302
self._atlasUuid = data.atlas ? data.atlas : '';
13031303
}
13041304

‎cocos/2d/components/label.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ export class Label extends UIRenderer {
10271027
if (!this.renderData) {
10281028
if (this._assembler && this._assembler.createData) {
10291029
this._renderData = this._assembler.createData(this) as RenderData;
1030-
this.renderData!.material = this.getRenderMaterial(0);
1030+
this.renderData!.material = this.material;
10311031
this._updateColor();
10321032
}
10331033
}

‎cocos/2d/components/sprite.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
import { ccclass, help, executionOrder, menu, tooltip, displayOrder, type, range, editable, serializable, visible } from 'cc.decorator';
27-
import { BUILD, JSB, EDITOR } from 'internal:constants';
27+
import { BUILD, EDITOR } from 'internal:constants';
2828
import { SpriteAtlas } from '../assets/sprite-atlas';
2929
import { SpriteFrame, SpriteFrameEvent } from '../assets/sprite-frame';
3030
import { builtinResMgr } from '../../asset/asset-manager/builtin-res-mgr';
@@ -703,7 +703,6 @@ export class Sprite extends UIRenderer {
703703
}
704704
if (textureChanged) {
705705
if (self.renderData) self.renderData.textureDirty = true;
706-
if (JSB) this._colorDirty();
707706
// texture type changed, set this._instanceMaterialType to default value
708707
const oldIsRT = oldFrame ? oldFrame.texture instanceof RenderTexture : false;
709708
const newIsRT = spriteFrame.texture instanceof RenderTexture;

‎cocos/2d/framework/ui-renderer.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,9 @@ export class UIRenderer extends Renderer {
398398
this.node.off(NodeEventType.ANCHOR_CHANGED, this._nodeStateChange, this);
399399
this.node.off(NodeEventType.SIZE_CHANGED, this._nodeStateChange, this);
400400
this.node.off(NodeEventType.PARENT_CHANGED, this._colorDirty, this);
401-
this.destroyRenderData();
401+
// When disabling, it is necessary to free up idle space to fully utilize chunks
402+
// and avoid breaking batch processing.
403+
this._destroyData();
402404
uiRendererManager.removeRenderer(this);
403405
this._renderFlag = false;
404406
this._renderEntity.enabled = false;
@@ -542,8 +544,10 @@ export class UIRenderer extends Renderer {
542544
}
543545

544546
protected _updateColor (): void {
545-
this._colorDirty();
547+
this.node._uiProps.colorDirty = true;
548+
this.setEntityColorDirty(true);
546549
this.setEntityColor(this._color);
550+
547551
const assembler = this._assembler;
548552
if (assembler) {
549553
if (assembler.updateColor) {

‎cocos/2d/renderer/mesh-buffer.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
import { JSB } from 'internal:constants';
26-
import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo, Feature, API } from '../../gfx';
26+
import { Device, BufferUsageBit, MemoryUsageBit, Attribute, Buffer, BufferInfo, InputAssembler, InputAssemblerInfo } from '../../gfx';
2727
import { getAttributeStride } from './vertex-format';
2828
import { sys, getError, warnID, assertIsTrue } from '../../core';
2929
import { NativeUIMeshBuffer } from './native-2d';
@@ -251,12 +251,7 @@ export class MeshBuffer {
251251

252252
this.floatsPerVertex = getAttributeStride(attrs) >> 2;
253253

254-
var vDataCountLimit = 65536; // 2^16 - 1
255-
const glApi = device.gfxAPI;
256-
if (glApi === API.WEBGPU || glApi === API.WEBGL2 || glApi === API.WEBGL && device.hasFeature(Feature.ELEMENT_INDEX_UINT)) {
257-
vDataCountLimit = 4294967295; // 2^32 - 1
258-
}
259-
assertIsTrue(this._initVDataCount / this._floatsPerVertex < vDataCountLimit, getError(9005));
254+
assertIsTrue(this._initVDataCount / this._floatsPerVertex < 65536, getError(9005));
260255

261256
if (!this.vData || !this.iData) {
262257
this.vData = new Float32Array(this._initVDataCount);

0 commit comments

Comments
 (0)