From 9e89e605d5429babb4b33df2e47ea86dff9d2ba7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 20 十一月 2025 11:55:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/ResModule/ResManager.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Main/ResModule/ResManager.cs b/Main/ResModule/ResManager.cs
index 7445d6b..62d5ac3 100644
--- a/Main/ResModule/ResManager.cs
+++ b/Main/ResModule/ResManager.cs
@@ -70,7 +70,7 @@
{typeof(Sprite), "png"},
{typeof(Texture2D), "jpg"},
{typeof(Texture), "jpg"},
- { typeof(Shader), "shader"},
+ {typeof(Shader), "shader"},
{typeof(TextAsset), "txt"},
{typeof(AudioClip), "wav"},
{typeof(Font), "ttf"},
@@ -167,7 +167,7 @@
//澶栭儴鐢ㄥ埌鐨勮嚜宸卞姞鍚庣紑锛屽唴閮ㄧ粺涓�鍘婚櫎鍚庣紑鍚�
name = name.Substring(0, name.LastIndexOf("."));
}
-
+ //TODO: 涓存椂鐗规畩澶勭悊鎵撳寘鍚庣殑璺緞璇诲彇
if (directory == "UI" || directory == "UIComp" || directory.StartsWith("Sprite")
|| directory == "Battle/Prefabs" || directory == "Materials")
{
@@ -181,6 +181,10 @@
else if (directory.Contains("Texture"))
{
directory = "maps/" + name;
+ }
+ else if (directory.Contains("Shader"))
+ {
+ directory = "graphic/shader";
}
@@ -216,8 +220,12 @@
private Sprite LoadSprite(string atlasName, string spriteName)
{
if (!AssetSource.isUseAssetBundle)
- {
+ {
SpriteAtlas atlas = LoadAsset<SpriteAtlas>("Sprite", atlasName.Replace("Sprite/", ""));
+ if (null == atlas)
+ {
+ return null;
+ }
return atlas.GetSprite(spriteName);
}
else
--
Gitblit v1.8.0