From 257e90a764a974c07b7de4a4c132dfdf9898903d Mon Sep 17 00:00:00 2001 From: Zhangaotian <8474238@qq.com> Date: Mon, 23 Oct 2023 17:14:05 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=9C=AC=E5=9C=B0addressables"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 405a96a25ba7e8d59c58b8f7cefcd4c1da080f16. --- .../AddressableAssetSettings.asset | 206 +++++++++++++++++- .../AssetGroups/HotUpdateDlls.asset | 38 +++- .../ProjectSettings/HybridCLRSettings.asset | 39 +++- 3 files changed, 274 insertions(+), 9 deletions(-) diff --git a/ProjectNLD/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/ProjectNLD/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 76c0e1f84ca..8dcf644666f 100644 --- a/ProjectNLD/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/ProjectNLD/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -1,3 +1,203 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:949135e678dd01c71b24561644edb6ec5a705a845f1bb3d5ea9efa9e391effa4 -size 8378 +%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: 87cc8f526ab764b2ba576426816abb98 + m_currentHash: + serializedVersion: 2 + Hash: 92fed4e643a4b23827a18cfc14c59f63 + m_OptimizeCatalogSize: 0 + m_BuildRemoteCatalog: 1 + m_BundleLocalCatalog: 0 + m_CatalogRequestsTimeout: 0 + m_DisableCatalogUpdateOnStart: 1 + 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: a38679cd3afa04e15a220b3bfdf0784e + m_RemoteCatalogLoadPath: + m_Id: f6688afdef3f34fb3a52cab67759d7ec + m_ContentStateBuildPathProfileVariableName: + m_CustomContentStateBuildPath: + m_ContentStateBuildPath: + m_BuildAddressablesWithPlayerBuild: 1 + m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]' + m_GroupAssets: + - {fileID: 11400000, guid: c4ad30a4baedd412fb6c1f44e52ec945, type: 2} + - {fileID: 11400000, guid: 4b567f0cb492b41b8b5fee7916320e5f, type: 2} + - {fileID: 11400000, guid: d3a4a2e1758d64bf5bf0091779ad551a, type: 2} + - {fileID: 11400000, guid: 9f59a4c26899941c781e74a684c12a13, type: 2} + - {fileID: 11400000, guid: c547e09079a0c4734be18b8b2307cd37, type: 2} + - {fileID: 11400000, guid: 30748edce9884442bb70d24d3725619c, type: 2} + - {fileID: 11400000, guid: bf675f2c0173743d7a4ec8911a716d95, type: 2} + - {fileID: 11400000, guid: 7b9ae3a83d26743ba81b372f5054ad0b, type: 2} + - {fileID: 11400000, guid: 6e531e8385d3caa4ea8cbe9711dd032c, type: 2} + - {fileID: 11400000, guid: 8709776ba90eb3d4a9f983fd389ef0ba, 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: bc835838929aa4532af9b1c9e7f345f1 + m_ProfileName: Default + m_Values: + - m_Id: d4b31c1ced9d146649418b08c47fb16e + m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' + - m_Id: 3b378b4c2717e46b4988637500cfb21a + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: e4ae0ccec4bea466698f1424cfdd5a14 + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: a38679cd3afa04e15a220b3bfdf0784e + m_Value: ServerData/[BuildTarget] + - m_Id: f6688afdef3f34fb3a52cab67759d7ec + m_Value: http://[PrivateIpAddress]:[HostingServicePort] + - m_Id: 0d05c8790753d43be8eadb010f3b6d9e + m_Value: 0.1.0 + - m_Id: 3a732203f10e8474980418d7a83f7df6 + m_Value: 132.232.113.98 + - m_Id: d0ea7f1c242cc45e384d526d06d1f42d + m_Value: 80 + - m_Id: 5bfb0ab98f3859143af22506ffa5aee4 + m_Value: + - m_InheritedParent: + m_Id: ffe3225e6f3934318aa29fdadbbadfbf + m_ProfileName: AllLocal + m_Values: + - m_Id: d4b31c1ced9d146649418b08c47fb16e + m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' + - m_Id: 3b378b4c2717e46b4988637500cfb21a + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: e4ae0ccec4bea466698f1424cfdd5a14 + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: a38679cd3afa04e15a220b3bfdf0784e + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: f6688afdef3f34fb3a52cab67759d7ec + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: 0d05c8790753d43be8eadb010f3b6d9e + m_Value: 0.1.0 + - m_Id: 3a732203f10e8474980418d7a83f7df6 + m_Value: 132.232.113.98 + - m_Id: d0ea7f1c242cc45e384d526d06d1f42d + m_Value: 80 + - m_Id: 5bfb0ab98f3859143af22506ffa5aee4 + m_Value: + - m_InheritedParent: + m_Id: fc7d3e7a400cf4b9997784a4f6a59e5a + m_ProfileName: Debug + m_Values: + - m_Id: d4b31c1ced9d146649418b08c47fb16e + m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' + - m_Id: 3b378b4c2717e46b4988637500cfb21a + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: e4ae0ccec4bea466698f1424cfdd5a14 + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: a38679cd3afa04e15a220b3bfdf0784e + m_Value: '[ServerData]/[BuildTarget]' + - m_Id: f6688afdef3f34fb3a52cab67759d7ec + m_Value: http://[PrivateIpAddress]/[WorkSpace]/[BuildTarget]/[AASVersion] + - m_Id: 0d05c8790753d43be8eadb010f3b6d9e + m_Value: 0.1.0 + - m_Id: 3a732203f10e8474980418d7a83f7df6 + m_Value: 132.232.113.98 + - m_Id: d0ea7f1c242cc45e384d526d06d1f42d + m_Value: 80 + - m_Id: 5bfb0ab98f3859143af22506ffa5aee4 + m_Value: WorkSpace + - m_InheritedParent: + m_Id: 8318f77bd41b94be2939bbcda22c10dd + m_ProfileName: Release + m_Values: + - m_Id: d4b31c1ced9d146649418b08c47fb16e + m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' + - m_Id: 3b378b4c2717e46b4988637500cfb21a + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: e4ae0ccec4bea466698f1424cfdd5a14 + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: a38679cd3afa04e15a220b3bfdf0784e + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: f6688afdef3f34fb3a52cab67759d7ec + m_Value: '[PrivateIpAddress]:[HostingServicePort]/[BuildTarget]/[AASVersion]' + - m_Id: 0d05c8790753d43be8eadb010f3b6d9e + m_Value: 0.1.0 + - m_Id: 3a732203f10e8474980418d7a83f7df6 + m_Value: 132.232.113.98 + - m_Id: d0ea7f1c242cc45e384d526d06d1f42d + m_Value: 80 + - m_Id: 5bfb0ab98f3859143af22506ffa5aee4 + m_Value: + m_ProfileEntryNames: + - m_Id: d4b31c1ced9d146649418b08c47fb16e + m_Name: BuildTarget + m_InlineUsage: 0 + - m_Id: 3b378b4c2717e46b4988637500cfb21a + m_Name: Local.BuildPath + m_InlineUsage: 0 + - m_Id: e4ae0ccec4bea466698f1424cfdd5a14 + m_Name: Local.LoadPath + m_InlineUsage: 0 + - m_Id: a38679cd3afa04e15a220b3bfdf0784e + m_Name: Remote.BuildPath + m_InlineUsage: 0 + - m_Id: f6688afdef3f34fb3a52cab67759d7ec + m_Name: Remote.LoadPath + m_InlineUsage: 0 + - m_Id: 0d05c8790753d43be8eadb010f3b6d9e + m_Name: AASVersion + m_InlineUsage: 0 + - m_Id: 3a732203f10e8474980418d7a83f7df6 + m_Name: PrivateIpAddress + m_InlineUsage: 0 + - m_Id: d0ea7f1c242cc45e384d526d06d1f42d + m_Name: HostingServicePort + m_InlineUsage: 0 + - m_Id: 5bfb0ab98f3859143af22506ffa5aee4 + m_Name: WorkSpace + m_InlineUsage: 0 + m_ProfileVersion: 1 + m_LabelTable: + m_LabelNames: + - default + m_SchemaTemplates: [] + m_GroupTemplateObjects: + - {fileID: 11400000, guid: 4861a61ff12ff4066b8236eea9152f91, type: 2} + m_InitializationObjects: [] + m_CertificateHandlerType: + m_AssemblyName: + m_ClassName: + m_ActivePlayerDataBuilderIndex: 3 + m_DataBuilders: + - {fileID: 11400000, guid: ff2c544d4cd8d4ff88e4f3a17b25735f, type: 2} + - {fileID: 11400000, guid: 98b682e0f5a2d46549717525e5637e09, type: 2} + - {fileID: 11400000, guid: b7b60522415f94068a0a09b6dbebd908, type: 2} + - {fileID: 11400000, guid: cc55ac1fe0c3c4e04b0e3f5db133e490, type: 2} + m_ActiveProfileId: fc7d3e7a400cf4b9997784a4f6a59e5a + m_HostingServicesManager: + m_HostingServiceInfos: [] + m_Settings: {fileID: 11400000} + m_NextInstanceId: 0 + m_RegisteredServiceTypeRefs: [] + m_PingTimeoutInMilliseconds: 5000 diff --git a/ProjectNLD/Assets/AddressableAssetsData/AssetGroups/HotUpdateDlls.asset b/ProjectNLD/Assets/AddressableAssetsData/AssetGroups/HotUpdateDlls.asset index ad1e8a3baf3..5f0f0b76381 100644 --- a/ProjectNLD/Assets/AddressableAssetsData/AssetGroups/HotUpdateDlls.asset +++ b/ProjectNLD/Assets/AddressableAssetsData/AssetGroups/HotUpdateDlls.asset @@ -1,3 +1,35 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4840889d177f1c1e12b68a36a175026456f549dd852e2ba4abec9f16bcbf0ba8 -size 1174 +%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: HotUpdateDlls + m_EditorClassIdentifier: + m_GroupName: HotUpdateDlls + m_Data: + m_SerializedData: [] + m_GUID: 27d03d1876bbf1d4899cd8ad912ae61d + m_SerializeEntries: + - m_GUID: fc0a59196e2c827448097ec5198b2901 + m_Address: Assets/HotUpdateDlls/HotUpdateDll + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 9379cb20c9c63464da9daa6fe5375f00 + m_Address: Assets/HotUpdateDlls/MetaDataDll + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: 57363d90d371d4f9297bcadcb2c690e7, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 26ea95b0f910b4248b32e226ec2866ed, type: 2} + - {fileID: 11400000, guid: 4e89fa03840371949898b50094c07f3f, type: 2} diff --git a/ProjectNLD/ProjectSettings/HybridCLRSettings.asset b/ProjectNLD/ProjectSettings/HybridCLRSettings.asset index 962d68be1e9..35c58a218c3 100644 --- a/ProjectNLD/ProjectSettings/HybridCLRSettings.asset +++ b/ProjectNLD/ProjectSettings/HybridCLRSettings.asset @@ -1,3 +1,36 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97ee65a45904d55f62fb91b5e3fb1cb7c8fb327b29e2c9f3bd2f6bf5972fafb3 -size 1619 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +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: e189374413a3f00468e49d51d8b27a09, type: 3} + m_Name: + m_EditorClassIdentifier: + enable: 1 + useGlobalIl2cpp: 0 + hybridclrRepoURL: https://gitee.com/focus-creative-games/hybridclr + il2cppPlusRepoURL: https://gitee.com/focus-creative-games/il2cpp_plus + hotUpdateAssemblyDefinitions: + - {fileID: 5897886265953266890, guid: f0b582ec4932c478892e6a09e09a6453, type: 3} + - {fileID: 5897886265953266890, guid: c553fcf143aa5f141b03bf935b1db364, type: 3} + - {fileID: 5897886265953266890, guid: 3cb1239c1f10075468674364b6379506, type: 3} + - {fileID: 5897886265953266890, guid: fd038cb290df8694eb5923edad409283, type: 3} + - {fileID: 5897886265953266890, guid: 9069ac25d95ca17448a247f3bb1c769f, type: 3} + - {fileID: 5897886265953266890, guid: 9bff4ab8c2b0f4d2780540e2780db4ce, type: 3} + - {fileID: 5897886265953266890, guid: 329a5ef739a981346a9b7767f5c6b18a, type: 3} + hotUpdateAssemblies: [] + preserveHotUpdateAssemblies: [] + hotUpdateDllCompileOutputRootDir: HybridCLRData/HotUpdateDlls + externalHotUpdateAssembliyDirs: [] + strippedAOTDllOutputRootDir: HybridCLRData/AssembliesPostIl2CppStrip + patchAOTAssemblies: [] + outputLinkFile: HybridCLRGenerate/link.xml + outputAOTGenericReferenceFile: HybridCLRGenerate/AOTGenericReferences.cs + maxGenericReferenceIteration: 10 + maxMethodBridgeGenericIteration: 10