From 1e8bbd3756bb7467f0070a39232a114dd94c3723 Mon Sep 17 00:00:00 2001 From: ntr Date: Mon, 25 Sep 2023 18:23:35 +1000 Subject: [PATCH] fullscreen weird --- Assets/Resources/URPAsset.asset | 0 Assets/Scenes/sr_junglism2.unity | 41 ++++++++++------------- ProjectSettings/ProjectSettings.asset | 14 ++++---- ProjectSettings/ShaderGraphSettings.asset | 0 ProjectSettings/VFXManager.asset | 2 +- 5 files changed, 24 insertions(+), 33 deletions(-) mode change 100755 => 100644 Assets/Resources/URPAsset.asset mode change 100755 => 100644 Assets/Scenes/sr_junglism2.unity mode change 100755 => 100644 ProjectSettings/ProjectSettings.asset mode change 100755 => 100644 ProjectSettings/ShaderGraphSettings.asset mode change 100755 => 100644 ProjectSettings/VFXManager.asset diff --git a/Assets/Resources/URPAsset.asset b/Assets/Resources/URPAsset.asset old mode 100755 new mode 100644 diff --git a/Assets/Scenes/sr_junglism2.unity b/Assets/Scenes/sr_junglism2.unity old mode 100755 new mode 100644 index 896ea89..ee84c3d --- a/Assets/Scenes/sr_junglism2.unity +++ b/Assets/Scenes/sr_junglism2.unity @@ -865,13 +865,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52048083} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 977.23474, y: -165.7302, z: -2086.4595} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &55853259 PrefabInstance: @@ -3760,7 +3760,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 203474076} - serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 2578.8755, y: 251.83788, z: 212.81699} m_LocalScale: {x: 1, y: 1, z: 1} @@ -3768,6 +3767,7 @@ Transform: m_Children: - {fileID: 887408362} m_Father: {fileID: 766862835} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!114 &203474082 MonoBehaviour: @@ -5784,7 +5784,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_LocalPosition.x @@ -7726,13 +7726,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 475149571} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3146.8, y: 251, z: 311.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &475769272 PrefabInstance: @@ -10801,13 +10801,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} - serializedVersion: 2 m_LocalRotation: {x: -0.27417248, y: -0.3337574, z: 0.3633117, w: 0.8254938} m_LocalPosition: {x: -365.9992, y: -2002.0156, z: -426.01685} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1906469785} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: -167.869, y: 129.88, z: -126.800995} --- !u!114 &705507997 MonoBehaviour: @@ -11918,13 +11918,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 755742072} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.9998229, z: -0, w: -0.018819254} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1136171772} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: -182.157, z: 0} --- !u!73398921 &755742074 VFXRenderer: @@ -12189,7 +12189,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalPosition.x @@ -13763,13 +13763,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 887408361} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203474081} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!73398921 &887408363 VFXRenderer: @@ -14927,7 +14927,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 955820482} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1773.5925, y: -52.500008, z: 877.1588} m_LocalScale: {x: 1, y: 1, z: 1} @@ -15357,6 +15356,7 @@ Transform: - {fileID: 1651403266} - {fileID: 112688477} m_Father: {fileID: 2050641105} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &956530159 PrefabInstance: @@ -18699,7 +18699,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1136171767} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 1654.8756, y: -183.06215, z: -2418.183} m_LocalScale: {x: 1, y: 1, z: 1} @@ -18707,6 +18706,7 @@ Transform: m_Children: - {fileID: 755742073} m_Father: {fileID: 766862835} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!114 &1136171773 MonoBehaviour: @@ -32197,7 +32197,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906469784} - serializedVersion: 2 m_LocalRotation: {x: 0.71074754, y: 0.5701635, z: -0.3333826, w: 0.24209014} m_LocalPosition: {x: 2416.41, y: 267.92, z: -1402} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32205,6 +32204,7 @@ Transform: m_Children: - {fileID: 705507995} m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1913193847 stripped Transform: @@ -33460,7 +33460,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_LocalScale.x @@ -34160,7 +34160,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050641104} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1773.5925, y: 52.500008, z: -877.1588} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34168,6 +34167,7 @@ Transform: m_Children: - {fileID: 955820483} m_Father: {fileID: 0} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2059307177 PrefabInstance: @@ -35768,6 +35768,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5324333733356675667, guid: 87a51212e10250274a8feda6be865b7c, type: 3} + propertyPath: m_Asset + value: + objectReference: {fileID: 8926484042661614526, guid: 18ee932b912969933a3e269d80c4a8d3, type: 3} - target: {fileID: 5992836117859062541, guid: 87a51212e10250274a8feda6be865b7c, type: 3} propertyPath: sector value: 3 @@ -35794,14 +35798,3 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87a51212e10250274a8feda6be865b7c, type: 3} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 2050641105} - - {fileID: 1906469785} - - {fileID: 52048085} - - {fileID: 766862834} - - {fileID: 327871849} - - {fileID: 2015948213} - - {fileID: 475149573} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset old mode 100755 new mode 100644 index bad87a2..9efb6af --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -88,11 +88,10 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 - dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 1 + resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 @@ -102,7 +101,7 @@ PlayerSettings: xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 visibleInBackground: 1 - allowFullscreenSwitch: 1 + allowFullscreenSwitch: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -128,7 +127,6 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 - switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -188,8 +186,8 @@ PlayerSettings: tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 - VisionOSSdkVersion: 0 - VisionOSTargetOSVersionString: 1.0 + bratwurstSdkVersion: 0 + bratwurstTargetOSVersionString: 16.4 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -237,10 +235,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: - VisionOSManualSigningProvisioningProfileID: + bratwurstManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 - VisionOSManualSigningProvisioningProfileType: 0 + bratwurstManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset old mode 100755 new mode 100644 index 87823a9..807920d --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -12,6 +12,6 @@ VFXManager: m_MaxDeltaTime: 0.05 m_MaxScrubTime: 30 m_CompiledVersion: 7 - m_RuntimeVersion: 35 + m_RuntimeVersion: 33 m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2} m_BatchEmptyLifetime: 300