From 540ba25a9e8a79d69102f423f087a8772a71789f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Ich=C3=A9?= Date: Wed, 5 May 2021 13:58:36 +0200 Subject: [PATCH] Added milliseconds results to Benchmark / Fix Benchmark startup hitches --- Assets/Prefabs/Benchmark/Benchmark.prefab | 1638 +++++++++++++++-- Assets/Scenes/Spaceship/Spaceship.unity | 55 - Assets/Scripts/Debug/FPSManager/FPSManager.cs | 23 +- .../FPSManagerSetResultsUIAction.cs | 23 +- .../Effects/Electric/SparkleBurst_Core.vfx | 2 +- Packages/manifest.json | 2 +- ProjectSettings/ProjectSettings.asset | 6 +- 7 files changed, 1523 insertions(+), 226 deletions(-) diff --git a/Assets/Prefabs/Benchmark/Benchmark.prefab b/Assets/Prefabs/Benchmark/Benchmark.prefab index 69c3615e..f8a2f7f4 100644 --- a/Assets/Prefabs/Benchmark/Benchmark.prefab +++ b/Assets/Prefabs/Benchmark/Benchmark.prefab @@ -1,5 +1,140 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &274970507381353260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4430023892825824938} + - component: {fileID: 6527264496547608015} + - component: {fileID: 7959020462757742747} + m_Layer: 0 + m_Name: Worst-MaxMs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4430023892825824938 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274970507381353260} + 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: 3122274711487549081} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -242, y: -133} + m_SizeDelta: {x: 206.3513, y: 40.1671} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6527264496547608015 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274970507381353260} + m_CullTransparentMesh: 1 +--- !u!114 &7959020462757742747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 274970507381353260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 66.34 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &347913559248210769 GameObject: m_ObjectHideFlags: 0 @@ -636,7 +771,7 @@ GameObject: - component: {fileID: 4052871410957798462} - component: {fileID: 7414774682855876710} m_Layer: 0 - m_Name: Panel + m_Name: Results Panel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -653,15 +788,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8865468661137312549} - - {fileID: 7992761772764571309} - - {fileID: 3764193938725407127} - - {fileID: 8853373271891127826} - - {fileID: 9077492461623421388} - - {fileID: 2780226342701218114} - - {fileID: 6332555295328415445} - - {fileID: 3842680062706961539} - - {fileID: 4861162672166137195} + - {fileID: 4987385046543705896} + - {fileID: 3122274711487549081} + - {fileID: 2900713376210654105} m_Father: {fileID: 8109539293998228371} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -691,7 +820,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 0.2627451} + m_Color: {r: 0.29799998, g: 0.29799998, b: 0.29799998, a: 0.2627451} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -843,6 +972,88 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1887592181526880970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4987385046543705896} + - component: {fileID: 285204209311563185} + - component: {fileID: 6030862000882314288} + m_Layer: 0 + m_Name: AveragePanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4987385046543705896 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887592181526880970} + 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: + - {fileID: 8865468661137312549} + - {fileID: 7992761772764571309} + - {fileID: 3764193938725407127} + - {fileID: 2052445992856686901} + - {fileID: 6294497609171895105} + - {fileID: 6114512515518941549} + - {fileID: 4108434644525428479} + m_Father: {fileID: 3031420996885021839} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -186.50745, y: 0} + m_SizeDelta: {x: -397.0148, y: -24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &285204209311563185 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887592181526880970} + m_CullTransparentMesh: 1 +--- !u!114 &6030862000882314288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887592181526880970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3584906, g: 0.3584906, b: 0.3584906, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2367762413612907664 GameObject: m_ObjectHideFlags: 0 @@ -943,7 +1154,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &2736667008806923276 +--- !u!1 &2554203373464461320 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -951,50 +1162,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6332555295328415445} - - component: {fileID: 1430782466294149289} - - component: {fileID: 6332661646609799448} + - component: {fileID: 4108434644525428479} + - component: {fileID: 56360458535972856} + - component: {fileID: 5713883719749614264} m_Layer: 0 - m_Name: Best + m_Name: ms/mpix m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6332555295328415445 +--- !u!224 &4108434644525428479 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2736667008806923276} + m_GameObject: {fileID: 2554203373464461320} 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: 3031420996885021839} + m_Father: {fileID: 4987385046543705896} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -206.42285, y: -226} - m_SizeDelta: {x: 297.5, y: 64.8089} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 455, y: -305} + m_SizeDelta: {x: 242.3056, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1430782466294149289 +--- !u!222 &56360458535972856 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2736667008806923276} + m_GameObject: {fileID: 2554203373464461320} m_CullTransparentMesh: 1 ---- !u!114 &6332661646609799448 +--- !u!114 &5713883719749614264 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2736667008806923276} + m_GameObject: {fileID: 2554203373464461320} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1008,7 +1219,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Best + m_text: 'ms/Mpix + +' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, @@ -1036,14 +1249,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 + m_fontSize: 55.8 + m_fontSizeBase: 55.8 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1072,13 +1285,13 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: -4.135315} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2844759635616054405 +--- !u!1 &2736667008806923276 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1086,42 +1299,177 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2844759635616054406} - - component: {fileID: 2844759635616054400} - - component: {fileID: 2844759635616054407} + - component: {fileID: 6332555295328415445} + - component: {fileID: 1430782466294149289} + - component: {fileID: 6332661646609799448} m_Layer: 0 - m_Name: BenchmarkWalkthroughPart02 + m_Name: Best m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2844759635616054406 -Transform: +--- !u!224 &6332555295328415445 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2844759635616054405} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 2736667008806923276} + 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: 2844759635811244993} + m_Father: {fileID: 2900713376210654105} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!320 &2844759635616054400 -PlayableDirector: + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -164, y: -35.093} + m_SizeDelta: {x: 297.5, y: 64.8089} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1430782466294149289 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2844759635616054405} + m_GameObject: {fileID: 2736667008806923276} + m_CullTransparentMesh: 1 +--- !u!114 &6332661646609799448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2736667008806923276} m_Enabled: 1 - serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: be92cd24310a1b54593174d363c0185a, type: 2} - m_InitialState: 1 - m_WrapMode: 2 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Best + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 48 + m_fontSizeBase: 48 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: -4.135315} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2844759635616054405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2844759635616054406} + - component: {fileID: 2844759635616054400} + - component: {fileID: 2844759635616054407} + m_Layer: 0 + m_Name: BenchmarkWalkthroughPart02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2844759635616054406 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2844759635616054405} + 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: 2844759635811244993} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!320 &2844759635616054400 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2844759635616054405} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: be92cd24310a1b54593174d363c0185a, type: 2} + m_InitialState: 1 + m_WrapMode: 2 m_DirectorUpdateMode: 1 m_InitialTime: 0 m_SceneBindings: @@ -1689,6 +2037,141 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4238757213598256503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9109844231336751712} + - component: {fileID: 6178729110187483926} + - component: {fileID: 3114470902571749693} + m_Layer: 0 + m_Name: Best-MinMs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9109844231336751712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4238757213598256503} + 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: 2900713376210654105} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -240.99994, y: -139.55025} + m_SizeDelta: {x: 206.3513, y: 44.301} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6178729110187483926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4238757213598256503} + m_CullTransparentMesh: 1 +--- !u!114 &3114470902571749693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4238757213598256503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 5.03 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4943446557949318664 GameObject: m_ObjectHideFlags: 0 @@ -1770,7 +2253,7 @@ MonoBehaviour: supersampleRate: 1 fileName: ../Spaceship-REF figureCount: 3 ---- !u!1 &5005771225792427721 +--- !u!1 &4962202517818576639 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1778,23 +2261,158 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7278716877541248279} - - component: {fileID: 5122234781755854382} - - component: {fileID: 4771731853083552028} + - component: {fileID: 7236474107473865626} + - component: {fileID: 1512732618511347163} + - component: {fileID: 3644695408429364378} m_Layer: 0 - m_Name: PostProcess Volume + m_Name: MS m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7278716877541248279 -Transform: + m_IsActive: 1 +--- !u!224 &7236474107473865626 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5005771225792427721} + m_GameObject: {fileID: 4962202517818576639} + 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: 3122274711487549081} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -88.78104, y: -131.77} + m_SizeDelta: {x: 82.2161, y: 37.7068} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1512732618511347163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4962202517818576639} + m_CullTransparentMesh: 1 +--- !u!114 &3644695408429364378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4962202517818576639} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: ms + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5005771225792427721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7278716877541248279} + - component: {fileID: 5122234781755854382} + - component: {fileID: 4771731853083552028} + m_Layer: 0 + m_Name: PostProcess Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7278716877541248279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5005771225792427721} 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} @@ -1846,50 +2464,320 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7901220045067287088} - - component: {fileID: 5473375731218971728} - - component: {fileID: 3377593894206033873} + - component: {fileID: 7901220045067287088} + - component: {fileID: 5473375731218971728} + - component: {fileID: 3377593894206033873} + m_Layer: 0 + m_Name: GPU + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7901220045067287088 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5171897168333927520} + 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: 8109539293998228371} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 782.6673, y: 183} + m_SizeDelta: {x: 1421.3345, y: 63.6477} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5473375731218971728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5171897168333927520} + m_CullTransparentMesh: 1 +--- !u!114 &3377593894206033873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5171897168333927520} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: NVIDIA GeForce RTX 2080Super + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 84ecc0e5a7d702d46871cc93206d17c0, type: 2} + m_sharedMaterial: {fileID: 829763291375606046, guid: 84ecc0e5a7d702d46871cc93206d17c0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5516804427518387569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2903134674649231383} + - component: {fileID: 6389246438890876161} + - component: {fileID: 3187318021411912642} + m_Layer: 0 + m_Name: MS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2903134674649231383 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5516804427518387569} + 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: 2900713376210654105} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -87.78798, y: -139.55025} + m_SizeDelta: {x: 82.216064, y: 44.2976} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6389246438890876161 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5516804427518387569} + m_CullTransparentMesh: 1 +--- !u!114 &3187318021411912642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5516804427518387569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: ms + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5572166654473372927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8853373271891127826} + - component: {fileID: 592723415950861642} + - component: {fileID: 7459472049350741522} m_Layer: 0 - m_Name: GPU + m_Name: Worst m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7901220045067287088 +--- !u!224 &8853373271891127826 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5171897168333927520} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 5572166654473372927} + 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: 8109539293998228371} - m_RootOrder: 5 + m_Father: {fileID: 3122274711487549081} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 782.6673, y: 183} - m_SizeDelta: {x: 1421.3345, y: 63.6477} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -158, y: -32.404} + m_SizeDelta: {x: 297.5, y: 64.8089} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5473375731218971728 +--- !u!222 &592723415950861642 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5171897168333927520} + m_GameObject: {fileID: 5572166654473372927} m_CullTransparentMesh: 1 ---- !u!114 &3377593894206033873 +--- !u!114 &7459472049350741522 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5171897168333927520} + m_GameObject: {fileID: 5572166654473372927} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1903,10 +2791,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: NVIDIA GeForce RTX 2080Super + m_text: Worst m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 84ecc0e5a7d702d46871cc93206d17c0, type: 2} - m_sharedMaterial: {fileID: 829763291375606046, guid: 84ecc0e5a7d702d46871cc93206d17c0, + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1931,14 +2819,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 48 + m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 4 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1967,13 +2855,13 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: 0, w: -4.135315} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5572166654473372927 +--- !u!1 &5592180334622882608 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1981,50 +2869,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8853373271891127826} - - component: {fileID: 592723415950861642} - - component: {fileID: 7459472049350741522} + - component: {fileID: 6114512515518941549} + - component: {fileID: 644411330244314149} + - component: {fileID: 4630228092873671215} m_Layer: 0 - m_Name: Worst + m_Name: Median MS per MPix m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8853373271891127826 +--- !u!224 &6114512515518941549 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5572166654473372927} + m_GameObject: {fileID: 5592180334622882608} 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: 3031420996885021839} - m_RootOrder: 3 + m_Father: {fileID: 4987385046543705896} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -206.42285, y: -40.900574} - m_SizeDelta: {x: 297.5, y: 64.8089} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 161.51404, y: -302.3} + m_SizeDelta: {x: 315.1207, y: 69.6} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &592723415950861642 +--- !u!222 &644411330244314149 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5572166654473372927} + m_GameObject: {fileID: 5592180334622882608} m_CullTransparentMesh: 1 ---- !u!114 &7459472049350741522 +--- !u!114 &4630228092873671215 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5572166654473372927} + m_GameObject: {fileID: 5592180334622882608} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2038,7 +2926,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Worst + m_text: 7 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, @@ -2066,8 +2954,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 + m_fontSize: 64 + m_fontSizeBase: 64 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2102,7 +2990,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: -4.135315} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -2264,12 +3152,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3031420996885021839} - m_RootOrder: 5 + m_Father: {fileID: 3122274711487549081} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -98.78284, y: -105} + m_AnchoredPosition: {x: -88.78107, y: -88.31102} m_SizeDelta: {x: 82.216064, y: 44.2976} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4169374826008906734 @@ -2465,6 +3353,141 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6225995474809780422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2052445992856686901} + - component: {fileID: 8899832262074017335} + - component: {fileID: 4558782539842473589} + m_Layer: 0 + m_Name: Median MS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2052445992856686901 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6225995474809780422} + 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: 4987385046543705896} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 161.5896, y: -231} + m_SizeDelta: {x: 315.1207, y: 67.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8899832262074017335 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6225995474809780422} + m_CullTransparentMesh: 1 +--- !u!114 &4558782539842473589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6225995474809780422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 7 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 64 + m_fontSizeBase: 64 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6249530739676921015 GameObject: m_ObjectHideFlags: 0 @@ -2650,7 +3673,7 @@ GameObject: - component: {fileID: 4816510467643519316} - component: {fileID: 7601720119672254176} m_Layer: 0 - m_Name: Median + m_Name: Median FPS m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2667,13 +3690,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3031420996885021839} + m_Father: {fileID: 4987385046543705896} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 231.76996, y: -205} - m_SizeDelta: {x: 352.2647, y: 224.5945} + m_AnchoredPosition: {x: 161.5896, y: -140} + m_SizeDelta: {x: 315.1207, y: 102.6863} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4816510467643519316 CanvasRenderer: @@ -2731,8 +3754,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 200 - m_fontSizeBase: 200 + m_fontSize: 96 + m_fontSizeBase: 96 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3008,8 +4031,12 @@ MonoBehaviour: Name: 'FPSManager - Set Results UI ' QualityText: {fileID: 2948372440147721721} OverallFPSText: {fileID: 7601720119672254176} + OverallMSText: {fileID: 4558782539842473589} + OverallMSPerMPixText: {fileID: 4630228092873671215} WorstFPSText: {fileID: 6309567849183629936} + WorstMSText: {fileID: 7959020462757742747} BestFPSText: {fileID: 6594036793868033441} + BestMSText: {fileID: 3114470902571749693} CPUInfo: {fileID: 6609061275548469786} GPUInfo: {fileID: 3377593894206033873} RAMInfo: {fileID: 4634737794159641177} @@ -3034,28 +4061,108 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7338885478366157863} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e96e23fc0058b9438af30550fbe4943, type: 3} - m_Name: - m_EditorClassIdentifier: - Name: 'Focus UI : ''Button_Return''' - UIObjectToFocus: {fileID: 7758494330861632767} ---- !u!114 &3719133753616918334 + m_GameObject: {fileID: 7338885478366157863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e96e23fc0058b9438af30550fbe4943, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: 'Focus UI : ''Button_Return''' + UIObjectToFocus: {fileID: 7758494330861632767} +--- !u!114 &3719133753616918334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7338885478366157863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c68adda9532fd8043b281736d2a5fbcf, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: 'Send Message : ''BENCHMARK_COMPLETE''' + MessageToSend: BENCHMARK_COMPLETE +--- !u!1 &7461369453563670257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2900713376210654105} + - component: {fileID: 8581105062547535587} + - component: {fileID: 6497045307288763087} + m_Layer: 0 + m_Name: Best Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2900713376210654105 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7461369453563670257} + 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: + - {fileID: 6332555295328415445} + - {fileID: 3842680062706961539} + - {fileID: 4861162672166137195} + - {fileID: 9109844231336751712} + - {fileID: 2903134674649231383} + m_Father: {fileID: 3031420996885021839} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 303.60614, y: -89.63346} + m_SizeDelta: {x: -631.2123, y: -203.2649} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8581105062547535587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7461369453563670257} + m_CullTransparentMesh: 1 +--- !u!114 &6497045307288763087 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7338885478366157863} + m_GameObject: {fileID: 7461369453563670257} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c68adda9532fd8043b281736d2a5fbcf, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - Name: 'Send Message : ''BENCHMARK_COMPLETE''' - MessageToSend: BENCHMARK_COMPLETE + m_Material: {fileID: 0} + m_Color: {r: 0.35359558, g: 0.5471698, b: 0.3912026, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7514378146662552260 GameObject: m_ObjectHideFlags: 0 @@ -3143,6 +4250,143 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &7534372680739664176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6294497609171895105} + - component: {fileID: 4747055925635660683} + - component: {fileID: 2582059000699156811} + m_Layer: 0 + m_Name: ms + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6294497609171895105 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7534372680739664176} + 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: 4987385046543705896} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 455.07556, y: -230.49998} + m_SizeDelta: {x: 242.3056, y: 68.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4747055925635660683 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7534372680739664176} + m_CullTransparentMesh: 1 +--- !u!114 &2582059000699156811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7534372680739664176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'ms + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0e7210a9c7afbc4ca4da9f095376e73, type: 2} + m_sharedMaterial: {fileID: 8932208077977238457, guid: c0e7210a9c7afbc4ca4da9f095376e73, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 55.8 + m_fontSizeBase: 55.8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7652084965173243847 GameObject: m_ObjectHideFlags: 0 @@ -3172,13 +4416,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3031420996885021839} + m_Father: {fileID: 4987385046543705896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 311, y: -60.298} - m_SizeDelta: {x: 510.7344, y: 64.8089} + m_AnchoredPosition: {x: 283.18, y: -32.404} + m_SizeDelta: {x: 566.37, y: 64.8089} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5580391644280175324 CanvasRenderer: @@ -3236,14 +4480,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 + m_fontSize: 72 + m_fontSizeBase: 72 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 4 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 @@ -3307,12 +4551,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3031420996885021839} - m_RootOrder: 8 + m_Father: {fileID: 2900713376210654105} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -98.78284, y: -286} + m_AnchoredPosition: {x: -87.781006, y: -97.64923} m_SizeDelta: {x: 82.216064, y: 44.2976} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2435036244367749566 @@ -3413,6 +4657,86 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7693535628434547400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3122274711487549081} + - component: {fileID: 8070731028490035894} + - component: {fileID: 1253948889698774316} + m_Layer: 0 + m_Name: Worst Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3122274711487549081 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7693535628434547400} + 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: + - {fileID: 8853373271891127826} + - {fileID: 9077492461623421388} + - {fileID: 2780226342701218114} + - {fileID: 4430023892825824938} + - {fileID: 7236474107473865626} + m_Father: {fileID: 3031420996885021839} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 303.60614, y: 92.8654} + m_SizeDelta: {x: -631.2123, y: -209.7289} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8070731028490035894 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7693535628434547400} + m_CullTransparentMesh: 1 +--- !u!114 &1253948889698774316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7693535628434547400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5660378, g: 0.4031684, b: 0.4031684, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &3791728184314164332 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3462,13 +4786,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3031420996885021839} + m_Father: {fileID: 4987385046543705896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 492.32996, y: -161} - m_SizeDelta: {x: 168.8585, y: 91.6365} + m_AnchoredPosition: {x: 412.99057, y: -145.71683} + m_SizeDelta: {x: 158.1356, y: 80.6616} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &674585182072392316 CanvasRenderer: @@ -3580,7 +4904,7 @@ GameObject: - component: {fileID: 3919351905850149921} - component: {fileID: 6594036793868033441} m_Layer: 0 - m_Name: Best-MinMs + m_Name: Best-MaxFPS m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3597,13 +4921,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3031420996885021839} - m_RootOrder: 7 + m_Father: {fileID: 2900713376210654105} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -252, y: -304.21942} - m_SizeDelta: {x: 206.35132, y: 111.7224} + m_AnchoredPosition: {x: -241, y: -88} + m_SizeDelta: {x: 206.3513, y: 63.6049} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3919351905850149921 CanvasRenderer: @@ -3661,8 +4985,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 + m_fontSize: 64 + m_fontSizeBase: 64 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3850,7 +5174,7 @@ GameObject: - component: {fileID: 6267331118887068400} - component: {fileID: 6309567849183629936} m_Layer: 0 - m_Name: Worst-MaxMs + m_Name: Worst-MinFPS m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3867,13 +5191,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3031420996885021839} - m_RootOrder: 4 + m_Father: {fileID: 3122274711487549081} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -252, y: -125} - m_SizeDelta: {x: 206.35132, y: 111.7224} + m_AnchoredPosition: {x: -241.99998, y: -79.112366} + m_SizeDelta: {x: 206.3513, y: 62.6848} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6267331118887068400 CanvasRenderer: @@ -3931,8 +5255,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 + m_fontSize: 64 + m_fontSizeBase: 64 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4057,18 +5381,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f634f86068ede4438eadd4e55c7c49a, type: 3} ---- !u!4 &1031820456864437346 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2966569147669108628, guid: 9f634f86068ede4438eadd4e55c7c49a, - type: 3} - m_PrefabInstance: {fileID: 2844759635663094774} - m_PrefabAsset: {fileID: 0} --- !u!95 &1084765432219353402 stripped Animator: m_CorrespondingSourceObject: {fileID: 2915871545750405836, guid: 9f634f86068ede4438eadd4e55c7c49a, type: 3} m_PrefabInstance: {fileID: 2844759635663094774} m_PrefabAsset: {fileID: 0} +--- !u!4 &1031820456864437346 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966569147669108628, guid: 9f634f86068ede4438eadd4e55c7c49a, + type: 3} + m_PrefabInstance: {fileID: 2844759635663094774} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2974126913820124107 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Spaceship/Spaceship.unity b/Assets/Scenes/Spaceship/Spaceship.unity index bbf2405d..504ed613 100644 --- a/Assets/Scenes/Spaceship/Spaceship.unity +++ b/Assets/Scenes/Spaceship/Spaceship.unity @@ -2612,61 +2612,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalPosition.x - value: -30.43326 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalPosition.y - value: 2.277846 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalPosition.z - value: 24.71866 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalRotation.w - value: -0.70875734 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.02552676 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.70453364 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.025373997 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -0.00000004600417 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.00000002881609 - objectReference: {fileID: 0} - - target: {fileID: 30793230800794719, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.000000001944926 - objectReference: {fileID: 0} - - target: {fileID: 2844759636163112433, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2844759637480249413, guid: 7a4067ac9aa3d974cbdfb8831d2cebeb, type: 3} propertyPath: m_Name diff --git a/Assets/Scripts/Debug/FPSManager/FPSManager.cs b/Assets/Scripts/Debug/FPSManager/FPSManager.cs index 68905c15..2c010cde 100644 --- a/Assets/Scripts/Debug/FPSManager/FPSManager.cs +++ b/Assets/Scripts/Debug/FPSManager/FPSManager.cs @@ -85,8 +85,18 @@ private void Update() const int MAX_QUEUE = 64; Queue queue = new Queue(); + float acc; + void ResetSmoothDeltaTime() + { + acc = 0; + if (queue == null) + queue = new Queue(); + else + queue.Clear(); + } + float GetSmoothDeltaTime() { if (queue.Count == MAX_QUEUE) @@ -208,7 +218,8 @@ public void Record(string filename) recording = true; recordingPaused = false; timings = new List(); - recordTTL = -1; + recordTTL = RecordInterval; + ResetSmoothDeltaTime(); } public RecordingResults results { get; private set; } @@ -246,15 +257,20 @@ public void EndRecord(bool abort = false) avgMs = med }; - Resolution r = Screen.currentResolution; + GraphicOption go = GameOption.Get(); SpaceshipOptions o = GameOption.Get(); + float p = o.screenPercentage / 100f; + float mPix = (go.width * p * go.height * p) / 1000000; + string dateTime = $"{DateTime.Now.ToLongDateString()} {DateTime.Now.ToShortTimeString()}"; string operatingSystem = $"{SystemInfo.operatingSystem}"; - string settings = $"{r.width}x{r.height}@{r.refreshRate}Hz ({Screen.fullScreenMode}) {o.screenPercentage}% SP - {QualitySettings.names[QualitySettings.GetQualityLevel()]} Quality"; + string settings = $"{go.width}x{go.height}@{go.refreshRate}Hz ({go.fullScreenMode}) {o.screenPercentage}% SP ({mPix.ToString("F2")} MegaPixels)- {QualitySettings.names[QualitySettings.GetQualityLevel()]} Quality"; string bestFPS = $"{(1000 / min).ToString("F1")}fps ({min.ToString("F2")}ms)"; string worstFPS = $"{(1000 / max).ToString("F1")}fps ({max.ToString("F2")}ms)"; string averageFPS = $"{(1000 / med).ToString("F1")}fps ({med.ToString("F2")}ms)"; + string msPerMPix = $"{(med/mPix).ToString("F2")} ms/MPix"; + string systemInfo = $"{SystemInfo.deviceModel}"; string cpuInfo = $" {SystemInfo.processorType} ({SystemInfo.processorCount} threads) @ {(SystemInfo.processorFrequency / 1000f).ToString("F2")} GHz."; string gpuInfo = $"{SystemInfo.graphicsDeviceName}({SystemInfo.graphicsDeviceType}) {SystemInfo.graphicsMemorySize / 1000}GB VRAM"; @@ -288,6 +304,7 @@ public void EndRecord(bool abort = false)

Spaceship - Benchmark Results

Average FPS : {averageFPS}
+Average MS per MegaPixel : {msPerMPix}
Best FPS : {bestFPS}
Worst FPS : {worstFPS}

diff --git a/Assets/Scripts/Debug/FPSManager/FPSManagerSetResultsUIAction.cs b/Assets/Scripts/Debug/FPSManager/FPSManagerSetResultsUIAction.cs index 47e1f578..ba54a6c2 100644 --- a/Assets/Scripts/Debug/FPSManager/FPSManagerSetResultsUIAction.cs +++ b/Assets/Scripts/Debug/FPSManager/FPSManagerSetResultsUIAction.cs @@ -8,22 +8,33 @@ public class FPSManagerSetResultsUIAction : ActionBase { public TextMeshProUGUI QualityText; public TextMeshProUGUI OverallFPSText; + public TextMeshProUGUI OverallMSText; + public TextMeshProUGUI OverallMSPerMPixText; public TextMeshProUGUI WorstFPSText; + public TextMeshProUGUI WorstMSText; public TextMeshProUGUI BestFPSText; + public TextMeshProUGUI BestMSText; public TextMeshProUGUI CPUInfo; public TextMeshProUGUI GPUInfo; public TextMeshProUGUI RAMInfo; public override void Execute(GameObject instigator = null) { - Resolution r = Screen.currentResolution; + GraphicOption go = GameOption.Get(); SpaceshipOptions o = GameOption.Get(); + float p = o.screenPercentage / 100f; + float mPix = (go.width * p * go.height * p) / 1000000; + FPSManager fpsm = Manager.Get(); - QualityText.text = $"{r.width}×{r.height}@{r.refreshRate}Hz ({Screen.fullScreenMode}) {o.screenPercentage}% SP - {QualitySettings.names[QualitySettings.GetQualityLevel()]} Quality"; - OverallFPSText.text = ((int)(1000 / fpsm.results.avgMs)).ToString(); - WorstFPSText.text = ((int)(1000 / fpsm.results.maxMs)).ToString(); - BestFPSText.text = ((int)(1000 / fpsm.results.minMs)).ToString(); - CPUInfo.text = $"{SystemInfo.processorType} ({SystemInfo.processorCount} threads) @ { (SystemInfo.processorFrequency/1000f).ToString("F2")} GHz. "; + QualityText.text = $"{go.width}x{go.height}@{go.refreshRate}Hz ({go.fullScreenMode}) {o.screenPercentage}% SP ({mPix.ToString("F2", System.Globalization.CultureInfo.InvariantCulture)} MPix) - {QualitySettings.names[QualitySettings.GetQualityLevel()]} Quality"; + OverallFPSText.text = (1000 / fpsm.results.avgMs).ToString("F1", System.Globalization.CultureInfo.InvariantCulture); + OverallMSText.text = fpsm.results.avgMs.ToString("F2", System.Globalization.CultureInfo.InvariantCulture); + OverallMSPerMPixText.text = (fpsm.results.avgMs / mPix).ToString("F2", System.Globalization.CultureInfo.InvariantCulture); + WorstFPSText.text = (1000 / fpsm.results.maxMs).ToString("F1", System.Globalization.CultureInfo.InvariantCulture); + WorstMSText.text = fpsm.results.maxMs.ToString("F2", System.Globalization.CultureInfo.InvariantCulture); + BestFPSText.text = (1000 / fpsm.results.minMs).ToString("F1", System.Globalization.CultureInfo.InvariantCulture); + BestMSText.text = fpsm.results.minMs.ToString("F2", System.Globalization.CultureInfo.InvariantCulture); + CPUInfo.text = $"{SystemInfo.processorType} ({SystemInfo.processorCount} threads) @ { (SystemInfo.processorFrequency/1000f).ToString("F2", System.Globalization.CultureInfo.InvariantCulture)} GHz. "; RAMInfo.text = $"System Memory : { SystemInfo.systemMemorySize / 1000}GB"; GPUInfo.text = $"{ SystemInfo.graphicsDeviceName} ({ SystemInfo.graphicsDeviceType}) { SystemInfo.graphicsMemorySize / 1000}GB VRAM"; } diff --git a/Assets/VFX/Effects/Electric/SparkleBurst_Core.vfx b/Assets/VFX/Effects/Electric/SparkleBurst_Core.vfx index b915ec23..010eb2fa 100644 --- a/Assets/VFX/Effects/Electric/SparkleBurst_Core.vfx +++ b/Assets/VFX/Effects/Electric/SparkleBurst_Core.vfx @@ -248,7 +248,7 @@ MonoBehaviour: m_ImportDependencies: [] m_GraphVersion: 6 m_ResourceVersion: 1 - m_saved: 0 + m_saved: 1 m_SubgraphDependencies: [] m_CategoryPath: --- !u!114 &114106425587585464 diff --git a/Packages/manifest.json b/Packages/manifest.json index c2ce1416..18d46f20 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,7 +9,7 @@ "com.unity.ugui": "1.0.0", "net.peeweek.build-frontend": "1.3.0-preview", "net.peeweek.console": "1.3.0", - "net.peeweek.game-options": "1.1.1-preview", + "net.peeweek.game-options": "1.2.0-preview", "net.peeweek.gameplay-ingredients": "2020.2.6", "com.unity.modules.animation": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a9b3fb88..fe263c2a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -642,8 +642,8 @@ PlayerSettings: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: + metroPackageName: Template3D + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -651,7 +651,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: Template_3D wsaImages: {} - metroTileShortName: + metroTileShortName: Spaceship Demo metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0