From 3e22b79cd3b7a9d33e868ce4673b1c2683db6b70 Mon Sep 17 00:00:00 2001 From: esteb Date: Tue, 10 Jan 2023 11:01:55 +0100 Subject: [PATCH] setup AR --- Packages/manifest.json | 25 +- Packages/packages-lock.json | 12 +- ProjectSettings/DynamicsManager.asset | 5 +- ProjectSettings/EditorBuildSettings.asset | 5 +- ProjectSettings/EditorSettings.asset | 15 +- ProjectSettings/GraphicsSettings.asset | 4 +- ProjectSettings/PresetManager.asset | 3 +- ProjectSettings/ProjectSettings.asset | 532 ++++++++++++++++----- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/QualitySettings.asset | 29 +- ProjectSettings/UnityConnectSettings.asset | 2 - ProjectSettings/VFXManager.asset | 1 - 12 files changed, 464 insertions(+), 173 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 7f93ce5..2f10007 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,15 @@ { - "dependencies": { + "scopedRegistries": [ + { + "name": "SpoiledCat", + "url": "https://registry.spoiledcat.com", + "scopes": [ + "com.spoiledcat" + ] + } + ], + "dependencies": { + "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.12.3.tgz", "com.spoiledcat.git": "1.0.12", "com.unity.collab-proxy": "1.17.7", "com.unity.feature.development": "1.0.1", @@ -43,14 +53,5 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" - }, - "scopedRegistries": [ - { - "name": "SpoiledCat", - "url": "https://registry.spoiledcat.com", - "scopes": [ - "com.spoiledcat" - ] - } - ] -} + } +} \ No newline at end of file diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8ee27b0..07f3019 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,13 @@ { "dependencies": { + "com.ptc.vuforia.engine": { + "version": "file:com.ptc.vuforia.engine-10.12.3.tgz", + "depth": 0, + "source": "local-tarball", + "dependencies": { + "com.unity.ugui": "1.0.0" + } + }, "com.spoiledcat.git": { "version": "1.0.12", "depth": 0, @@ -41,7 +49,7 @@ "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", "com.unity.test-framework": "1.1.31", - "com.unity.testtools.codecoverage": "1.2.2" + "com.unity.testtools.codecoverage": "1.0.1" } }, "com.unity.ide.rider": { @@ -129,7 +137,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.2", + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index cdc1f3e..8fb96f4 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,7 +3,7 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 13 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 @@ -22,6 +22,7 @@ PhysicsManager: m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 + m_ClothGravity: {x: 0, y: -9.81, z: 0} m_ContactPairsMode: 0 m_BroadphaseType: 0 m_WorldBounds: @@ -31,4 +32,4 @@ PhysicsManager: m_FrictionType: 0 m_EnableEnhancedDeterminism: 0 m_EnableUnifiedHeightmaps: 1 - m_DefaultMaxAngluarSpeed: 7 + m_DefaultMaxAngularSpeed: 7 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..c1361cb 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/SamplesResources/Scenes/0-Main.unity + guid: a09cb257d566c489595b16ab37547666 m_configObjects: {} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 1e44a0a..4af553a 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,10 +3,10 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 - m_ExternalVersionControlSupport: Visible Meta Files + serializedVersion: 9 + m_ExternalVersionControlSupport: Hidden Meta Files m_SerializationMode: 2 - m_LineEndingsForNewScripts: 0 + m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 m_PrefabRegularEnvironment: {fileID: 0} m_PrefabUIEnvironment: {fileID: 0} @@ -26,5 +26,10 @@ EditorSettings: m_EnterPlayModeOptionsEnabled: 0 m_EnterPlayModeOptions: 3 m_ShowLightmapResolutionOverlay: 1 - m_UseLegacyProbeSampleCount: 0 - m_SerializeInlineMappingsOnOneLine: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 43369e3..74d7b53 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 12 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -59,5 +59,3 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 - m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 0 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset index 67a94da..636a595 100644 --- a/ProjectSettings/PresetManager.asset +++ b/ProjectSettings/PresetManager.asset @@ -3,5 +3,4 @@ --- !u!1386491679 &1 PresetManager: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_DefaultPresets: {} + m_DefaultList: [] diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4fd1d05..33bf0b7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -4,11 +4,11 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 23 - productGUID: 779122bfa7fdde925aee11475c170772 + productGUID: 3f68965e88b11904ebd53ce3753e306f AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 4 + defaultScreenOrientation: 0 targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 @@ -40,14 +40,15 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 0} + m_VirtualRealitySplashScreen: {fileID: 2800000, guid: e0866a3fe6007224a9e3078d831ce6fc, + type: 3} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1920 - defaultScreenHeight: 1080 + defaultScreenWidth: 1024 + defaultScreenHeight: 768 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 1 + m_ActiveColorSpace: 0 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 @@ -66,7 +67,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 - androidUseSwappy: 1 + androidUseSwappy: 0 androidBlitType: 0 androidResizableWindow: 0 androidDefaultWindowWidth: 1920 @@ -75,7 +76,7 @@ PlayerSettings: androidMinimumWindowHeight: 300 androidFullscreenMode: 1 defaultIsNativeResolution: 1 - macRetinaSupport: 1 + macRetinaSupport: 0 runInBackground: 1 captureSingleScreen: 0 muteOtherAudioSources: 0 @@ -91,13 +92,13 @@ PlayerSettings: resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games - gpuSkinning: 1 + gpuSkinning: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 - visibleInBackground: 1 + visibleInBackground: 0 allowFullscreenSwitch: 1 fullscreenMode: 1 xboxSpeechDB: 0 @@ -125,7 +126,7 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 - vulkanEnablePreTransform: 1 + vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: @@ -134,13 +135,13 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 10.12.3 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 - xboxOneDisableKinectGpuReservation: 1 - xboxOneEnable7thCore: 1 + xboxOneDisableKinectGpuReservation: 0 + xboxOneEnable7thCore: 0 vrSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 @@ -154,14 +155,18 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Android: com.vuforia.engine.VuforiaEngine + Lumin: com.PTCInc.VuforiaEngine + Standalone: com.PTCInc.VuforiaEngine + iPhone: com.vuforia.engine.VuforiaEngine buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + overrideDefaultApplicationIdentifier: 1 + AndroidBundleVersionCode: 10123 + AndroidMinSdkVersion: 26 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -173,10 +178,10 @@ PlayerSettings: CreateWallpaper: 0 APKExpansionFiles: 0 keepLoadedShadersAlive: 0 - StripUnusedMeshComponents: 1 - VertexChannelCompressionMask: 4054 + StripUnusedMeshComponents: 0 + VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 14.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 11.0 @@ -222,7 +227,7 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 - iOSRenderExtraFrameOnPause: 0 + iOSRenderExtraFrameOnPause: 1 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: @@ -234,9 +239,9 @@ PlayerSettings: iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 shaderPrecisionModel: 0 - clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea - templatePackageId: com.unity.template.3d@8.1.3 - templateDefaultScene: Assets/Scenes/SampleScene.unity + clonedFromGUID: 8b852f676d7064d02918aa4f985e90f4 + templatePackageId: + templateDefaultScene: useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 @@ -244,11 +249,11 @@ PlayerSettings: useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 2 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: + AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 @@ -268,46 +273,270 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] - m_BuildTargetBatching: - - m_BuildTarget: Standalone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: tvOS - m_StaticBatching: 1 - m_DynamicBatching: 0 + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 128 + m_Height: 128 + m_Kind: 0 + m_BuildTargetPlatformIcons: - m_BuildTarget: Android - m_StaticBatching: 1 - m_DynamicBatching: 0 + m_Icons: + - m_Textures: + - {fileID: 2800000, guid: b15ee11232b424d68898398fe3cab2d0, type: 3} + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: fe689abc1067e4869a58c87d14482078, type: 3} + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 827b731c62d8d42c093899fa44179bb2, type: 3} + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: d85ccead4ae714b0682b281b94267e7f, type: 3} + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 6fae8ff752f494bacb3c562bed7dea2d, type: 3} + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 98e9bf2eec31e492d858fd08e8223ca4, type: 3} + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: b15ee11232b424d68898398fe3cab2d0, type: 3} + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: fe689abc1067e4869a58c87d14482078, type: 3} + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 827b731c62d8d42c093899fa44179bb2, type: 3} + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: d85ccead4ae714b0682b281b94267e7f, type: 3} + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 6fae8ff752f494bacb3c562bed7dea2d, type: 3} + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 98e9bf2eec31e492d858fd08e8223ca4, type: 3} + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 17890dd0942584ef7b1886ffc15250a1, type: 3} + - {fileID: 2800000, guid: 44f5763023bff4d3dbfb13b858cff6ce, type: 3} + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 2c78137d6929a46249f124bad6c3c8a8, type: 3} + - {fileID: 2800000, guid: b4f6488d420d24b3fa919a0d3a53bcf2, type: 3} + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: ad05b3745e8844194bae1994e47cd9b3, type: 3} + - {fileID: 2800000, guid: 78781f500fd7e4133b37547cebfe0231, type: 3} + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 96655ac7a5e9f46d0af3ba32b5ce1d2c, type: 3} + - {fileID: 2800000, guid: 02ad1a4d05ea64249bdee469ef9fe40c, type: 3} + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: aebd9fdb8f30d4d18b318f4312877849, type: 3} + - {fileID: 2800000, guid: 71bdaccaa006c43bf9b5eaa2ef7bad56, type: 3} + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 7b3a41568325b49058f0f996eb569a3b, type: 3} + - {fileID: 2800000, guid: 626c896dc88974a9fb360ba573bb43e5, type: 3} + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: - m_BuildTarget: iPhone - m_StaticBatching: 1 - m_DynamicBatching: 0 - - m_BuildTarget: WebGL - m_StaticBatching: 0 - m_DynamicBatching: 0 + m_Icons: + - m_Textures: + - {fileID: 2800000, guid: 50f07d81dcf4c4fbb8b2c326e7d4b6bb, type: 3} + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + - m_Textures: + - {fileID: 2800000, guid: 83a6483f53e5f448a84f14d9e27ee822, type: 3} + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: b3252f95d1a3a4cd58871ff4716e5d8b, type: 3} + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: b3252f95d1a3a4cd58871ff4716e5d8b, type: 3} + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: f9da296bf616b458d98a63f8f7557004, type: 3} + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: dd034f60ad00b407089fd2248eb2bae0, type: 3} + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: 753491ea5c3de4f928409d7f8e96b80b, type: 3} + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: ead39ea5b70b3401090170549ec78dda, type: 3} + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: 753491ea5c3de4f928409d7f8e96b80b, type: 3} + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: ead39ea5b70b3401090170549ec78dda, type: 3} + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: e5d044c008db542bf8371f7e7c91bb50, type: 3} + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: b36a145ee04964f5a8fbc998f53ad10f, type: 3} + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: b36a145ee04964f5a8fbc998f53ad10f, type: 3} + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: b3252f95d1a3a4cd58871ff4716e5d8b, type: 3} + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: 73c9e6fc8fd374b119e143a8bc52bf28, type: 3} + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: e5d044c008db542bf8371f7e7c91bb50, type: 3} + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: + - {fileID: 2800000, guid: 4cbc9362b367d44d58da2b6146f50c17, type: 3} + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: 6cb233dc65f0b459daf2ad80d17034da, type: 3} + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: + - {fileID: 2800000, guid: 819aa9af392f0436686712974e387eb9, type: 3} + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 - m_BuildTarget: Switch - m_GraphicsJobs: 1 + m_GraphicsJobs: 0 - m_BuildTarget: MetroSupport - m_GraphicsJobs: 1 + m_GraphicsJobs: 0 - m_BuildTarget: AppleTVSupport m_GraphicsJobs: 0 - m_BuildTarget: BJMSupport - m_GraphicsJobs: 1 + m_GraphicsJobs: 0 - m_BuildTarget: LinuxStandaloneSupport - m_GraphicsJobs: 1 + m_GraphicsJobs: 0 - m_BuildTarget: PS4Player - m_GraphicsJobs: 1 + m_GraphicsJobs: 0 - m_BuildTarget: iOSSupport m_GraphicsJobs: 0 - m_BuildTarget: WindowsStandaloneSupport - m_GraphicsJobs: 1 + m_GraphicsJobs: 0 - m_BuildTarget: XboxOnePlayer - m_GraphicsJobs: 1 + m_GraphicsJobs: 0 - m_BuildTarget: LuminSupport m_GraphicsJobs: 0 - m_BuildTarget: AndroidPlayer @@ -321,23 +550,12 @@ PlayerSettings: m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer - m_APIs: 150000000b000000 - m_Automatic: 1 + m_APIs: 1500000008000000 + m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 - - m_BuildTarget: AppleTVSupport - m_APIs: 10000000 - m_Automatic: 1 - - m_BuildTarget: WebGLSupport - m_APIs: 0b000000 - m_Automatic: 1 - m_BuildTargetVRSettings: - - m_BuildTarget: Standalone - m_Enabled: 0 - m_Devices: - - Oculus - - OpenVR + m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 @@ -349,30 +567,22 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Android + - m_BuildTarget: Standalone m_EncodingQuality: 1 - - m_BuildTarget: iPhone + - m_BuildTarget: XboxOne m_EncodingQuality: 1 - - m_BuildTarget: tvOS + - m_BuildTarget: PS4 m_EncodingQuality: 1 m_BuildTargetGroupLightmapSettings: [] - m_BuildTargetNormalMapEncoding: - - m_BuildTarget: Android - m_Encoding: 1 - - m_BuildTarget: iPhone - m_Encoding: 1 - - m_BuildTarget: tvOS - m_Encoding: 1 - m_BuildTargetDefaultTextureCompressionFormat: - - m_BuildTarget: Android - m_Format: 3 + m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: + cameraUsageDescription: Camera access required for target detection and tracking locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: @@ -455,7 +665,7 @@ PlayerSettings: switchAccessibleURLs: switchLegalInformation: switchMainThreadStackSize: 1048576 - switchPresenceGroupId: + switchPresenceGroupId: 0x01004b9000490000 switchLogoHandling: 0 switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 @@ -467,8 +677,8 @@ PlayerSettings: switchUserAccountSaveDataSize: 0 switchUserAccountSaveDataJournalSize: 0 switchApplicationAttribute: 0 - switchCardSpecSize: -1 - switchCardSpecClock: -1 + switchCardSpecSize: 4 + switchCardSpecClock: 25 switchRatingsMask: 0 switchRatingsInt_0: 0 switchRatingsInt_1: 0 @@ -483,7 +693,7 @@ PlayerSettings: switchRatingsInt_10: 0 switchRatingsInt_11: 0 switchRatingsInt_12: 0 - switchLocalCommunicationIds_0: + switchLocalCommunicationIds_0: 0x01004b9000490000 switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: switchLocalCommunicationIds_3: @@ -498,7 +708,7 @@ PlayerSettings: switchDataLossConfirmation: 0 switchUserAccountLockEnabled: 0 switchSystemResourceMemory: 16777216 - switchSupportedNpadStyles: 22 + switchSupportedNpadStyles: 3 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 @@ -514,7 +724,6 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 - switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -522,7 +731,7 @@ PlayerSettings: ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: - ps4ParentalLevel: 11 + ps4ParentalLevel: 1 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 @@ -532,7 +741,7 @@ PlayerSettings: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 - ps4VideoOutReprojectionRate: 60 + ps4VideoOutReprojectionRate: 120 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -573,7 +782,7 @@ PlayerSettings: ps4UseAudio3dBackend: 0 ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 - ps4ScriptOptimizationLevel: 0 + ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: @@ -599,10 +808,10 @@ PlayerSettings: splashScreenBackgroundSourcePortrait: {fileID: 0} blurSplashScreenBackground: 1 spritePackerPolicy: - webGLMemorySize: 16 + webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 - webGLDataCaching: 1 + webGLDataCaching: 0 webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: @@ -611,17 +820,29 @@ PlayerSettings: webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 webGLWasmArithmeticExceptions: 0 - webGLLinkerTarget: 1 + webGLLinkerTarget: 0 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 webGLPowerPreference: 2 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + Android: VUFORIA_ANDROID_SETTINGS + Windows Store Apps: VUFORIA_WSA_SETTINGS + iPhone: VUFORIA_IOS_SETTINGS additionalCompilerArguments: {} - platformArchitecture: {} - scriptingBackend: {} + platformArchitecture: + iPhone: 1 + scriptingBackend: + Android: 1 + Standalone: 0 + WP8: 2 + WebGL: 1 + WebPlayer: 0 + Windows Store Apps: 1 + iPhone: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: {} - incrementalIl2cppBuild: {} + incrementalIl2cppBuild: + iPhone: 1 suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 @@ -629,35 +850,109 @@ PlayerSettings: selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 - gcIncremental: 1 + gcIncremental: 0 assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: - metroCertificatePath: + metroPackageName: Vuforia.Engine.VuforiaEngine + metroPackageVersion: 10.12.3.0 + metroCertificatePath: Assets\WSATestCertificate.pfx metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: - metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: Template_3D - wsaImages: {} - metroTileShortName: + metroCertificateSubject: Vuforia + metroCertificateIssuer: Vuforia + metroCertificateNotAfter: 80a428773e1cd501 + metroApplicationDescription: Vuforia Engine + wsaImages: + 65636: Assets/Common/Icons/UWP/StoreLogo.scale-100.png + 65661: Assets/Common/Icons/UWP/StoreLogo.scale-125.png + 65686: Assets/Common/Icons/UWP/StoreLogo.scale-150.png + 65736: Assets/Common/Icons/UWP/StoreLogo.scale-200.png + 65936: Assets/Common/Icons/UWP/StoreLogo.scale-400.png + 131172: Assets/Common/Icons/UWP/SplashScreen.scale-100.png + 131197: Assets/Common/Icons/UWP/SplashScreen.scale-125.png + 131222: Assets/Common/Icons/UWP/SplashScreen.scale-150.png + 131272: Assets/Common/Icons/UWP/SplashScreen.scale-200.png + 2031632: Assets/Common/Icons/UWP/Square44x44Logo.targetsize-16.png + 2031640: Assets/Common/Icons/UWP/Square44x44Logo.targetsize-24.png + 2031648: Assets/Common/Icons/UWP/Square44x44Logo.targetsize-32.png + 2031664: Assets/Common/Icons/UWP/Square44x44Logo.targetsize-48.png + 2031716: Assets/Common/Icons/UWP/Square44x44Logo.scale-100.png + 2031741: Assets/Common/Icons/UWP/Square44x44Logo.scale-125.png + 2031766: Assets/Common/Icons/UWP/Square44x44Logo.scale-150.png + 2031816: Assets/Common/Icons/UWP/Square44x44Logo.scale-200.png + 2031872: Assets/Common/Icons/UWP/Square44x44Logo.targetsize-256.png + 2032016: Assets/Common/Icons/UWP/Square44x44Logo.scale-400.png + 2162788: Assets/Common/Icons/UWP/Square150x150Logo.scale-100.png + 2162813: Assets/Common/Icons/UWP/Square150x150Logo.scale-125.png + 2162838: Assets/Common/Icons/UWP/Square150x150Logo.scale-150.png + 2162888: Assets/Common/Icons/UWP/Square150x150Logo.scale-200.png + 2163088: Assets/Common/Icons/UWP/Square150x150Logo.scale-400.png + 2293860: Assets/Common/Icons/UWP/Wide310x150Logo.scale-100.png + 2293885: Assets/Common/Icons/UWP/Wide310x150Logo.scale-125.png + 2293910: Assets/Common/Icons/UWP/Wide310x150Logo.scale-150.png + 2293960: Assets/Common/Icons/UWP/Wide310x150Logo.scale-200.png + 2294160: Assets/Common/Icons/UWP/Wide310x150Logo.scale-400.png + metroTileShortName: Vuforia Engine metroTileShowName: 0 - metroMediumTileShowName: 0 + metroMediumTileShowName: 1 metroLargeTileShowName: 0 - metroWideTileShowName: 0 + metroWideTileShowName: 1 metroSupportStreamingInstall: 0 metroLastRequiredScene: 0 metroDefaultTileSize: 1 - metroTileForegroundText: 2 - metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} - metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} - metroSplashScreenUseBackgroundColor: 0 - platformCapabilities: {} - metroTargetDeviceFamilies: {} + metroTileForegroundText: 1 + metroTileBackgroundColor: {r: 0.4117647, g: 0.7490196, b: 0.2901961, a: 1} + metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} + metroSplashScreenUseBackgroundColor: 1 + platformCapabilities: + WindowsStoreApps: + OfflineMapsManagement: False + HumanInterfaceDevice: False + Location: False + Chat: False + Bluetooth: False + AllJoyn: False + MusicLibrary: False + LowLevelDevices: False + PrivateNetworkClientServer: False + InternetClientServer: False + VideosLibrary: False + Objects3D: False + InternetClient: True + RemoteSystem: False + BlockedChatMessages: False + PhoneCall: False + UserDataTasks: False + Appointments: False + SystemManagement: False + SpatialPerception: False + Microphone: False + SharedUserCertificates: False + InputInjectionBrokered: False + PicturesLibrary: False + RemovableStorage: False + WebCam: True + VoipCall: False + UserAccountInformation: False + UserNotificationListener: False + PhoneCallHistoryPublic: False + PointOfService: False + RecordedCallsFolder: False + Contacts: False + Proximity: False + CodeGeneration: False + BackgroundMediaPlayback: False + EnterpriseAuthentication: False + metroTargetDeviceFamilies: + Desktop: False + Holographic: False + IoT: False + IoTHeadless: False + Mobile: False + Team: False + Xbox: False metroFTAName: metroFTAFileTypes: [] metroProtocolName: @@ -681,7 +976,7 @@ PlayerSettings: XboxOneGameRating: {} XboxOneIsContentPackage: 0 XboxOneEnhancedXboxCompatibilityMode: 0 - XboxOneEnableGPUVariability: 1 + XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] @@ -690,8 +985,7 @@ PlayerSettings: XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: vrEditorSettings: {} - cloudServicesEnabled: - UNet: 1 + cloudServicesEnabled: {} luminIcon: m_Name: m_ModelFolderPath: @@ -701,9 +995,9 @@ PlayerSettings: m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: - m_VersionCode: 1 - m_VersionName: - apiCompatibilityLevel: 6 + m_VersionCode: 10123 + m_VersionName: 10.12.3 + apiCompatibilityLevel: 3 activeInputHandler: 0 windowsGamepadBackendHint: 0 cloudProjectId: @@ -712,7 +1006,7 @@ PlayerSettings: projectName: organizationId: cloudEnabled: 0 - legacyClampBlendShapeWeights: 0 + legacyClampBlendShapeWeights: 1 playerDataPath: forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 3643b02..6a95707 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.16f1 -m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) +m_EditorVersion: 2021.3.14f1 +m_EditorVersionWithRevision: 2021.3.14f1 (eee1884e7226) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 36c0dad..ebcc78b 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 + skinWeights: 1 textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 @@ -53,7 +53,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -88,7 +88,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -123,7 +123,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -158,7 +158,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 @@ -193,7 +193,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 @@ -216,19 +216,4 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 2 - Lumin: 5 - GameCoreScarlett: 5 - GameCoreXboxOne: 5 - Nintendo 3DS: 5 - Nintendo Switch: 5 - PS4: 5 - PS5: 5 - Stadia: 5 - Standalone: 5 - WebGL: 3 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 + m_PerPlatformDefaultQuality: {} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index a88bee0..fa0b146 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -9,7 +9,6 @@ UnityConnectSettings: m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_ConfigUrl: https://config.uca.cloud.unity3d.com - m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com @@ -23,7 +22,6 @@ UnityConnectSettings: m_Enabled: 0 m_TestMode: 0 m_InitializeOnStartup: 1 - m_PackageRequiringCoreStatsPresent: 0 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index 3a95c98..6e0eaca 100644 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -6,7 +6,6 @@ VFXManager: m_IndirectShader: {fileID: 0} m_CopyBufferShader: {fileID: 0} m_SortShader: {fileID: 0} - m_StripUpdateShader: {fileID: 0} m_RenderPipeSettingsPath: m_FixedTimeStep: 0.016666668 m_MaxDeltaTime: 0.05