From 68682e98da06a6c56c9e065853844f99e962e0f0 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 1 Aug 2023 22:45:20 +1000 Subject: [PATCH] move timing around --- Assets/Prefabs/Timing/Timing.prefab | 52 ++----- Assets/Scenes/sr_junglism/sr_junglism.unity | 34 ++-- .../sr_silverstorage/sr_silverstorage.unity | 79 ++++++---- .../sr_star_fraenkel_zermelo.unity | 147 ++++++------------ Assets/Scenes/testTrack/TestTrack.unity | 79 ++++++---- Assets/Src/Timing.cs | 4 +- Assets/Src/UI/TimingUI.cs | 14 +- 7 files changed, 182 insertions(+), 227 deletions(-) diff --git a/Assets/Prefabs/Timing/Timing.prefab b/Assets/Prefabs/Timing/Timing.prefab index 429b294..4eea152 100644 --- a/Assets/Prefabs/Timing/Timing.prefab +++ b/Assets/Prefabs/Timing/Timing.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 4743817676494260426} - component: {fileID: 8438506523596255020} + - component: {fileID: 1192389867829506101} + - component: {fileID: 7103342737542340337} m_Layer: 0 m_Name: Timing m_TagString: Untagged @@ -33,9 +35,8 @@ Transform: - {fileID: 8988386863196765033} - {fileID: 6781038596028326335} - {fileID: 6536205892250662305} - - {fileID: 6382567932203971393} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8438506523596255020 MonoBehaviour: @@ -49,48 +50,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3} m_Name: m_EditorClassIdentifier: + sectorTimes: [] timerEnabled: 0 + mapName: sectorTime: 0 ---- !u!1 &2884870557220750692 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6382567932203971393} - - component: {fileID: 957429026670911964} - - component: {fileID: 5975136821837370545} - m_Layer: 5 - m_Name: UIDocument - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6382567932203971393 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2884870557220750692} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.8755074, y: -3.1621284, z: -74.183014} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4743817676494260426} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &957429026670911964 + lapTime: 0 + sectors: [] +--- !u!114 &1192389867829506101 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2884870557220750692} + m_GameObject: {fileID: 2603084029878042569} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} @@ -100,21 +72,19 @@ MonoBehaviour: m_ParentUI: {fileID: 0} sourceAsset: {fileID: 9197481963319205126, guid: 8b8620c717c8ee2edafdfb5f4efa79cb, type: 3} m_SortingOrder: 0 ---- !u!114 &5975136821837370545 +--- !u!114 &7103342737542340337 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2884870557220750692} + m_GameObject: {fileID: 2603084029878042569} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} m_Name: m_EditorClassIdentifier: - uiDocument: {fileID: 957429026670911964} ship: {fileID: 0} - timing: {fileID: 8438506523596255020} --- !u!1001 &4742593648222185125 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_junglism/sr_junglism.unity b/Assets/Scenes/sr_junglism/sr_junglism.unity index 3a57e13..0e0f580 100644 --- a/Assets/Scenes/sr_junglism/sr_junglism.unity +++ b/Assets/Scenes/sr_junglism/sr_junglism.unity @@ -10039,15 +10039,19 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: - objectReference: {fileID: 766862837} + objectReference: {fileID: 0} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} - propertyPath: timingDoc + propertyPath: timingUi value: objectReference: {fileID: 766862836} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: timingDoc + value: + objectReference: {fileID: 766862837} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipControls value: - objectReference: {fileID: 0} + objectReference: {fileID: 2015948214} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_RootOrder value: 4 @@ -22549,18 +22553,7 @@ Transform: m_PrefabAsset: {fileID: 0} --- !u!114 &766862836 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - m_PrefabInstance: {fileID: 766862834} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &766862837 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5975136821837370545, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + m_CorrespondingSourceObject: {fileID: 7103342737542340337, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} m_PrefabInstance: {fileID: 766862834} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -22569,6 +22562,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &766862837 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1192389867829506101, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + m_PrefabInstance: {fileID: 766862834} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &767277666 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity index effc8bc..4097cde 100644 --- a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity @@ -415,7 +415,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 965851724} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_Enabled @@ -447,7 +447,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_RootOrder - value: -1 + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_LocalScale.x + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_LocalScale.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_LocalScale.z + value: 0.66 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalPosition.x @@ -463,19 +475,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.13052872 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.9914445 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -493,6 +505,10 @@ PrefabInstance: propertyPath: ship value: objectReference: {fileID: 1972710421} + - target: {fileID: 7103342737542340337, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: ship + value: + objectReference: {fileID: 1972710421} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: 50250db5eab455f70a577dbe84484ee1, type: 3} @@ -520,6 +536,28 @@ Transform: m_CorrespondingSourceObject: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} m_PrefabInstance: {fileID: 766862834} m_PrefabAsset: {fileID: 0} +--- !u!114 &766862836 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7103342737542340337, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + m_PrefabInstance: {fileID: 766862834} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &766862837 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1192389867829506101, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + m_PrefabInstance: {fileID: 766862834} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: --- !u!1 &965851723 GameObject: m_ObjectHideFlags: 0 @@ -548,7 +586,6 @@ Transform: m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 766862835} - {fileID: 1556238047} m_Father: {fileID: 0} m_RootOrder: 2 @@ -830,28 +867,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 273700024047119412, guid: 87a51212e10250274a8feda6be865b7c, type: 3} m_PrefabInstance: {fileID: 1650371476} m_PrefabAsset: {fileID: 0} ---- !u!114 &1705992920 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - m_PrefabInstance: {fileID: 766862834} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1705992922 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5975136821837370545, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - m_PrefabInstance: {fileID: 766862834} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1906469784 GameObject: m_ObjectHideFlags: 0 @@ -910,15 +925,15 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: - objectReference: {fileID: 1705992922} + objectReference: {fileID: 0} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingUi value: - objectReference: {fileID: 1705992922} + objectReference: {fileID: 766862836} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: - objectReference: {fileID: 1705992920} + objectReference: {fileID: 766862837} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipControls value: diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity b/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity index 8391de1..4916cb9 100644 --- a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity +++ b/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity @@ -611,7 +611,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 965851724} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_Enabled @@ -643,7 +643,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_RootOrder - value: -1 + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_LocalScale.x + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_LocalScale.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_LocalScale.z + value: 0.66 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalPosition.x @@ -659,19 +671,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.13052872 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0.9914445 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -689,6 +701,10 @@ PrefabInstance: propertyPath: ship value: objectReference: {fileID: 616008081} + - target: {fileID: 7103342737542340337, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: ship + value: + objectReference: {fileID: 616008081} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: 50250db5eab455f70a577dbe84484ee1, type: 3} @@ -716,6 +732,28 @@ Transform: m_CorrespondingSourceObject: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} m_PrefabInstance: {fileID: 766862834} m_PrefabAsset: {fileID: 0} +--- !u!114 &766862836 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7103342737542340337, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + m_PrefabInstance: {fileID: 766862834} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &766862837 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1192389867829506101, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + m_PrefabInstance: {fileID: 766862834} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: --- !u!1 &965851723 GameObject: m_ObjectHideFlags: 0 @@ -744,7 +782,6 @@ Transform: m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 766862835} - {fileID: 425847538} m_Father: {fileID: 0} m_RootOrder: 2 @@ -760,74 +797,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1563959527 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1563959530} - - component: {fileID: 1563959529} - - component: {fileID: 1563959528} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1563959528 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1563959527} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1563959529 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1563959527} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &1563959530 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1563959527} - 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: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1650371476 PrefabInstance: m_ObjectHideFlags: 0 @@ -938,28 +907,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 273700024047119412, guid: 87a51212e10250274a8feda6be865b7c, type: 3} m_PrefabInstance: {fileID: 1650371476} m_PrefabAsset: {fileID: 0} ---- !u!114 &1705992920 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - m_PrefabInstance: {fileID: 766862834} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1705992922 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5975136821837370545, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - m_PrefabInstance: {fileID: 766862834} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1906469784 GameObject: m_ObjectHideFlags: 0 @@ -1007,15 +954,15 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: - objectReference: {fileID: 1705992922} + objectReference: {fileID: 0} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingUi value: - objectReference: {fileID: 1705992922} + objectReference: {fileID: 766862836} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: - objectReference: {fileID: 1705992920} + objectReference: {fileID: 766862837} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipControls value: diff --git a/Assets/Scenes/testTrack/TestTrack.unity b/Assets/Scenes/testTrack/TestTrack.unity index 54f15ca..408650e 100644 --- a/Assets/Scenes/testTrack/TestTrack.unity +++ b/Assets/Scenes/testTrack/TestTrack.unity @@ -462,15 +462,15 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: - objectReference: {fileID: 1292078235} + objectReference: {fileID: 0} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingUi value: - objectReference: {fileID: 1292078235} + objectReference: {fileID: 1643546428} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: - objectReference: {fileID: 1292078237} + objectReference: {fileID: 1643546429} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipControls value: @@ -1048,28 +1048,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7588376663361902483, guid: 73ab56de058af21389c312279181f856, type: 3} m_PrefabInstance: {fileID: 1287343202} m_PrefabAsset: {fileID: 0} ---- !u!114 &1292078235 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5975136821837370545, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - m_PrefabInstance: {fileID: 6345872851367721384} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1292078237 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - m_PrefabInstance: {fileID: 6345872851367721384} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1297026289 PrefabInstance: m_ObjectHideFlags: 0 @@ -1268,17 +1246,51 @@ Transform: m_CorrespondingSourceObject: {fileID: 7588376663361902483, guid: 73ab56de058af21389c312279181f856, type: 3} m_PrefabInstance: {fileID: 1549479480} m_PrefabAsset: {fileID: 0} +--- !u!1 &1643546425 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + m_PrefabInstance: {fileID: 6345872851367721384} + m_PrefabAsset: {fileID: 0} --- !u!114 &1643546426 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} m_PrefabInstance: {fileID: 6345872851367721384} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1643546425} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1643546428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643546425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3} + m_Name: + m_EditorClassIdentifier: + ship: {fileID: 699883395} +--- !u!114 &1643546429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643546425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PanelSettings: {fileID: 11400000, guid: dab173ab15446054bb709b9a7ab085b6, type: 2} + m_ParentUI: {fileID: 0} + sourceAsset: {fileID: 9197481963319205126, guid: 8b8620c717c8ee2edafdfb5f4efa79cb, type: 3} + m_SortingOrder: 0 --- !u!1001 &1799749852 PrefabInstance: m_ObjectHideFlags: 0 @@ -1909,6 +1921,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_ParentUI + value: + objectReference: {fileID: 1643546429} - target: {fileID: 1367906234716419496, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: sector value: 1 @@ -1984,7 +2000,7 @@ PrefabInstance: - target: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: ui value: - objectReference: {fileID: 1292078235} + objectReference: {fileID: 0} - target: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: sectors.Array.size value: 2 @@ -2001,6 +2017,13 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 968610525847117003, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} - {fileID: 711392991746672853, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + - {fileID: 2884870557220750692, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + insertIndex: -1 + addedObject: {fileID: 1643546429} + - targetCorrespondingSourceObject: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + insertIndex: -1 + addedObject: {fileID: 1643546428} m_SourcePrefab: {fileID: 100100000, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} diff --git a/Assets/Src/Timing.cs b/Assets/Src/Timing.cs index 5437cb7..fe15137 100644 --- a/Assets/Src/Timing.cs +++ b/Assets/Src/Timing.cs @@ -10,7 +10,6 @@ using UnityEditor; using UnityEngine.SceneManagement; public class Timing: MonoBehaviour { - [SerializeField] TimingUI ui; public List sectorTimes; @@ -20,12 +19,12 @@ public class Timing: MonoBehaviour { public double sectorTime; public double lapTime; public Sector[] sectors; - public Lap recentLap = null; double sectorStart; double lapStart; void Awake() { + ui = GetComponent(); sectorTimes = new List(); sectorStart = 0.0; sectorTime = 0.0; @@ -37,7 +36,6 @@ public class Timing: MonoBehaviour { Debug.Log("Track Sector Count - " + sectors.Length); LapStorageService.GetPlayerLaps(mapName); - recentLap = null; } void Update() { diff --git a/Assets/Src/UI/TimingUI.cs b/Assets/Src/UI/TimingUI.cs index 8b0c9c6..9d2aa84 100644 --- a/Assets/Src/UI/TimingUI.cs +++ b/Assets/Src/UI/TimingUI.cs @@ -6,22 +6,19 @@ using UnityEngine; using UnityEngine.UIElements; public class TimingUI : MonoBehaviour { - UIDocument uiDocument; - [SerializeField] ShipControls ship; - [SerializeField] Timing timing; - - Label timer; - Label pb; - Label recentTime; - Label recentDiff; + UIDocument uiDocument; VisualElement recentLap; VisualElement currentLap; VisualElement sectors; + Label timer; + Label pb; + Label recentTime; + Label recentDiff; void OnEnable() { Init(); @@ -29,6 +26,7 @@ public class TimingUI : MonoBehaviour { void Init() { uiDocument = GetComponent(); + timing = GetComponent(); recentLap = uiDocument.rootVisualElement.Q("recentLap"); currentLap = uiDocument.rootVisualElement.Q("currentLap");