From 146b689d5f0c5d2474ef69f81d4ddbd5d0828877 Mon Sep 17 00:00:00 2001 From: TippingGame Date: Sun, 9 Mar 2025 14:22:28 +0800 Subject: [PATCH] =?UTF-8?q?1.3.112=201.=E5=B0=8F=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 +++++ Editor/AssetManager/ABBuildTool.cs | 1 + Editor/ExcelTool/ExcelDataTool.cs | 2 +- .../ResourcesManager/ResourcesLoader.cs | 22 ++++++++++--------- Tests/SDKManager/DemoSDK.cs | 2 +- Tests/SDKManager/README.md | 2 +- Tests/SDKManager/README_EN.md | 2 +- package.json | 2 +- 8 files changed, 24 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b753e4a..6c9e7d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [1.3.112] - 2025-03-09 +1.小优化，完善文档 + +## [1.3.111] - 2025-03-06 +1.#32 修复ResourcesLoader中的三目运算符使用错误 + ## [1.3.110] - 2025-03-06 1.#32 的优化 2.打包的AssetBundles复制到Assets外Bundles内，并且加上平台名进行区分 diff --git a/Editor/AssetManager/ABBuildTool.cs b/Editor/AssetManager/ABBuildTool.cs index 193e01da..fa3640de 100644 --- a/Editor/AssetManager/ABBuildTool.cs +++ b/Editor/AssetManager/ABBuildTool.cs @@ -50,6 +50,7 @@ public static void BuildAllAB() FileTools.SafeClearDir(outpath); FileTools.CheckDirAndCreateWhenNeeded(outpath); FileTools.SafeCopyDirectory(strABOutPAthDir, outpath, true); + AssetDatabase.Refresh(); // 等待AB打包完成，再写入数据 GenerateAssetNames(true); diff --git a/Editor/ExcelTool/ExcelDataTool.cs b/Editor/ExcelTool/ExcelDataTool.cs index b9c379b4..6a19972a 100644 --- a/Editor/ExcelTool/ExcelDataTool.cs +++ b/Editor/ExcelTool/ExcelDataTool.cs @@ -76,7 +76,7 @@ private static void CreateAsmdefFile() // 将内容写入.asmdef文件 FileTools.SafeWriteAllText(asmrefPath, asmdefContent); - LogF8.LogConfig("创建.asmdef文件 " + Application.dataPath + DLLFolder + "/" + "/" + CODE_NAMESPACE + ".asmdef" + ""); + LogF8.LogConfig("创建.asmdef文件 " + Application.dataPath + DLLFolder + "/" + CODE_NAMESPACE + ".asmdef" + ""); } public static void LoadAllExcelData() diff --git a/Runtime/AssetManager/ResourcesManager/ResourcesLoader.cs b/Runtime/AssetManager/ResourcesManager/ResourcesLoader.cs index f8ea0e55..fc86d798 100644 --- a/Runtime/AssetManager/ResourcesManager/ResourcesLoader.cs +++ b/Runtime/AssetManager/ResourcesManager/ResourcesLoader.cs @@ -89,10 +89,6 @@ public override T GetAssetObject(string subAssetName = null) } else { - if (subAssetName.IsNullOrEmpty()) - { - return this.ResouceObject as T; - } bool success = TryGetAsset(resourcePath + subAssetName, out Object obj); if (success) { @@ -122,10 +118,6 @@ public override Object GetAssetObject(string subAssetName = null) } else { - if (subAssetName.IsNullOrEmpty()) - { - return this.ResouceObject; - } bool success = TryGetAsset(resourcePath + subAssetName, out Object obj); if (success) { @@ -362,6 +354,11 @@ void End(Object o = null) public virtual T LoadAll(string subAssetName = null) where T : Object { + if (!subAssetName.IsNullOrEmpty()) + { + this.subAssetName = subAssetName; + } + if (resourceLoadState == LoaderState.FINISHED) { if (subAssetName.IsNullOrEmpty()) @@ -389,11 +386,16 @@ public virtual T LoadAll(string subAssetName = null) } } resourceLoadState = LoaderState.FINISHED; - return _resouceObject == null ? _resouceObject as T : resouceObject as T; + return _resouceObject != null ? _resouceObject as T : resouceObject as T; } public virtual Object LoadAll(System.Type assetType = default, string subAssetName = null) { + if (!subAssetName.IsNullOrEmpty()) + { + this.subAssetName = subAssetName; + } + if (resourceLoadState == LoaderState.FINISHED) { if (subAssetName.IsNullOrEmpty()) @@ -430,7 +432,7 @@ public virtual Object LoadAll(System.Type assetType = default, string subAssetNa } } resourceLoadState = LoaderState.FINISHED; - return _resouceObject == null ? _resouceObject : resouceObject; + return _resouceObject != null ? _resouceObject : resouceObject; } /// diff --git a/Tests/SDKManager/DemoSDK.cs b/Tests/SDKManager/DemoSDK.cs index 4bb8ab45..f71bb6a3 100644 --- a/Tests/SDKManager/DemoSDK.cs +++ b/Tests/SDKManager/DemoSDK.cs @@ -37,7 +37,7 @@ void Start() // SDK退出游戏 FF8.SDK.SDKExitGame(); - // 播放视频广告 + // 原生提示 FF8.SDK.SDKToast("Native Toast"); } } diff --git a/Tests/SDKManager/README.md b/Tests/SDKManager/README.md index 73dc831c..ea2553ca 100644 --- a/Tests/SDKManager/README.md +++ b/Tests/SDKManager/README.md @@ -42,7 +42,7 @@ Unity F8 SDKManager组件，与原生平台交互，接入多个平台或者渠 // SDK退出游戏 FF8.SDK.SDKExitGame(); - // 播放视频广告 + // 原生提示 FF8.SDK.SDKToast("Native Toast"); ``` diff --git a/Tests/SDKManager/README_EN.md b/Tests/SDKManager/README_EN.md index 150d7cb9..4137c643 100644 --- a/Tests/SDKManager/README_EN.md +++ b/Tests/SDKManager/README_EN.md @@ -42,7 +42,7 @@ Unity F8 SDKManager组件，与原生平台交互，接入多个平台或者渠 // SDK退出游戏 FF8.SDK.SDKExitGame(); - // 播放视频广告 + // 原生提示 FF8.SDK.SDKToast("Native Toast"); ``` diff --git a/package.json b/package.json index 9841334c..80a8289f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "com.tippinggame.f8framework", "displayName": "F8Framework", "description": "Unity F8Framework Core", - "version": "1.3.110", + "version": "1.3.112", "unity": "2021.3", "license": "MIT", "keywords": ["Unity", "Framework", "Core"],