From a1133d3622ec777dadc62fd8664c06b5d22de7c8 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Tue, 20 Sep 2022 20:17:33 -0400 Subject: [PATCH] improve performance with new render settings - fix letterboxing losing camera references --- Assets/Resources/Prefabs/Cameras.prefab | 127 +++++++++++++++++ Assets/Scenes/Editor.unity | 172 ++++-------------------- Assets/Scripts/GameManager.cs | 1 + Assets/Scripts/Initializer.cs | 2 + Assets/Scripts/LevelEditor/Editor.cs | 3 +- ProjectSettings/DynamicsManager.asset | 3 +- ProjectSettings/GraphicsSettings.asset | 19 ++- ProjectSettings/ProjectSettings.asset | 5 +- ProjectSettings/QualitySettings.asset | 10 +- 9 files changed, 184 insertions(+), 158 deletions(-) diff --git a/Assets/Resources/Prefabs/Cameras.prefab b/Assets/Resources/Prefabs/Cameras.prefab index a2dca76eb..37ea5abc3 100644 --- a/Assets/Resources/Prefabs/Cameras.prefab +++ b/Assets/Resources/Prefabs/Cameras.prefab @@ -1,5 +1,56 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &5584137290458315811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 455520442982280351} + - component: {fileID: 6060748659854770895} + m_Layer: 0 + m_Name: LetterboxFullscreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &455520442982280351 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5584137290458315811} + 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_Children: [] + m_Father: {fileID: 6234653029009288364} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6060748659854770895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5584137290458315811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e188ee899633d0b49870a5ae38b7359d, type: 3} + m_Name: + m_EditorClassIdentifier: + ratio: {x: 16, y: 9} + forceRatioOnAwake: 1 + listenForWindowChanges: 1 + createCameraForLetterBoxRendering: 0 + findCamerasAutomatically: 1 + letterBoxCameraColor: {r: 0, g: 0, b: 0, a: 1} + cameras: [] + letterBoxCamera: {fileID: 5997098664667581191} --- !u!1 &6234653028281991659 GameObject: m_ObjectHideFlags: 0 @@ -202,9 +253,85 @@ Transform: - {fileID: 6234653028453841262} - {fileID: 6234653028281991656} - {fileID: 1942359490671534657} + - {fileID: 455520442982280351} + - {fileID: 3022914124654306410} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7745146194305554249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3022914124654306410} + - component: {fileID: 5997098664667581191} + m_Layer: 0 + m_Name: LetterboxBgCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3022914124654306410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745146194305554249} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6234653029009288364} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &5997098664667581191 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7745146194305554249} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -100 + m_CullingMask: + serializedVersion: 2 + m_Bits: 0 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &8463691957270393964 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index a7f4f705c..e5212dfbd 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -3041,57 +3041,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Content: {fileID: 1750038561} ---- !u!1 &89978021 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 89978023} - - component: {fileID: 89978022} - m_Layer: 0 - m_Name: LetterboxFullscreen - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &89978022 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89978021} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e188ee899633d0b49870a5ae38b7359d, type: 3} - m_Name: - m_EditorClassIdentifier: - ratio: {x: 16, y: 9} - forceRatioOnAwake: 1 - listenForWindowChanges: 1 - createCameraForLetterBoxRendering: 0 - findCamerasAutomatically: 1 - letterBoxCameraColor: {r: 0, g: 0, b: 0, a: 1} - cameras: [] - letterBoxCamera: {fileID: 1186982022} ---- !u!4 &89978023 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89978021} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &93132552 GameObject: m_ObjectHideFlags: 0 @@ -4820,7 +4769,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -289.15005, y: 2} + m_AnchoredPosition: {x: -289.15002, y: 2} m_SizeDelta: {x: -578.29, y: 49.92} m_Pivot: {x: 0.5, y: 0} --- !u!114 &156962255 @@ -5203,7 +5152,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.001007} + m_AnchoredPosition: {x: 0, y: -39.000977} m_SizeDelta: {x: 0, y: -78.32001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &172566393 @@ -10484,7 +10433,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.0050354004, y: 0.000061035156} + m_AnchoredPosition: {x: -0.0050354004, y: 0} m_SizeDelta: {x: 1280, y: 281.88} m_Pivot: {x: 0.5, y: 0} --- !u!114 &382658482 @@ -11823,7 +11772,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.001007} + m_AnchoredPosition: {x: 0, y: -39.000977} m_SizeDelta: {x: 0, y: -78.32001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &435667403 @@ -12269,7 +12218,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.001007} + m_AnchoredPosition: {x: 0, y: -39.000977} m_SizeDelta: {x: 0, y: -78.32001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &454315226 @@ -14758,7 +14707,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 119.83, y: -19.690994} + m_AnchoredPosition: {x: 119.83, y: -19.690979} m_SizeDelta: {x: 578.29, y: -43.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &546272878 @@ -15986,7 +15935,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -49.99994} + m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: -48, y: -148} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &572765323 @@ -17475,7 +17424,7 @@ MonoBehaviour: m_HandleRect: {fileID: 704039020} m_Direction: 0 m_Value: 0 - m_Size: 0.03287128 + m_Size: 0.032871276 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -19222,7 +19171,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.001007} + m_AnchoredPosition: {x: 0, y: -39.000977} m_SizeDelta: {x: 0, y: -78.32001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &673880752 @@ -25344,8 +25293,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 1 - m_Size: 0.9999893 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -25843,7 +25792,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.001007} + m_AnchoredPosition: {x: 0, y: -39.000977} m_SizeDelta: {x: 0, y: -78.32001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &926134725 @@ -26534,7 +26483,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.001007} + m_AnchoredPosition: {x: 0, y: -39.000977} m_SizeDelta: {x: 0, y: -78.32001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &948189509 @@ -29483,7 +29432,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 120.830025, y: -19.690964} + m_AnchoredPosition: {x: 120.830025, y: -19.690979} m_SizeDelta: {x: 576.29, y: -43.38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1056099133 @@ -30892,7 +30841,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -408.98004, y: -17} + m_AnchoredPosition: {x: -408.97998, y: -17} m_SizeDelta: {x: -817.96, y: -46.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1118147045 @@ -32369,7 +32318,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 129.90404} + m_AnchoredPosition: {x: 0, y: 129.8829} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -33172,7 +33121,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -49.99991} + m_AnchoredPosition: {x: 0, y: -49.999878} m_SizeDelta: {x: -48, y: -148} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1182686745 @@ -33411,80 +33360,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186810248} m_CullTransparentMesh: 1 ---- !u!1 &1186982020 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1186982023} - - component: {fileID: 1186982022} - m_Layer: 0 - m_Name: LetterboxBgCam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!20 &1186982022 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1186982020} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -100 - m_CullingMask: - serializedVersion: 2 - m_Bits: 0 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1186982023 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1186982020} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1192611371 GameObject: m_ObjectHideFlags: 0 @@ -38150,7 +38025,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.0012207031, y: 0.000061035156} + m_AnchoredPosition: {x: -0.0012207031, y: 0} m_SizeDelta: {x: 0, y: -0.000030517578} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1336470763 @@ -39252,7 +39127,7 @@ MonoBehaviour: m_EditorClassIdentifier: MainCanvas: {fileID: 1791483802} EditorCamera: {fileID: 2047408675} - GameLetterbox: {fileID: 89978021} + GameLetterbox: {fileID: 0} ScreenRenderTexture: {fileID: 8400000, guid: d3f3d6ca32122da4d9e3a8e7aa2ede16, type: 2} Screen: {fileID: 558010761} GridGameSelector: {fileID: 1154875943} @@ -39277,6 +39152,7 @@ MonoBehaviour: - {fileID: 1265865542} - {fileID: 1336470763} - {fileID: 1946344932} + - {fileID: 292323699} tooltipText: {fileID: 1196204504} fullscreen: 0 discordDuringTesting: 0 @@ -45885,7 +45761,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 111.50012, y: -29.533981} + m_AnchoredPosition: {x: 111.50012, y: -29.533966} m_SizeDelta: {x: 223, y: -108.27} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1671351976 @@ -49282,7 +49158,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -84.99002} + m_AnchoredPosition: {x: 0, y: -84.99005} m_SizeDelta: {x: 320, y: -84.99} m_Pivot: {x: 0, y: 1} --- !u!1 &1852819572 @@ -52665,7 +52541,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -29.530014} + m_AnchoredPosition: {x: 0, y: -29.529999} m_SizeDelta: {x: 0, y: -108.26} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1980243267 @@ -56143,7 +56019,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -39.001007} + m_AnchoredPosition: {x: 0, y: -39.000977} m_SizeDelta: {x: 0, y: -78.32001} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2122610459 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 74a2ea8e1..69818d02e 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -21,6 +21,7 @@ namespace HeavenStudio [Header("Components")] public TextAsset txt; public Camera GameCamera, CursorCam, OverlayCamera; + public GameObject GameLetterbox; public CircleCursor CircleCursor; [HideInInspector] public GameObject GamesHolder; public Games.Global.Flash fade; diff --git a/Assets/Scripts/Initializer.cs b/Assets/Scripts/Initializer.cs index e645c9f0e..ee18415c9 100644 --- a/Assets/Scripts/Initializer.cs +++ b/Assets/Scripts/Initializer.cs @@ -20,6 +20,7 @@ namespace HeavenStudio GameObject MainCamera = Cameras.transform.GetChild(0).gameObject; GameObject CursorCamera = Cameras.transform.GetChild(1).gameObject; GameObject OverlayCamera = Cameras.transform.GetChild(2).gameObject; + GameObject GameLetterbox = Cameras.transform.GetChild(3).gameObject; GameObject Cursor = Instantiate(Resources.Load("Prefabs/Cursor")); Cursor.name = "Cursor"; @@ -38,6 +39,7 @@ namespace HeavenStudio gameManager.GameCamera = MainCamera.GetComponent(); gameManager.CursorCam = CursorCamera.GetComponent(); gameManager.OverlayCamera = OverlayCamera.GetComponent(); + gameManager.GameLetterbox = GameLetterbox; GameObject Profiler = Instantiate(Resources.Load("Prefabs/GameProfiler")); Profiler.name = "GameProfiler"; diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index 70db292ea..ffa7420fe 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -30,7 +30,7 @@ namespace HeavenStudio.Editor [SerializeField] public Camera EditorCamera; // [SerializeField] public GameObject EditorLetterbox; - [SerializeField] public GameObject GameLetterbox; + public GameObject GameLetterbox; [Header("Rect")] [SerializeField] private RenderTexture ScreenRenderTexture; @@ -93,6 +93,7 @@ namespace HeavenStudio.Editor GameCamera.instance.camera.targetTexture = ScreenRenderTexture; GameManager.instance.CursorCam.targetTexture = ScreenRenderTexture; GameManager.instance.OverlayCamera.targetTexture = ScreenRenderTexture; + GameLetterbox = GameManager.instance.GameLetterbox; Screen.texture = ScreenRenderTexture; GameManager.instance.Init(); diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index fc90ab958..3d61a58be 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -7,6 +7,7 @@ PhysicsManager: m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 m_SleepThreshold: 0.005 m_DefaultContactOffset: 0.01 m_DefaultSolverIterations: 6 @@ -17,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ff8fffffff8fffffff8fffffff8fffffff8fffffff8fffffff8fffffff8fffffff8fffffff8fffffff8fffffff8fffff0080ffff0080ffff0080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 31f386d5f..b6797a8a3 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -46,7 +46,24 @@ GraphicsSettings: m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 m_DefaultMobileRenderingPath: 1 - m_TierSettings: [] + m_TierSettings: + - serializedVersion: 5 + m_BuildTarget: 1 + m_Tier: 2 + m_Settings: + standardShaderQuality: 2 + renderingPath: 1 + hdrMode: 1 + realtimeGICPUUsage: 50 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 + useHDR: 0 + useDetailNormalMap: 1 + useCascadedShadowMaps: 1 + prefer32BitShadowMaps: 0 + enableLPPV: 1 + useDitherMaskForAlphaBlendedShadows: 1 + m_Automatic: 1 m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 92cb2a977..dc72f593e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -294,7 +294,7 @@ PlayerSettings: - m_BuildTarget: iOSSupport m_GraphicsJobs: 0 - m_BuildTarget: WindowsStandaloneSupport - m_GraphicsJobs: 0 + m_GraphicsJobs: 1 - m_BuildTarget: XboxOnePlayer m_GraphicsJobs: 0 - m_BuildTarget: LuminSupport @@ -587,7 +587,8 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + managedStrippingLevel: + Standalone: 0 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 38a45f356..99baf172c 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -98,7 +98,7 @@ QualitySettings: softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 - vSyncCount: 1 + vSyncCount: 0 lodBias: 0.7 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -134,7 +134,7 @@ QualitySettings: softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -170,7 +170,7 @@ QualitySettings: softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1.5 maximumLODLevel: 0 streamingMipmapsActive: 0 @@ -196,7 +196,7 @@ QualitySettings: shadowDistance: 150 shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.45785606} shadowmaskMode: 1 skinWeights: 255 textureQuality: 0 @@ -206,7 +206,7 @@ QualitySettings: softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 2 maximumLODLevel: 0 streamingMipmapsActive: 0