From 7c6c6902c5df0bb3b09fd917590a0524b97fb989 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 1 Aug 2023 16:32:49 +1000 Subject: [PATCH] crosshair wip --- Assets/Prefabs/Ship.meta | 8 + Assets/Prefabs/Ship/Ship.prefab | 631 +++++++++++++++++ Assets/Prefabs/Ship/Ship.prefab.meta | 7 + Assets/Scenes/sr_junglism/sr_junglism.unity | 603 +++------------- .../sr_silverstorage/sr_silverstorage.meta | 8 + .../sr_silverstorage/sr_silverstorage.unity | 587 ++------------- .../sr_silverstorage/LightingData.asset | Bin 0 -> 18192 bytes .../sr_silverstorage/LightingData.asset.meta | 8 + .../sr_silverstorage/ReflectionProbe-0.exr | 3 + .../ReflectionProbe-0.exr.meta | 140 ++++ .../sr_star_fraenkel_zermelo.unity | 667 ++++-------------- Assets/Src/Laps.cs | 104 +++ Assets/Src/Laps.cs.meta | 11 + Assets/Src/Timing.cs | 95 +-- Assets/Src/UI/Controls.uxml | 10 + ...TimeEntry.uxml.meta => Controls.uxml.meta} | 2 +- Assets/Src/UI/ControlsUI.cs | 33 + Assets/Src/UI/ControlsUI.cs.meta | 11 + Assets/Src/UI/Crosshair.uxml | 6 + Assets/Src/UI/Crosshair.uxml.meta | 10 + Assets/Src/UI/LapTimeEntry.uxml | 5 - Assets/{UI Toolkit => Src/UI}/Menu.uxml | 0 Assets/{UI Toolkit => Src/UI}/Menu.uxml.meta | 0 Assets/Src/UI/MenuControls.cs | 10 +- Assets/Src/UI/{MenuUi.cs => MenuUI.cs} | 2 +- .../Src/UI/{MenuUi.cs.meta => MenuUI.cs.meta} | 0 .../ShipInterface.uxml => Src/UI/Timing.uxml} | 10 +- .../UI/Timing.uxml.meta} | 0 Assets/Src/UI/{ShipUi.cs => TimingUI.cs} | 22 +- .../UI/{ShipUi.cs.meta => TimingUI.cs.meta} | 0 Assets/Src/UI/{ShipUi.uss => TimingUi.uss} | 1 - .../UI/{ShipUi.uss.meta => TimingUi.uss.meta} | 0 ProjectSettings/EditorBuildSettings.asset | 6 +- ProjectSettings/ProjectSettings.asset | 2 +- TODO.md | 17 +- 35 files changed, 1331 insertions(+), 1688 deletions(-) create mode 100644 Assets/Prefabs/Ship.meta create mode 100644 Assets/Prefabs/Ship/Ship.prefab create mode 100644 Assets/Prefabs/Ship/Ship.prefab.meta create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage.meta create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr create mode 100644 Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta create mode 100644 Assets/Src/Laps.cs create mode 100644 Assets/Src/Laps.cs.meta create mode 100644 Assets/Src/UI/Controls.uxml rename Assets/Src/UI/{LapTimeEntry.uxml.meta => Controls.uxml.meta} (86%) create mode 100644 Assets/Src/UI/ControlsUI.cs create mode 100644 Assets/Src/UI/ControlsUI.cs.meta create mode 100644 Assets/Src/UI/Crosshair.uxml create mode 100644 Assets/Src/UI/Crosshair.uxml.meta delete mode 100644 Assets/Src/UI/LapTimeEntry.uxml rename Assets/{UI Toolkit => Src/UI}/Menu.uxml (100%) rename Assets/{UI Toolkit => Src/UI}/Menu.uxml.meta (100%) rename Assets/Src/UI/{MenuUi.cs => MenuUI.cs} (96%) rename Assets/Src/UI/{MenuUi.cs.meta => MenuUI.cs.meta} (100%) rename Assets/{UI Toolkit/ShipInterface.uxml => Src/UI/Timing.uxml} (74%) rename Assets/{UI Toolkit/ShipInterface.uxml.meta => Src/UI/Timing.uxml.meta} (100%) rename Assets/Src/UI/{ShipUi.cs => TimingUI.cs} (72%) rename Assets/Src/UI/{ShipUi.cs.meta => TimingUI.cs.meta} (100%) rename Assets/Src/UI/{ShipUi.uss => TimingUi.uss} (96%) rename Assets/Src/UI/{ShipUi.uss.meta => TimingUi.uss.meta} (100%) diff --git a/Assets/Prefabs/Ship.meta b/Assets/Prefabs/Ship.meta new file mode 100644 index 0000000..2e129d3 --- /dev/null +++ b/Assets/Prefabs/Ship.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 351ce07bdd9c9ee48a891989df925610 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Ship/Ship.prefab b/Assets/Prefabs/Ship/Ship.prefab new file mode 100644 index 0000000..88df6ca --- /dev/null +++ b/Assets/Prefabs/Ship/Ship.prefab @@ -0,0 +1,631 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &152039392252133056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7286862636762428999} + - component: {fileID: 8714633563501844203} + - component: {fileID: 8741575037915115956} + - component: {fileID: 5996894432694701127} + - component: {fileID: 2159510532656851192} + m_Layer: 10 + m_Name: 3pCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7286862636762428999 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152039392252133056} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3589635702276405719} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &8714633563501844203 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152039392252133056} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 1024 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 69afef3b14b4f4450900a9413836edae, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &8741575037915115956 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152039392252133056} + m_Enabled: 1 +--- !u!114 &5996894432694701127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152039392252133056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!1183024399 &2159510532656851192 +LookAtConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152039392252133056} + m_Enabled: 1 + serializedVersion: 2 + m_Weight: 1 + m_RotationAtRest: {x: 0, y: 0, z: 0} + m_RotationOffset: {x: 0, y: 0, z: 0} + m_Roll: 0 + m_WorldUpObject: {fileID: 0} + m_UseUpObject: 1 + m_Active: 1 + m_IsLocked: 0 + m_Sources: + - sourceTransform: {fileID: 7286862636762428999} + weight: 1 +--- !u!1 &2973494201441328189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2024927552184032925} + - component: {fileID: 7583115105922956764} + - component: {fileID: 3792430562793951787} + m_Layer: 10 + m_Name: ControlsDoc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2024927552184032925 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2973494201441328189} + 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: 3589635702276405719} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7583115105922956764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2973494201441328189} + 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: d5de5c7af6c565fbc9f4a345b0fddfd0, type: 3} + m_SortingOrder: 0 +--- !u!114 &3792430562793951787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2973494201441328189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3} + m_Name: + m_EditorClassIdentifier: + ship: {fileID: 1093091269199902593} +--- !u!1 &5535911989893287240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3869627124329100603} + - component: {fileID: 8483217137784193517} + m_Layer: 10 + m_Name: CrosshairDoc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3869627124329100603 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5535911989893287240} + 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: 3589635702276405719} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8483217137784193517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5535911989893287240} + 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: 49cd8988c7a839e05b3f1bf56cd61792, type: 3} + m_SortingOrder: 0 +--- !u!1 &7388956961000793968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1526924705325842294} + - component: {fileID: 4388149188352537970} + - component: {fileID: 7510218262252450460} + - component: {fileID: 5823699807631455469} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1526924705325842294 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7388956961000793968} + 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: 3589635702276405719} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &4388149188352537970 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7388956961000793968} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 2000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &7510218262252450460 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7388956961000793968} + m_Enabled: 1 +--- !u!114 &5823699807631455469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7388956961000793968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 1 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!1 &8925193253056788144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3589635702276405719} + - component: {fileID: 3273845117821321837} + - component: {fileID: 1078575758916187615} + - component: {fileID: 2548211892761974259} + - component: {fileID: 1815657972860532234} + - component: {fileID: 1093091269199902593} + - component: {fileID: 5993260185458565267} + - component: {fileID: 5504977206886047616} + m_Layer: 10 + m_Name: Ship + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3589635702276405719 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 5} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7286862636762428999} + - {fileID: 1526924705325842294} + - {fileID: 3869627124329100603} + - {fileID: 2024927552184032925} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3273845117821321837 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1078575758916187615 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5c6ae25f73498fb4db2e36a46d2c620f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &2548211892761974259 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &1815657972860532234 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.5 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1093091269199902593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40716ff800be8d74ead775a18a496d89, type: 3} + m_Name: + m_EditorClassIdentifier: + aim: {fileID: 4388149188352537970} + timing: {fileID: 0} +--- !u!114 &5993260185458565267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 8f7b6d79e6b54ecee85d2214b5375aa5, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 3d5d2223-bd99-4486-a95d-cefe220e0257 + m_ActionName: movement/accelerate[/Mouse/leftButton,/XInputControllerWindows/rightTrigger] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: a27ee77d-59bd-4935-9a7b-961c2da0faf7 + m_ActionName: movement/decelerate[/Mouse/rightButton,/XInputControllerWindows/leftTrigger] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: d8d4baa2-2812-45af-99f6-eab49bef6b61 + m_ActionName: movement/strafe[/XInputControllerWindows/leftStick,/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: f705d9c6-7be0-40e0-95ba-990e6892d4dc + m_ActionName: movement/look[/Mouse/delta,/XInputControllerWindows/rightStick] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 2ced6ae8-aba2-4cd7-882e-6e6473308812 + m_ActionName: movement/respawn[/Keyboard/space,/XInputControllerWindows/buttonEast,/XInputControllerWindows/buttonSouth,/XInputControllerWindows/buttonWest,/XInputControllerWindows/buttonNorth] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: cea65125-c42e-40e9-bc97-966522e16691 + m_ActionName: movement/quit[/Keyboard/f10] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: cee6d41d-d488-4548-b2d6-11e16bb6b116 + m_ActionName: menu/New action[/Gamepad/start,/Keyboard/escape] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: ship + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &5504977206886047616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925193253056788144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cee35157fdc2b133bf69416f2db2ac3, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Ship/Ship.prefab.meta b/Assets/Prefabs/Ship/Ship.prefab.meta new file mode 100644 index 0000000..b18dd68 --- /dev/null +++ b/Assets/Prefabs/Ship/Ship.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 217f9c8f922f2d41cac52c3699bde478 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_junglism/sr_junglism.unity b/Assets/Scenes/sr_junglism/sr_junglism.unity index 0c5cc0d..a153677 100644 --- a/Assets/Scenes/sr_junglism/sr_junglism.unity +++ b/Assets/Scenes/sr_junglism/sr_junglism.unity @@ -1021,7 +1021,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &52900271 GameObject: @@ -10047,10 +10047,10 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipControls value: - objectReference: {fileID: 1972710421} + objectReference: {fileID: 0} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_LocalPosition.x @@ -19201,143 +19201,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!1 &666695208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 666695209} - - component: {fileID: 666695212} - - component: {fileID: 666695211} - - component: {fileID: 666695210} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &666695209 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1972710420} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &666695210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 1 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!81 &666695211 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 ---- !u!20 &666695212 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1001 &671040747 PrefabInstance: m_ObjectHideFlags: 0 @@ -22615,7 +22478,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_LocalPosition.x @@ -22660,7 +22523,7 @@ PrefabInstance: - target: {fileID: 5975136821837370545, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: ship value: - objectReference: {fileID: 1972710421} + objectReference: {fileID: 2015948214} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} @@ -56879,7 +56742,7 @@ Transform: - {fileID: 1298261825} - {fileID: 688975771} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1913193847 stripped Transform: @@ -58086,228 +57949,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73ab56de058af21389c312279181f856, type: 3} ---- !u!1 &1972710416 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1972710420} - - component: {fileID: 1972710419} - - component: {fileID: 1972710418} - - component: {fileID: 1972710417} - - component: {fileID: 1972710422} - - component: {fileID: 1972710421} - - component: {fileID: 1972710424} - - component: {fileID: 1972710425} - m_Layer: 10 - m_Name: Ship - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1972710417 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1972710418 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c6ae25f73498fb4db2e36a46d2c620f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1972710419 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1972710420 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 681.7, y: 0, z: -744} - m_LocalScale: {x: 2, y: 2, z: 5} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2129212233} - - {fileID: 666695209} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1972710421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 40716ff800be8d74ead775a18a496d89, type: 3} - m_Name: - m_EditorClassIdentifier: - aim: {fileID: 666695212} - timing: {fileID: 1088368772} ---- !u!54 &1972710422 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.5 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &1972710424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 8f7b6d79e6b54ecee85d2214b5375aa5, type: 3} - m_NotificationBehavior: 2 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 3d5d2223-bd99-4486-a95d-cefe220e0257 - m_ActionName: movement/accelerate[/Mouse/leftButton,/XInputControllerWindows/rightTrigger] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: a27ee77d-59bd-4935-9a7b-961c2da0faf7 - m_ActionName: movement/decelerate[/Mouse/rightButton,/XInputControllerWindows/leftTrigger] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: d8d4baa2-2812-45af-99f6-eab49bef6b61 - m_ActionName: movement/strafe[/XInputControllerWindows/leftStick,/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: f705d9c6-7be0-40e0-95ba-990e6892d4dc - m_ActionName: movement/look[/Mouse/delta,/XInputControllerWindows/rightStick] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 2ced6ae8-aba2-4cd7-882e-6e6473308812 - m_ActionName: movement/respawn[/Keyboard/space,/XInputControllerWindows/buttonEast,/XInputControllerWindows/buttonSouth,/XInputControllerWindows/buttonWest,/XInputControllerWindows/buttonNorth] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cea65125-c42e-40e9-bc97-966522e16691 - m_ActionName: movement/quit[/Keyboard/f10] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cee6d41d-d488-4548-b2d6-11e16bb6b116 - m_ActionName: menu/ToggleMenu[/Gamepad/start,/Keyboard/escape] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: ship - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &1972710425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cee35157fdc2b133bf69416f2db2ac3, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1973114533 stripped Transform: m_CorrespondingSourceObject: {fileID: 7588376663361902483, guid: 73ab56de058af21389c312279181f856, type: 3} @@ -59159,6 +58800,78 @@ Transform: m_CorrespondingSourceObject: {fileID: 7588376663361902483, guid: 73ab56de058af21389c312279181f856, type: 3} m_PrefabInstance: {fileID: 2044044102} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2015948213 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.x + value: 681.7 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.z + value: -744 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8925193253056788144, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_Name + value: Ship + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} +--- !u!114 &2015948214 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1093091269199902593, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 2015948213} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40716ff800be8d74ead775a18a496d89, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2021201532 PrefabInstance: m_ObjectHideFlags: 0 @@ -59994,7 +59707,7 @@ Transform: m_Children: - {fileID: 955820483} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2055501893 GameObject: @@ -62094,164 +61807,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7588376663361902483, guid: 73ab56de058af21389c312279181f856, type: 3} m_PrefabInstance: {fileID: 800771948} m_PrefabAsset: {fileID: 0} ---- !u!1 &2129212232 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2129212233} - - component: {fileID: 2129212235} - - component: {fileID: 2129212234} - - component: {fileID: 2129212236} - - component: {fileID: 2129212237} - m_Layer: 10 - m_Name: 3pCamera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2129212233 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1972710420} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &2129212234 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 ---- !u!20 &2129212235 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 1024 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 69afef3b14b4f4450900a9413836edae, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &2129212236 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1183024399 &2129212237 -LookAtConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - serializedVersion: 2 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_Roll: 0 - m_WorldUpObject: {fileID: 0} - m_UseUpObject: 1 - m_Active: 1 - m_IsLocked: 0 - m_Sources: - - sourceTransform: {fileID: 2129212233} - weight: 1 --- !u!4 &2130096815 stripped Transform: m_CorrespondingSourceObject: {fileID: 7588376663361902483, guid: 73ab56de058af21389c312279181f856, type: 3} diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage.meta new file mode 100644 index 0000000..dc0e8b3 --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7f8075f2b9d632c68449d0557d7a13a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity index c70c6b8..9d108e6 100644 --- a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity @@ -20,7 +20,7 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientSkyColor: {r: 1, g: 1, b: 1, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: c62be38ca4fbb9cf4926457bbc55a6de, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 0c3facce63898ba54a8e749be3b66d26, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: bce38263096f35008841c37a1fed3767, type: 2} --- !u!196 &4 NavMeshSettings: @@ -291,143 +291,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 273700024047119412, guid: 87a51212e10250274a8feda6be865b7c, type: 3} m_PrefabInstance: {fileID: 1029791531313142756} m_PrefabAsset: {fileID: 0} ---- !u!1 &666695208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 666695209} - - component: {fileID: 666695212} - - component: {fileID: 666695211} - - component: {fileID: 666695210} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &666695209 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1972710420} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &666695210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 1 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!81 &666695211 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 ---- !u!20 &666695212 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 2000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -1021,386 +884,17 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1972710416 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1972710420} - - component: {fileID: 1972710419} - - component: {fileID: 1972710418} - - component: {fileID: 1972710417} - - component: {fileID: 1972710422} - - component: {fileID: 1972710421} - - component: {fileID: 1972710424} - - component: {fileID: 1972710425} - m_Layer: 10 - m_Name: Ship - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1972710417 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1972710418 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c6ae25f73498fb4db2e36a46d2c620f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1972710419 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1972710420 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_LocalRotation: {x: 0, y: 0.88294756, z: 0, w: 0.46947163} - m_LocalPosition: {x: -838.9999, y: 0, z: 945.99976} - m_LocalScale: {x: 2, y: 2, z: 5} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2129212233} - - {fileID: 666695209} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 124, z: 0} ---- !u!114 &1972710421 +--- !u!114 &1972710421 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1093091269199902593, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 5198188376350273124} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 40716ff800be8d74ead775a18a496d89, type: 3} m_Name: m_EditorClassIdentifier: - aim: {fileID: 666695212} - timing: {fileID: 1088368772} ---- !u!54 &1972710422 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.5 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &1972710424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 8f7b6d79e6b54ecee85d2214b5375aa5, type: 3} - m_NotificationBehavior: 2 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 3d5d2223-bd99-4486-a95d-cefe220e0257 - m_ActionName: movement/accelerate[/Mouse/leftButton,/XInputControllerWindows/rightTrigger] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: a27ee77d-59bd-4935-9a7b-961c2da0faf7 - m_ActionName: movement/decelerate[/Mouse/rightButton,/XInputControllerWindows/leftTrigger] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: d8d4baa2-2812-45af-99f6-eab49bef6b61 - m_ActionName: movement/strafe[/XInputControllerWindows/leftStick,/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: f705d9c6-7be0-40e0-95ba-990e6892d4dc - m_ActionName: movement/look[/Mouse/delta,/XInputControllerWindows/rightStick] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 2ced6ae8-aba2-4cd7-882e-6e6473308812 - m_ActionName: movement/respawn[/Keyboard/space,/XInputControllerWindows/buttonEast,/XInputControllerWindows/buttonSouth,/XInputControllerWindows/buttonWest,/XInputControllerWindows/buttonNorth] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cea65125-c42e-40e9-bc97-966522e16691 - m_ActionName: movement/quit[/Keyboard/f10] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cee6d41d-d488-4548-b2d6-11e16bb6b116 - m_ActionName: menu/New action[/Gamepad/start,/Keyboard/escape] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: ship - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &1972710425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cee35157fdc2b133bf69416f2db2ac3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &2129212232 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2129212233} - - component: {fileID: 2129212235} - - component: {fileID: 2129212234} - - component: {fileID: 2129212236} - - component: {fileID: 2129212237} - m_Layer: 10 - m_Name: 3pCamera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2129212233 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1972710420} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &2129212234 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 ---- !u!20 &2129212235 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 1024 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 69afef3b14b4f4450900a9413836edae, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &2129212236 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1183024399 &2129212237 -LookAtConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - serializedVersion: 2 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_Roll: 0 - m_WorldUpObject: {fileID: 0} - m_UseUpObject: 1 - m_Active: 1 - m_IsLocked: 0 - m_Sources: - - sourceTransform: {fileID: 2129212233} - weight: 1 --- !u!1001 &656092325660581143 PrefabInstance: m_ObjectHideFlags: 0 @@ -1417,6 +911,10 @@ PrefabInstance: propertyPath: shipUi value: objectReference: {fileID: 1705992922} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: timingUi + value: + objectReference: {fileID: 1705992922} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: @@ -1576,3 +1074,68 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87a51212e10250274a8feda6be865b7c, type: 3} +--- !u!1001 &5198188376350273124 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1093091269199902593, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: timing + value: + objectReference: {fileID: 1088368772} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.x + value: -838.9999 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.z + value: 945.99976 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.w + value: 0.46947163 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.y + value: 0.88294756 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 124 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8925193253056788144, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_Name + value: Ship + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset new file mode 100644 index 0000000000000000000000000000000000000000..0af66e0c977324e3a44ab7f9b8a4dd180adea567 GIT binary patch literal 18192 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 K^3k+Wi~kQ`g%UOZ literal 0 HcmV?d00001 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta new file mode 100644 index 0000000..8212790 --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c3facce63898ba54a8e749be3b66d26 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr new file mode 100644 index 0000000..c652fbd --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:015b75cccacff5ccc3ebcc734079b5881689251ffee1ea8542e81a809975fae6 +size 104941 diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..182dbff --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage/ReflectionProbe-0.exr.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: c050062dbbdafe6a4943c8c35271d0c4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: 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 b3287a0..8391de1 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 @@ -170,8 +170,77 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &235775465 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1093091269199902593, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: timing + value: + objectReference: {fileID: 1088368772} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5535911989893287240, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8925193253056788144, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_Name + value: Ship + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} --- !u!1001 &339815783 PrefabInstance: m_ObjectHideFlags: 0 @@ -380,143 +449,17 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 64b045a17d258ce37b459b444db394d4, type: 3} m_PrefabInstance: {fileID: 425847537} m_PrefabAsset: {fileID: 0} ---- !u!1 &666695208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 666695209} - - component: {fileID: 666695212} - - component: {fileID: 666695211} - - component: {fileID: 666695210} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &666695209 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1972710420} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &666695210 +--- !u!114 &616008081 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1093091269199902593, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 235775465} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Script: {fileID: 11500000, guid: 40716ff800be8d74ead775a18a496d89, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 1 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!81 &666695211 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 ---- !u!20 &666695212 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666695208} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 2000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -745,7 +688,7 @@ PrefabInstance: - target: {fileID: 5975136821837370545, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: ship value: - objectReference: {fileID: 1972710421} + objectReference: {fileID: 616008081} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: 50250db5eab455f70a577dbe84484ee1, type: 3} @@ -804,7 +747,7 @@ Transform: - {fileID: 766862835} - {fileID: 425847538} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -165, z: 0} --- !u!114 &1088368772 stripped MonoBehaviour: @@ -817,6 +760,74 @@ 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 @@ -979,388 +990,8 @@ Transform: m_Children: - {fileID: 705507995} m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1972710416 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1972710420} - - component: {fileID: 1972710419} - - component: {fileID: 1972710418} - - component: {fileID: 1972710417} - - component: {fileID: 1972710422} - - component: {fileID: 1972710421} - - component: {fileID: 1972710424} - - component: {fileID: 1972710425} - m_Layer: 10 - m_Name: Ship - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1972710417 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1972710418 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c6ae25f73498fb4db2e36a46d2c620f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1972710419 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1972710420 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 5} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2129212233} - - {fileID: 666695209} - m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1972710421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 40716ff800be8d74ead775a18a496d89, type: 3} - m_Name: - m_EditorClassIdentifier: - aim: {fileID: 666695212} - timing: {fileID: 1088368772} ---- !u!54 &1972710422 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.5 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &1972710424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 8f7b6d79e6b54ecee85d2214b5375aa5, type: 3} - m_NotificationBehavior: 2 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 3d5d2223-bd99-4486-a95d-cefe220e0257 - m_ActionName: movement/accelerate[/Mouse/leftButton,/XInputControllerWindows/rightTrigger] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: a27ee77d-59bd-4935-9a7b-961c2da0faf7 - m_ActionName: movement/decelerate[/Mouse/rightButton,/XInputControllerWindows/leftTrigger] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: d8d4baa2-2812-45af-99f6-eab49bef6b61 - m_ActionName: movement/strafe[/XInputControllerWindows/leftStick,/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: f705d9c6-7be0-40e0-95ba-990e6892d4dc - m_ActionName: movement/look[/Mouse/delta,/XInputControllerWindows/rightStick] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 2ced6ae8-aba2-4cd7-882e-6e6473308812 - m_ActionName: movement/respawn[/Keyboard/space,/XInputControllerWindows/buttonEast,/XInputControllerWindows/buttonSouth,/XInputControllerWindows/buttonWest,/XInputControllerWindows/buttonNorth] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cea65125-c42e-40e9-bc97-966522e16691 - m_ActionName: movement/quit[/Keyboard/f10] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cee6d41d-d488-4548-b2d6-11e16bb6b116 - m_ActionName: menu/New action[/Gamepad/start,/Keyboard/escape] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: ship - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &1972710425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972710416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cee35157fdc2b133bf69416f2db2ac3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &2129212232 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2129212233} - - component: {fileID: 2129212235} - - component: {fileID: 2129212234} - - component: {fileID: 2129212236} - - component: {fileID: 2129212237} - m_Layer: 10 - m_Name: 3pCamera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2129212233 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1972710420} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &2129212234 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 ---- !u!20 &2129212235 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 1024 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 69afef3b14b4f4450900a9413836edae, type: 2} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &2129212236 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!1183024399 &2129212237 -LookAtConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2129212232} - m_Enabled: 1 - serializedVersion: 2 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_Roll: 0 - m_WorldUpObject: {fileID: 0} - m_UseUpObject: 1 - m_Active: 1 - m_IsLocked: 0 - m_Sources: - - sourceTransform: {fileID: 2129212233} - weight: 1 --- !u!1001 &656092325660581143 PrefabInstance: m_ObjectHideFlags: 0 @@ -1377,6 +1008,10 @@ PrefabInstance: propertyPath: shipUi value: objectReference: {fileID: 1705992922} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: timingUi + value: + objectReference: {fileID: 1705992922} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: @@ -1384,10 +1019,10 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipControls value: - objectReference: {fileID: 1972710421} + objectReference: {fileID: 616008081} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Src/Laps.cs b/Assets/Src/Laps.cs new file mode 100644 index 0000000..d81c524 --- /dev/null +++ b/Assets/Src/Laps.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using System.IO; + +using UnityEngine; + +public enum SectorColour { + Green, + Purple, + White, + Yellow, +} + +[Serializable] +public struct SectorTime { + public int Sector; + public double Seconds; + public override string ToString() => $"{Seconds:0.000}"; +} + +[Serializable] +public struct Lap { + public string Map; + public int Number; + public List Sectors; + + // 0:1:39 + public override string ToString() { + return $"{TimeSpan.FromSeconds(TotalTime()):m\\:ss\\.fff}"; + } + + public double TotalTime() { + return Sectors.Sum(s => s.Seconds); + } +} + + +[Serializable] +public class LapJSON { + public string Map; + public List Laps = new(); +} + +// We can't save a dictionary with the Unity JSONUtility +// so we use this to hold a list of maps +public class LapStorage { + public List Laps = new(); +} + +static class LapStorageService { + static Dictionary lapsByMap = new(); + static string lapStoragePath = Path.Combine(Application.persistentDataPath, "lapStorage.json"); + + static LapStorageService() { + LapStorage lapStorage = new LapStorage(); + + try { + string json = File.ReadAllText(lapStoragePath); + JsonUtility.FromJsonOverwrite(json, lapStorage); + } catch { + Debug.Log("No existing lapStorage.json"); + } + + lapsByMap = lapStorage.Laps.ToDictionary((lapJson) => lapJson.Map); + } + + public static LapJSON GetPlayerLaps(string mapName) { + LapJSON currentLaps; + bool found = lapsByMap.TryGetValue(mapName, out currentLaps); + if (!found) + return new LapJSON { Map = mapName, Laps = new List() }; + return currentLaps; + } + + static void Persist() { + LapStorage lapStorage = new LapStorage { Laps = lapsByMap.Values.ToList() }; + File.WriteAllText(lapStoragePath, JsonUtility.ToJson(lapStorage)); + } + + // laps.count + public static int NumberOfCompletions() { return 0; } + + // finds your PB in all completions + public static int Rank() { return 1; } + + public static void PersistLap(Lap lap) { + LapJSON lapJson; + bool found = lapsByMap.TryGetValue(lap.Map, out lapJson); + if (!found) + lapJson = new LapJSON { Map = lap.Map, Laps = new List() }; + + // Add lap and persist + lapJson.Laps.Add(lap); + lapsByMap[lap.Map] = lapJson; + Persist(); + } + + public static Lap PB(string mapName) { + return lapsByMap[mapName].Laps + .MinBy(l => l.TotalTime()); + } +} \ No newline at end of file diff --git a/Assets/Src/Laps.cs.meta b/Assets/Src/Laps.cs.meta new file mode 100644 index 0000000..7c3e9ba --- /dev/null +++ b/Assets/Src/Laps.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f401855ddbefe813696eb36e638217df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Src/Timing.cs b/Assets/Src/Timing.cs index 690d6aa..ac6ec25 100644 --- a/Assets/Src/Timing.cs +++ b/Assets/Src/Timing.cs @@ -8,97 +8,6 @@ using UnityEngine; using UnityEditor; using UnityEngine.SceneManagement; -public enum SectorColour { - Green, - Purple, - White, - Yellow, -} - -[Serializable] -public struct SectorTime { - public int Sector; - public double Seconds; - public override string ToString() => $"{Seconds:0.000}"; -} - -[Serializable] -public struct Lap { - public string Map; - public int Number; - public List Sectors; - - // 0:1:39 - public override string ToString() { - return $"{TimeSpan.FromSeconds(TotalTime()):m\\:ss\\.fff}"; - } - - public double TotalTime() { - return Sectors.Sum(s => s.Seconds); - } -} - - -[Serializable] -public class LapJSON { - public string Map; - public List Laps = new(); -} - -public class LapStorage { - public List Laps = new(); -} - -static class LapStorageService { - // static Dictionary lapsByMap = new Dictionary(); - static Dictionary lapsByMap = new(); - static string lapStoragePath = Path.Combine(Application.persistentDataPath, "lapStorage.json"); - - static LapStorageService() { - LapStorage lapStorage = new LapStorage(); - - try { - string json = File.ReadAllText(lapStoragePath); - JsonUtility.FromJsonOverwrite(json, lapStorage); - } catch { - Debug.Log("No existing lapStorage.json"); - } - - lapsByMap = lapStorage.Laps.ToDictionary((lapJson) => lapJson.Map); - } - - public static LapJSON GetPlayerLaps(string mapName) { - LapJSON currentLaps; - bool found = lapsByMap.TryGetValue(mapName, out currentLaps); - if (!found) - return new LapJSON { Map = mapName, Laps = new List() }; - return currentLaps; - } - - static void Persist() { - LapStorage lapStorage = new LapStorage { Laps = lapsByMap.Values.ToList() }; - File.WriteAllText(lapStoragePath, JsonUtility.ToJson(lapStorage)); - } - - // laps.count - public static int NumberOfCompletions() { return 0; } - - // finds your PB in all completions - public static int Rank() { return 1; } - - public static void PersistLap(Lap lap) { - LapJSON lapJson; - bool found = lapsByMap.TryGetValue(lap.Map, out lapJson); - if (!found) - lapJson = new LapJSON { Map = lap.Map, Laps = new List() }; - - // Add lap and persist - lapJson.Laps.Add(lap); - lapsByMap[lap.Map] = lapJson; - Persist(); - } -} - public class Timing: MonoBehaviour { [SerializeField] public List lapTimes; @@ -220,5 +129,9 @@ public class Timing: MonoBehaviour { false => SectorColour.Yellow, }; } + + public Lap PB() { + return LapStorageService.PB(mapName); + } } diff --git a/Assets/Src/UI/Controls.uxml b/Assets/Src/UI/Controls.uxml new file mode 100644 index 0000000..dbfc11a --- /dev/null +++ b/Assets/Src/UI/Controls.uxml @@ -0,0 +1,10 @@ + +