From d5a9b9f0f46a56c7ae32ee93d29ae0b9dd2ee52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=86=A0=E5=B3=B0?= <33317070@qq.com> Date: Thu, 28 May 2026 11:03:28 +0800 Subject: [PATCH] Add explicit YooAsset macro gates --- .../BuildTasks/TaskBuilding_IABP.cs | 2 +- .../BuildTasks/TaskCopyBundledFiles_IABP.cs | 2 +- .../BuildTasks/TaskCreateManifest_IABP.cs | 2 +- .../BuildTasks/TaskCreatePackage_IABP.cs | 2 +- .../BuildTasks/TaskCreateRecordFile_IABP.cs | 2 +- .../BuildTasks/TaskCreateReport_IABP.cs | 2 +- .../BuildTasks/TaskGetBuildMap_IABP.cs | 2 +- .../BuildTasks/TaskPrepare_IABP.cs | 2 +- .../BuildTasks/TaskUpdateBundleInfo_IABP.cs | 2 +- .../BuildTasks/TaskVerifyBuildResult_IABP.cs | 2 +- .../InstantAssetBuildPipeline/InstantAssetBuildLog.cs | 2 +- .../InstantAssetBuildParameters.cs | 2 +- .../InstantAssetBuildPipeline.cs | 2 +- .../InstantAssetBuildPipeline/InstantAssetRecordFile.cs | 2 +- .../InstantAssetBuildPipelineViewer.cs | 2 +- .../InstantBundleHandle/InstantAssetTableContext.cs | 2 +- .../Services/InstantBundleHandle/InstantBundleHandle.cs | 2 +- .../Operations/IBHLoadAllAssetsOperation.cs | 2 +- .../Operations/IBHLoadAssetOperation.cs | 2 +- .../Operations/IBHLoadSceneOperation.cs | 2 +- .../Operations/IBHLoadSubAssetsOperation.cs | 2 +- Assets/YooAsset/Runtime/YooAsset.asmdef | 6 +++--- .../Extension Sample/Editor/MacroSupport/MacroDefine.cs | 8 ++++---- .../Editor/MacroSupport/MacroProcessor.cs | 2 +- .../Extension Sample/Editor/MacroSupport/RspGenerator.cs | 2 +- .../Test Sample/Runtime/CommonTests/TestUniTask.cs | 4 ++-- Assets/YooAsset/Samples~/UniTask Sample/README.md | 4 ++-- .../External/YooAsset/AsyncOperationBaseExtensions.cs | 2 +- .../Runtime/External/YooAsset/HandleBaseExtensions.cs | 2 +- .../Runtime/External/YooAsset/UniTask.YooAsset.asmdef | 2 +- 30 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskBuilding_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskBuilding_IABP.cs index 94b11f9a..041bc172 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskBuilding_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskBuilding_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System; using System.Collections.Generic; using UnityEditor; diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCopyBundledFiles_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCopyBundledFiles_IABP.cs index c4f821be..28eb8301 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCopyBundledFiles_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCopyBundledFiles_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using UnityEditor; namespace YooAsset.Editor diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateManifest_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateManifest_IABP.cs index a68ed1a5..a52fc0d4 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateManifest_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateManifest_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System; namespace YooAsset.Editor diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreatePackage_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreatePackage_IABP.cs index 733708ce..200db94a 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreatePackage_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreatePackage_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT namespace YooAsset.Editor { /// diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateRecordFile_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateRecordFile_IABP.cs index 6661c158..9048fdcc 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateRecordFile_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateRecordFile_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System.Collections.Generic; namespace YooAsset.Editor diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateReport_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateReport_IABP.cs index eebe48e0..2f79f9fa 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateReport_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskCreateReport_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT namespace YooAsset.Editor { /// diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskGetBuildMap_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskGetBuildMap_IABP.cs index 3b66ca93..2ccb2043 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskGetBuildMap_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskGetBuildMap_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT namespace YooAsset.Editor { /// diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskPrepare_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskPrepare_IABP.cs index a49642fc..1f8ef8a3 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskPrepare_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskPrepare_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT namespace YooAsset.Editor { /// diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskUpdateBundleInfo_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskUpdateBundleInfo_IABP.cs index 4ca55dc7..00aedac5 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskUpdateBundleInfo_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskUpdateBundleInfo_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System; namespace YooAsset.Editor diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskVerifyBuildResult_IABP.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskVerifyBuildResult_IABP.cs index cc9f2a52..e8c44111 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskVerifyBuildResult_IABP.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/BuildTasks/TaskVerifyBuildResult_IABP.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System; using System.Linq; using System.Collections.Generic; diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildLog.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildLog.cs index 22652105..ade2c50c 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildLog.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildLog.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System; using System.IO; using System.Collections.Generic; diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildParameters.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildParameters.cs index 947a3525..a8495495 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildParameters.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildParameters.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using UnityEditor; namespace YooAsset.Editor diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildPipeline.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildPipeline.cs index 425dca7c..ec56e579 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildPipeline.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetBuildPipeline.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System; using System.Collections.Generic; diff --git a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetRecordFile.cs b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetRecordFile.cs index 753c5e05..4b72b3b5 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetRecordFile.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/BuildPipeline/InstantAssetBuildPipeline/InstantAssetRecordFile.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System.Text; using System.IO; using System.Collections.Generic; diff --git a/Assets/YooAsset/Editor/BundleBuilder/VisualViewers/InstantAssetBuildPipeline/InstantAssetBuildPipelineViewer.cs b/Assets/YooAsset/Editor/BundleBuilder/VisualViewers/InstantAssetBuildPipeline/InstantAssetBuildPipelineViewer.cs index b04ad26e..f395b937 100644 --- a/Assets/YooAsset/Editor/BundleBuilder/VisualViewers/InstantAssetBuildPipeline/InstantAssetBuildPipelineViewer.cs +++ b/Assets/YooAsset/Editor/BundleBuilder/VisualViewers/InstantAssetBuildPipeline/InstantAssetBuildPipelineViewer.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using System; using UnityEditor; using UnityEngine; diff --git a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantAssetTableContext.cs b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantAssetTableContext.cs index b234c96c..6d48e273 100644 --- a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantAssetTableContext.cs +++ b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantAssetTableContext.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using UnityEngine; diff --git a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantBundleHandle.cs b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantBundleHandle.cs index ee893c8a..b0930002 100644 --- a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantBundleHandle.cs +++ b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/InstantBundleHandle.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAllAssetsOperation.cs b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAllAssetsOperation.cs index e4f23f7e..493a9f4f 100644 --- a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAllAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAllAssetsOperation.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT namespace YooAsset { /// diff --git a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAssetOperation.cs b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAssetOperation.cs index b9630060..77119c5e 100644 --- a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAssetOperation.cs +++ b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadAssetOperation.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using UnityEngine; namespace YooAsset diff --git a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSceneOperation.cs b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSceneOperation.cs index 6734c5ab..bc92d56f 100644 --- a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSceneOperation.cs +++ b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSceneOperation.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSubAssetsOperation.cs b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSubAssetsOperation.cs index df168844..e0d50e3c 100644 --- a/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSubAssetsOperation.cs +++ b/Assets/YooAsset/Runtime/BundleHandle/Services/InstantBundleHandle/Operations/IBHLoadSubAssetsOperation.cs @@ -1,4 +1,4 @@ -#if TUANJIE_1_8_OR_NEWER +#if TUANJIE_1_8_OR_NEWER && YOOASSET_INSTANT_ASSET_SUPPORT namespace YooAsset { /// diff --git a/Assets/YooAsset/Runtime/YooAsset.asmdef b/Assets/YooAsset/Runtime/YooAsset.asmdef index 94a93f3a..89f1ee1c 100644 --- a/Assets/YooAsset/Runtime/YooAsset.asmdef +++ b/Assets/YooAsset/Runtime/YooAsset.asmdef @@ -13,17 +13,17 @@ { "name": "com.tuyoogame.yooasset", "expression": "", - "define": "YOO_ASSET_3" + "define": "YOOASSET_3" }, { "name": "com.tuyoogame.yooasset", "expression": "3.0.0-beta", - "define": "YOO_ASSET_3_0" + "define": "YOOASSET_3_0" }, { "name": "com.tuyoogame.yooasset", "expression": "3.0.0-beta", - "define": "YOO_ASSET_3_0_OR_NEWER" + "define": "YOOASSET_3_0_OR_NEWER" } ], "noEngineReferences": false diff --git a/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroDefine.cs b/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroDefine.cs index 01ff0ddf..c20dab58 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroDefine.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroDefine.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -#if YOO_MACRO_SUPPORT +#if YOOASSET_MACRO_SUPPORT namespace YooAsset.Editor { /// @@ -13,9 +13,9 @@ namespace YooAsset.Editor /// public static IReadOnlyList Macros { get; } = new List() { - "YOO_ASSET_3", - "YOO_ASSET_3_0", - "YOO_ASSET_3_0_OR_NEWER", + "YOOASSET_3", + "YOOASSET_3_0", + "YOOASSET_3_0_OR_NEWER", }; } } diff --git a/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroProcessor.cs b/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroProcessor.cs index 2eff15cf..d6224208 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroProcessor.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/MacroProcessor.cs @@ -5,7 +5,7 @@ using System.Text; using System.Xml; using UnityEditor; -#if YOO_MACRO_SUPPORT +#if YOOASSET_MACRO_SUPPORT namespace YooAsset.Editor { /// diff --git a/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/RspGenerator.cs b/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/RspGenerator.cs index 0d4e1872..386b6d21 100644 --- a/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/RspGenerator.cs +++ b/Assets/YooAsset/Samples~/Extension Sample/Editor/MacroSupport/RspGenerator.cs @@ -6,7 +6,7 @@ using System.Xml; using UnityEditor; using UnityEngine; -#if YOO_MACRO_SUPPORT +#if YOOASSET_MACRO_SUPPORT namespace YooAsset.Editor.Experiment { /// diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestUniTask.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestUniTask.cs index 07d584e1..f7f6d947 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestUniTask.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/CommonTests/TestUniTask.cs @@ -1,4 +1,4 @@ -#if UNITASK_YOOASSET_SUPPORT +#if YOOASSET_UNITASK_SUPPORT using System; using System.Collections; using System.Threading; @@ -208,7 +208,7 @@ public class TestUniTask { public IEnumerator RuntimeTester() { - Debug.LogWarning("UniTask tests skipped: UNITASK_YOOASSET_SUPPORT is not defined."); + Debug.LogWarning("UniTask tests skipped: YOOASSET_UNITASK_SUPPORT is not defined."); yield break; } } diff --git a/Assets/YooAsset/Samples~/UniTask Sample/README.md b/Assets/YooAsset/Samples~/UniTask Sample/README.md index 2633298a..056207fd 100644 --- a/Assets/YooAsset/Samples~/UniTask Sample/README.md +++ b/Assets/YooAsset/Samples~/UniTask Sample/README.md @@ -46,7 +46,7 @@ public class TestTask : MonoBehaviour Project Settings --> Player --> Scripting Define Symbols ``` - UNITASK_YOOASSET_SUPPORT + YOOASSET_UNITASK_SUPPORT ``` 5. 重启Unity引擎 @@ -68,7 +68,7 @@ public class TestTask : MonoBehaviour Project Settings --> Player --> Scripting Define Symbols ``` - UNITASK_YOOASSET_SUPPORT + YOOASSET_UNITASK_SUPPORT ``` 4. 重启Unity引擎 diff --git a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/AsyncOperationBaseExtensions.cs b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/AsyncOperationBaseExtensions.cs index b64292dc..e2ce8092 100644 --- a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/AsyncOperationBaseExtensions.cs +++ b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/AsyncOperationBaseExtensions.cs @@ -1,4 +1,4 @@ -#if UNITASK_YOOASSET_SUPPORT +#if YOOASSET_UNITASK_SUPPORT using System; using System.Threading; using YooAsset; diff --git a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs index 5bdb69c8..151f9b0d 100644 --- a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs +++ b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/HandleBaseExtensions.cs @@ -1,4 +1,4 @@ -#if UNITASK_YOOASSET_SUPPORT +#if YOOASSET_UNITASK_SUPPORT #if UNITY_2020_1_OR_NEWER && ! UNITY_2021 #define UNITY_2020_BUG #endif diff --git a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/UniTask.YooAsset.asmdef b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/UniTask.YooAsset.asmdef index 13a04805..89cea19b 100644 --- a/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/UniTask.YooAsset.asmdef +++ b/Assets/YooAsset/Samples~/UniTask Sample/UniTask/Runtime/External/YooAsset/UniTask.YooAsset.asmdef @@ -16,7 +16,7 @@ { "name": "com.cysharp.unitask", "expression": "", - "define": "UNITASK_YOOASSET_SUPPORT" + "define": "YOOASSET_UNITASK_SUPPORT" } ], "noEngineReferences": false