From ed98029a88cd89702980ac7c40b711afddc5aeb2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 十一月 2025 14:44:59 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/ResModule/BuiltInLoader.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Main/ResModule/BuiltInLoader.cs b/Main/ResModule/BuiltInLoader.cs
index 3dad5ea..8baa053 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)))
{
var path = StringUtility.Contact("Assets/ResourcesOut/BuiltIn/Sprites/", name, SPRITE_EXTENSION);
+ path = System.Text.RegularExpressions.Regex.Replace(path, @"[\p{C}]", "");
sprite = UnityEditor.AssetDatabase.LoadAssetAtPath<Sprite>(path);
}
else
@@ -52,7 +53,7 @@
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);
@@ -75,7 +76,7 @@
public static void UnLoadPrefab(string name)
{
- if (!AssetSource.builtInFromEditor)
+ if (AssetSource.isUseAssetBundle)
{
AssetBundleUtility.Instance.UnloadAsset("builtin/prefabs", name);
}
@@ -84,7 +85,7 @@
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);
@@ -108,7 +109,7 @@
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");
@@ -132,7 +133,7 @@
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");
@@ -157,7 +158,7 @@
{
T config = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
var resourcePath = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
@@ -183,7 +184,7 @@
public static Font LoadFont(string fontName)
{
Font font = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
--
Gitblit v1.8.0