From d6550ccbff7412780aca85582179bc8dc924860b Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 12 六月 2025 18:01:36 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建 新增scale over in out 效果
---
Main/ResModule/ResManager.cs | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Main/ResModule/ResManager.cs b/Main/ResModule/ResManager.cs
index 3806ee4..b8318cb 100644
--- a/Main/ResModule/ResManager.cs
+++ b/Main/ResModule/ResManager.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+锘縰sing UnityEngine;
using System.Collections;
using System.Collections.Generic;
using Cysharp.Threading.Tasks;
@@ -8,6 +8,8 @@
using System.IO;
using UnityEngine.Networking;
using UnityEngine.Video;
+using System.Reflection;
+
#if UNITY_EDITOR
@@ -139,11 +141,12 @@
{
T asset = null;
- var path = string.Concat($"Assets/ResourcesOut/{directory}/{name}", GetExtension(typeof(T))).Replace("//", "/").Trim().Replace("\\", "/");
-
- if (AssetSource.uiFromEditor)
+ var path = ($"Assets/ResourcesOut/{directory}/{name}" + GetExtension(typeof(T))).Replace("//", "/").Trim().Replace("\\", "/");
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
+ // TODO YYL 杩樻槸瑕佹壘鍒板瓧绗︿覆闂
+ path = System.Text.RegularExpressions.Regex.Replace(path, @"[\p{C}]", "");
asset = UnityEditor.AssetDatabase.LoadAssetAtPath<T>(path);
#endif
}
@@ -163,12 +166,12 @@
private Sprite LoadSprite(string atlasName, string spriteName)
{
-// #if !UNITY_EDITOR
+#if !UNITY_EDITOR
SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
return atlas.GetSprite(spriteName);
-// #else
- // return ResManager.Instance.LoadAssetInternal<Sprite>(atlasName, spriteName);
-// #endif
+#else
+ return ResManager.Instance.LoadAssetInternal<Sprite>(atlasName, spriteName);
+#endif
}
public void LoadAssetAsync<T>(string directory, string name, Action<bool, UnityEngine.Object> callBack) where T : UnityEngine.Object
@@ -206,7 +209,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);
@@ -222,7 +225,7 @@
public void UnloadAsset(string assetBundleName, string assetName)
{
- if (AssetSource.uiFromEditor)
+ if (!AssetSource.isUseAssetBundle)
return;
AssetBundleUtility.Instance.UnloadAsset(assetBundleName, assetName);
@@ -230,7 +233,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