From cc3855df6a83e86e6111a9dd1510ebe50eb5aace Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 九月 2025 21:40:01 +0800
Subject: [PATCH] 0312 unityeditor改资源标识，方便测试
---
Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs | 10 +++++-----
Main/ResModule/ResManager.cs | 13 +++++++------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
index 84c5bc1..e64ab7a 100644
--- a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
+++ b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs
@@ -257,11 +257,11 @@
private void EditorCopyAsset()
{
- if (AssetSource.isUseAssetBundle)
- {
- FileExtersion.DirectoryCopy(ResourcesPath.CONFIG_FODLER, ResourcesPath.Instance.StreamingAssetPath + "config");
- FileExtersion.DirectoryCopy(ResourcesPath.ResourcesOutPath + "BuiltIn", ResourcesPath.Instance.StreamingAssetPath + "builtin");
- }
+ // if (AssetSource.isUseAssetBundle)
+ // {
+ // FileExtersion.DirectoryCopy(ResourcesPath.CONFIG_FODLER, ResourcesPath.Instance.StreamingAssetPath + "config");
+ // FileExtersion.DirectoryCopy(ResourcesPath.ResourcesOutPath + "BuiltIn", ResourcesPath.Instance.StreamingAssetPath + "builtin");
+ // }
}
}
\ No newline at end of file
diff --git a/Main/ResModule/ResManager.cs b/Main/ResModule/ResManager.cs
index 3ebcdf0..56bbfb3 100644
--- a/Main/ResModule/ResManager.cs
+++ b/Main/ResModule/ResManager.cs
@@ -205,12 +205,13 @@
private Sprite LoadSprite(string atlasName, string spriteName)
{
-#if UNITY_EDITOR
- SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
- return atlas.GetSprite(spriteName);
-#else
- return ResManager.Instance.LoadAssetInternal<Sprite>(atlasName, spriteName);
-#endif
+ if (!AssetSource.isUseAssetBundle)
+ {
+ SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
+ return atlas.GetSprite(spriteName);
+ }
+ else
+ return LoadAssetInternal<Sprite>(atlasName, spriteName);
}
public void LoadAssetAsync<T>(string directory, string name, Action<bool, UnityEngine.Object> callBack) where T : UnityEngine.Object
--
Gitblit v1.8.0