From e652d6ed951e1391fd694e55db5bd2df82996a62 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 20 Jan 2025 17:58:21 +0800 Subject: [PATCH] [v3.8.6] Fix a mangleProperties issue which is caused by using `as any` in trail.ts. (#18216) --- cocos/particle/renderer/particle-system-renderer-base.ts | 2 +- cocos/particle/renderer/particle-system-renderer-cpu.ts | 2 +- cocos/particle/renderer/trail.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/particle/renderer/particle-system-renderer-base.ts b/cocos/particle/renderer/particle-system-renderer-base.ts index a81e73a149..202633a437 100644 --- a/cocos/particle/renderer/particle-system-renderer-base.ts +++ b/cocos/particle/renderer/particle-system-renderer-base.ts @@ -128,7 +128,7 @@ export abstract class ParticleSystemRendererBase { } public updateTrailMaterial (): void {} - public getDefaultTrailMaterial (): null { return null; } + public getDefaultTrailMaterial (): Material | null { return null; } public abstract getParticleCount (): number; public abstract getFreeParticle (): Particle | null; public abstract onMaterialModified (index: number, material: Material): void; diff --git a/cocos/particle/renderer/particle-system-renderer-cpu.ts b/cocos/particle/renderer/particle-system-renderer-cpu.ts index 5ac316c967..03ebdd3b5b 100644 --- a/cocos/particle/renderer/particle-system-renderer-cpu.ts +++ b/cocos/particle/renderer/particle-system-renderer-cpu.ts @@ -243,7 +243,7 @@ export default class ParticleSystemRendererCPU extends ParticleSystemRendererBas return this._particles!.add(); } - public getDefaultTrailMaterial (): any { + public getDefaultTrailMaterial (): Material | null { return this._defaultTrailMat; } diff --git a/cocos/particle/renderer/trail.ts b/cocos/particle/renderer/trail.ts index b1c0b7a08f..201e31e518 100644 --- a/cocos/particle/renderer/trail.ts +++ b/cocos/particle/renderer/trail.ts @@ -454,7 +454,7 @@ export default class TrailModule { public updateMaterial (): void { if (this._particleSystem) { this._material = this._particleSystem.getMaterialInstance(1) - || (this._particleSystem.processor as any)._defaultTrailMat; + || this._particleSystem.processor.getDefaultTrailMaterial(); if (this._trailModel) { this._trailModel.setSubModelMaterial(0, this._material!); }