From ad69c6d733eaf4fc30992f5f0663b6f08430e194 Mon Sep 17 00:00:00 2001 From: changyunjia <905640960@qq.com> Date: Fri, 12 Jun 2026 15:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AddressableAssetsData.meta | 8 - .../AddressableAssetSettings.asset | 110 ---------- .../AddressableAssetSettings.asset.meta | 8 - Assets/AddressableAssetsData/Android.meta | 8 - .../Android/addressables_content_state.bin | Bin 1454 -> 0 bytes .../addressables_content_state.bin.meta | 7 - .../AssetGroupTemplates.meta | 8 - .../AssetGroupTemplates/Packed Assets.asset | 76 ------- .../Packed Assets.asset.meta | 8 - Assets/AddressableAssetsData/AssetGroups.meta | 8 - .../AssetGroups/Built In Data.asset | 23 --- .../AssetGroups/Built In Data.asset.meta | 8 - .../AssetGroups/Default Local Group.asset | 37 ---- .../Default Local Group.asset.meta | 8 - .../AssetGroups/Schemas.meta | 8 - .../Built In Data_PlayerDataGroupSchema.asset | 17 -- ...t In Data_PlayerDataGroupSchema.asset.meta | 8 - ... Local Group_BundledAssetGroupSchema.asset | 45 ----- ...l Group_BundledAssetGroupSchema.asset.meta | 8 - ...Local Group_ContentUpdateGroupSchema.asset | 16 -- ... Group_ContentUpdateGroupSchema.asset.meta | 8 - .../AddressableAssetsData/DataBuilders.meta | 8 - .../DataBuilders/BuildScriptFastMode.asset | 20 -- .../BuildScriptFastMode.asset.meta | 8 - .../DataBuilders/BuildScriptPackedMode.asset | 20 -- .../BuildScriptPackedMode.asset.meta | 8 - .../BuildScriptPackedPlayMode.asset | 20 -- .../BuildScriptPackedPlayMode.asset.meta | 8 - .../DataBuilders/BuildScriptVirtualMode.asset | 20 -- .../BuildScriptVirtualMode.asset.meta | 8 - .../AddressableAssetsData/DefaultObject.asset | 15 -- .../DefaultObject.asset.meta | 8 - .../ProfileDataSourceSettings.asset | 34 ---- .../ProfileDataSourceSettings.asset.meta | 8 - Assets/AddressableAssetsData/iOS.meta | 8 - .../iOS/addressables_content_state.bin | Bin 1450 -> 0 bytes .../iOS/addressables_content_state.bin.meta | 7 - .../SGModule/Editor/AddressablesManager.cs | 188 ------------------ .../Editor/AddressablesManager.cs.meta | 3 - .../ConfigLoader/FileNetworkManager.cs | 11 +- Packages/manifest.json | 1 - Packages/packages-lock.json | 21 -- 42 files changed, 2 insertions(+), 849 deletions(-) delete mode 100644 Assets/AddressableAssetsData.meta delete mode 100644 Assets/AddressableAssetsData/AddressableAssetSettings.asset delete mode 100644 Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta delete mode 100644 Assets/AddressableAssetsData/Android.meta delete mode 100644 Assets/AddressableAssetsData/Android/addressables_content_state.bin delete mode 100644 Assets/AddressableAssetsData/Android/addressables_content_state.bin.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroupTemplates.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Built In Data.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/DataBuilders.meta delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset delete mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta delete mode 100644 Assets/AddressableAssetsData/DefaultObject.asset delete mode 100644 Assets/AddressableAssetsData/DefaultObject.asset.meta delete mode 100644 Assets/AddressableAssetsData/ProfileDataSourceSettings.asset delete mode 100644 Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta delete mode 100644 Assets/AddressableAssetsData/iOS.meta delete mode 100644 Assets/AddressableAssetsData/iOS/addressables_content_state.bin delete mode 100644 Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta delete mode 100644 Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs delete mode 100644 Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs.meta diff --git a/Assets/AddressableAssetsData.meta b/Assets/AddressableAssetsData.meta deleted file mode 100644 index c121055..0000000 --- a/Assets/AddressableAssetsData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 692a8563bf4ba9749905419c982657c8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset deleted file mode 100644 index 93c6da7..0000000 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ /dev/null @@ -1,110 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3} - m_Name: AddressableAssetSettings - m_EditorClassIdentifier: - m_DefaultGroup: a45d0d25213104f44ad8fe07eb3548d1 - m_currentHash: - serializedVersion: 2 - Hash: 24f7d451677154961ad4235510acee73 - m_OptimizeCatalogSize: 0 - m_BuildRemoteCatalog: 0 - m_BundleLocalCatalog: 0 - m_CatalogRequestsTimeout: 0 - m_DisableCatalogUpdateOnStart: 0 - m_IgnoreUnsupportedFilesInBuild: 0 - m_UniqueBundleIds: 0 - m_NonRecursiveBuilding: 1 - m_CCDEnabled: 0 - m_maxConcurrentWebRequests: 3 - m_ContiguousBundles: 1 - m_StripUnityVersionFromBundleBuild: 0 - m_DisableVisibleSubAssetRepresentations: 0 - m_ShaderBundleNaming: 0 - m_ShaderBundleCustomNaming: - m_MonoScriptBundleNaming: 0 - m_CheckForContentUpdateRestrictionsOption: 0 - m_MonoScriptBundleCustomNaming: - m_RemoteCatalogBuildPath: - m_Id: - m_RemoteCatalogLoadPath: - m_Id: - m_ContentStateBuildPathProfileVariableName: - m_CustomContentStateBuildPath: - m_ContentStateBuildPath: - m_BuildAddressablesWithPlayerBuild: 0 - m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]' - m_GroupAssets: - - {fileID: 11400000, guid: 902fafad9bba93345b7a8d95737094ff, type: 2} - - {fileID: 11400000, guid: 0835c4975fed7d14795ec925b54bca80, type: 2} - m_BuildSettings: - m_CompileScriptsInVirtualMode: 0 - m_CleanupStreamingAssetsAfterBuilds: 1 - m_LogResourceManagerExceptions: 1 - m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles - m_ProfileSettings: - m_Profiles: - - m_InheritedParent: - m_Id: 70f0db63e1b2ccc49a35826b26d42ffa - m_ProfileName: Default - m_Values: - - m_Id: 693c6cc232ba75944b76340184d8d5da - m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' - - m_Id: 6c2c4720f61c8134b9b4b2c9776cd752 - m_Value: http://[PrivateIpAddress]:[HostingServicePort] - - m_Id: 6e2463dd44eb1f54cb6bd7d1ed217d78 - m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' - - m_Id: 79ac92be39ae3b548acfff4d617e9f3d - m_Value: ServerData/[BuildTarget] - - m_Id: c213fc96596f0424b92d9b5da98dc49d - m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' - m_ProfileEntryNames: - - m_Id: 693c6cc232ba75944b76340184d8d5da - m_Name: Local.LoadPath - m_InlineUsage: 0 - - m_Id: 6c2c4720f61c8134b9b4b2c9776cd752 - m_Name: Remote.LoadPath - m_InlineUsage: 0 - - m_Id: 6e2463dd44eb1f54cb6bd7d1ed217d78 - m_Name: Local.BuildPath - m_InlineUsage: 0 - - m_Id: 79ac92be39ae3b548acfff4d617e9f3d - m_Name: Remote.BuildPath - m_InlineUsage: 0 - - m_Id: c213fc96596f0424b92d9b5da98dc49d - m_Name: BuildTarget - m_InlineUsage: 0 - m_ProfileVersion: 1 - m_LabelTable: - m_LabelNames: - - default - - config - m_SchemaTemplates: [] - m_GroupTemplateObjects: - - {fileID: 11400000, guid: e3717cb91779b3c42b0fa261a19e2089, type: 2} - m_InitializationObjects: [] - m_CertificateHandlerType: - m_AssemblyName: - m_ClassName: - m_ActivePlayerDataBuilderIndex: 3 - m_DataBuilders: - - {fileID: 11400000, guid: e3793cbe36022934c8e448ba864e7d23, type: 2} - - {fileID: 11400000, guid: c1b22d2e9c442004aa8ce9415342d39b, type: 2} - - {fileID: 11400000, guid: 09b58a3e361fb894bb05487b13037296, type: 2} - - {fileID: 11400000, guid: 451c87b652b66324b93ed04ca22c9f79, type: 2} - m_ActiveProfileId: 70f0db63e1b2ccc49a35826b26d42ffa - m_HostingServicesManager: - m_HostingServiceInfos: [] - m_Settings: {fileID: 11400000} - m_NextInstanceId: 0 - m_RegisteredServiceTypeRefs: [] - m_PingTimeoutInMilliseconds: 5000 diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta b/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta deleted file mode 100644 index 0fb133c..0000000 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e60983ba8459aa349988c3ecb65abf31 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/Android.meta b/Assets/AddressableAssetsData/Android.meta deleted file mode 100644 index a491e64..0000000 --- a/Assets/AddressableAssetsData/Android.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 820198255c53d7944a20b1c68c5aa2c9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin deleted file mode 100644 index 0f61f5fda4223f4ad75293d1f41af93e989164e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1454 zcmbtU&2G~`5VlL=BqUMQ1A=1?94ps$+BlIYQW~|QkkTk^=>Z{Y7(K zc_A*m7UBh9)=o=$A}VWX*5lpz=9@oTwq;qrahct$#s-Sf1yA(C?Ncg2DKcT8+(VjZ zA-7u}K&nLWeb3FG?baY;I+L)^A=8qu?baxpuq1v5i*s=We4l5Gl@0u>9JRn%#qKKw zTDb>V!szOEH4t0_*Jqk&C?i1gnvn&_C4(m9jFwtGCh;8TF`o+cOhPI&42UL7%!Y!{ z5z+HzapNH46yve&l3nVo!)TBL=Ol9`A3vECh3lIZ9#?FQz4HV`**8gaO88n2ydZGf z?w&vOYbIF7L1EP@C@My`?kZH;UElRz*2ZVWfaN#_tF*U1&PoUds8&VMsG%6<815L9 z$YcyBgp(OOx=Re~<5@K(d1;Rl2FJ8SvHJE#p6aIv`_2ARgv)0Mht)P)w%>zhA7@-A zDVVnTy3^-WiiGY^m=f%DCSt;7Qe@W=$vZb9j71>@e-g$W4|-vz9R@+SOTy_i^t?%j z`d-H^$kpn|rEJ98RXPvzmtxc3r*tI6Z9;MA+?;4pi80({p!Dgr#!*xagmcp94N>!Q z8VzJzOQUn7FEYJ_`aI)TK+h%NY6@~Qjm9`R5@J0}(nL3muH|ANFlJN=2k%J=cr$lt z2IxdkxIa8gKEsPNx=?_=j)W{Gq%c&^^Mi}aF&+#}s+QkhA`=Egp6WR)EtaFJF6Y3F z6QD(p+h!oF&8l6kzJ6Sm?kJlUt=YD1cE_Zt^{+bpJp6ux_llpQ*_|eeRyU-y>yt@u w&uhp2Zm$laIKr~@uHWY-8 zh@RJr8~Yij7>{k2>{4ePMuQwUCz&((@X@5GyS{1RamCiyJNHnO159GuDdFGErr&IO zp%-+ffop$!pRKo+$9F~?yPE)ytD@igF{-PSbcjVPxXC-{bqkD!sWAs!)lu?+wWGhk29{5 z6inNE-ARs5b|_2<_Bj(VVKXVR%ZTJ%8xh8$ZW}r@?(|yCb{vEqAT;cTanS7q{csxg zW3M3QZX%De5pPzh+|FH!4S$o)krY=6#ews3l0_B9@F@eOk1sWjp{gOAlSZ$JnwQgP zAY(U;PLaCE^h4C=8NUE}DhXFpkXvaq#;K7I>tT{6x@L4O7XyLuqEa|`M^eC>xl1!V zM}or5;Ysoto}|&40`zqtWHB9up?aJjoSl#HU}#dc{Qex7Fd*_+&tYk?99wlh2X34I zE&AIw!(eSy?P~Sq-LiB|*|eu?+qT&qlcvVM>h$B;gQs|}co5C*)KN5gT}pcane^K} uR<+gdH>Z=H-w%DiNn#&@@=ts}|C6iw|5_#m--kbB{mM@O diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta deleted file mode 100644 index 016abc9..0000000 --- a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 56a8814c396664b048814cc6d477d82d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs b/Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs deleted file mode 100644 index 574f2a0..0000000 --- a/Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs +++ /dev/null @@ -1,188 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using SGModule.Common.Helper; -using UnityEditor; -using UnityEditor.PackageManager; -using UnityEditor.PackageManager.Requests; -using PackageInfo = UnityEditor.PackageManager.PackageInfo; -#if USE_ADDRESSABLES -using UnityEditor.AddressableAssets; -#endif - -namespace SGModule.Editor { - [InitializeOnLoad] - public static class AddressablesManager { - private const string AddressablesPackageName = "com.unity.addressables"; - private const string AddressablesSymbol = "USE_ADDRESSABLES"; - private static AddRequest _addRequest; - - // 安装标记，避免重复弹窗 - private static bool _isInstallingAddressables; - - static AddressablesManager() { - EditorApplication.projectChanged += OnProjectChanged; // 监听项目变更 - - CheckAndSetupAddressables(); - } - - private static string DefaultConfigsPath => "Assets/Configs"; // 默认的 Addressables 配置路径 - - private static void CheckAndSetupAddressables() { - if (IsAddressablesInstalled()) { - Log.Info("ConfigLoader", "Addressables 已安装，正在初始化..."); - - AddScriptingDefineSymbol(AddressablesSymbol); - -#if USE_ADDRESSABLES - EnsureAddressablesConfigured(); -#endif - } - else { - RemoveScriptingDefineSymbol(AddressablesSymbol); - if (!_isInstallingAddressables) { - PromptToInstallAddressables(); - } - } - } - - private static bool IsAddressablesInstalled() { - return PackageInfo.GetAllRegisteredPackages().Any(package => package.name == AddressablesPackageName); - } - - private static void PromptToInstallAddressables() { - var install = EditorUtility.DisplayDialog( - "Addressables 未安装", - "当前插件依赖 Addressables 功能，请安装以确保正常使用。\n\n是否立即安装 Addressables？", - "安装", - "取消"); - - if (install) { - InstallAddressables(); - } - else { - Log.Warning("ConfigLoader", "用户取消安装 Addressables，部分功能可能无法正常使用！"); - } - } - - private static void InstallAddressables() { - if (_isInstallingAddressables) { - return; // 防止重复安装 - } - - Log.Info("ConfigLoader", "开始安装 Addressables..."); - - _isInstallingAddressables = true; // 标记正在安装，避免重复弹窗 - _addRequest = Client.Add(AddressablesPackageName); - - EditorApplication.update += MonitorAddRequest; - } - - private static void MonitorAddRequest() { - if (_addRequest == null || !_addRequest.IsCompleted) { - return; - } - - EditorApplication.update -= MonitorAddRequest; - - if (_addRequest.Status == StatusCode.Success) { - Log.Info("ConfigLoader", "Addressables 安装成功！"); - - EditorUtility.DisplayDialog("安装完成", "Addressables 安装成功，请稍候等待 Unity 刷新。", "确定"); - - CheckAndSetupAddressables(); - } - else if (_addRequest.Status >= StatusCode.Failure) { - Log.Error("ConfigLoader", $"安装 Addressables 失败：{_addRequest.Error.message}"); - - EditorUtility.DisplayDialog("安装失败", $"安装 Addressables 失败：{_addRequest.Error.message}", "确定"); - } - - _isInstallingAddressables = false; // 重置标记 - } - - private static void AddScriptingDefineSymbol(string symbol) { - var symbols = new List(PlayerSettings - .GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup).Split(';')); - if (symbols.Contains(symbol)) { - return; - } - - - symbols.Add(symbol); - PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, - string.Join(";", symbols)); - Log.Info("ConfigLoader", $"已添加脚本定义符号: {symbol}"); - } - - private static void RemoveScriptingDefineSymbol(string symbol) { - var symbols = new List(PlayerSettings - .GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup).Split(';')); - if (symbols.Contains(symbol)) { - symbols.Remove(symbol); - PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, - string.Join(";", symbols)); - - Log.Info("ConfigLoader", $"已移除脚本定义符号: {symbol}"); - } - } - - private static void OnProjectChanged() { - Log.Info("ConfigLoader", "检测到项目变更，重新检查 Addressables 状态..."); - - CheckAndSetupAddressables(); - } - -#if USE_ADDRESSABLES - private static void EnsureAddressablesConfigured() { - var settings = AddressableAssetSettingsDefaultObject.Settings; - - if (settings == null) { - Log.Info("ConfigLoader", "正在初始化 Addressables 设置..."); - - settings = AddressableAssetSettingsDefaultObject.GetSettings(true); // 自动创建配置 - } - - // 确保默认的 Configs 文件夹存在并被添加到 Addressables - var needRefresh = false; - if (!Directory.Exists(DefaultConfigsPath)) { - Directory.CreateDirectory(DefaultConfigsPath); - Log.Info("ConfigLoader", $"已创建文件夹: {DefaultConfigsPath}"); - - needRefresh = true; - } - - if (!IsFolderInAddressables(DefaultConfigsPath)) { - var guid = AssetDatabase.AssetPathToGUID(DefaultConfigsPath); - var group = settings.DefaultGroup; - settings.CreateOrMoveEntry(guid, group)?.SetLabel("config", true, true); - needRefresh = true; - } - - if (needRefresh) { - AssetDatabase.Refresh(); - } - } - - private static bool IsFolderInAddressables(string folderPath) { - var settings = AddressableAssetSettingsDefaultObject.Settings; - foreach (var group in settings.groups) - { - if (group) - { - foreach (var entry in group.entries) - { - if (AssetDatabase.GUIDToAssetPath(entry.guid) == folderPath) - { - return true; - } - } - } - } - - - return false; - } -#endif - } -} diff --git a/Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs.meta b/Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs.meta deleted file mode 100644 index 784773a..0000000 --- a/Assets/SGModule/ConfigLoader/SGModule/Editor/AddressablesManager.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 383ac67f695b4c6e94ba988c9303cd5b -timeCreated: 1733734050 \ No newline at end of file diff --git a/Assets/SGModule/ConfigLoader/SGModule/Scripts/ConfigLoader/FileNetworkManager.cs b/Assets/SGModule/ConfigLoader/SGModule/Scripts/ConfigLoader/FileNetworkManager.cs index 159a66e..a5167c7 100644 --- a/Assets/SGModule/ConfigLoader/SGModule/Scripts/ConfigLoader/FileNetworkManager.cs +++ b/Assets/SGModule/ConfigLoader/SGModule/Scripts/ConfigLoader/FileNetworkManager.cs @@ -6,9 +6,7 @@ using System.Linq; using SGModule.Common.Base; using SGModule.Common.Helper; using UnityEngine; -using UnityEngine.AddressableAssets; using UnityEngine.Networking; -using UnityEngine.ResourceManagement.AsyncOperations; #if UNITY_EDITOR using UnityEditor; #endif @@ -72,10 +70,7 @@ namespace SGModule.ConfigLoader private IEnumerator CopyFile(Action onComplete = null) { -#if USE_ADDRESSABLES - var handle = Addressables.LoadResourceLocationsAsync(FolderLabel); - yield return handle; // if (handle.Status == AsyncOperationStatus.Succeeded) { // 查找以 ".json" 结尾的文件 @@ -98,6 +93,7 @@ namespace SGModule.ConfigLoader var destFilePath = Path.Combine(_configFolderPath, jsonFileName); File.WriteAllBytes(destFilePath, jsonFile.bytes); onComplete?.Invoke(true); + yield return null; // } // else { // Log.ConfigLoader.Error("Failed to load JSON file"); @@ -117,10 +113,7 @@ namespace SGModule.ConfigLoader // onComplete?.Invoke(false); // } -#else - Log.Error( "没有 Addressables 插件，请检查 "); - yield break; -#endif + } private IEnumerator CopyFile(string sourceFile, string destFile, Action onComplete = null) diff --git a/Packages/manifest.json b/Packages/manifest.json index 5d184bb..60e992f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,7 +1,6 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.addressables": "1.22.3", "com.unity.collab-proxy": "2.7.1", "com.unity.feature.development": "1.0.1", "com.unity.nuget.newtonsoft-json": "3.2.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index bff37a0..0453efe 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,20 +6,6 @@ "source": "builtin", "dependencies": {} }, - "com.unity.addressables": { - "version": "1.22.3", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "1.21.25", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.collab-proxy": { "version": "2.7.1", "depth": 0, @@ -107,13 +93,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.scriptablebuildpipeline": { - "version": "1.21.25", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.services.core": { "version": "1.14.0", "depth": 1,