From a24fb377eb8ba2651f77d8c05e3d822478206793 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 06 六月 2025 16:14:21 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建 去掉AssetSource下的resFromEditor 添加了IsUseAssetBundle UIBase添加了防呆的InitComponentIneteral
---
Main/ResModule/BuiltInLoader.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Main/ResModule/BuiltInLoader.cs b/Main/ResModule/BuiltInLoader.cs
index 3dad5ea..a7eee09 100644
--- a/Main/ResModule/BuiltInLoader.cs
+++ b/Main/ResModule/BuiltInLoader.cs
@@ -14,7 +14,7 @@
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)))
@@ -52,7 +52,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 +75,7 @@
public static void UnLoadPrefab(string name)
{
- if (!AssetSource.builtInFromEditor)
+ if (AssetSource.isUseAssetBundle)
{
AssetBundleUtility.Instance.UnloadAsset("builtin/prefabs", name);
}
@@ -84,7 +84,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 +108,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 +132,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 +157,7 @@
{
T config = null;
- if (AssetSource.builtInFromEditor)
+ if (!AssetSource.isUseAssetBundle)
{
#if UNITY_EDITOR
var resourcePath = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
@@ -183,7 +183,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