diff --git a/Assets/Prefabs/UI/GameUI.prefab b/Assets/Prefabs/UI/GameUI.prefab index 6d02867..4d70e26 100644 --- a/Assets/Prefabs/UI/GameUI.prefab +++ b/Assets/Prefabs/UI/GameUI.prefab @@ -596,6 +596,7 @@ GameObject: - component: {fileID: 3685877439028762280} - component: {fileID: 1977405528458548599} - component: {fileID: 1670233975246388694} + - component: {fileID: 6882932966758703109} m_Layer: 5 m_Name: GameUI m_TagString: Untagged @@ -622,6 +623,7 @@ RectTransform: - {fileID: 4429602029198271624} - {fileID: 2823721143316666755} - {fileID: 9000047314404377693} + - {fileID: 7211211680280156960} - {fileID: 6256671941795819917} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -748,6 +750,18 @@ MonoBehaviour: ShopUI: {fileID: 5443863488021826499} ConstructionUI: {fileID: 4415559599605733937} CancelButton: {fileID: 4179011387012367373} +--- !u!114 &6882932966758703109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715023913428069073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3133f56145d6d44a99566fdb8dacfec, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &916661619396280674 GameObject: m_ObjectHideFlags: 0 @@ -2964,6 +2978,138 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &4676866721297065436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7211211680280156960} + - component: {fileID: 8622396985485827187} + - component: {fileID: 455761304838655372} + - component: {fileID: 4979900831748787775} + m_Layer: 5 + m_Name: Home + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7211211680280156960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676866721297065436} + 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: 3367038424042638127} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -629.7, y: -437.6} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8622396985485827187 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676866721297065436} + m_CullTransparentMesh: 1 +--- !u!114 &455761304838655372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676866721297065436} + 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: 7dd18aed23f60fa4c97774f4d9c31181, 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 &4979900831748787775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4676866721297065436} + 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: 455761304838655372} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6882932966758703109} + m_TargetAssemblyTypeName: SwitchScene, Assembly-CSharp + m_MethodName: SwitchToScene + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: MainMenu + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &4733917317194524145 GameObject: m_ObjectHideFlags: 0 @@ -3071,7 +3217,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -25} + m_AnchoredPosition: {x: 84, y: -92} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &1924606167970031342 diff --git a/Assets/Scripts/UI/ToggleUIObjects.cs b/Assets/Scripts/UI/ToggleUIObjects.cs new file mode 100644 index 0000000..80ffff1 --- /dev/null +++ b/Assets/Scripts/UI/ToggleUIObjects.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ToggleUIObjects : MonoBehaviour +{ + public GameObject escToggleNoBuild; + + bool isActive; + void Start() + { + isActive = false; + + if (escToggleNoBuild != null) + escToggleNoBuild.SetActive(isActive); + else + Debug.LogWarning(escToggleNoBuild + "not assigned"); + } + + void Update() + { + if (!GameManager.Instance.IsBuildMode && Input.GetKeyDown(KeyCode.Escape)) + { + isActive = !isActive; + } + if(GameManager.Instance.IsBuildMode && Input.GetKeyDown(KeyCode.Escape)) + { + isActive = false; + } + if (escToggleNoBuild != null) + escToggleNoBuild.SetActive(isActive); + else + Debug.LogWarning(escToggleNoBuild + "not assigned"); + } +} diff --git a/Assets/Scripts/UI/ToggleUIObjects.cs.meta b/Assets/Scripts/UI/ToggleUIObjects.cs.meta new file mode 100644 index 0000000..7ce43a8 --- /dev/null +++ b/Assets/Scripts/UI/ToggleUIObjects.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 83ce77a154a61524c812be4354c59f4e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utilities/HealthComponent.cs b/Assets/Scripts/Utilities/HealthComponent.cs index 2b134bb..9d94c81 100644 --- a/Assets/Scripts/Utilities/HealthComponent.cs +++ b/Assets/Scripts/Utilities/HealthComponent.cs @@ -36,6 +36,8 @@ public class HealthComponent : MonoBehaviour public void SimpleKill() { + CameraController.instance.ShakeCamera(5,1); + Destroy(gameObject); } } diff --git a/Assets/Sprites/houseHome.png.meta b/Assets/Sprites/houseHome.png.meta index f4a1f47..5186b53 100644 --- a/Assets/Sprites/houseHome.png.meta +++ b/Assets/Sprites/houseHome.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -99,7 +99,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: