From 95f9b1be78719703aa64ac85c100d6d2e7920071 Mon Sep 17 00:00:00 2001 From: tverona1 Date: Sun, 29 Sep 2019 20:34:32 -0700 Subject: [PATCH] Upgrade to Unity 2019.3.0b4 --- .../Textures/screenshot_all.png.meta | 51 +++++++++++--- .../Textures/screenshot_physics.png.meta | 51 +++++++++++--- .../Textures/screenshot_raw.png.meta | 51 +++++++++++--- .../Textures/screenshot_ui.png.meta | 51 +++++++++++--- Assets/Oculus/VR/Textures/handle.png.meta | 65 ++++++++++++++---- Assets/Oculus/VR/Textures/windowgui.png.meta | 64 ++++++++++++++--- Assets/Resources/OVRBuildConfig.asset | 2 +- Packages/manifest.json | 6 +- ProjectSettings/AudioManager.asset | Bin 4144 -> 416 bytes ProjectSettings/ClusterInputManager.asset | Bin 4104 -> 114 bytes ProjectSettings/NavMeshAreas.asset | Bin 4464 -> 1308 bytes ProjectSettings/PresetManager.asset | Bin 4104 -> 146 bytes ProjectSettings/ProjectSettings.asset | 52 ++++++++++---- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/TimeManager.asset | Bin 4116 -> 202 bytes ProjectSettings/VFXManager.asset | Bin 4116 -> 308 bytes 16 files changed, 312 insertions(+), 85 deletions(-) diff --git a/Assets/OVRInputSelection/Textures/screenshot_all.png.meta b/Assets/OVRInputSelection/Textures/screenshot_all.png.meta index 710a55f..8638a99 100644 --- a/Assets/OVRInputSelection/Textures/screenshot_all.png.meta +++ b/Assets/OVRInputSelection/Textures/screenshot_all.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: c85e01b12adaaef42bfa2f8eaa8c6775 -timeCreated: 1512502617 -licenseType: Pro TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +30,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -39,46 +45,71 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Android + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/OVRInputSelection/Textures/screenshot_physics.png.meta b/Assets/OVRInputSelection/Textures/screenshot_physics.png.meta index c3525ec..9d89f0d 100644 --- a/Assets/OVRInputSelection/Textures/screenshot_physics.png.meta +++ b/Assets/OVRInputSelection/Textures/screenshot_physics.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 08cab6c84d1d0f043a5496bc97a744da -timeCreated: 1512502616 -licenseType: Pro TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +30,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -39,46 +45,71 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Android + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/OVRInputSelection/Textures/screenshot_raw.png.meta b/Assets/OVRInputSelection/Textures/screenshot_raw.png.meta index f49681d..6d0fb0d 100644 --- a/Assets/OVRInputSelection/Textures/screenshot_raw.png.meta +++ b/Assets/OVRInputSelection/Textures/screenshot_raw.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: d7b2d40a5fe539f4d9315528e230265c -timeCreated: 1512502617 -licenseType: Pro TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +30,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -39,46 +45,71 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Android + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/OVRInputSelection/Textures/screenshot_ui.png.meta b/Assets/OVRInputSelection/Textures/screenshot_ui.png.meta index 9c65e4a..ed864a4 100644 --- a/Assets/OVRInputSelection/Textures/screenshot_ui.png.meta +++ b/Assets/OVRInputSelection/Textures/screenshot_ui.png.meta @@ -1,10 +1,9 @@ fileFormatVersion: 2 guid: 27a7839379f859b44ae0f1e694c2995e -timeCreated: 1512502616 -licenseType: Pro TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -12,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -20,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -27,10 +30,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -39,46 +45,71 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: Android + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android maxTextureSize: 2048 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Oculus/VR/Textures/handle.png.meta b/Assets/Oculus/VR/Textures/handle.png.meta index bacb7a5..7f5a5fc 100644 --- a/Assets/Oculus/VR/Textures/handle.png.meta +++ b/Assets/Oculus/VR/Textures/handle.png.meta @@ -1,54 +1,91 @@ fileFormatVersion: 2 guid: ce8f78b2b9292484e97f36ad9568fc4f TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 16 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 - rGBM: 0 compressionQuality: 50 - allowsAlphaSplitting: 0 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 8 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: gui + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Oculus/VR/Textures/windowgui.png.meta b/Assets/Oculus/VR/Textures/windowgui.png.meta index 645e906..7759f71 100644 --- a/Assets/Oculus/VR/Textures/windowgui.png.meta +++ b/Assets/Oculus/VR/Textures/windowgui.png.meta @@ -1,33 +1,42 @@ fileFormatVersion: 2 guid: a26663690a6580440963aa46e582c35b TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 1 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -2 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 16 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -35,13 +44,48 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 8 - buildTargetSettings: [] + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: pointersui + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset index cf5cd6c..f2d36f8 100644 --- a/Assets/Resources/OVRBuildConfig.asset +++ b/Assets/Resources/OVRBuildConfig.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3} m_Name: OVRBuildConfig m_EditorClassIdentifier: - androidSDKPath: + androidSDKPath: C:\Users\tvero\AppData\Local\Android\Sdk gradlePath: jdkPath: diff --git a/Packages/manifest.json b/Packages/manifest.json index 32e5eac..2a138c0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,12 +3,12 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.2.16", "com.unity.ext.nunit": "1.0.0", - "com.unity.ide.rider": "1.0.8", + "com.unity.ide.rider": "1.1.0", "com.unity.ide.visualstudio": "1.0.11", "com.unity.ide.vscode": "1.0.7", - "com.unity.test-framework": "1.0.16", + "com.unity.test-framework": "1.1.1", "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.1.0", + "com.unity.timeline": "1.2.2", "com.unity.ugui": "1.0.0", "com.unity.xr.oculus.android": "1.36.0", "com.unity.modules.ai": "1.0.0", diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index 79a0b3284c1558fec0163d0a0e2e683ca28e4735..07ebfb05df3b58b4a596eac64cd19529d36ce565 100644 GIT binary patch literal 416 zcmZutJx{|h5Z&`Du0xqfRj06c3xvWzMU|jPOwrZ3L3!Vt zBj3G(Sczo$o86{oYoI=h>LwGR zUd$#XUE-Uw_lRL0;rAx?nm3%Ba(mE|8?-7&ag|H5&=VdEo!<0csh*>`&l49@fq!(I PZ<~_7BTa$YYo-4H?oWc8 literal 4144 zcmeH~zi!k(5XQ%GAQ1i}1O!M>TtOXOhy-+8h(Re5DV)W%XydG-C40Ar&n`&iIu8*< zlOh$O;Q^5H3=st{kUT*O%=h_Xf*?&fpTCJzZ=4S$4~oK7SEf%-+nWS0nG4PQY_ewh%~@HdFb zrwCyU*NDll5W*V%0WtYiLKyi9=GsNfd8Y|W@`+#p5uKc}1s(FRe$NNk!#>x^YY*i$ zYTv<`Q;#tp_uoU#J~y#m)PIKcoqzlDLtfM$-}ra`RdoD%md|0OaW3-1Iu^N2*b!MO zHjP_T1GS|y>A&qcTlBSbowY7aTXCYSmdFiMS-p%zGxw3uSxGBzoBugB+}@{{rz)Tj5l z8<-^03C=lx5SfwMu)2Q#^8>K=C5}zN<)zt;b8X21@ zs2OrO=ad$gq!xMR6_l3vCgvrkrxsapDJbN|`zK|kCYN|*rlh*%B&HWzDHwo-!3u%A H=vXcQ9j+l} literal 4104 zcmeH^yGjE=6o$`iZfd-1C%%A1NEC0~LM#+f5D`mRWDq3@vblhj3${LkrH!4PT^_(T zg^f>OVQJ<1|2s=yNouPzFr1xl&is>nBjVkO%uk5O0xF8gdbPGw*{D>5E%}Y(*ch-c zZp3lFy!-z2GdR5OeVjjjZ@w*q)-l<_u`LqeNSrJpawE?SKm$bMi45CGS>5e6-K`OSy|aZv6Jxx2Vo%*S zZ{DPD^QQe8&u1*?1YUa`-?3KNViwY<%!J+FBpt5Rb=VDp$n$;QRfBNAt^#iXA9FOj zr$WCWw=1+(WT}Zf#?#(Uv@KyqWtV^)LLVy%sm^@=)gw7%s5)1`G)#kGd6h`a? zK`wz)jH${L|=*C;#J#+RVV%IK|Aa_c`8A zBIb`q!(J~O^oR5aYSRpt|67hINlgitxFfWLM3gRso&Fh|qDXfXEfZzXk3`Rg@U zV=2_ubq)`p#3aQ@q4T=^Fh;?r%UsM0ZOlX%3mGS+V^L&FOeya%CA}V~AS*$RQOXr< zgqq6F_f9aVj&p!KsOW1Uu}Qb5d)OZw{)6+f0Ej2(~<^ik$B(It5-$< literal 4464 zcmeH~OHUI~6vxj%3%=hkKn0%*6A2ITv5^)U1)~Ik#JDn-_NENZv`uGf)P))MvUiCw zaiI$n`2eytu8AAt(zr8z0qXyMXQt`&8))Xh?LFr==iZ+4zjx6Q$xetItO-6u4qy@) z8yUSmJU%?4uF7_^*|aRM7ktoc-v0P`?bpNaU4Pc6b??Nht&5=Zc;3awuxla#mNZQe zh*&s-vfsVro8-xU_mRW8z?U$y9-N!(Ck&XMG2d$=WIf?QhMaXa zB91dQ#(eUZ5kJ(y*CKwngTIdWkq-Vg;zv99M#PVG@GlYP`P1V1zrknyCkSD2oj>7| z_YuP4{NM1&`w3w&--b^AvU}ZY#ams<}OJMc_HF+>d8Ir zt<2Y}tGehfYTvgjWlvOHD^H?_c?1RJE2$_~OR?(t;y${oJU?I76@TejP0toUT8pD) zQw`fGwV-OtHU5Gs*$sRX`HZ&9D}LxNI@OvE-D$^mm&MVgvM$uCwJ6I~PwzC`TE1AX zdS1cyd{rrGaqY^2F5A@#s})yO8p@g0j}b4+O!5VFuIdl9vkVx2qGQToz=FyDeIDHC|JwFbpZ(@Uu1sNy bdN&GyiF|l}>86R=7SN@(GY!0>RPEAV9`-Qm diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset index 889a54159a97142fd66c6c2af4f4b11e8373b655..67a94daefe2e6bce3ec73546ad7cda94f702ad22 100644 GIT binary patch literal 146 zcmY$5boBL6Fw`^TQVnr*S5PcfR47SIw<^ucEU7e3(M!(H)iE+KG_>N<)zt;b8X8-e znOGW{nOiET8FB>_r52}__$KBhrl%HJaVaR|#``B_r6!knWTvFL* mG81z$t5Q?KQj3Z+^Yg3}jKHd0QqvMkb4noQ02No)asdFNTr08w literal 4104 zcmeH_yGlbr5Qb-S^?uhzL41LD11})KA_T z))uxtipT%oJrUy@2s^0<70jbaby&}rmjh(}R>l2DT;B!hGj&N(SW%adkK7A0q-$ze*8 zQi_S*K;8wX9yBE>(_ci+{&vH(;Thbegqpn_KRhWb;Ag0LZYQEWH`Veko}rdGKi%@K zZgS&k*}_h~i#2t!JYjUZLCyKSh|#-R=9?dKnS1R0o4WP0A4YzM$oag>03nR`sUtqZ z$p_&yg;!GlrVc}fX~Tc(FdXs1xnJ{x4e!J|^v~tEnDY<3i)yf5t_2e1w#5*e?p&Sv z67X|e-1LI-rBAY&Lum)?vn~_@4$POUcB$Y6rN2FSuUg&p_A0V(kG1n_ttSg7E!m|k qCfW=yG8P4sH~$QF#eJOuP64NYQ@|9Ra)v?PFk?M^s&qb>bD7wiS>3_F(q literal 4116 zcmZQzV02_)5D;NtU=Re-K#GCE$iUD-&sfhO(Tw5W|Ns9P8G&M~Ac_C~Z$B!ZwoE@N zB8Kt!6}j#g_t=1a~VySEI3PRdW`Q#dvMC@d3z_(m{pa+O)V{1^gHJbMLNCLtUdEGi2{a+mgI- zJEs-lSp5TS7~U9%5{Zm$&KpH10dc)F7t~wRp(J$Sr!?b5ym`cxx~#Azbu%J;VE@eu BUiSb1 literal 4116 zcmeH^O-chn5QVE9<8KxU?y~R(!$iR-h=>WnEQHYk5nM=Pnq(vy!`QkDv`g_G9>8O` z*QHr{i?pwLJcFw$cvSV*)m8ACNWBnkY!T5WG7`~F(%g@C<3#V#+svx=*0h+8;XL=I1UI5_5t-Xe1EirgX~_f=A~j(QuaLkkdxLiLRq z32N?-0&{`Km~(*h%HJJEf-5=&KLO*tHDqA!S4~tb=1aipn0XZDH}Hn%FEbB{=p4Ow z5TAJm=gaQZnJ)Cel$55nJZ#^OCy&--L)|y!5shzpML#dit*r<^Hy@c^2SuvwFccT2 zKy#W;OlGXji@^h5h4IxA>