From f85d3a9e42c389244227bbb7c2697174aa277ab8 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 04 九月 2025 17:20:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/ResModule/ResManager.cs |   54 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/Main/ResModule/ResManager.cs b/Main/ResModule/ResManager.cs
index 0f40ef0..e05b672 100644
--- a/Main/ResModule/ResManager.cs
+++ b/Main/ResModule/ResManager.cs
@@ -1,13 +1,11 @@
-using UnityEngine;
-using System.Collections;
+锘縰sing UnityEngine;
 using System.Collections.Generic;
-using Cysharp.Threading.Tasks;
 using System;
 using UnityEngine.U2D;
-using LitJson;
 using System.IO;
-using UnityEngine.Networking;
 using UnityEngine.Video;
+using Spine.Unity;
+
 
 
 #if UNITY_EDITOR
@@ -67,14 +65,16 @@
     {
         {typeof(GameObject), "prefab"},
         {typeof(Sprite), "png"},
-        {typeof(Texture2D), "png"},
-        {typeof(Shader), "shader"},
+        {typeof(Texture2D), "jpg"},
+        {typeof(Texture), "jpg"},
+        { typeof(Shader), "shader"},
         {typeof(TextAsset), "txt"},
         {typeof(AudioClip), "wav"},
         {typeof(Font), "ttf"},
         {typeof(Material), "mat"},
         {typeof(VideoClip), "mp4"},
         {typeof(SpriteAtlas), "spriteatlasv2"},
+        {typeof(SkeletonDataAsset), "asset"},
     };
 
 
@@ -126,7 +126,6 @@
     public T LoadAsset<T> (string directory, string name) where T : UnityEngine.Object
     {
         T asset = null;
-
         //  鐗规畩澶勭悊 鍥犱负鏈変竴灞傚浘闆嗙殑鍏崇郴 directory瑕佷紶鍏ョ殑搴旇鏄痑tlas鐨勫悕瀛�
         if (typeof(T) == typeof(Sprite))
         {
@@ -140,9 +139,8 @@
     {
         T asset = null;
 
-        var path = string.Concat($"Assets/ResourcesOut/{directory}/{name}", GetExtension(typeof(T))).Replace("//", "/");
-
-        if (AssetSource.uiFromEditor)
+        var path = ($"Assets/ResourcesOut/{directory}/{name}" + GetExtension(typeof(T))).Replace("//", "/").Trim().Replace("\\", "/");
+        if (!AssetSource.isUseAssetBundle)
         {
 #if UNITY_EDITOR
             asset = UnityEditor.AssetDatabase.LoadAssetAtPath<T>(path);
@@ -156,20 +154,36 @@
 
         if (asset == null)
         {
-            Debug.LogErrorFormat("LoadAsset() => 鍔犺浇涓嶅埌璧勬簮: {0}.", name);
+            Debug.LogErrorFormat("LoadAsset() => 鍔犺浇涓嶅埌璧勬簮: {0}", path);
         }
 
         return asset;
     }
 
+    public string[] LoadConfig(string name)
+    {
+        string path = string.Empty;
+#if UNITY_EDITOR
+        if (!AssetSource.isUseAssetBundle)
+        {
+            path = ResourcesPath.CONFIG_FODLER + "/" + name + ".txt";
+        }
+        else
+#endif
+        {
+            path = AssetVersionUtility.GetAssetFilePath($"Config/{name}.txt");
+        }
+
+        return File.ReadAllLines(path);
+    }
+
     private Sprite LoadSprite(string atlasName, string spriteName)
     {
 #if !UNITY_EDITOR
-        SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName);
+        SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
         return atlas.GetSprite(spriteName);
 #else
-        //  缂栬緫鍣ㄤ笅鍙互鐩存帴鍔犺浇娌″暐闂
-        return LoadAssetInternal<Sprite>("Sprite/" + atlasName, spriteName);
+        return ResManager.Instance.LoadAssetInternal<Sprite>(atlasName, spriteName);
 #endif
     }
 
@@ -188,7 +202,7 @@
     private void LoadSpriteAsync<T>(string atlasName, string spriteName, Action<bool, UnityEngine.Object> callBack) where T : UnityEngine.Object
     {
 #if !UNITY_EDITOR
-        LoadAssetAsync<SpriteAtlas>("Sprite", atlasName, (isLoaded, atlas) => {
+        LoadAssetAsync<SpriteAtlas>(atlasName, spriteName, (isLoaded, atlas) => {
             if (isLoaded)
             {
                 callBack?.Invoke(isLoaded, atlas.GetSprite(spriteName));
@@ -200,7 +214,7 @@
         });
 #else
         //  缂栬緫鍣ㄤ笅鍙互鐩存帴鍔犺浇娌″暐闂
-        LoadAssetAsyncInternal<T>("Sprite/" + atlasName, spriteName, callBack);
+        LoadAssetAsyncInternal<T>(atlasName, spriteName, callBack);
 #endif
     }
 
@@ -208,7 +222,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);
@@ -224,7 +238,7 @@
 
     public void UnloadAsset(string assetBundleName, string assetName)
     {
-        if (AssetSource.uiFromEditor)
+        if (!AssetSource.isUseAssetBundle)
             return;
 
         AssetBundleUtility.Instance.UnloadAsset(assetBundleName, assetName);
@@ -232,7 +246,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