diff --git a/Assets/MobileDependencyResolver.meta b/Assets/MobileDependencyResolver.meta
new file mode 100644
index 0000000000000000000000000000000000000000..0a89788f900d6998d94f0dac90da5a5e592aa951
--- /dev/null
+++ b/Assets/MobileDependencyResolver.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 333d24e71d12446ba5c77815e64b0ca8
+folderAsset: yes
+timeCreated: 1448926447
+licenseType: Pro
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MobileDependencyResolver/Editor.meta b/Assets/MobileDependencyResolver/Editor.meta
new file mode 100644
index 0000000000000000000000000000000000000000..457843c6e3534d16d9d5c66322619e33582f50c2
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e105e00cdce8456482d26b1fcd1ca47d
+folderAsset: yes
+timeCreated: 1448926516
+licenseType: Pro
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll
new file mode 100644
index 0000000000000000000000000000000000000000..f3d81009d0c32977ee61c9d4776310a60a4eb121
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d5a5e13ac50fc748d07563103399ea5b69ae7f2742f40ebe7b0709386923543
+size 57856
diff --git a/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll.meta
new file mode 100644
index 0000000000000000000000000000000000000000..74c19af0fccadeb41f3f29c0e3ebbd7d7a25807e
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll.meta
@@ -0,0 +1,80 @@
+fileFormatVersion: 2
+guid: a1e8415cfe85469f9aa0aea941166031
+labels:
+- gvh
+- gvh_targets-editor
+- gvh_version-1.2.135.0
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 0
+ platformData:
+ - first:
+ : Any
+ second:
+ enabled: 0
+ settings:
+ Exclude Android: 1
+ Exclude Editor: 0
+ Exclude Linux64: 1
+ Exclude OSXUniversal: 1
+ Exclude Win: 1
+ Exclude Win64: 1
+ - first:
+ Android: Android
+ second:
+ enabled: 0
+ settings:
+ CPU: ARMv7
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 1
+ settings:
+ CPU: AnyCPU
+ DefaultValueInitialized: true
+ OS: OSX
+ - first:
+ Standalone: Linux64
+ second:
+ enabled: 0
+ settings:
+ CPU: AnyCPU
+ - first:
+ Standalone: OSXUniversal
+ second:
+ enabled: 0
+ settings:
+ CPU: None
+ - first:
+ Standalone: Win
+ second:
+ enabled: 0
+ settings:
+ CPU: x86
+ - first:
+ Standalone: Win64
+ second:
+ enabled: 0
+ settings:
+ CPU: x86_64
+ - first:
+ Windows Store Apps: WindowsStoreApps
+ second:
+ enabled: 0
+ settings:
+ CPU: AnyCPU
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll
new file mode 100644
index 0000000000000000000000000000000000000000..08f7aa4f9c538579f70bd6f1a51520e859230f3d
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f94ef91dd7cfd94c33d9390158a4ded24f54945c5699ae1918ece60989864b3
+size 326656
diff --git a/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll.meta
new file mode 100644
index 0000000000000000000000000000000000000000..22e9d7b5db9daa0cec9c3d65da46c06bbd88c506
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll.meta
@@ -0,0 +1,37 @@
+fileFormatVersion: 2
+guid: 97738b29c18143b0a469277b09d35889
+labels:
+- gvh
+- gvh_targets-editor
+- gvh_version-1.2.135.0
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 1
+ settings:
+ DefaultValueInitialized: true
+ - first:
+ Windows Store Apps: WindowsStoreApps
+ second:
+ enabled: 0
+ settings:
+ CPU: AnyCPU
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll
new file mode 100644
index 0000000000000000000000000000000000000000..8ccc46fbdab9a8c10cda3d2aceb84f4a9c60a498
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:254a4e9d1a7403cf733c86db1a6d2b0f5d83514f543f4b23b5e610d08d57e9c5
+size 13312
diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll.meta
new file mode 100644
index 0000000000000000000000000000000000000000..61eb5f26c564b42e6ea330c3673d9d027b1bee72
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll.meta
@@ -0,0 +1,37 @@
+fileFormatVersion: 2
+guid: bb6999c8a5ce4ba99688ec579babe5b7
+labels:
+- gvh
+- gvh_targets-editor
+- gvh_version-1.2.135.0
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 1
+ settings:
+ DefaultValueInitialized: true
+ - first:
+ Windows Store Apps: WindowsStoreApps
+ second:
+ enabled: 0
+ settings:
+ CPU: AnyCPU
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll
new file mode 100644
index 0000000000000000000000000000000000000000..fb2ef2f3977cecd972a1a943b4efa72d97733c8a
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9048415ad3a56eb171379353c8f4c8cb992fd637879dba9308d1fed4a21e6956
+size 72192
diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll.meta
new file mode 100644
index 0000000000000000000000000000000000000000..83d8867f8d20d886b0ee7ab00356b4bfb91cd0af
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll.meta
@@ -0,0 +1,37 @@
+fileFormatVersion: 2
+guid: 369cd88e7aa04bd98e0f6c229f7c1510
+labels:
+- gvh
+- gvh_targets-editor
+- gvh_version-1.2.135.0
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 1
+ settings:
+ DefaultValueInitialized: true
+ - first:
+ Windows Store Apps: WindowsStoreApps
+ second:
+ enabled: 0
+ settings:
+ CPU: AnyCPU
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt
new file mode 100644
index 0000000000000000000000000000000000000000..de086af1f71b109e4a5b1aaf6014726418e6138f
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt
@@ -0,0 +1,4 @@
+Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll
+Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll
+Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll
+Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll
diff --git a/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt.meta b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d24a4a6940ed17a56604f29e9264665f069bd798
--- /dev/null
+++ b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ba6f911c6f9d4d9ea269756e9dafb641
+labels:
+- gvh
+- gvh_manifest
+- gvh_version-1.2.135.0
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 0fb82375b388862fb8a8edcbcd7c48964673e8e8..15fa1743656aa4d2c6add1ef7f85663a581bf65f 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -3,21 +3,21 @@
"com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
- "com.unity.ads": "4.4.2",
+ "com.unity.ads": "4.12.0",
"com.unity.analytics": "3.6.12",
"com.unity.cinemachine": "2.10.3",
"com.unity.collab-proxy": "2.5.2",
- "com.unity.ide.rider": "3.0.31",
+ "com.unity.ide.rider": "3.0.34",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.inputsystem": "1.7.0",
- "com.unity.jobs": "0.51.0-preview.32",
+ "com.unity.jobs": "0.70.0-preview.7",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.probuilder": "5.2.3",
- "com.unity.purchasing": "4.9.3",
+ "com.unity.purchasing": "4.12.2",
"com.unity.test-framework": "1.1.33",
- "com.unity.textmeshpro": "3.0.6",
+ "com.unity.textmeshpro": "3.0.9",
"com.unity.timeline": "1.6.5",
- "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4",
+ "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.11",
"com.unity.modules.ai": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 1af7bd9d894c7443acd34d30ca911e7a9d07e280..231c783a36a1a3bba92cc130a95eda4bc76bca24 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -26,7 +26,7 @@
"dependencies": {}
},
"com.unity.ads": {
- "version": "4.4.2",
+ "version": "4.12.0",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -45,7 +45,7 @@
},
"com.unity.burst": {
"version": "1.8.18",
- "depth": 1,
+ "depth": 2,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.2.1",
@@ -70,12 +70,13 @@
"url": "https://packages.unity.com"
},
"com.unity.collections": {
- "version": "1.3.1",
+ "version": "1.4.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.6.6",
- "com.unity.test-framework": "1.1.31"
+ "com.unity.test-framework": "1.1.31",
+ "com.unity.nuget.mono-cecil": "1.11.4"
},
"url": "https://packages.unity.com"
},
@@ -87,7 +88,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
- "version": "3.0.31",
+ "version": "3.0.34",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -114,27 +115,24 @@
"url": "https://packages.unity.com"
},
"com.unity.jobs": {
- "version": "0.51.0-preview.32",
+ "version": "0.70.0-preview.7",
"depth": 0,
"source": "registry",
"dependencies": {
- "com.unity.burst": "1.6.6",
- "com.unity.collections": "1.3.1",
- "com.unity.mathematics": "1.2.6",
- "com.unity.nuget.mono-cecil": "1.10.1"
+ "com.unity.collections": "1.4.0"
},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.6",
- "depth": 1,
+ "depth": 3,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.nuget.mono-cecil": {
- "version": "1.10.1",
- "depth": 1,
+ "version": "1.11.4",
+ "depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
@@ -158,15 +156,14 @@
"url": "https://packages.unity.com"
},
"com.unity.purchasing": {
- "version": "4.9.3",
+ "version": "4.12.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
- "com.unity.services.core": "1.8.1",
+ "com.unity.services.core": "1.12.5",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
- "com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
@@ -190,18 +187,18 @@
"url": "https://packages.unity.com"
},
"com.unity.sysroot": {
- "version": "2.0.5",
+ "version": "2.0.10",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.sysroot.linux-x86_64": {
- "version": "2.0.4",
+ "version": "2.0.9",
"depth": 1,
"source": "registry",
"dependencies": {
- "com.unity.sysroot": "2.0.5"
+ "com.unity.sysroot": "2.0.10"
},
"url": "https://packages.unity.com"
},
@@ -217,7 +214,7 @@
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
- "version": "3.0.6",
+ "version": "3.0.9",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -238,12 +235,12 @@
"url": "https://packages.unity.com"
},
"com.unity.toolchain.win-x86_64-linux-x86_64": {
- "version": "2.0.4",
+ "version": "2.0.10",
"depth": 0,
"source": "registry",
"dependencies": {
- "com.unity.sysroot": "2.0.5",
- "com.unity.sysroot.linux-x86_64": "2.0.4"
+ "com.unity.sysroot": "2.0.10",
+ "com.unity.sysroot.linux-x86_64": "2.0.9"
},
"url": "https://packages.unity.com"
},
diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc01efb7f63157e8055e5c16c3d76b86a33ae4b4
--- /dev/null
+++ b/ProjectSettings/GvhProjectSettings.xml
@@ -0,0 +1,3 @@
+<projectSettings>
+ <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
+</projectSettings>
\ No newline at end of file
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index d771e60b96d3c18f4c074a6af6030a3efcdf3bb9..45d9e0e5ac1f3755832df31df5c92db143b979d8 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,31 +6,31 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
- value: 01550655000d5008580a5e7412710e44464e4129787125667a7a1f37e0e66d39
+ value: 5a530c5653060c0a0c0b5f2140770f4443154979297a76347c2a1e30b5b33068
flags: 0
RecentlyUsedSceneGuid-1:
- value: 5a530c5653060c0a0c0b5f2140770f4443154979297a76347c2a1e30b5b33068
+ value: 530055020302595d550a0e7447220b4415161a7c2f782432282a4f31e6b93068
flags: 0
RecentlyUsedSceneGuid-2:
- value: 530055020302595d550a0e7447220b4415161a7c2f782432282a4f31e6b93068
+ value: 0702005254070d5d5d5a5d7145210f444116487c282d7f357e7a1e66b6b0313a
flags: 0
RecentlyUsedSceneGuid-3:
- value: 0702005254070d5d5d5a5d7145210f444116487c282d7f357e7a1e66b6b0313a
+ value: 00540c020302515f0b0f5f2711265c44171519797e7c7463787d4d63e1b8303c
flags: 0
RecentlyUsedSceneGuid-4:
- value: 00540c020302515f0b0f5f2711265c44171519797e7c7463787d4d63e1b8303c
+ value: 5b01035553515d0e0b0f5b7415725d444e4f1d2b2e782332757f4863e4e6673c
flags: 0
RecentlyUsedSceneGuid-5:
- value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
+ value: 520107035d0c510c080d547215760b4413154d2e7a2c226129281c65e3b63768
flags: 0
RecentlyUsedSceneGuid-6:
- value: 5b01035553515d0e0b0f5b7415725d444e4f1d2b2e782332757f4863e4e6673c
+ value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
flags: 0
RecentlyUsedSceneGuid-7:
- value: 520107035d0c510c080d547215760b4413154d2e7a2c226129281c65e3b63768
+ value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
flags: 0
RecentlyUsedSceneGuid-8:
- value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
+ value: 5b5200520604510a5b5b587642270744124e4e7a7e7f2764742f1b61b0e6613a
flags: 0
RecentlyUsedSceneGuid-9:
value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c
@@ -70,4 +70,5 @@ EditorUserSettings:
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 1
+ m_VCScanLocalPackagesOnConnect: 1
m_ArtifactGarbageCollection: 1