Test_Project_Cocos/cocos-enhance-kit
1
0
Fork 0
mirror of https://github.com/smallmain/cocos-enhance-kit.git synced 2024-12-26 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[engine] 修复勾选延迟加载资源时资源不会加载的问题

Browse Source
This commit is contained in:
SmallMain 2022-07-28 22:53:09 +08:00
parent b330bf563c
commit 27477452c5
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/cocos2d/core/components/CCLabel.js
View File

@ -819,8 +819,10 @@ let Label = cc.Class({
// 根据材质更新 uniform // 根据材质更新 uniform
const isMultiMaterial = material.material.isMultiSupport(); const isMultiMaterial = material.material.isMultiSupport();
if (isMultiMaterial) { if (isMultiMaterial) {
// 贴图在 updateRenderData 才确定下来 const texture = this._frame._texture;
// if (texture) this._updateMultiTexId(material, texture); if (texture instanceof cc.Texture2D && !texture.loaded) {
cc.assetManager.postLoadNative(texture);
}
this._texIdDirty = true; this._texIdDirty = true;
} else { } else {
material.setProperty('texture', this._frame._texture); material.setProperty('texture', this._frame._texture);

4
engine/cocos2d/core/components/CCMotionStreak.js
View File

@ -261,6 +261,10 @@ var MotionStreak = cc.Class({
const isMultiMaterial = material.material.isMultiSupport(); const isMultiMaterial = material.material.isMultiSupport();
if (isMultiMaterial) { if (isMultiMaterial) {
if (!this._texture) return; if (!this._texture) return;
const texture = this._texture;
if (texture instanceof cc.Texture2D && !texture.loaded) {
cc.assetManager.postLoadNative(texture);
}
this._updateMultiTexId(material, this._texture); this._updateMultiTexId(material, this._texture);
} else { } else {
const textureImpl = this._texture && this._texture.getImpl(); const textureImpl = this._texture && this._texture.getImpl();

5
engine/cocos2d/core/components/CCSprite.js
View File

@ -486,8 +486,9 @@ var Sprite = cc.Class({
// 根据材质更新 uniform // 根据材质更新 uniform
const isMultiMaterial = material.material.isMultiSupport(); const isMultiMaterial = material.material.isMultiSupport();
if (isMultiMaterial) { if (isMultiMaterial) {
// 在 assembler 中进行更新性能会更好，不需要每次 setSpriteFrame 都更新，并且动态图集会导致两次触发 if (texture instanceof cc.Texture2D && !texture.loaded) {
// if (texture) this._updateMultiTexId(material, texture); cc.assetManager.postLoadNative(texture);
}
this._texIdDirty = true; this._texIdDirty = true;
} else { } else {
const textureImpl = texture && texture.getImpl(); const textureImpl = texture && texture.getImpl();