From 62d422195891d3467a779730cb8e8f6440dc8919 Mon Sep 17 00:00:00 2001 From: Reinier Vens Date: Sat, 10 Apr 2021 01:47:16 +0100 Subject: [PATCH] Hypothermia & UI Fixes Implemented hypothermia death, with associated postprocessing and HUD UI Fixed heatstroke and hypothermia not triggering death events Fixed target inventory dropdown not working in trade menu Added ability to rename ship Added player death on cockpit destruction Fixed confirmation dialog not using onconfirm callback Fixed faulty double click in inventory panel Fading out heat texture when ship has uniform temperature Fixed inventory panel displaying incorrect default when no cargo bay equipped Fixed incorrect state for console and weapon effect managers when restarting from in-game menu Fixed save/reload when ship is docked at a station --- Aetheria.Shared.Unity.csproj | 6 +- Assets/Materials/UI/Map Gravity Lines.mat | 2 +- Assets/Prefabs/UI/Inventory.prefab | 227 +++++++++- Assets/Resources/Sprites/Attribution.txt | 1 + Assets/Resources/Sprites/Icons/edit.png | 3 + Assets/Resources/Sprites/Icons/edit.png.meta | 108 +++++ Assets/Scenes/ARPG.unity | 404 +++++++++++++++--- .../Postprocessing Profile Hypothermia.asset | 3 + ...tprocessing Profile Hypothermia.asset.meta | 8 + ...rocessing Profile Severe Hypothermia.asset | 3 + ...sing Profile Severe Hypothermia.asset.meta | 8 + Assets/Scenes/Main Menu.unity | 12 +- Assets/Scripts/Gameplay/ActionGameManager.cs | 28 +- Assets/Scripts/Gameplay/EntityInstance.cs | 6 + Assets/Scripts/ServerShared/Entity.cs | 31 +- Assets/Scripts/ServerShared/Enums.cs | 8 + Assets/Scripts/ServerShared/Settings.cs | 5 + Assets/Scripts/ServerShared/Ship.cs | 2 +- Assets/Scripts/UI/ConfirmationDialog.cs | 2 +- Assets/Scripts/UI/ConsoleController.cs | 5 + Assets/Scripts/UI/InventoryMenu.cs | 11 +- Assets/Scripts/UI/InventoryPanel.cs | 76 +++- Assets/Scripts/UI/SchematicDisplay.cs | 4 +- Assets/Scripts/UI/TradeMenu.cs | 36 +- GameData/PlayerSettings.msgpack | 4 +- UserSettings/EditorUserSettings.asset | 2 +- 26 files changed, 867 insertions(+), 138 deletions(-) create mode 100644 Assets/Resources/Sprites/Icons/edit.png create mode 100644 Assets/Resources/Sprites/Icons/edit.png.meta create mode 100644 Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset create mode 100644 Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset.meta create mode 100644 Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset create mode 100644 Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset.meta diff --git a/Aetheria.Shared.Unity.csproj b/Aetheria.Shared.Unity.csproj index d36b74678..bc862db88 100644 --- a/Aetheria.Shared.Unity.csproj +++ b/Aetheria.Shared.Unity.csproj @@ -99,6 +99,7 @@ + @@ -195,6 +196,7 @@ + @@ -205,6 +207,7 @@ + @@ -250,9 +253,6 @@ - - - diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat index 04b35e926..749d876be 100644 --- a/Assets/Materials/UI/Map Gravity Lines.mat +++ b/Assets/Materials/UI/Map Gravity Lines.mat @@ -86,7 +86,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Scale: 2.2132032 + - _Scale: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Prefabs/UI/Inventory.prefab b/Assets/Prefabs/UI/Inventory.prefab index 0b67dd419..0addea4f8 100644 --- a/Assets/Prefabs/UI/Inventory.prefab +++ b/Assets/Prefabs/UI/Inventory.prefab @@ -302,7 +302,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6584545650613466935} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -883,7 +883,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6584545650613466935} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1492,6 +1492,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78aa0b8ec7594a7438f13757228e3500, type: 3} m_Name: m_EditorClassIdentifier: + Dialog: {fileID: 0} Flip: 0 Settings: {fileID: 0} GameManager: {fileID: 0} @@ -1501,6 +1502,7 @@ MonoBehaviour: MaxTempLabel: {fileID: 5621828991514048865} TemperatureRange: {fileID: 2392984749858388076} Dropdown: {fileID: 8289855250608258092} + EditName: {fileID: 6472679976588045056} Current: {fileID: 3016612072679339612} Thermal: {fileID: 5512238094018694157} Grid: {fileID: 2279630453710142156} @@ -2303,12 +2305,13 @@ MonoBehaviour: Exponent: 0.25 Minimum: 0 Maximum: 1 - MaxTemperature: 1000 FitToContent: 0 CellHitPulseTime: 0 ToggleEnabledColor: {r: 1, g: 0.44583336, b: 0.050000012, a: 1} ToggleDisabledColor: {r: 0.638, g: 0.638, b: 0.638, a: 1} CellBackgroundColor: {r: 0, g: 0, b: 0, a: 0.9019608} + MinTempRange: 1 + DoubleClickTime: 0.5 EmptyCells: [] --- !u!222 &6932930312706461541 CanvasRenderer: @@ -2704,6 +2707,7 @@ RectTransform: m_Children: - {fileID: 4397116930423727094} - {fileID: 2279630453679143107} + - {fileID: 3031152863755518086} - {fileID: 2279630453117559409} - {fileID: 5683613523479270443} - {fileID: 6462754505713931446} @@ -2928,7 +2932,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 209.12, y: -20} + m_AnchoredPosition: {x: 194.12, y: -20} m_SizeDelta: {x: 16, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6903091099768520881 @@ -3047,6 +3051,162 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &5597744373671005301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8871154407653395989} + - component: {fileID: 1999427605226240630} + - component: {fileID: 6720261458386253163} + - component: {fileID: 46465656507224876} + - component: {fileID: 8253125032381557098} + - component: {fileID: 6472679976588045056} + m_Layer: 5 + m_Name: Edit Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8871154407653395989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597744373671005301} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3031152863755518086} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -4} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1999427605226240630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597744373671005301} + m_CullTransparentMesh: 0 +--- !u!114 &6720261458386253163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597744373671005301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 03575af0c95ad804ab3babf732d6c9df, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &46465656507224876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597744373671005301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 1 + m_AspectRatio: 1 +--- !u!114 &8253125032381557098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597744373671005301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 22 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &6472679976588045056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5597744373671005301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6720261458386253163} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7041853550605465833 GameObject: m_ObjectHideFlags: 0 @@ -3140,6 +3300,63 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &7780098766961163673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3031152863755518086} + - component: {fileID: 884902314474629503} + m_Layer: 5 + m_Name: Edit Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3031152863755518086 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7780098766961163673} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8871154407653395989} + m_Father: {fileID: 6584545650613466935} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &884902314474629503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7780098766961163673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 22 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &7805065824974865075 GameObject: m_ObjectHideFlags: 0 @@ -3247,7 +3464,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6584545650613466935} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/Assets/Resources/Sprites/Attribution.txt b/Assets/Resources/Sprites/Attribution.txt index 08ec4c11f..d410495a9 100644 --- a/Assets/Resources/Sprites/Attribution.txt +++ b/Assets/Resources/Sprites/Attribution.txt @@ -73,6 +73,7 @@ loading by dewadesign capacitor by Giovanny Mine by Creaticca Creative Agency pattern by Andrejs Kirma +edit by The Icon Z Other diff --git a/Assets/Resources/Sprites/Icons/edit.png b/Assets/Resources/Sprites/Icons/edit.png new file mode 100644 index 000000000..3c6570e93 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/edit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9878ce15a21331addd872d9a7e2d4bc8a360a82f659d0464940df8398491e46 +size 12346 diff --git a/Assets/Resources/Sprites/Icons/edit.png.meta b/Assets/Resources/Sprites/Icons/edit.png.meta new file mode 100644 index 000000000..8e5c28e61 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/edit.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 03575af0c95ad804ab3babf732d6c9df +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 740bd9b10..94136e1bb 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -701,6 +701,81 @@ RectTransform: m_AnchoredPosition: {x: 128, y: 0} m_SizeDelta: {x: -256, y: -4} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &79341831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 79341832} + - component: {fileID: 79341834} + - component: {fileID: 79341833} + m_Layer: 5 + m_Name: Hypothermia Meter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &79341832 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79341831} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 565920246} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.28, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &79341833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79341831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0.5, b: 1, a: 0.2509804} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &79341834 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79341831} + m_CullTransparentMesh: 0 --- !u!1 &101395089 GameObject: m_ObjectHideFlags: 0 @@ -2731,7 +2806,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 565920246} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3449,7 +3524,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 565920246} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -4014,7 +4089,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 906767442} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &259895015 MonoBehaviour: @@ -5394,6 +5469,7 @@ MonoBehaviour: EnergyFill: {fileID: 0} HullDurabilityFill: {fileID: 1904825248} HeatstrokeMeterFill: {fileID: 0} + HypothermiaMeterFill: {fileID: 0} HeatstrokeLimitFill: {fileID: 0} TriggerGroups: {fileID: 1399423353} TriggerGroupsFadeDuration: 0.5 @@ -5472,6 +5548,7 @@ MonoBehaviour: MaxTempLabel: {fileID: 0} TemperatureRange: {fileID: 0} Dropdown: {fileID: 0} + EditName: {fileID: 0} Current: {fileID: 0} Thermal: {fileID: 0} Grid: {fileID: 1359207440} @@ -6264,6 +6341,7 @@ MonoBehaviour: ToggleDisabledColor: {r: 0, g: 0, b: 0, a: 0} CellBackgroundColor: {r: 0, g: 0, b: 0, a: 0.9490196} MinTempRange: 0 + DoubleClickTime: 0.5 EmptyCells: [] --- !u!1 &411347518 GameObject: @@ -8572,6 +8650,7 @@ RectTransform: m_Children: - {fileID: 933815653} - {fileID: 1029396711} + - {fileID: 79341832} - {fileID: 238787911} - {fileID: 212527383} m_Father: {fileID: 2041542910} @@ -9526,7 +9605,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &630131159 RectTransform: m_ObjectHideFlags: 0 @@ -9592,12 +9671,12 @@ PrefabInstance: - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -9607,82 +9686,82 @@ PrefabInstance: - target: {fileID: 2279630452912159027, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452912159027, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: -10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: -10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453233804081, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453233804081, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: -10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: 107.76 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: 24 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.x - value: 225.12 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.y - value: -8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453710142155, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: -396 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453710142155, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: -545 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453886260052, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -9794,6 +9873,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: Dialog + value: + objectReference: {fileID: 620555924} - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: Settings @@ -9828,42 +9912,72 @@ PrefabInstance: - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: 32 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: 32 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.x - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.y - value: -24 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454002795611, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454002795611, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: -10 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4075091371340814903, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -9888,12 +10002,12 @@ PrefabInstance: - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.x - value: 209.12 + value: 194.12 objectReference: {fileID: 0} - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -9905,6 +10019,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0.07519531 objectReference: {fileID: 0} + - target: {fileID: 8871154407653395989, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aac073da6df367d499834c926930dd84, type: 3} --- !u!224 &642590527 stripped @@ -10665,6 +10784,54 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &694183019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 694183020} + - component: {fileID: 694183021} + m_Layer: 8 + m_Name: Severe Hypothermia Postprocessing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &694183020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694183019} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 906767442} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &694183021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694183019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 357ad7145154ecc418b5aed495564e30, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 0 + priority: 4 --- !u!1 &697075015 GameObject: m_ObjectHideFlags: 0 @@ -12231,7 +12398,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 906767442} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &803284856 MonoBehaviour: @@ -13361,6 +13528,8 @@ Transform: - {fileID: 937280108} - {fileID: 1404901905} - {fileID: 837424434} + - {fileID: 1800086609} + - {fileID: 694183020} - {fileID: 803284855} - {fileID: 259895014} m_Father: {fileID: 0} @@ -13894,7 +14063,7 @@ GameObject: - component: {fileID: 933815655} - component: {fileID: 933815654} m_Layer: 5 - m_Name: Heatstroke Limit + m_Name: Death Meter m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13932,7 +14101,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.5, b: 0.5, a: 0.050980393} + m_Color: {r: 1, g: 1, b: 1, a: 0.050980393} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -15217,7 +15386,9 @@ MonoBehaviour: DeathPPTransitionTime: 1 DeathPP: {fileID: 803284856} HeatstrokePP: {fileID: 1404901906} + HypothermiaPP: {fileID: 1800086610} SevereHeatstrokePP: {fileID: 837424435} + SevereHypothermiaPP: {fileID: 694183021} EffectManagerParent: {fileID: 134113271} TradeMenu: {fileID: 522642869} HostileTargetIndicator: {fileID: 1787772783} @@ -25535,6 +25706,54 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790787329} m_CullTransparentMesh: 0 +--- !u!1 &1800086608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1800086609} + - component: {fileID: 1800086610} + m_Layer: 8 + m_Name: Hypothermia Postprocessing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1800086609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800086608} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 906767442} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1800086610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800086608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 7d27a972b31e1b643b20386699173fef, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 0 + priority: 3 --- !u!1 &1803753852 GameObject: m_ObjectHideFlags: 0 @@ -27275,7 +27494,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1997243493 RectTransform: m_ObjectHideFlags: 0 @@ -28710,7 +28929,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_BackGroundColor: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -29466,17 +29685,17 @@ PrefabInstance: - target: {fileID: 257019179550429270, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 257019179550429270, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 257019179596293679, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} propertyPath: m_SizeDelta.y - value: -583 + value: 0 objectReference: {fileID: 0} - target: {fileID: 257019179596293679, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} @@ -29486,17 +29705,17 @@ PrefabInstance: - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} propertyPath: m_SizeDelta.x - value: -7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7131821417165215475, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} @@ -29756,12 +29975,12 @@ PrefabInstance: - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -29771,82 +29990,82 @@ PrefabInstance: - target: {fileID: 2279630452912159027, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452912159027, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: -10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: -10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453233804081, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453233804081, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: -10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: 107.76 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: 24 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.x - value: 225.12 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.y - value: -8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453710142155, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: -396 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453710142155, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: -545 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630453886260052, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -29958,6 +30177,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: Dialog + value: + objectReference: {fileID: 620555924} - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: Settings @@ -29977,42 +30201,72 @@ PrefabInstance: - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.x - value: 32 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: 32 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.x - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.y - value: -24 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454002795611, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2279630454002795611, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: -10 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4075091371340814903, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -30042,12 +30296,12 @@ PrefabInstance: - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_SizeDelta.y - value: 16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: m_AnchoredPosition.x - value: 209.12 + value: 194.12 objectReference: {fileID: 0} - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, type: 3} @@ -30059,6 +30313,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0.07519531 objectReference: {fileID: 0} + - target: {fileID: 8871154407653395989, guid: aac073da6df367d499834c926930dd84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aac073da6df367d499834c926930dd84, type: 3} --- !u!1 &2352149239930504691 @@ -34341,6 +34600,7 @@ MonoBehaviour: MaxTempLabel: {fileID: 1012981709} TemperatureRange: {fileID: 416399494} Dropdown: {fileID: 0} + EditName: {fileID: 0} Current: {fileID: 0} Thermal: {fileID: 0} Grid: {fileID: 7628189704016736660} @@ -35133,6 +35393,7 @@ MonoBehaviour: ToggleDisabledColor: {r: 0, g: 0, b: 0, a: 0} CellBackgroundColor: {r: 0, g: 0, b: 0, a: 0.9490196} MinTempRange: 0 + DoubleClickTime: 0.5 EmptyCells: [] --- !u!114 &7628189704109037583 MonoBehaviour: @@ -35180,6 +35441,7 @@ MonoBehaviour: EnergyFill: {fileID: 271575215} HullDurabilityFill: {fileID: 753112995} HeatstrokeMeterFill: {fileID: 1029396711} + HypothermiaMeterFill: {fileID: 79341832} HeatstrokeLimitFill: {fileID: 933815653} TriggerGroups: {fileID: 1399423353} TriggerGroupsFadeDuration: 0.5 diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset new file mode 100644 index 000000000..a5db91eee --- /dev/null +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19b638459e92f1a57122e1588bbf28f3c8ecf40afdc31ecc487dd90ae06846e3 +size 25722 diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset.meta b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset.meta new file mode 100644 index 000000000..57adfed4b --- /dev/null +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Hypothermia.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d27a972b31e1b643b20386699173fef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset new file mode 100644 index 000000000..7c0dc04b9 --- /dev/null +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcb6c46abafc875eb18a146c68a27dc34a187c0ec4342d1ea230ebdd099d1b8b +size 26377 diff --git a/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset.meta b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset.meta new file mode 100644 index 000000000..bba0ae9c4 --- /dev/null +++ b/Assets/Scenes/ARPG_Profiles/Postprocessing Profile Severe Hypothermia.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 357ad7145154ecc418b5aed495564e30 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 98ecd2057..17e2927a7 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -802,8 +802,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 741153267} - m_LocalRotation: {x: 0.015506928, y: 0.9502416, z: -0.30741316, w: 0.047933303} - m_LocalPosition: {x: -117.52003, y: -77.08742, z: 149.09026} + m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.047933225} + m_LocalPosition: {x: -117.51999, y: -77.08743, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 412917866} @@ -1220,8 +1220,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965376321} - m_LocalRotation: {x: 0.015506928, y: 0.9502416, z: -0.30741316, w: 0.047933303} - m_LocalPosition: {x: -117.52003, y: -77.08742, z: 149.09026} + m_LocalRotation: {x: 0.015506903, y: 0.9502416, z: -0.30741313, w: 0.047933225} + m_LocalPosition: {x: -117.51999, y: -77.08743, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -2307,7 +2307,7 @@ PrefabInstance: - target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} propertyPath: m_AnchoredPosition.x - value: 60.98 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664209305474245377, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} @@ -2332,7 +2332,7 @@ PrefabInstance: - target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} propertyPath: m_AnchoredPosition.x - value: 55.675 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3664209306888449100, guid: 3d8d9cbf10b12214e98891c1f03c1e99, type: 3} diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 976104e87..3617e97b9 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -72,7 +72,9 @@ public class ActionGameManager : MonoBehaviour public float DeathPPTransitionTime; public PostProcessVolume DeathPP; public PostProcessVolume HeatstrokePP; + public PostProcessVolume HypothermiaPP; public PostProcessVolume SevereHeatstrokePP; + public PostProcessVolume SevereHypothermiaPP; [Header("Scene Links")] public Transform EffectManagerParent; @@ -173,6 +175,8 @@ public class ActionGameManager : MonoBehaviour private void OnDisable() { Input.Dispose(); + ConsoleController.ClearCommands(); + EntityInstance.ClearWeaponManagers(); } void Start() @@ -676,7 +680,10 @@ public class ActionGameManager : MonoBehaviour PopulateLevel(CurrentSector.Zones[PlayerSettings.CurrentRun.CurrentZone]); var targetEntity = Zone.Entities[PlayerSettings.CurrentRun.CurrentZoneEntity]; if (targetEntity is OrbitalEntity orbitalEntity) + { + CurrentEntity = targetEntity.Children.First(c => c is Ship {IsPlayerShip: true}); DoDock(orbitalEntity, orbitalEntity.DockingBays.First()); + } else { //StartCoroutine(IntroCutscene(targetEntity as Ship)); @@ -730,7 +737,6 @@ public class ActionGameManager : MonoBehaviour { UnbindEntity(); DoDock(entity, bay); - TradeMenu.Inventory = entity.CargoBays.First(); AkSoundEngine.PostEvent("Dock", gameObject); return; } @@ -742,6 +748,7 @@ public class ActionGameManager : MonoBehaviour private void DoDock(Entity entity, EquippedDockingBay dockingBay) { + TradeMenu.Inventory = entity.CargoBays.First(); DockedEntity = entity; ZoneRenderer.PerspectiveEntity = DockedEntity; DockingBay = dockingBay; @@ -882,18 +889,20 @@ public class ActionGameManager : MonoBehaviour var indicator = HostileTargetIndicator.Instantiate(); _visibleHostileIndicators.Add(hostile, indicator); } + _shipSubscriptions.Add(CurrentEntity.VisibleHostiles.ObserveAdd().Subscribe(addEvent => { var indicator = HostileTargetIndicator.Instantiate(); _visibleHostileIndicators.Add(addEvent.Value, indicator); })); + _shipSubscriptions.Add(CurrentEntity.VisibleHostiles.ObserveRemove().Subscribe(removeEvent => { _visibleHostileIndicators[removeEvent.Value].GetComponent().ReturnToPool(); _visibleHostileIndicators.Remove(removeEvent.Value); })); - _shipSubscriptions.Add(CurrentEntity.Death.Subscribe(_ => + _shipSubscriptions.Add(CurrentEntity.Death.Subscribe(cause => { var deathTime = Time.time; UnbindEntity(); @@ -903,20 +912,29 @@ public class ActionGameManager : MonoBehaviour Menu.gameObject.SetActive(false); PlayerSettings.CurrentRun = null; SavePlayerSettings(); - SaveState(); Observable.EveryUpdate() .Where(_ => Time.time - deathTime < DeathPPTransitionTime) .Subscribe(_ => { var t = (Time.time - deathTime) / DeathPPTransitionTime; - HeatstrokePP.weight = 1 - t; - SevereHeatstrokePP.weight = 1 - t; + if(cause==CauseOfDeath.Heatstroke) + { + HeatstrokePP.weight = 1 - t; + SevereHeatstrokePP.weight = 1 - t; + } + else if (cause == CauseOfDeath.Hypothermia) + { + HypothermiaPP.weight = 1 - t; + SevereHypothermiaPP.weight = 1 - t; + } DeathPP.weight = t; }, () => { HeatstrokePP.weight = 0; SevereHeatstrokePP.weight = 0; + HypothermiaPP.weight = 0; + SevereHypothermiaPP.weight = 0; DeathPP.weight = 1; }); })); diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index ce1a4be2c..9fd6158b4 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -48,6 +48,12 @@ public class EntityInstance : MonoBehaviour private static Dictionary _instantWeaponManagers = new Dictionary(); private static Dictionary _constantWeaponManagers = new Dictionary(); + public static void ClearWeaponManagers() + { + _instantWeaponManagers.Clear(); + _constantWeaponManagers.Clear(); + } + public Dictionary Barrels { get; private set; } public Dictionary BarrelIndices { get; private set; } public Dictionary RadiatorMeshes { get; private set; } diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index df6fe6cca..e034b1bca 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -98,6 +98,7 @@ public abstract class Entity public Cockpit Cockpit { get; private set; } public Sensor Sensor { get; private set; } public float Heatstroke { get; private set; } + public float Hypothermia { get; private set; } public float TargetRange { get; private set; } public float MaxTemp { get; private set; } @@ -115,12 +116,14 @@ public abstract class Entity public Subject Docked = new Subject(); public Subject HeatstrokeRisk = new Subject(); public Subject HeatstrokeDeath = new Subject(); + public Subject HypothermiaRisk = new Subject(); + public Subject HypothermiaDeath = new Subject(); public UniRx.IObservable ItemDestroyed; public UniRx.IObservable HullArmorDepleted; public UniRx.IObservable HardpointArmorDepleted; public UniRx.IObservable WeaponDestroyed; - public UniRx.IObservable Death; + public UniRx.IObservable Death; private List _subscriptions = new List(); @@ -178,7 +181,10 @@ public abstract class Entity ItemDestroyed = ItemDamage.Where(x => x.item.EquippableItem.Durability < .01f).Select(x=>x.item); WeaponDestroyed = ItemDestroyed.Select(x => x.Behaviors.FirstOrDefault(b => b is Weapon) as Weapon).Where(x => x != null); HullArmorDepleted = ArmorDamage.Where(x => Armor[x.pos.x, x.pos.y] < .01f).Select(x => x.pos); - Death = HullDamage.Select(_ => Unit.Default).Where(_ => Hull.Durability < .01f).Merge(HeatstrokeDeath); + Death = HullDamage.Where(_ => Hull.Durability < .01f).Select(_ => CauseOfDeath.HullDestroyed) + .Merge(HeatstrokeDeath.Select(_ => CauseOfDeath.Heatstroke)) + .Merge(HypothermiaDeath.Select(_ => CauseOfDeath.Hypothermia)) + .Merge(ItemDestroyed.Where(i=>i.GetBehavior()!=null).Select(_ => CauseOfDeath.CockpitDestroyed)); EntityInfoGathered.ObserveReplace().Subscribe(replace => { @@ -779,7 +785,7 @@ public abstract class Entity ItemManager.GameplaySettings.HeatstrokeMultiplier * delta); if(previous < ItemManager.GameplaySettings.SevereHeatstrokeRiskThreshold && Heatstroke > ItemManager.GameplaySettings.SevereHeatstrokeRiskThreshold) HeatstrokeRisk.OnNext(Unit.Default); - if(Heatstroke > 1) + if(Heatstroke > .99) { HeatstrokeDeath.OnNext(Unit.Default); Deactivate(); @@ -789,6 +795,25 @@ public abstract class Entity { Heatstroke = saturate(Heatstroke - ItemManager.GameplaySettings.HeatstrokeRecoverySpeed * delta); } + if (Cockpit.Item.Temperature < ItemManager.GameplaySettings.HypothermiaTemperature) + { + var previous = Hypothermia; + Hypothermia = saturate( + Hypothermia + + pow(ItemManager.GameplaySettings.HypothermiaTemperature - Cockpit.Item.Temperature, ItemManager.GameplaySettings.HypothermiaExponent) * + ItemManager.GameplaySettings.HypothermiaMultiplier * delta); + if(previous < ItemManager.GameplaySettings.SevereHeatstrokeRiskThreshold && Heatstroke > ItemManager.GameplaySettings.SevereHeatstrokeRiskThreshold) + HypothermiaRisk.OnNext(Unit.Default); + if(Hypothermia > .99) + { + HypothermiaDeath.OnNext(Unit.Default); + Deactivate(); + } + } + else + { + Hypothermia = saturate(Hypothermia - ItemManager.GameplaySettings.HypothermiaRecoverySpeed * delta); + } } foreach (var equippedItem in _orderedEquipment) diff --git a/Assets/Scripts/ServerShared/Enums.cs b/Assets/Scripts/ServerShared/Enums.cs index 28c6be239..f5acbc6bb 100644 --- a/Assets/Scripts/ServerShared/Enums.cs +++ b/Assets/Scripts/ServerShared/Enums.cs @@ -12,6 +12,14 @@ public enum ItemRotation Clockwise = 3 } +public enum CauseOfDeath +{ + HullDestroyed, + CockpitDestroyed, + Heatstroke, + Hypothermia +} + public enum HitType { Armor, diff --git a/Assets/Scripts/ServerShared/Settings.cs b/Assets/Scripts/ServerShared/Settings.cs index 7110c6cab..8d64821e5 100644 --- a/Assets/Scripts/ServerShared/Settings.cs +++ b/Assets/Scripts/ServerShared/Settings.cs @@ -168,6 +168,11 @@ public class GameplaySettings public float HeatstrokeExponent = 2; public float HeatstrokeRecoverySpeed = .2f; public float HeatstrokeControlLimit = .75f; + public float HypothermiaTemperature = 273; + public float HypothermiaMultiplier = .00001f; + public float HypothermiaExponent = 2; + public float HypothermiaRecoverySpeed = .2f; + public float HypothermiaControlLimit = .75f; public float LockIndicatorNoiseAmplitude = 50f; public ExponentialLerp LockIndicatorFrequency; public ExponentialLerp LockSpinSpeed; diff --git a/Assets/Scripts/ServerShared/Ship.cs b/Assets/Scripts/ServerShared/Ship.cs index 7b8127e9f..dd6132640 100644 --- a/Assets/Scripts/ServerShared/Ship.cs +++ b/Assets/Scripts/ServerShared/Ship.cs @@ -234,9 +234,9 @@ public class Ship : Entity public override void Update(float delta) { - foreach (var thruster in _allThrusters) thruster.Axis = 0; if (_active && !_exitingWormhole && !_enteringWormhole) { + foreach (var thruster in _allThrusters) thruster.Axis = 0; var rightThrusterTorqueCompensation = abs(RightStrafeTotalTorque) / RightStrafeTorqueThrusters.Length; foreach (var thruster in _rightThrusters) { diff --git a/Assets/Scripts/UI/ConfirmationDialog.cs b/Assets/Scripts/UI/ConfirmationDialog.cs index 72ec21920..fea00c611 100644 --- a/Assets/Scripts/UI/ConfirmationDialog.cs +++ b/Assets/Scripts/UI/ConfirmationDialog.cs @@ -27,7 +27,7 @@ public class ConfirmationDialog : PropertiesPanel private void Start() { Cancel.onClick.AddListener(() => End()); - Confirm.onClick.AddListener(() => End()); + Confirm.onClick.AddListener(() => End(true)); if (CancelClickCatcher != null) CancelClickCatcher.OnClick += data => { diff --git a/Assets/Scripts/UI/ConsoleController.cs b/Assets/Scripts/UI/ConsoleController.cs index 1f39d94ff..640b3d6f7 100644 --- a/Assets/Scripts/UI/ConsoleController.cs +++ b/Assets/Scripts/UI/ConsoleController.cs @@ -29,6 +29,11 @@ public class ConsoleController get => _instance ?? (_instance = new ConsoleController()); } + public static void ClearCommands() + { + _commands.Clear(); + } + public static void AddCommand(string command, Action action) { var lower = command.ToLowerInvariant(); diff --git a/Assets/Scripts/UI/InventoryMenu.cs b/Assets/Scripts/UI/InventoryMenu.cs index 91dd73ad1..d1c486517 100644 --- a/Assets/Scripts/UI/InventoryMenu.cs +++ b/Assets/Scripts/UI/InventoryMenu.cs @@ -62,6 +62,7 @@ public class InventoryMenu : MonoBehaviour var cargo = GameManager.DockingBay ?? GameManager.CurrentEntity.CargoBays.FirstOrDefault(); if (cargo!=null) InventoryPanels[0].Display(cargo); + else InventoryPanels[0].Clear(); if(GameManager.CurrentEntity != null) InventoryPanels[1].Display(GameManager.CurrentEntity); else InventoryPanels[1].Clear(); @@ -285,14 +286,14 @@ public class InventoryMenu : MonoBehaviour } }); - panel.OnClickAsObservable().Subscribe(data => + panel.OnClickAsObservable().Subscribe(e => { - if (data is InventoryCargoEventData cargoEvent) + if (e.data is InventoryCargoEventData cargoEvent) { var item = cargoEvent.CargoBay.Occupancy[cargoEvent.Position.x, cargoEvent.Position.y]; if(item!=null) { - if (Mouse.current.clickCount.ReadValue() == 2) + if (e.clickCount == 2) { var otherPanel = panel == InventoryPanels[0] ? InventoryPanels[1] : InventoryPanels[0]; if (otherPanel.CanDropItem(item)) @@ -335,12 +336,12 @@ public class InventoryMenu : MonoBehaviour } } } - else if (data is InventoryEntityEventData entityEvent) + else if (e.data is InventoryEntityEventData entityEvent) { var item = entityEvent.Entity.GearOccupancy[entityEvent.Position.x, entityEvent.Position.y]; if (item != null) { - if (Mouse.current.clickCount.ReadValue() == 2) + if (e.clickCount == 2) { var otherPanel = panel == InventoryPanels[0] ? InventoryPanels[1] : InventoryPanels[0]; if (otherPanel.CanDropItem(item.EquippableItem)) diff --git a/Assets/Scripts/UI/InventoryPanel.cs b/Assets/Scripts/UI/InventoryPanel.cs index 4c4d52922..f4acaf0dc 100644 --- a/Assets/Scripts/UI/InventoryPanel.cs +++ b/Assets/Scripts/UI/InventoryPanel.cs @@ -20,7 +20,7 @@ using int2 = Unity.Mathematics.int2; public class InventoryPanel : MonoBehaviour, IPointerClickHandler { - [FormerlySerializedAs("ConfirmationDialog")] public ConfirmationDialog Dialog; + public ConfirmationDialog Dialog; public bool Flip; public GameSettings Settings; public ActionGameManager GameManager; @@ -30,6 +30,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler public TextMeshProUGUI MaxTempLabel; public GameObject TemperatureRange; public Button Dropdown; + public Button EditName; public Button Current; public Button Thermal; public GridLayoutGroup Grid; @@ -47,12 +48,13 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler public Color ToggleEnabledColor; public Color ToggleDisabledColor; public Color CellBackgroundColor = new Color(0, 0, 0, .75f); - public float MinTempRange; + public float MinTempRange = 1; + public float DoubleClickTime = .5f; Subject _onBeginDrag; Subject _onDrag; Subject _onEndDrag; - Subject _onClick; + Subject<(InventoryEventData data, int clickCount)> _onClick; Subject _onPointerEnter; Subject _onPointerExit; @@ -72,6 +74,9 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler private Dictionary _cellAnimationSequence = new Dictionary(); private int _hitSequence = 0; private bool _thermal = false; + private int _clickCount; + private InventoryCell _clickCell; + private float _clickTime; private bool _hud; @@ -122,6 +127,23 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler } }); } + + if (EditName) + { + EditName.onClick.AddListener(() => + { + Dialog.Clear(); + var entityName = _displayedEntity.Name; + Dialog.AddField("Name", () => entityName, s => entityName = s); + Dialog.Show(() => + { + _displayedEntity.Name = entityName; + Title.text = _displayedEntity.Name; + }); + Dialog.MoveToCursor(); + }); + } + if(Dropdown) { Dropdown.onClick.AddListener(() => @@ -134,7 +156,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler var options = entity.CargoBays .Where(bay => bay != _displayedCargo) .Select((bay, index) => - ($"Bay {index}", () => Display(bay), true)); + ($"Bay {index+1}", () => Display(bay), true)); if(entity != _displayedEntity) options = options.Prepend(("Equipment", () => Display(entity), true)); ContextMenu.AddDropdown(entity.Name, options); } @@ -180,6 +202,8 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler { if (_displayedEntity != null && TemperatureDisplay) { + var tempRange = _displayedEntity.MaxTemp - _displayedEntity.MinTemp; + var opacity = smoothstep(0, MinTempRange, tempRange); if(MinTempLabel) { MinTempLabel.text = $"{((int) (_displayedEntity.MinTemp - 273.15f)).ToString()}°C"; @@ -194,7 +218,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler { var temp = (_displayedEntity.Temperature[x - 1, y - 1] - _displayedEntity.MinTemp) / (_displayedEntity.MaxTemp-_displayedEntity.MinTemp); var color = TemperatureColor.GetPixelBilinear(TemperatureColorCurve.Evaluate(temp), 0); - color.a = TemperatureAlphaCurve.Evaluate(temp); + color.a = TemperatureAlphaCurve.Evaluate(temp) * opacity; _temperatureTexture.SetPixel(x,y,color); } else @@ -230,17 +254,12 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler _subscriptions.Clear(); - if (Current) - Current.gameObject.SetActive(false); - if (Thermal) - Thermal.gameObject.SetActive(false); + if (Current) Current.gameObject.SetActive(false); + if (Thermal) Thermal.gameObject.SetActive(false); + if (TemperatureRange) TemperatureRange.SetActive(false); + if(TemperatureDisplay) TemperatureDisplay.gameObject.SetActive(false); + if (EditName) EditName.gameObject.SetActive(false); - if (TemperatureRange) - TemperatureRange.SetActive(false); - - if(TemperatureDisplay) - TemperatureDisplay.gameObject.SetActive(false); - if(Title) Title.text = "None"; } @@ -261,6 +280,11 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler if(Title) Title.text = entity.Name; + if (EditName) + { + EditName.gameObject.SetActive(true); + } + var hullData = GameManager.ItemManager.GetData(entity.Hull) as HullData; if (FitToContent) @@ -317,7 +341,15 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler if(cell.PointerClickTrigger) { cell.PointerClickTrigger.OnPointerClickAsObservable() - .Subscribe(data => _onClick?.OnNext(new InventoryEntityEventData(data, v, entity))); + .Subscribe(data => + { + if (cell != _clickCell || Time.time - _clickTime > DoubleClickTime) + _clickCount = 0; + _clickCell = cell; + _clickTime = Time.time; + _clickCount++; + _onClick?.OnNext((new InventoryEntityEventData(data, v, entity), _clickCount)); + }); cell.BeginDragTrigger.OnBeginDragAsObservable() .Subscribe(data => _onBeginDrag?.OnNext(new InventoryEntityEventData(data, v, entity))); cell.DragTrigger.OnDragAsObservable() @@ -436,7 +468,15 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler { var cell = NodePrototype.Instantiate(); cell.PointerClickTrigger.OnPointerClickAsObservable() - .Subscribe(data => _onClick?.OnNext(new InventoryCargoEventData(data, v, cargo))); + .Subscribe(data => + { + if (cell != _clickCell || Time.time - _clickTime > DoubleClickTime) + _clickCount = 0; + _clickCell = cell; + _clickTime = Time.time; + _clickCount++; + _onClick?.OnNext((new InventoryCargoEventData(data, v, cargo), _clickCount)); + }); cell.BeginDragTrigger.OnBeginDragAsObservable() .Subscribe(data => _onBeginDrag?.OnNext(new InventoryCargoEventData(data, v, cargo))); cell.DragTrigger.OnDragAsObservable() @@ -676,7 +716,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler } public Subject OnBackgroundClick = new Subject(); - public UniRx.IObservable OnClickAsObservable() => _onClick ?? (_onClick = new Subject()); + public Subject<(InventoryEventData data, int clickCount)> OnClickAsObservable() => _onClick ?? (_onClick = new Subject<(InventoryEventData data, int clickCount)>()); public UniRx.IObservable OnBeginDragAsObservable() => _onBeginDrag ?? (_onBeginDrag = new Subject()); public UniRx.IObservable OnDragAsObservable() => _onDrag ?? (_onDrag = new Subject()); public UniRx.IObservable OnEndDragAsObservable() => _onEndDrag ?? (_onEndDrag = new Subject()); diff --git a/Assets/Scripts/UI/SchematicDisplay.cs b/Assets/Scripts/UI/SchematicDisplay.cs index e777dd3e1..9c2e723f8 100644 --- a/Assets/Scripts/UI/SchematicDisplay.cs +++ b/Assets/Scripts/UI/SchematicDisplay.cs @@ -36,6 +36,7 @@ public class SchematicDisplay : MonoBehaviour public RectTransform EnergyFill; public RectTransform HullDurabilityFill; public RectTransform HeatstrokeMeterFill; + public RectTransform HypothermiaMeterFill; public RectTransform HeatstrokeLimitFill; public CanvasGroup TriggerGroups; @@ -249,7 +250,8 @@ public class SchematicDisplay : MonoBehaviour CockpitTemperatureLabel.text = $"{((int) (_cockpit.Item.Temperature - 273.15f)).ToString()}°C"; HeatstrokeMeterFill.anchorMax = new Vector2(_entity.Heatstroke, 1); - HeatstrokeLimitFill.anchorMax = new Vector2(_cockpit.Item.Temperature / Settings.GameplaySettings.HeatstrokeTemperature, 1); + HypothermiaMeterFill.anchorMax = new Vector2(_entity.Hypothermia, 1); + HeatstrokeLimitFill.anchorMax = new Vector2(unlerp(Settings.GameplaySettings.HypothermiaTemperature, Settings.GameplaySettings.HeatstrokeTemperature, _cockpit.Item.Temperature), 1); } SensorCooldownFill.anchorMax = new Vector2(_entity.Sensor?.Cooldown ?? 0, 1); diff --git a/Assets/Scripts/UI/TradeMenu.cs b/Assets/Scripts/UI/TradeMenu.cs index 19d2a084d..c2b7214d2 100644 --- a/Assets/Scripts/UI/TradeMenu.cs +++ b/Assets/Scripts/UI/TradeMenu.cs @@ -69,7 +69,7 @@ public class TradeMenu : MonoBehaviour ContextMenu.AddDropdown("Gear Type", hardpointTypes .Select(x => (Enum.GetName(typeof(HardpointType), x), () => { - if (_hardpointFilter.filter == null) + if (!_hardpointFilter.filter) { _hardpointFilter.filter = FilterPrototype.Instantiate(); _hardpointFilter.filter.OnDisable += () => @@ -78,12 +78,12 @@ public class TradeMenu : MonoBehaviour Populate(); }; } - if(_commodityFilter.filter != null) + if(_commodityFilter.filter) { _commodityFilter.filter.GetComponent().ReturnToPool(); _commodityFilter.filter = null; } - if(_compoundCommodityFilter.filter != null) + if(_compoundCommodityFilter.filter) { _compoundCommodityFilter.filter.GetComponent().ReturnToPool(); _compoundCommodityFilter.filter = null; @@ -96,7 +96,7 @@ public class TradeMenu : MonoBehaviour ContextMenu.AddDropdown("Simple Commodity", commodityTypes .Select(x => (Enum.GetName(typeof(SimpleCommodityCategory), x), () => { - if (_commodityFilter.filter == null) + if (!_commodityFilter.filter) { _commodityFilter.filter = FilterPrototype.Instantiate(); _commodityFilter.filter.OnDisable += () => @@ -105,12 +105,12 @@ public class TradeMenu : MonoBehaviour Populate(); }; } - if(_hardpointFilter.filter != null) + if(_hardpointFilter.filter) { _hardpointFilter.filter.GetComponent().ReturnToPool(); _hardpointFilter.filter = null; } - if(_compoundCommodityFilter.filter != null) + if(_compoundCommodityFilter.filter) { _compoundCommodityFilter.filter.GetComponent().ReturnToPool(); _compoundCommodityFilter.filter = null; @@ -123,7 +123,7 @@ public class TradeMenu : MonoBehaviour ContextMenu.AddDropdown("Compound Commodity", compoundCommodityTypes .Select(x => (Enum.GetName(typeof(CompoundCommodityCategory), x), () => { - if (_compoundCommodityFilter.filter == null) + if (!_compoundCommodityFilter.filter) { _compoundCommodityFilter.filter = FilterPrototype.Instantiate(); _compoundCommodityFilter.filter.OnDisable += () => @@ -132,12 +132,12 @@ public class TradeMenu : MonoBehaviour Populate(); }; } - if(_hardpointFilter.filter != null) + if(_hardpointFilter.filter) { _hardpointFilter.filter.GetComponent().ReturnToPool(); _hardpointFilter.filter = null; } - if(_commodityFilter.filter != null) + if(_commodityFilter.filter) { _commodityFilter.filter.GetComponent().ReturnToPool(); _commodityFilter.filter = null; @@ -449,13 +449,19 @@ public class TradeMenu : MonoBehaviour foreach (var ship in GameManager.CurrentEntity.Parent.Children.Where(e => e is Ship {IsPlayerShip: true})) { foreach (var bay in ship.CargoBays.Select((bay, index) => (bay, index))) - ContextMenu.AddOption($"{ship.Name} Bay {bay.index}", - () => - { - _targetCargo = bay.bay; - TargetCargoLabel.text = $"{ship.Name} Bay {bay.index}"; - }); + { + if(_targetCargo != bay.bay) + { + ContextMenu.AddOption($"{ship.Name} Bay {bay.index+1}", + () => + { + _targetCargo = bay.bay; + TargetCargoLabel.text = $"{ship.Name} Bay {bay.index+1}"; + }); + } + } } + ContextMenu.Show(); }); } diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index e2a2615ea..dac4e1f5d 100644 --- a/GameData/PlayerSettings.msgpack +++ b/GameData/PlayerSettings.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe52401aea73b9a07065cc694627493046240842c16f9c3506449169ac070c4f -size 23946 +oid sha256:e299a0e7898b43fe30092f642cda5d13b1eabb2c634105860ae373b671f438b0 +size 16952 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index bdea7a3bf..243b698c4 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fea7488aad690c3e4c48425e069b7acdbc37eb7838cc9871354b2d7162716281 +oid sha256:b4fb3152599a8666aedca5b475f5e565647b91afd1835b193b2ae6acf78653c1 size 1699