From 89343a7a0909e5244a3b69c4db1294de4536243b Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期一, 15 十二月 2025 18:15:22 +0800
Subject: [PATCH] 262 幻境阁系统-客户端 新增仅适用武将解锁的头像和形象的红点移除规则
---
Main/ResModule/BuiltInLoader.cs | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Main/ResModule/BuiltInLoader.cs b/Main/ResModule/BuiltInLoader.cs
index 3dad5ea..9b8c8f3 100644
--- a/Main/ResModule/BuiltInLoader.cs
+++ b/Main/ResModule/BuiltInLoader.cs
@@ -14,12 +14,13 @@
public static Sprite LoadSprite(string name)
{
Sprite sprite = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- if (excludePngs.Contains(StringUtility.Contact(name, SPRITE_EXTENSION)))
+ if (excludePngs.Contains(StringUtility.Concat(name, SPRITE_EXTENSION)))
{
- var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/Sprites/", name, SPRITE_EXTENSION);
+ var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Sprites/", name, SPRITE_EXTENSION);
+ path = System.Text.RegularExpressions.Regex.Replace(path, @"[\p{C}]", "");
sprite = UnityEditor.AssetDatabase.LoadAssetAtPath<Sprite>(path);
}
else
@@ -52,10 +53,10 @@
public static GameObject LoadPrefab(string name)
{
GameObject prefab = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/Prefabs/", name, PREFAB_EXTENSION);
+ var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Prefabs/", name, PREFAB_EXTENSION);
prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(path);
#endif
}
@@ -75,7 +76,7 @@
public static void UnLoadPrefab(string name)
{
- if (!AssetSource.builtInFromEditor)
+ if (AssetSource.isUseAssetBundle)
{
AssetBundleUtility.Instance.UnloadAsset("builtin/prefabs", name);
}
@@ -84,10 +85,10 @@
public static AudioClip LoadMusic(string name)
{
AudioClip audioClip = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/Musics/", name, AUDIO_EXTENSION);
+ var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Musics/", name, ".mp3");
audioClip = UnityEditor.AssetDatabase.LoadAssetAtPath<AudioClip>(path);
#endif
}
@@ -108,10 +109,10 @@
public static AnimationClip LoadAnimationClip(string name)
{
AnimationClip clip = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/AnimationClips/", name, ".anim");
+ var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/AnimationClips/", name, ".anim");
clip = UnityEditor.AssetDatabase.LoadAssetAtPath<AnimationClip>(path);
#endif
}
@@ -132,10 +133,10 @@
public static Material LoadMaterial(string name)
{
Material material = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/Materials/", name, ".mat");
+ var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Materials/", name, ".mat");
material = UnityEditor.AssetDatabase.LoadAssetAtPath<Material>(path);
#endif
}
@@ -157,10 +158,10 @@
{
T config = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- var resourcePath = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
+ var resourcePath = StringUtility.Concat(ResourcesPath.ResourcesOutAssetPath,
"BuiltIn/ScriptableObjects/", name, ".asset");
config = UnityEditor.AssetDatabase.LoadAssetAtPath<T>(resourcePath);
@@ -183,10 +184,10 @@
public static Font LoadFont(string fontName)
{
Font font = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
- var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
+ var path = StringUtility.Concat(ResourcesPath.ResourcesOutAssetPath,
"BuiltIn/Font/", fontName, ".ttf");
font = UnityEditor.AssetDatabase.LoadAssetAtPath<Font>(path);
#endif
--
Gitblit v1.8.0