From 5d3366f2e0f687995eb7ad2107c4379fe7acd4e8 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 04 七月 2025 11:54:05 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建 特效穿透问题修复
---
Main/ResModule/ResManager.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/Main/ResModule/ResManager.cs b/Main/ResModule/ResManager.cs
index 4c5ce0b..b049bde 100644
--- a/Main/ResModule/ResManager.cs
+++ b/Main/ResModule/ResManager.cs
@@ -142,7 +142,7 @@
T asset = null;
var path = ($"Assets/ResourcesOut/{directory}/{name}" + GetExtension(typeof(T))).Replace("//", "/").Trim().Replace("\\", "/");
- if (AssetSource.uiFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
// TODO YYL 杩樻槸瑕佹壘鍒板瓧绗︿覆闂
@@ -162,6 +162,23 @@
}
return asset;
+ }
+
+ public string[] LoadConfig(string name)
+ {
+ string path = string.Empty;
+ if (!AssetSource.isUseAssetBundle)
+ {
+#if UNITY_EDITOR
+ path = ResourcesPath.CONFIG_FODLER + "/" + name + ".txt";
+#endif
+ }
+ else
+ {
+ path = AssetVersionUtility.GetAssetFilePath($"Config/{name}.txt");
+ }
+
+ return File.ReadAllLines(path);
}
private Sprite LoadSprite(string atlasName, string spriteName)
@@ -209,7 +226,7 @@
{
var path = string.Concat($"Assets/ResourcesOut/{directory}/{name}", GetExtension(typeof(T))).Replace("//", "/");
- if (AssetSource.uiFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
var asset = UnityEditor.AssetDatabase.LoadAssetAtPath<T>(path);
@@ -225,7 +242,7 @@
public void UnloadAsset(string assetBundleName, string assetName)
{
- if (AssetSource.uiFromEditor)
+ if (!AssetSource.isUseAssetBundle)
return;
AssetBundleUtility.Instance.UnloadAsset(assetBundleName, assetName);
@@ -233,7 +250,7 @@
public void UnloadAssetBundle(string assetBundleName, bool unloadAllLoadedObjects, bool includeDependenice)
{
- if (AssetSource.uiFromEditor)
+ if (!AssetSource.isUseAssetBundle)
return;
AssetBundleUtility.Instance.UnloadAssetBundle(assetBundleName, unloadAllLoadedObjects, includeDependenice);
}
--
Gitblit v1.8.0