From 285006fd9e6e7c900cb96f93cc738d4a509d0559 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 12 Sep 2023 22:03:04 +1000 Subject: [PATCH] menu bokeh undecided on --- Assets/Prefabs/Menu/Menu.prefab | 24 +++- Assets/Scenes/msg_blackstar.unity | 32 ++++- .../msg_blackstar/BlurVolume Profile.asset | 62 ++++++++++ .../BlurVolume Profile.asset.meta | 8 ++ .../msg_blackstar/Global Volume Profile.asset | 12 +- Assets/Scenes/sr_junglism2.unity | 15 +-- .../Global Volume Profile 1.asset | 110 ++++++++++++++++++ .../Global Volume Profile 1.asset.meta | 8 ++ Assets/Scenes/sr_silverstorage.unity | 67 +++-------- .../Global Volume Profile.asset | 15 +++ .../Global Volume Profile.asset.meta | 8 ++ Assets/Src/UI/MenuControls.cs | 6 + Assets/Src/UI/TimingUI.cs | 6 + TODO.md | 10 +- 14 files changed, 309 insertions(+), 74 deletions(-) mode change 100644 => 100755 Assets/Prefabs/Menu/Menu.prefab create mode 100755 Assets/Scenes/msg_blackstar/BlurVolume Profile.asset create mode 100755 Assets/Scenes/msg_blackstar/BlurVolume Profile.asset.meta create mode 100755 Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset create mode 100755 Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset.meta mode change 100644 => 100755 Assets/Scenes/sr_silverstorage.unity create mode 100755 Assets/Scenes/sr_silverstorage/Global Volume Profile.asset create mode 100755 Assets/Scenes/sr_silverstorage/Global Volume Profile.asset.meta diff --git a/Assets/Prefabs/Menu/Menu.prefab b/Assets/Prefabs/Menu/Menu.prefab old mode 100644 new mode 100755 index 983009d..dffd08a --- a/Assets/Prefabs/Menu/Menu.prefab +++ b/Assets/Prefabs/Menu/Menu.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 5731929726813851803} - component: {fileID: 5313449993149091347} - component: {fileID: 3459824902519845831} + - component: {fileID: 3033317543584580398} m_Layer: 0 m_Name: Menu m_TagString: Untagged @@ -26,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3221660762140721390} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5731929726813851803 MonoBehaviour: @@ -63,7 +64,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: timingDoc: {fileID: 0} + crosshairDoc: {fileID: 0} + controlsDoc: {fileID: 0} shipControls: {fileID: 0} + timingUi: {fileID: 0} + controlsUI: {fileID: 0} --- !u!114 &3459824902519845831 MonoBehaviour: m_ObjectHideFlags: 0 @@ -76,3 +81,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: af1d31f9c950ece1e852a40ebd6c45a2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &3033317543584580398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3221660762140721390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 10 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: dc8a6b6eba1fd7443adb3c1814cb7e73, type: 2} diff --git a/Assets/Scenes/msg_blackstar.unity b/Assets/Scenes/msg_blackstar.unity index 95670f9..fa77bf3 100755 --- a/Assets/Scenes/msg_blackstar.unity +++ b/Assets/Scenes/msg_blackstar.unity @@ -139,7 +139,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &52048084 MonoBehaviour: m_ObjectHideFlags: 0 @@ -375,8 +375,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedComponents: + - {fileID: 4582701354599139261, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + m_RemovedGameObjects: + - {fileID: 7435896455896431905, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} @@ -385,6 +387,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} insertIndex: -1 addedObject: {fileID: 943464874} + - targetCorrespondingSourceObject: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 943464879} m_SourcePrefab: {fileID: 100100000, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} --- !u!1001 &571777217 PrefabInstance: @@ -394,6 +399,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1192389867829506101, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_Name value: Timing @@ -797,6 +806,23 @@ MonoBehaviour: m_FirstSelected: {fileID: 943464869} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!114 &943464879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 943464869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 10 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: dc8a6b6eba1fd7443adb3c1814cb7e73, type: 2} --- !u!1 &1047904317 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/msg_blackstar/BlurVolume Profile.asset b/Assets/Scenes/msg_blackstar/BlurVolume Profile.asset new file mode 100755 index 0000000..a7c6468 --- /dev/null +++ b/Assets/Scenes/msg_blackstar/BlurVolume Profile.asset @@ -0,0 +1,62 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: BlurVolume Profile + m_EditorClassIdentifier: + components: + - {fileID: 1198423244784227193} +--- !u!114 &1198423244784227193 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 2 + gaussianStart: + m_OverrideState: 0 + m_Value: 10 + gaussianEnd: + m_OverrideState: 0 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 0 + m_Value: 1 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 1.86 + aperture: + m_OverrideState: 0 + m_Value: 5.6 + focalLength: + m_OverrideState: 0 + m_Value: 50 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 diff --git a/Assets/Scenes/msg_blackstar/BlurVolume Profile.asset.meta b/Assets/Scenes/msg_blackstar/BlurVolume Profile.asset.meta new file mode 100755 index 0000000..37729e3 --- /dev/null +++ b/Assets/Scenes/msg_blackstar/BlurVolume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc8a6b6eba1fd7443adb3c1814cb7e73 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/msg_blackstar/Global Volume Profile.asset b/Assets/Scenes/msg_blackstar/Global Volume Profile.asset index 0d10867..06140e2 100755 --- a/Assets/Scenes/msg_blackstar/Global Volume Profile.asset +++ b/Assets/Scenes/msg_blackstar/Global Volume Profile.asset @@ -18,16 +18,16 @@ MonoBehaviour: m_Value: 1 threshold: m_OverrideState: 1 - m_Value: 0 + m_Value: 0.5 intensity: m_OverrideState: 1 - m_Value: 19.15 + m_Value: 0.45 scatter: - m_OverrideState: 0 - m_Value: 0.7 + m_OverrideState: 1 + m_Value: 0.358 clamp: m_OverrideState: 0 - m_Value: 65472 + m_Value: 0 tint: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} @@ -41,7 +41,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 6 dirtTexture: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: {fileID: 0} dimension: 1 dirtIntensity: diff --git a/Assets/Scenes/sr_junglism2.unity b/Assets/Scenes/sr_junglism2.unity index af4f755..d6c15fb 100755 --- a/Assets/Scenes/sr_junglism2.unity +++ b/Assets/Scenes/sr_junglism2.unity @@ -840,7 +840,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &52048084 MonoBehaviour: m_ObjectHideFlags: 0 @@ -857,7 +857,7 @@ MonoBehaviour: priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 11400000, guid: 3371c134b2e85c04aaaf9d53e30c06cc, type: 2} + sharedProfile: {fileID: 11400000, guid: 2cc94c0bac3e5054595b7d263cd0deb8, type: 2} --- !u!4 &52048085 Transform: m_ObjectHideFlags: 0 @@ -5909,7 +5909,8 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 7435896455896431905, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} @@ -6157,10 +6158,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 955820483} m_Modifications: - - target: {fileID: -7511558181221131132, guid: eb3911e41b65f8e5abe6c150f641443f, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1793470114132628887, guid: aeda0d12d88b4328d99fa46e8eeac427, type: 3} propertyPath: m_Name value: TunnelTrackLimitRred (97) @@ -6225,6 +6222,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -41.57202 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: eb3911e41b65f8e5abe6c150f641443f, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset b/Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset new file mode 100755 index 0000000..c64c56b --- /dev/null +++ b/Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset @@ -0,0 +1,110 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile 1 + m_EditorClassIdentifier: + components: + - {fileID: 450464162674374539} + - {fileID: 7416039628752768495} +--- !u!114 &450464162674374539 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + skipIterations: + m_OverrideState: 0 + m_Value: 1 + threshold: + m_OverrideState: 1 + m_Value: 0.5 + intensity: + m_OverrideState: 1 + m_Value: 0.45 + scatter: + m_OverrideState: 1 + m_Value: 0.358 + clamp: + m_OverrideState: 0 + m_Value: 0 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + downscale: + m_OverrideState: 0 + m_Value: 0 + maxIterations: + m_OverrideState: 0 + m_Value: 6 + dirtTexture: + m_OverrideState: 1 + m_Value: {fileID: 0} + dimension: 1 + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &7416039628752768495 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 0 + mode: + m_OverrideState: 1 + m_Value: 2 + gaussianStart: + m_OverrideState: 0 + m_Value: 10 + gaussianEnd: + m_OverrideState: 0 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 0 + m_Value: 1 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 2.51 + aperture: + m_OverrideState: 0 + m_Value: 5.6 + focalLength: + m_OverrideState: 0 + m_Value: 50 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 diff --git a/Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset.meta b/Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset.meta new file mode 100755 index 0000000..77a0260 --- /dev/null +++ b/Assets/Scenes/sr_junglism2/Global Volume Profile 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5ee638a288d3ed468b43d05eb5ea295 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage.unity old mode 100644 new mode 100755 index 18b5444..253c31a --- a/Assets/Scenes/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage.unity @@ -123,55 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &52048083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 52048085} - - component: {fileID: 52048084} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &52048084 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52048083} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: 07694d72073f3bf94aa960ae60546cc5, type: 2} ---- !u!4 &52048085 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52048083} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 977.23474, y: -165.7302, z: -2086.4595} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &339815783 PrefabInstance: m_ObjectHideFlags: 0 @@ -378,13 +329,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: -0.27417248, y: -0.3337574, z: 0.3633117, w: 0.8254938} m_LocalPosition: {x: -365.9992, y: -2002.0156, z: -426.01685} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1906469785} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -167.869, y: 129.88, z: -126.800995} --- !u!114 &705507997 MonoBehaviour: @@ -581,6 +532,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965851723} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.9914445, z: -0, w: 0.13052872} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} @@ -588,7 +540,6 @@ Transform: m_Children: - {fileID: 1556238047} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -165, z: 0} --- !u!114 &1088368772 stripped MonoBehaviour: @@ -902,6 +853,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906469784} + serializedVersion: 2 m_LocalRotation: {x: 0.71074754, y: 0.5701635, z: -0.3333826, w: 0.24209014} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -909,7 +861,6 @@ Transform: m_Children: - {fileID: 705507995} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1972710421 stripped MonoBehaviour: @@ -1007,7 +958,8 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 7435896455896431905, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} @@ -1211,3 +1163,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1906469785} + - {fileID: 965851724} + - {fileID: 656092325660581143} + - {fileID: 5198188376350273124} + - {fileID: 766862834} diff --git a/Assets/Scenes/sr_silverstorage/Global Volume Profile.asset b/Assets/Scenes/sr_silverstorage/Global Volume Profile.asset new file mode 100755 index 0000000..5811643 --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/Global Volume Profile.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: [] diff --git a/Assets/Scenes/sr_silverstorage/Global Volume Profile.asset.meta b/Assets/Scenes/sr_silverstorage/Global Volume Profile.asset.meta new file mode 100755 index 0000000..f0face0 --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6951ec994285e04296092dbba1c0a06 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Src/UI/MenuControls.cs b/Assets/Src/UI/MenuControls.cs index b20c174..cf9732f 100644 --- a/Assets/Src/UI/MenuControls.cs +++ b/Assets/Src/UI/MenuControls.cs @@ -1,5 +1,6 @@ using UnityEngine; using UnityEngine.UIElements; +using UnityEngine.Rendering; using UnityEngine.InputSystem; public class MenuControls : MonoBehaviour { @@ -19,6 +20,8 @@ public class MenuControls : MonoBehaviour { MenuUI menuUi; + Volume effectsVolume; + [SerializeField] TimingUI timingUi; @@ -37,6 +40,7 @@ public class MenuControls : MonoBehaviour { void Awake() { menuDoc = GetComponent(); + effectsVolume = GetComponent(); if (input == null) input = new SpaceRaceInput(); input.menu.Enable(); @@ -71,6 +75,7 @@ public class MenuControls : MonoBehaviour { visible = true; UnityEngine.Cursor.lockState = CursorLockMode.None; menuDoc.enabled = true; + effectsVolume.enabled = true; menuUi.AddTracks(); menuUi.FocusTracks(); @@ -90,6 +95,7 @@ public class MenuControls : MonoBehaviour { visible = false; UnityEngine.Cursor.lockState = CursorLockMode.Locked; menuDoc.enabled = false; + effectsVolume.enabled = false; // resume control of the ship timingDoc.enabled = true; diff --git a/Assets/Src/UI/TimingUI.cs b/Assets/Src/UI/TimingUI.cs index 6f52e26..25b9bfa 100644 --- a/Assets/Src/UI/TimingUI.cs +++ b/Assets/Src/UI/TimingUI.cs @@ -25,6 +25,8 @@ public class TimingUI : MonoBehaviour { Label noticeTime; Label noticePosition; + bool ShouldHide => timing?.sectors.Count() == 0; + static string[] completionMsgs = { "smooth", "very fast", @@ -64,6 +66,10 @@ public class TimingUI : MonoBehaviour { notice.AddToClassList("hidden"); } + void Start() { + if (ShouldHide) uiDocument.enabled = false; + } + void FixedUpdate() { if (timer == null || timing == null) { Debug.LogWarning("no timer"); diff --git a/TODO.md b/TODO.md index 0532d67..ace275e 100644 --- a/TODO.md +++ b/TODO.md @@ -8,13 +8,11 @@ - create ntr@megastructure.games on microsoft - make project .msix -- blackstar menu - -- minimap +- menu + - set bokeh? - sound - - post times to server - backup store to json on disk in case server down - not rly sure how this would work @@ -25,6 +23,10 @@ - git lfs +- minimap + - really want this? + - would make map source obvious + - models - liquidator - cruise craft racing