fix：1、删除部分不用的资源代码。2、a面修复bug

2026-04-28 18:42:00 +08:00
parent 70d45d4705
commit cc12dffbaa
417 changed files with 36736 additions and 40575 deletions
@@ -12,10 +12,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
  m_Name: AddressableAssetSettings
  m_EditorClassIdentifier: 
-  m_DefaultGroup: a45d0d25213104f44ad8fe07eb3548d1
+  m_DefaultGroup: b19196a2cc99a41b288eda098c987e6e
  m_currentHash:
    serializedVersion: 2
-    Hash: 24f7d451677154961ad4235510acee73
+    Hash: 68c51392f1af44f6981ac48ebf87b338
  m_OptimizeCatalogSize: 0
  m_BuildRemoteCatalog: 0
  m_BundleLocalCatalog: 0
@@ -44,8 +44,8 @@ MonoBehaviour:
  m_BuildAddressablesWithPlayerBuild: 0
  m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
  m_GroupAssets:
-  - {fileID: 11400000, guid: 902fafad9bba93345b7a8d95737094ff, type: 2}
-  - {fileID: 11400000, guid: 0835c4975fed7d14795ec925b54bca80, type: 2}
+  - {fileID: 11400000, guid: 2449bf3c8b76d46fea83478d72e4078d, type: 2}
+  - {fileID: 11400000, guid: 9509abfdb587c41faba2e57981af0044, type: 2}
  m_BuildSettings:
    m_CompileScriptsInVirtualMode: 0
    m_CleanupStreamingAssetsAfterBuilds: 1
@@ -54,35 +54,35 @@ MonoBehaviour:
  m_ProfileSettings:
    m_Profiles:
    - m_InheritedParent: 
-      m_Id: 70f0db63e1b2ccc49a35826b26d42ffa
+      m_Id: 7914462d1432a43ed8122599674e5b46
      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_Id: 03e663e77fb334721aca9e1201fb663d
        m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
-      - m_Id: 79ac92be39ae3b548acfff4d617e9f3d
+      - m_Id: 19877ca90d44540b3beed5449f7f2c8a
+        m_Value: http://[PrivateIpAddress]:[HostingServicePort]
+      - m_Id: 70a08c042690d47e8ba04f1dd13f37e5
        m_Value: ServerData/[BuildTarget]
-      - m_Id: c213fc96596f0424b92d9b5da98dc49d
+      - m_Id: a710bc9017dc94db0ab21394ee8a90e7
        m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
+      - m_Id: bf2aa691c6f2b48fc881b16914646534
+        m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
    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_Id: 03e663e77fb334721aca9e1201fb663d
      m_Name: Local.BuildPath
      m_InlineUsage: 0
-    - m_Id: 79ac92be39ae3b548acfff4d617e9f3d
+    - m_Id: 19877ca90d44540b3beed5449f7f2c8a
+      m_Name: Remote.LoadPath
+      m_InlineUsage: 0
+    - m_Id: 70a08c042690d47e8ba04f1dd13f37e5
      m_Name: Remote.BuildPath
      m_InlineUsage: 0
-    - m_Id: c213fc96596f0424b92d9b5da98dc49d
+    - m_Id: a710bc9017dc94db0ab21394ee8a90e7
      m_Name: BuildTarget
      m_InlineUsage: 0
+    - m_Id: bf2aa691c6f2b48fc881b16914646534
+      m_Name: Local.LoadPath
+      m_InlineUsage: 0
    m_ProfileVersion: 1
  m_LabelTable:
    m_LabelNames:
@@ -90,7 +90,7 @@ MonoBehaviour:
    - config
  m_SchemaTemplates: []
  m_GroupTemplateObjects:
-  - {fileID: 11400000, guid: e3717cb91779b3c42b0fa261a19e2089, type: 2}
+  - {fileID: 11400000, guid: e479326aa95dd40699073f4071a23455, type: 2}
  m_InitializationObjects: []
  m_CertificateHandlerType:
    m_AssemblyName: 
@@ -101,7 +101,7 @@ MonoBehaviour:
  - {fileID: 11400000, guid: c1b22d2e9c442004aa8ce9415342d39b, type: 2}
  - {fileID: 11400000, guid: 09b58a3e361fb894bb05487b13037296, type: 2}
  - {fileID: 11400000, guid: 451c87b652b66324b93ed04ca22c9f79, type: 2}
-  m_ActiveProfileId: 70f0db63e1b2ccc49a35826b26d42ffa
+  m_ActiveProfileId: 7914462d1432a43ed8122599674e5b46
  m_HostingServicesManager:
    m_HostingServiceInfos: []
    m_Settings: {fileID: 11400000}
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f800864c27698964ab1fae5a1384670e
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -13,25 +13,11 @@ MonoBehaviour:
  m_Name: Packed Assets
  m_EditorClassIdentifier: 
  m_SchemaObjects:
-  - {fileID: 5467363252551928993}
-  - {fileID: 56619259277380849}
+  - {fileID: 20804963791511616}
+  - {fileID: 3833701188628310790}
  m_Description: Pack assets into asset bundles.
  m_Settings: {fileID: 11400000, guid: e60983ba8459aa349988c3ecb65abf31, type: 2}
--- !u!114 &56619259277380849
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
-  m_Name: ContentUpdateGroupSchema
-  m_EditorClassIdentifier: 
-  m_Group: {fileID: 0}
-  m_StaticContent: 0
--- !u!114 &5467363252551928993
+--- !u!114 &20804963791511616
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@@ -74,3 +60,17 @@ MonoBehaviour:
    m_ClassName: 
  m_BundleNaming: 0
  m_AssetLoadMode: 0
+--- !u!114 &3833701188628310790
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 0}
+  m_StaticContent: 0
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e3717cb91779b3c42b0fa261a19e2089
+guid: e479326aa95dd40699073f4071a23455
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
@@ -15,9 +15,20 @@ MonoBehaviour:
  m_GroupName: Built In Data
  m_Data:
    m_SerializedData: []
-  m_GUID: cd4decefa4232884fa80ecdbff31c3a5
-  m_SerializeEntries: []
+  m_GUID: 716aecaa3648941b0a73d038b1bd8b82
+  m_SerializeEntries:
+  - m_GUID: EditorSceneList
+    m_Address: EditorSceneList
+    m_ReadOnly: 1
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: Resources
+    m_Address: Resources
+    m_ReadOnly: 1
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
  m_ReadOnly: 1
  m_Settings: {fileID: 11400000, guid: e60983ba8459aa349988c3ecb65abf31, type: 2}
  m_SchemaSet:
-    m_Schemas: []
+    m_Schemas:
+    - {fileID: 11400000, guid: 0771ae25d28c8437b9222dcb0cbf91a1, type: 2}
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0835c4975fed7d14795ec925b54bca80
+guid: 2449bf3c8b76d46fea83478d72e4078d
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
@@ -15,7 +15,7 @@ MonoBehaviour:
  m_GroupName: Default Local Group
  m_Data:
    m_SerializedData: []
-  m_GUID: a45d0d25213104f44ad8fe07eb3548d1
+  m_GUID: b19196a2cc99a41b288eda098c987e6e
  m_SerializeEntries:
  - m_GUID: 2286bdb9423d4da48ba3b1bd8765173f
    m_Address: Assets/Configs
@@ -27,5 +27,5 @@ MonoBehaviour:
  m_Settings: {fileID: 11400000, guid: e60983ba8459aa349988c3ecb65abf31, type: 2}
  m_SchemaSet:
    m_Schemas:
-    - {fileID: 11400000, guid: a6c2bb9206a787d40a5ddd394de13ea2, type: 2}
-    - {fileID: 11400000, guid: 38bec3dff28f2014194d6df27120ffe2, type: 2}
+    - {fileID: 11400000, guid: 5d42038cb6f1f474bb88e875c09a673c, type: 2}
+    - {fileID: 11400000, guid: 7f77f240ee7524c0fb5b655c6c12479a, type: 2}
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 902fafad9bba93345b7a8d95737094ff
+guid: 9509abfdb587c41faba2e57981af0044
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a65b9c2fafd9b444aa0ce2c532b4133d
+guid: cdfb3c3472ad44a4ca2dc3b1eff26621
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
@@ -12,6 +12,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3}
  m_Name: Built In Data_PlayerDataGroupSchema
  m_EditorClassIdentifier: 
-  m_Group: {fileID: 11400000, guid: 0835c4975fed7d14795ec925b54bca80, type: 2}
+  m_Group: {fileID: 11400000, guid: 2449bf3c8b76d46fea83478d72e4078d, type: 2}
  m_IncludeResourcesFolders: 1
  m_IncludeBuildSettingsScenes: 1
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 20981212fe0549c4f8f7200e0ce3f519
+guid: 0771ae25d28c8437b9222dcb0cbf91a1
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
  m_Name: Default Local Group_BundledAssetGroupSchema
  m_EditorClassIdentifier: 
-  m_Group: {fileID: 0}
+  m_Group: {fileID: 11400000, guid: 9509abfdb587c41faba2e57981af0044, type: 2}
  m_InternalBundleIdMode: 1
  m_Compression: 1
  m_IncludeAddressInCatalog: 1
@@ -34,9 +34,9 @@ MonoBehaviour:
  m_RedirectLimit: -1
  m_RetryCount: 0
  m_BuildPath:
-    m_Id: 6e2463dd44eb1f54cb6bd7d1ed217d78
+    m_Id: 03e663e77fb334721aca9e1201fb663d
  m_LoadPath:
-    m_Id: 693c6cc232ba75944b76340184d8d5da
+    m_Id: bf2aa691c6f2b48fc881b16914646534
  m_BundleMode: 0
  m_AssetBundleProviderType:
    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a6c2bb9206a787d40a5ddd394de13ea2
+guid: 5d42038cb6f1f474bb88e875c09a673c
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
@@ -12,5 +12,5 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
  m_Name: Default Local Group_ContentUpdateGroupSchema
  m_EditorClassIdentifier: 
-  m_Group: {fileID: 0}
+  m_Group: {fileID: 11400000, guid: 9509abfdb587c41faba2e57981af0044, type: 2}
  m_StaticContent: 0
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 38bec3dff28f2014194d6df27120ffe2
+guid: 7f77f240ee7524c0fb5b655c6c12479a
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
@@ -1,34 +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: 7e3976da977cb49238499ea3b4c237ae, type: 3}
-  m_Name: ProfileDataSourceSettings
-  m_EditorClassIdentifier: 
-  profileGroupTypes:
-  - m_GroupTypePrefix: Built-In
-    m_Variables:
-    - m_Suffix: BuildPath
-      m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
-    - m_Suffix: LoadPath
-      m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
-  - m_GroupTypePrefix: Editor Hosted
-    m_Variables:
-    - m_Suffix: BuildPath
-      m_Value: ServerData/[BuildTarget]
-    - m_Suffix: LoadPath
-      m_Value: http://[PrivateIpAddress]:[HostingServicePort]
-  environments: []
-  currentEnvironment:
-    id: 
-    projectId: 
-    projectGenesisId: 
-    name: 
-    isDefault: 0
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 59f7c3bb2d35146c88dfedf2004a8ae7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -0,0 +1,15 @@
+<linker>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.TextAsset" preserve="all" />
+  </assembly>
+</linker>
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f92f9691c788c414a82e03722722293e
+guid: 4d1ff18b5b76e4ca89ac710ba725b6d9
 TextScriptImporter:
  externalObjects: {}
  userData: 
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7ba7c6a75110f483683dc4885aee0758
+guid: 7a6bb8d6796214d5d98923061a6904f9
 TextScriptImporter:
  externalObjects: {}
  userData: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 378be7daeb2a24cda933279930d665e4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 820198255c53d7944a20b1c68c5aa2c9
+guid: 4d777acff45264bfa805da30991be34f
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 3429646f5d4949efa347230fa86778b7
+guid: e2d7ea0845de4cf984265d2a444b7aa4
 labels:
 - gvh
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll
 - gvhp_targets-editor
 PluginImporter:
  externalObjects: {}
@@ -14,7 +14,7 @@ PluginImporter:
  isPreloaded: 0
  isOverridable: 0
  isExplicitlyReferenced: 0
-  validateReferences: 1
+  validateReferences: 0
  platformData:
  - first:
      Any: 
@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: 51b6f287d0d540049f299c19a2f62321
+guid: baf24db2bf904e729e7796721c09e8ad
 labels:
 - gvh
 - gvh_rename_to_disable
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb
 - gvhp_targets-editor
 DefaultImporter:
  externalObjects: {}
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 5b1a2b9a8d0748609fa3195265844d21
+guid: fa49a85d4ba140a0ae21528ed12d174c
 labels:
 - gvh
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll
 - gvhp_targets-editor
 PluginImporter:
  externalObjects: {}
@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: 50924eb6369047da88d4803f207075b7
+guid: d13c8602d5e14e43b0e92459754c4315
 labels:
 - gvh
 - gvh_rename_to_disable
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb
 - gvhp_targets-editor
 DefaultImporter:
  externalObjects: {}
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 4026c19ba8ec495f93f5919b5f2934ee
+guid: d8bb10c56a0147bc855a6296778e025e
 labels:
 - gvh
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll
 - gvhp_targets-editor
 PluginImporter:
  externalObjects: {}
@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: fda6a96d9a064226b6cea47e6eef3d16
+guid: a695eb9f64fe49569a2db0c4246c877d
 labels:
 - gvh
 - gvh_rename_to_disable
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb
 - gvhp_targets-editor
 DefaultImporter:
  externalObjects: {}
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 025280fbe75c450fbdf7c5fc7ecc8860
+guid: 5980a684c61d42fbb6b74e2eb3477016
 labels:
 - gvh
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll
 - gvhp_targets-editor
 PluginImporter:
  externalObjects: {}
@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: 5f7e0d6d612a4e18be5161653a63d2f0
+guid: 9f56badf3ca84753b00163c3b632d4e5
 labels:
 - gvh
 - gvh_rename_to_disable
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb
 - gvhp_targets-editor
 DefaultImporter:
  externalObjects: {}
@@ -1,3 +1,22 @@
+# Version 1.2.186 - May 19, 2025
+* iOS Resolver - Set `validateReferences` to off by default,
+  to prevent errors when running without iOS Support installed.
+  Fixes #412 and #622
+
+# Version 1.2.185 - Feb 3, 2025
+* Android Resolver - Reverse conditional checker for `packaging` keyword in maintemplate based on android gradle plugin version. Fixes #715
+
+# Version 1.2.184 - Jan 28, 2025
+* Android Resolver - Update and resolve `packaging` keyword in maintemplate
+  based on android gradle plugin version.
+  Fixes #715
+
+# Version 1.2.183 - Sep 18, 2024
+* Android Resolver - Handle package paths that don't include a version hash,
+  which is no longer present with Unity 6. Fixes #697
+* Android Resolver - Handle packages referenced using local file paths.
+  Fixes #701
+
 # Version 1.2.182 - Aug 2, 2024
 * General - Check for gradle version instead of Unity version when determining
  the template files to modify.
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: b699fc553a294dbcad96ff0365038f6a
+guid: aba4ee01c6d145f7bf2d944d892f709a
 labels:
 - gvh
- gvh_version-1.2.182
+- gvh_version-1.2.186
 - gvhp_exportpath-ExternalDependencyManager/Editor/CHANGELOG.md
 timeCreated: 1584567712
 licenseType: Pro
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 61128ff4560e43ddb606dc203efe7799
+guid: f7632a50b10045458c53a5ddf7b6d238
 labels:
 - gvh
- gvh_version-1.2.182
+- gvh_version-1.2.186
 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll
 - gvhp_targets-editor
 timeCreated: 1480838400
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: ef0c2c4976ca4593860e7d5871a226bf
+guid: 57f5a82a79ab4b098f09326c8f3c73a6
 labels:
 - gvh
- gvh_version-1.2.182
+- gvh_version-1.2.186
 - gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.pdb
 timeCreated: 1538009133
 licenseType: Pro
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: b91d7551a5d9453e914e5295af46195e
+guid: ae8b2bc8d1ac4ad48f0ab2b2e7ac75fb
 labels:
 - gvh
- gvh_version-1.2.182
+- gvh_version-1.2.186
 - gvhp_exportpath-ExternalDependencyManager/Editor/LICENSE
 timeCreated: 1584567712
 licenseType: Pro
@@ -72,6 +72,12 @@ EDM4U is available on
 openupm add com.google.external-dependency-manager
 ```

+### Install via git URL
+1. Open Package Manager
+2. Click on the + icon on the top left corner of the "Package Manager" screen
+3. Click on "Install package from git url..."
+4. Paste: https://github.com/googlesamples/unity-jar-resolver.git?path=upm
+
 ### Install via Google APIs for Unity

 EDM4U is available both in UPM and legacy `.unitypackage` formats on
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: ee2d63ed1abf409b893e36120a404f03
+guid: 77919e84cef8419ab4b725fc16e83d52
 labels:
 - gvh
- gvh_version-1.2.182
+- gvh_version-1.2.186
 - gvhp_exportpath-ExternalDependencyManager/Editor/README.md
 timeCreated: 1584567712
 licenseType: Pro
@@ -1,13 +0,0 @@
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.dll
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.IOSResolver.pdb
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.dll
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.JarResolver.pdb
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.dll
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.PackageManagerResolver.pdb
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.dll
-Assets/ExternalDependencyManager/Editor/1.2.182/Google.VersionHandlerImpl.pdb
-Assets/ExternalDependencyManager/Editor/CHANGELOG.md
-Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
-Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb
-Assets/ExternalDependencyManager/Editor/LICENSE
-Assets/ExternalDependencyManager/Editor/README.md
@@ -0,0 +1,13 @@
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll
+Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb
+Assets/ExternalDependencyManager/Editor/CHANGELOG.md
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb
+Assets/ExternalDependencyManager/Editor/LICENSE
+Assets/ExternalDependencyManager/Editor/README.md
@@ -1,10 +1,10 @@
 fileFormatVersion: 2
-guid: d602686ba68d4bfea020d161c28431a9
+guid: c9a3138961c74d99b7046b783112fceb
 labels:
 - gvh
 - gvh_manifest
- gvh_version-1.2.182
- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.182_manifest.txt
+- gvh_version-1.2.186
+- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt
 - gvhp_manifestname-0External Dependency Manager
 - gvhp_manifestname-play-services-resolver
 timeCreated: 1474401009
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dependencies>
    <androidPackages>
-        <androidPackage spec="com.applovin:applovin-sdk:13.3.1" />
+        <androidPackage spec="com.applovin:applovin-sdk:13.6.2" />
    </androidPackages>
    <iosPods>
-        <iosPod name="AppLovinSDK" version="13.3.1" />
+        <iosPod name="AppLovinSDK" version="13.6.2" />
    </iosPods>
 </dependencies>
@@ -8,7 +8,7 @@

 #import "MAUnityAdManager.h"

-#define VERSION @"8.3.1"
+#define VERSION @"8.6.2"
 #define NSSTRING(_X) ( (_X != NULL) ? [NSString stringWithCString: _X encoding: NSStringEncodingConversionAllowLossy].al_stringByTrimmingWhitespace : nil)

@interface NSString (ALUtils)
@@ -1,3 +1,3 @@
 # AppLovin MAX Unity Plugin 

-To get the latest changes, see the [AppLovin MAX Unity Changelog](https://developers.applovin.com/en/max/unity/changelog).
+To get the latest changes, see the [AppLovin MAX Unity Changelog](https://support.axon.ai/en/max/unity/changelog).
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ac25046ac442f4c1895555ada8d01866
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1235281c630214a8999b2185ceba6388
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/BigoAds/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:bigoads-adapter:4.9.1.0" />
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationBigoAdsAdapter" version="4.5.1.0" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: fba397d5cac8648fea9b0fe82e201e63
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 381fc70c9669549e88eb86eb1342ab4c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ef8467ffb0e4447b79a8804884a7520a
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/ByteDance/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:bytedance-adapter:6.3.0.3.0">
-            <repositories>
-                <repository>https://artifact.bytedance.com/repository/pangle</repository>
-            </repositories>
-        </androidPackage>
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationByteDanceAdapter" version="6.3.0.6.0" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 0828555cb1ce94702a4af6f3dce3d735
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 48b75ae264f3640c99a2815be5a86273
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a90f13141c35746f5a2996c8ad068fe9
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Chartboost/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:chartboost-adapter:9.7.0.4">
-            <repositories>
-                <repository>https://cboost.jfrog.io/artifactory/chartboost-ads/</repository>
-            </repositories>
-        </androidPackage>
-        <androidPackage spec="com.google.android.gms:play-services-base:16.1.0" />
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationChartboostAdapter" version="9.7.0.2" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 93b0a4618bd884871af0981a7867bb2f
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Chartboost/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c39dfd07e7ff425795e8eff06ead0b1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 28880992a399a48b7abe95b66649d711
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Facebook/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <!-- Ensure that Resolver doesn't inadvertently pull Facebook's beta versions of the SDK by forcing a specific version.
-             Since FAN SDK depends on older versions of a few support and play service versions
-             `com.applovin.mediation:facebook-adapter:x.y.z.a` resolves to `com.applovin.mediation:facebook-adapter:+` which pulls down the beta versions of FAN SDK.
-             Note that forcing the adapter is enough to stop Jar Resolver from pulling the latest FAN SDK. -->
-        <androidPackage spec="com.applovin.mediation:facebook-adapter:[6.19.0.2]" />
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationFacebookAdapter" version="6.17.0.0" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: aea9bdf974328420db5ae118ef0d2b87
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Facebook/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 18f372df2f09440cdade47221956470d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e076e4ef7e2874ba69b108cc7a346c2a
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Fyber/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:fyber-adapter:8.3.2.0"/>
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationFyberAdapter" version="8.3.2.1"/>
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 5e123cdc08e804dffb2c40c4fbc83caf
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Fyber/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f4430d8e4f65345669cea12967ee37d8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e8015bd045cea462c8f39c8a05867d08
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Google/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <!-- Ensure that Resolver doesn't inadvertently pull the latest Play Services Ads' SDK that we haven't certified against. -->
-        <androidPackage spec="com.applovin.mediation:google-adapter:[24.6.0.0]" />
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationGoogleAdapter" version="12.11.0.0" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 053b810d3594744e38b6fd0fa378fb57
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Google/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d170f61e92f2d42cab7a56391804f8c9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a141703acd55a48c2a3e6e6599f90c64
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/InMobi/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:inmobi-adapter:10.7.8.1" />
-        <androidPackage spec="com.squareup.picasso:picasso:2.71828" />
-        <androidPackage spec="com.android.support:recyclerview-v7:28.+" />
-        <androidPackage spec="com.android.support:customtabs:28.+" />
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationInMobiAdapter" version="10.7.8.0" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: bc66a0ef4503843ee9b1bf1b1e867367
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/InMobi/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 397d42e9f2d7345f0a0d7120144610e8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 531d860cac61f47d19e32f526470ae43
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/IronSource/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:ironsource-adapter:8.4.0.0.1">
-            <repositories>
-                <repository>https://android-sdk.is.com/</repository>
-            </repositories>
-        </androidPackage>
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationIronSourceAdapter" version="8.4.0.0.0" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 19262406303f04f05b14b31b3c734d35
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/IronSource/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 58d8d614f6ef2452fba6d494d19e8dbe
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: db1de4066dc4e4290b3879b34fa87de2
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Mintegral/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:mintegral-adapter:16.8.61.1">
-            <repositories>
-                <repository>https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea</repository>
-            </repositories>
-        </androidPackage>
-        <androidPackage spec="androidx.recyclerview:recyclerview:1.2.1" />
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationMintegralAdapter" version="7.7.3.0.0" />
-    </iosPods>
-</dependencies>
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 221b2a20a58a04f2cb4afb0779587206
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0284843f4258d4c359b8cc15db28700e
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9ecadc3649c184389b90252aa2a2b448
-labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/Moloco/Editor
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-    <androidPackages>
-        <androidPackage spec="com.applovin.mediation:moloco-adapter:4.1.0.0" />
-    </androidPackages>
-    <iosPods>
-        <iosPod name="AppLovinMediationMolocoAdapter" version="3.13.0.0" />
-    </iosPods>
-</dependencies>
--- a/Show More
+++ b/Show More