From 40b74dfc4266fb81917a9ca669644d6047eeca80 Mon Sep 17 00:00:00 2001 From: Hugh Perkins Date: Thu, 22 Dec 2022 07:26:56 -0500 Subject: [PATCH] updating unity version to 16 --- .../Scripts/PushBlockActions.cs | 2 +- Project/Packages/manifest.json | 8 +- Project/Packages/packages-lock.json | 12 +- Project/ProjectSettings/MemorySettings.asset | 35 ++++ .../PackageManagerSettings.asset | 36 ++++ Project/ProjectSettings/ProjectVersion.txt | 4 +- .../SceneTemplateSettings.json | 167 ++++++++++++++++++ .../VersionControlSettings.asset | 8 + Project/ProjectSettings/boot.config | 0 com.unity.ml-agents/Samples.meta | 8 + com.unity.ml-agents/Samples/3DBall.meta | 8 + .../Samples/3DBall/3DBall.unitypackage.meta | 7 + 12 files changed, 283 insertions(+), 12 deletions(-) create mode 100644 Project/ProjectSettings/MemorySettings.asset create mode 100644 Project/ProjectSettings/PackageManagerSettings.asset create mode 100644 Project/ProjectSettings/SceneTemplateSettings.json create mode 100644 Project/ProjectSettings/VersionControlSettings.asset create mode 100644 Project/ProjectSettings/boot.config create mode 100644 com.unity.ml-agents/Samples.meta create mode 100644 com.unity.ml-agents/Samples/3DBall.meta create mode 100644 com.unity.ml-agents/Samples/3DBall/3DBall.unitypackage.meta diff --git a/Project/Assets/ML-Agents/Examples/PushBlockWithInput/Scripts/PushBlockActions.cs b/Project/Assets/ML-Agents/Examples/PushBlockWithInput/Scripts/PushBlockActions.cs index d328ee3ba2f..b060fb914bd 100644 --- a/Project/Assets/ML-Agents/Examples/PushBlockWithInput/Scripts/PushBlockActions.cs +++ b/Project/Assets/ML-Agents/Examples/PushBlockWithInput/Scripts/PushBlockActions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.3.0 +// version 1.4.4 // from Assets/ML-Agents/Examples/PushBlockWithInput/PushBlockActions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if diff --git a/Project/Packages/manifest.json b/Project/Packages/manifest.json index b352f407828..612b9988d08 100644 --- a/Project/Packages/manifest.json +++ b/Project/Packages/manifest.json @@ -1,12 +1,12 @@ { "dependencies": { - "com.unity.ide.rider": "3.0.5", - "com.unity.inputsystem": "1.3.0", + "com.unity.ide.rider": "3.0.16", + "com.unity.inputsystem": "1.4.4", "com.unity.ml-agents": "file:../../com.unity.ml-agents", "com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions", - "com.unity.nuget.newtonsoft-json": "2.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.recorder": "3.0.3", - "com.unity.test-framework": "1.1.29", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.3", "com.unity.ugui": "1.0.0", diff --git a/Project/Packages/packages-lock.json b/Project/Packages/packages-lock.json index 4c897ed4ed6..7213cec8eef 100644 --- a/Project/Packages/packages-lock.json +++ b/Project/Packages/packages-lock.json @@ -28,14 +28,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.5", + "version": "3.0.16", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.3.0", + "version": "1.4.4", "depth": 0, "source": "registry", "dependencies": { @@ -70,7 +72,7 @@ } }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", + "version": "3.0.2", "depth": 0, "source": "registry", "dependencies": {}, @@ -102,7 +104,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { diff --git a/Project/ProjectSettings/MemorySettings.asset b/Project/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000000..5b5facecace --- /dev/null +++ b/Project/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/Project/ProjectSettings/PackageManagerSettings.asset b/Project/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 00000000000..dec5942aa6a --- /dev/null +++ b/Project/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_ConfigSource: 0 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_Modified: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -826 + m_OriginalInstanceId: -828 + m_LoadAssets: 0 diff --git a/Project/ProjectSettings/ProjectVersion.txt b/Project/ProjectSettings/ProjectVersion.txt index 8ea1b855ae7..3643b022731 100644 --- a/Project/ProjectSettings/ProjectVersion.txt +++ b/Project/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.11f1 -m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf) +m_EditorVersion: 2021.3.16f1 +m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) diff --git a/Project/ProjectSettings/SceneTemplateSettings.json b/Project/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 00000000000..6f3e60fd8b7 --- /dev/null +++ b/Project/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/Project/ProjectSettings/VersionControlSettings.asset b/Project/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 00000000000..dca288142fc --- /dev/null +++ b/Project/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/Project/ProjectSettings/boot.config b/Project/ProjectSettings/boot.config new file mode 100644 index 00000000000..e69de29bb2d diff --git a/com.unity.ml-agents/Samples.meta b/com.unity.ml-agents/Samples.meta new file mode 100644 index 00000000000..646c197a548 --- /dev/null +++ b/com.unity.ml-agents/Samples.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2fe2221703001402abda34032093d988 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.ml-agents/Samples/3DBall.meta b/com.unity.ml-agents/Samples/3DBall.meta new file mode 100644 index 00000000000..3276bd6ab82 --- /dev/null +++ b/com.unity.ml-agents/Samples/3DBall.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 410af9d9924074cdba654e7f67773124 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.ml-agents/Samples/3DBall/3DBall.unitypackage.meta b/com.unity.ml-agents/Samples/3DBall/3DBall.unitypackage.meta new file mode 100644 index 00000000000..dc68eba0658 --- /dev/null +++ b/com.unity.ml-agents/Samples/3DBall/3DBall.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 432e2e918b3e6427683b98fe51c1c7ef +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: