From f3ae8542aee4b5de78fc20d9543bb424b315708f Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 10 九月 2025 14:23:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/ResModule/ResManager.cs | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/Main/ResModule/ResManager.cs b/Main/ResModule/ResManager.cs
index b049bde..e05b672 100644
--- a/Main/ResModule/ResManager.cs
+++ b/Main/ResModule/ResManager.cs
@@ -1,14 +1,10 @@
锘縰sing UnityEngine;
-using System.Collections;
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 System.Reflection;
+using Spine.Unity;
@@ -69,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"},
};
@@ -145,8 +143,6 @@
if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- // TODO YYL 杩樻槸瑕佹壘鍒板瓧绗︿覆闂
- path = System.Text.RegularExpressions.Regex.Replace(path, @"[\p{C}]", "");
asset = UnityEditor.AssetDatabase.LoadAssetAtPath<T>(path);
#endif
}
@@ -167,13 +163,13 @@
public string[] LoadConfig(string name)
{
string path = string.Empty;
+#if UNITY_EDITOR
if (!AssetSource.isUseAssetBundle)
{
-#if UNITY_EDITOR
path = ResourcesPath.CONFIG_FODLER + "/" + name + ".txt";
-#endif
}
else
+#endif
{
path = AssetVersionUtility.GetAssetFilePath($"Config/{name}.txt");
}
--
Gitblit v1.8.0