Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

资源预加载分离

main
pengjunwu 2024-02-05 14:45:46 +08:00
parent 16d271427c
commit 93b04bc12d
17 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectNLD/Assets/Code/Scripts/Framework/Data/TableManager.cs
View File

@ -26,7 +26,7 @@ namespace Framework
{
// DebugUtil.LogY("TableManager LoadByteBuf {0}", file);
var filePath = _CombiePath(file);
var loadAsset = AssetManager.Instance.LoadAsset<TextAsset>(filePath);
var loadAsset = AssetManager.Instance.GetPreLoadResult<TextAsset>(filePath);
var jsonText = loadAsset.text;
return JSON.Parse(jsonText);
}

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Camp/CampTimeLineCollector.cs
View File

@ -18,7 +18,7 @@ public class CampTimeLineCollector : ScriptableObject
private static CampTimeLineCollector _instance;
public static CampTimeLineCollector Instance =>
_instance ??= AssetManager.Instance.LoadAsset<CampTimeLineCollector>(PATH,false);
_instance ??= AssetManager.Instance.LoadAsset<CampTimeLineCollector>(PATH);
[ReadOnly]
[SerializeField]

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Character/State/FullState/FullStateFadeOut.cs
View File

@ -56,7 +56,7 @@ namespace Gameplay.Character
_cacheHideObjs.Add(meshRender.gameObject);
continue;
}
var newShader = AssetManager.Instance.LoadAsset<Shader>(Constants.SHADER_FADEOUT_PATH);
var newShader = AssetManager.Instance.GetPreLoadResult<Shader>(Constants.SHADER_FADEOUT_PATH);
var newMat = new Material(newShader);
meshRender.material = newMat;

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Level/SelecterView.cs
View File

@ -176,7 +176,7 @@ namespace Gameplay.Level
var pos = map.CellGetPosition(cell);
if (_selectedGroundGFX == null)
{
var sampleObj = AssetManager.Instance.LoadAsset<GameObject>(Constants.CHARACTER_SELECT_GROUND_GFX);
var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(Constants.CHARACTER_SELECT_GROUND_GFX);
_selectedGroundGFX = GameObject.Instantiate(sampleObj);
_selectedGroundGFX.transform.position = pos;
}

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Map/MapUtils.cs
View File

@ -75,7 +75,7 @@ namespace Gameplay
var mapPath = string.Format(Constants.MAP_CONFIG_FORMAT_PATH, mapFileName);
//var configFilePath = string.Format(Constants.MAP_CONFIG_FORMAT_PATH, mapFileName);
//var mapData = await JsonHelper.LoadFromAddressble<MapData>(mapPath);
var textAsset = AssetManager.Instance.LoadAsset<TextAsset>(mapPath,false);
var textAsset = AssetManager.Instance.LoadAsset<TextAsset>(mapPath);
MapData mapData = null;
if (textAsset != null)
{

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Performance/PerformanceManager.cs
View File

@ -102,7 +102,7 @@ namespace Gameplay.Performance
return;
}
var renderers = rootObj.GetComponentsInChildren<Renderer>();
var shader = AssetManager.Instance.LoadAsset<Shader>(Constants.SHADER_SIMPLE_PATH);
var shader = AssetManager.Instance.GetPreLoadResult<Shader>(Constants.SHADER_SIMPLE_PATH);
foreach (var renderer in renderers)
{
var materials = renderer.materials;

8
ProjectNLD/Assets/Code/Scripts/Gameplay/PostProcess/PostOutline/PostOutlineRPF.cs
View File

@ -52,10 +52,10 @@ public class PostOutlineRPF : ScriptableRendererFeature
if (_mat1 == null)
{
_mat1 = Instantiate(AssetManager.Instance.LoadAsset<Material>(Constants.SHADER_OUTLINE_PATH1));
_mat1_1 = Instantiate(AssetManager.Instance.LoadAsset<Material>(Constants.SHADER_OUTLINE_PATH1_1));
_mat2 = Instantiate(AssetManager.Instance.LoadAsset<Material>(Constants.SHADER_OUTLINE_PATH2));
_mat3 = Instantiate(AssetManager.Instance.LoadAsset<Material>(Constants.SHADER_OUTLINE_PATH3));
_mat1 = Instantiate(AssetManager.Instance.GetPreLoadResult<Material>(Constants.SHADER_OUTLINE_PATH1));
_mat1_1 = Instantiate(AssetManager.Instance.GetPreLoadResult<Material>(Constants.SHADER_OUTLINE_PATH1_1));
_mat2 = Instantiate(AssetManager.Instance.GetPreLoadResult<Material>(Constants.SHADER_OUTLINE_PATH2));
_mat3 = Instantiate(AssetManager.Instance.GetPreLoadResult<Material>(Constants.SHADER_OUTLINE_PATH3));
// DebugUtil.LogError("shader name: " + _mat1.shader.name + " " + _mat2.shader.name + " " + _mat3.shader.name);
// DebugUtil.LogError("shader pass count:" + _mat1.shader.passCount + " " + _mat2.shader.passCount + " " + _mat3.shader.passCount);

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Scene/PostProcessData.cs
View File

@ -42,7 +42,7 @@ public class PostProcessData : SerializedScriptableObject
if (_instance == null)
{
Debug.Log("load Instance");
_instance = AssetManager.Instance.LoadAsset<PostProcessData>(PATH, false);
_instance = AssetManager.Instance.LoadAsset<PostProcessData>(PATH);
Debug.Log($"load finish isnull:{_instance == null}");
}

8
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Common/UIHeadItemNode.cs
View File

@ -212,7 +212,7 @@ public class UIHeadItemNode : UINode
if (!ValueValidator.IsIdValid(uid)) return;
var spritePath = CommonUtils.GetDefaultHeadPathByUid(uid);
var sprite = AssetManager.Instance.LoadAsset<Sprite>(spritePath);
var sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(spritePath);
if (sprite)
{
imgHead.sprite = sprite;
@ -228,7 +228,7 @@ public class UIHeadItemNode : UINode
var job = CommonUtils.GetProfessionByUid(uid);
var jobData = TableManager.Instance.Tables.JobAttri.GetOrDefault((int)job);
var spritePath = jobData.IconPath;
var sprite = AssetManager.Instance.LoadAsset<Sprite>(spritePath);
var sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(spritePath);
if (sprite)
{
imgPro.sprite = sprite;
@ -347,7 +347,7 @@ public class UIHeadItemNode : UINode
public void SetHeadImage(string spritePath)
{
var sprite = AssetManager.Instance.LoadAsset<Sprite>(spritePath);
var sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(spritePath);
imgHead.sprite = sprite;
}
@ -378,7 +378,7 @@ public class UIHeadItemNode : UINode
private void _SetBgImage(string spritePath)
{
var sprite = AssetManager.Instance.LoadAsset<Sprite>(spritePath);
var sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(spritePath);
imgBg.sprite = sprite;
}

8
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIFightClockController.cs
View File

@ -143,15 +143,15 @@ public class UIFightClockController : UIWindow{
if (min < 10)
{
string path = LevelUIManager.GetNumberImage(0);
Image_ClockNum0.sprite = AssetManager.Instance.LoadAsset<Sprite>(path);
Image_ClockNum1.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetNumberImage(min));
Image_ClockNum0.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(path);
Image_ClockNum1.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(min));
}
else
{
int minTen = GetNumberBit(min, true);
int minBit = GetNumberBit(min);
Image_ClockNum0.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetNumberImage(minTen));
Image_ClockNum1.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetNumberImage(minBit));
Image_ClockNum0.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(minTen));
Image_ClockNum1.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(minBit));
}
Image_ClockNum2.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetNumberImage(secTen));

10
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIHerosHeadItemNode.cs
View File

@ -531,17 +531,17 @@ public class UIHerosHeadItemNode : UIHeadItemNodeBase
else if (isOnVehicle)
{
Image_StateRetreat.gameObject.SetActive(true);
Image_StateRetreat.sprite = AssetManager.Instance.LoadAsset<Sprite>(Constants.UI_INVEHICLE_STATE);
Image_StateRetreat.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(Constants.UI_INVEHICLE_STATE);
}
else if (isRetreat)
{
Image_StateRetreat.gameObject.SetActive(true);
Image_StateRetreat.sprite = AssetManager.Instance.LoadAsset<Sprite>(Constants.UI_RETREATE_STATE);
Image_StateRetreat.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(Constants.UI_RETREATE_STATE);
}
else if (isSuppress)
{
Image_StateRetreat.gameObject.SetActive(true);
Image_StateRetreat.sprite = AssetManager.Instance.LoadAsset<Sprite>(Constants.UI_SUPPRESS_STATE);
Image_StateRetreat.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(Constants.UI_SUPPRESS_STATE);
}
else
{
@ -615,7 +615,7 @@ public class UIHerosHeadItemNode : UIHeadItemNodeBase
if (m_curMorale <= m_totalMorale * 0.3)
{
m_isDanger = true;
Image_BattleMorale.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetMoralePic(m_isDanger));
Image_BattleMorale.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetMoralePic(m_isDanger));
}
}
else
@ -623,7 +623,7 @@ public class UIHerosHeadItemNode : UIHeadItemNodeBase
if (m_curMorale > m_totalMorale * 0.3)
{
m_isDanger = false;
Image_BattleMorale.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetMoralePic(m_isDanger));
Image_BattleMorale.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetMoralePic(m_isDanger));
}
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs
View File

@ -414,12 +414,12 @@ public class UITeamFightController : UIWindow
Text_SkillCD.text = CommonUtils.GetLocalizeText("time_sec", skillData.CDTime);
Text_SkillInfoDes.text = CommonUtils.GetLocalizeText(skillData.SkillDesc);
}
Image_StandPaintting.sprite = AssetManager.Instance.LoadAsset<Sprite>(path);
Image_StandPaintting.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(path);
var charData = TableManager.Instance.Tables.CharacterAttri.GetOrDefault(cfg.RoleID);
var professionData = TableManager.Instance.Tables.JobAttri.GetOrDefault((int)charData.Job);
//Image_CharacterLogo.sprite = AssetManager.Instance.LoadAsset<Sprite>();
//Image_SkillInfoLogo.sprite = AssetManager.Instance.LoadAsset<Sprite>();
Image_Profession.sprite = AssetManager.Instance.LoadAsset<Sprite>(professionData.IconPath);
Image_Profession.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(professionData.IconPath);
Text_CharacterName.text = CommonUtils.GetLocalizeText(cfg.Name);
Text_EnglishName.text = CommonUtils.GetLocalizeText(cfg.NickName);
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightSceneUI/UICharacterStateBar.cs
View File

@ -67,7 +67,7 @@ public class UICharacterStateBar: UIUnitStateBar
if ((float)curMorale <= m_totalMorale * 0.3)
{
m_isInDanger = true;
Image_Morale.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetMoralePic(m_isInDanger));
Image_Morale.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetMoralePic(m_isInDanger));
}
}
else
@ -75,7 +75,7 @@ public class UICharacterStateBar: UIUnitStateBar
if ((float)curMorale > m_totalMorale * 0.3)
{
m_isInDanger = false;
Image_Morale.sprite = AssetManager.Instance.LoadAsset<Sprite>(LevelUIManager.GetMoralePic(m_isInDanger));
Image_Morale.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetMoralePic(m_isInDanger));
}
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightSceneUI/UIFightSceneController.cs
View File

@ -126,7 +126,7 @@ public class UIFightSceneController : UIWindow
var img = go.GetComponent<Image>();
if (character.statusData.isRetreat)
{
img.sprite = AssetManager.Instance.LoadAsset<Sprite>(Constants.UI_RETREATE_STATE_MAP);
img.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(Constants.UI_RETREATE_STATE_MAP);
SetActionStatesPos(go, character);
go.SetActive(true);
img.SetNativeSize();
@ -134,7 +134,7 @@ public class UIFightSceneController : UIWindow
}
else if (character.runtimeData.isInSuppressed)
{
img.sprite = AssetManager.Instance.LoadAsset<Sprite>(Constants.UI_SUPPRESS_STATE_MAP);
img.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(Constants.UI_SUPPRESS_STATE_MAP);
SetActionStatesPos(go, character);
go.SetActive(true);
img.SetNativeSize();

4
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/ShowAllCharacter/UISelectCharacterController.cs
View File

@ -228,12 +228,12 @@ public class UISelectCharacterController : UIWindow
{
if (value == ALL_DROPDOWN_VALUE)
{
return AssetManager.GetSingleton().LoadAsset<Sprite>((jobAttriCfg.Get(1).IconPath));
return AssetManager.GetSingleton().GetPreLoadResult<Sprite>((jobAttriCfg.Get(1).IconPath));
}
else
{
return AssetManager.GetSingleton().LoadAsset<Sprite>((jobAttriCfg.Get(value).IconPath));
return AssetManager.GetSingleton().GetPreLoadResult<Sprite>((jobAttriCfg.Get(value).IconPath));
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Vehicle/TireMark/TireMarkManager.cs
View File

@ -78,7 +78,7 @@ namespace Gameplay.Vehicle.TireMark
var zCount = Mathf.CeilToInt(zSize / panelSize);
var startX = bounds.min.x + panelSize / 2;
var startZ = bounds.min.z + panelSize / 2;
var sampleObj = AssetManager.Instance.LoadAsset<GameObject>(Constants.TIREMARK_UNIT_PATH);
var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(Constants.TIREMARK_UNIT_PATH);
for (int i = 0; i < xCount; i++)
{
for (int j = 0; j < zCount; j++)
@ -94,7 +94,7 @@ namespace Gameplay.Vehicle.TireMark
}
// 创建渲染用的材质
drawMat = AssetManager.Instance.LoadAsset<Material>(Constants.TIREMARK_MAT_PATH);
drawMat = AssetManager.Instance.GetPreLoadResult<Material>(Constants.TIREMARK_MAT_PATH);
_RegistEvents();
}

2
ProjectNLD/Assets/PhxhSDK

@ -1 +1 @@
Subproject commit 942f7a14a38b7a46ddfe5ff2947b5e54fb46e258
Subproject commit 2f336ed4d78745f3529216735cc46b5bd8fbea22