From e058b1ce5be72cd65765c10fa9285aabc5cc20ca Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Thu, 7 Oct 2021 19:08:00 +0200 Subject: [PATCH] idk --- Assets/Buildings/Scripts/BuildingBlueprint.cs | 6 +- Assets/Buildings/Scripts/BuildingPlacement.cs | 25 +- Assets/Buildings/Scripts/BuildingsRegistry.cs | 5 +- Assets/Buildings/Scripts/UI.meta | 8 + Assets/Buildings/Scripts/UI/SelectBuilding.cs | 12 + .../Scripts/UI/SelectBuilding.cs.meta | 11 + Assets/Scenes/SampleScene.unity | 667 ++++++++++++++++++ Assets/UI.meta | 8 + Assets/UI/BuildingMenu.meta | 8 + Assets/{ => UI}/HUD.meta | 0 Assets/{ => UI}/HUD/Minimap.meta | 0 Assets/{ => UI}/HUD/Minimap/Minimap.cs | 0 Assets/{ => UI}/HUD/Minimap/Minimap.cs.meta | 0 .../{ => UI}/HUD/Minimap/MinimapCamera.prefab | 0 .../HUD/Minimap/MinimapCamera.prefab.meta | 0 .../{ => UI}/HUD/Minimap/MinimapPanel.prefab | 0 .../HUD/Minimap/MinimapPanel.prefab.meta | 0 .../HUD/Minimap/MinimapTexture.renderTexture | 0 .../Minimap/MinimapTexture.renderTexture.meta | 0 Assets/{ => UI}/HUD/Minimap/cirlce_mask.png | Bin .../{ => UI}/HUD/Minimap/cirlce_mask.png.meta | 0 21 files changed, 745 insertions(+), 5 deletions(-) create mode 100644 Assets/Buildings/Scripts/UI.meta create mode 100644 Assets/Buildings/Scripts/UI/SelectBuilding.cs create mode 100644 Assets/Buildings/Scripts/UI/SelectBuilding.cs.meta create mode 100644 Assets/UI.meta create mode 100644 Assets/UI/BuildingMenu.meta rename Assets/{ => UI}/HUD.meta (100%) rename Assets/{ => UI}/HUD/Minimap.meta (100%) rename Assets/{ => UI}/HUD/Minimap/Minimap.cs (100%) rename Assets/{ => UI}/HUD/Minimap/Minimap.cs.meta (100%) rename Assets/{ => UI}/HUD/Minimap/MinimapCamera.prefab (100%) rename Assets/{ => UI}/HUD/Minimap/MinimapCamera.prefab.meta (100%) rename Assets/{ => UI}/HUD/Minimap/MinimapPanel.prefab (100%) rename Assets/{ => UI}/HUD/Minimap/MinimapPanel.prefab.meta (100%) rename Assets/{ => UI}/HUD/Minimap/MinimapTexture.renderTexture (100%) rename Assets/{ => UI}/HUD/Minimap/MinimapTexture.renderTexture.meta (100%) rename Assets/{ => UI}/HUD/Minimap/cirlce_mask.png (100%) rename Assets/{ => UI}/HUD/Minimap/cirlce_mask.png.meta (100%) diff --git a/Assets/Buildings/Scripts/BuildingBlueprint.cs b/Assets/Buildings/Scripts/BuildingBlueprint.cs index b6331f0..04bdf98 100644 --- a/Assets/Buildings/Scripts/BuildingBlueprint.cs +++ b/Assets/Buildings/Scripts/BuildingBlueprint.cs @@ -121,7 +121,7 @@ public class BuildingBlueprint : MonoBehaviour isColliding = true; } - Debug.Log("Colliding True"); + // Debug.Log("Colliding True"); } public void OnTriggerStay(Collider other) { @@ -129,7 +129,7 @@ public class BuildingBlueprint : MonoBehaviour { isColliding = true; } - Debug.Log("Colliding True"); + // Debug.Log("Colliding True"); } public void OnTriggerExit(Collider other) { @@ -137,6 +137,6 @@ public class BuildingBlueprint : MonoBehaviour { isColliding = false; } - Debug.Log("Colliding False"); + // Debug.Log("Colliding False"); } } diff --git a/Assets/Buildings/Scripts/BuildingPlacement.cs b/Assets/Buildings/Scripts/BuildingPlacement.cs index 4c7eef9..3c0d6d7 100644 --- a/Assets/Buildings/Scripts/BuildingPlacement.cs +++ b/Assets/Buildings/Scripts/BuildingPlacement.cs @@ -5,12 +5,35 @@ using UnityEngine; public class BuildingPlacement : MonoBehaviour { [SerializeField] private GameObject terrain; - [SerializeField] private GameObject prefab; + + public GameObject prefab; + public TMPro.TextMeshProUGUI buildingText; + + int i = 0; Ray ray; + private void Start() + { + buildingText = GameObject.Find("SelectionText").GetComponent(); + } void Update() { + + if (Input.GetKeyDown(KeyCode.H)) + { + List registry = GameObject.Find("GameManager").GetComponent().GetRegistry(); + + i++; + if(i >= registry.Count) + { + i = 0; + } + + prefab = registry[i]; + buildingText.text = prefab.name; + } + // Build Button Handler if (Input.GetButtonDown("Build")) { // Wenn man den Button 'B' diff --git a/Assets/Buildings/Scripts/BuildingsRegistry.cs b/Assets/Buildings/Scripts/BuildingsRegistry.cs index d1a23d1..7cb9a66 100644 --- a/Assets/Buildings/Scripts/BuildingsRegistry.cs +++ b/Assets/Buildings/Scripts/BuildingsRegistry.cs @@ -6,5 +6,8 @@ public class BuildingsRegistry : MonoBehaviour { [SerializeField] private List registered_buildings = new List(); - + public List GetRegistry() + { + return registered_buildings; + } } diff --git a/Assets/Buildings/Scripts/UI.meta b/Assets/Buildings/Scripts/UI.meta new file mode 100644 index 0000000..f9032bc --- /dev/null +++ b/Assets/Buildings/Scripts/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd22183ef08d3c148b89da7eb6ac6226 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Buildings/Scripts/UI/SelectBuilding.cs b/Assets/Buildings/Scripts/UI/SelectBuilding.cs new file mode 100644 index 0000000..edcf7ed --- /dev/null +++ b/Assets/Buildings/Scripts/UI/SelectBuilding.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SelectBuilding : MonoBehaviour +{ + public GameObject select; + public void Select(GameObject select) + { + GameObject.Find("FirstPerson Player").GetComponent().prefab = select; + } +} diff --git a/Assets/Buildings/Scripts/UI/SelectBuilding.cs.meta b/Assets/Buildings/Scripts/UI/SelectBuilding.cs.meta new file mode 100644 index 0000000..75447c6 --- /dev/null +++ b/Assets/Buildings/Scripts/UI/SelectBuilding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 07315fb4060a66e4b800f322b186d428 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 762b7a9..e3fef52 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -353,6 +353,160 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185435514} m_CullTransparentMesh: 1 +--- !u!1 &405060992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 405060993} + - component: {fileID: 405060995} + - component: {fileID: 405060994} + m_Layer: 5 + m_Name: Building_List_Item_Desc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &405060993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405060992} + 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: 1306694354} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 29.002, y: -8.1035} + m_SizeDelta: {x: -58.004, y: -21.2071} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &405060994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405060992} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Title of Building +--- !u!222 &405060995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405060992} + m_CullTransparentMesh: 1 +--- !u!1 &639089560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 639089561} + - component: {fileID: 639089563} + - component: {fileID: 639089562} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &639089561 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 639089560} + 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: 1306694354} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 32.300003, y: 0.000012159} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &639089562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 639089560} + 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.8867924, g: 0.12883584, b: 0.12883584, 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: 0} + 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!222 &639089563 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 639089560} + m_CullTransparentMesh: 1 --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -541,6 +695,7 @@ RectTransform: - {fileID: 1048269304} - {fileID: 114639928} - {fileID: 1395840125} + - {fileID: 876577010} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -549,6 +704,140 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &876577009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 876577010} + - component: {fileID: 876577012} + - component: {fileID: 876577011} + m_Layer: 5 + m_Name: SelectionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &876577010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876577009} + 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: 708126143} + m_RootOrder: 4 + 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: 272, y: 169.69} + m_SizeDelta: {x: 182.9485, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &876577011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876577009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 23 + m_fontSizeBase: 23 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &876577012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876577009} + m_CullTransparentMesh: 1 --- !u!1 &1048269303 GameObject: m_ObjectHideFlags: 0 @@ -641,6 +930,229 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f9379cc95b36d44bd902c97580c107, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1143987171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1143987175} + - component: {fileID: 1143987174} + - component: {fileID: 1143987173} + - component: {fileID: 1143987172} + m_Layer: 5 + m_Name: BuildingMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1143987172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143987171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1143987173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143987171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1143987174 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143987171} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1143987175 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143987171} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1530112607} + m_Father: {fileID: 0} + m_RootOrder: 6 + 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, y: 0} +--- !u!1 &1306694353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1306694354} + - component: {fileID: 1306694357} + - component: {fileID: 1306694356} + - component: {fileID: 1306694355} + m_Layer: 5 + m_Name: Building_List_Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1306694354 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306694353} + 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: 639089561} + - {fileID: 2001106169} + - {fileID: 405060993} + m_Father: {fileID: 1530112607} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 2.4873047, y: -29.70729} + m_SizeDelta: {x: -21.2497, y: 50} + m_Pivot: {x: 0.5, y: 0.49999997} +--- !u!114 &1306694355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306694353} + 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: 1306694356} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1306694356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306694353} + 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: 10905, guid: 0000000000000000f000000000000000, type: 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 &1306694357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306694353} + m_CullTransparentMesh: 1 --- !u!1 &1395840124 GameObject: m_ObjectHideFlags: 0 @@ -795,6 +1307,82 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} m_PrefabInstance: {fileID: 7029954222161724659} m_PrefabAsset: {fileID: 0} +--- !u!1 &1530112606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530112607} + - component: {fileID: 1530112609} + - component: {fileID: 1530112608} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1530112607 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530112606} + 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: 1306694354} + m_Father: {fileID: 1143987175} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -178.8405, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1530112608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530112606} + 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: 0.392} + 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: 10907, guid: 0000000000000000f000000000000000, type: 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 &1530112609 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530112606} + m_CullTransparentMesh: 1 --- !u!1 &1814976973 GameObject: m_ObjectHideFlags: 0 @@ -966,6 +1554,85 @@ MonoBehaviour: Preset: {fileID: 11400000, guid: 00d8d18194811de4183650aceb857e9f, type: 2} GamerManager: {fileID: 1861247503} TimeOfDay: 10.3 +--- !u!1 &2001106168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2001106169} + - component: {fileID: 2001106171} + - component: {fileID: 2001106170} + m_Layer: 5 + m_Name: Building_List_Item_Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2001106169 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001106168} + 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: 1306694354} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 29.0023, y: 10.604} + m_SizeDelta: {x: -58.0035, y: -21.2071} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2001106170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001106168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Title of Building +--- !u!222 &2001106171 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001106168} + m_CullTransparentMesh: 1 --- !u!1001 &7029954222161724659 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/UI.meta b/Assets/UI.meta new file mode 100644 index 0000000..594fde5 --- /dev/null +++ b/Assets/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7587f80547520d4abdee352f22e6178 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/BuildingMenu.meta b/Assets/UI/BuildingMenu.meta new file mode 100644 index 0000000..42d4599 --- /dev/null +++ b/Assets/UI/BuildingMenu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 692be901d84eb11449e7e5a1b77a7477 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HUD.meta b/Assets/UI/HUD.meta similarity index 100% rename from Assets/HUD.meta rename to Assets/UI/HUD.meta diff --git a/Assets/HUD/Minimap.meta b/Assets/UI/HUD/Minimap.meta similarity index 100% rename from Assets/HUD/Minimap.meta rename to Assets/UI/HUD/Minimap.meta diff --git a/Assets/HUD/Minimap/Minimap.cs b/Assets/UI/HUD/Minimap/Minimap.cs similarity index 100% rename from Assets/HUD/Minimap/Minimap.cs rename to Assets/UI/HUD/Minimap/Minimap.cs diff --git a/Assets/HUD/Minimap/Minimap.cs.meta b/Assets/UI/HUD/Minimap/Minimap.cs.meta similarity index 100% rename from Assets/HUD/Minimap/Minimap.cs.meta rename to Assets/UI/HUD/Minimap/Minimap.cs.meta diff --git a/Assets/HUD/Minimap/MinimapCamera.prefab b/Assets/UI/HUD/Minimap/MinimapCamera.prefab similarity index 100% rename from Assets/HUD/Minimap/MinimapCamera.prefab rename to Assets/UI/HUD/Minimap/MinimapCamera.prefab diff --git a/Assets/HUD/Minimap/MinimapCamera.prefab.meta b/Assets/UI/HUD/Minimap/MinimapCamera.prefab.meta similarity index 100% rename from Assets/HUD/Minimap/MinimapCamera.prefab.meta rename to Assets/UI/HUD/Minimap/MinimapCamera.prefab.meta diff --git a/Assets/HUD/Minimap/MinimapPanel.prefab b/Assets/UI/HUD/Minimap/MinimapPanel.prefab similarity index 100% rename from Assets/HUD/Minimap/MinimapPanel.prefab rename to Assets/UI/HUD/Minimap/MinimapPanel.prefab diff --git a/Assets/HUD/Minimap/MinimapPanel.prefab.meta b/Assets/UI/HUD/Minimap/MinimapPanel.prefab.meta similarity index 100% rename from Assets/HUD/Minimap/MinimapPanel.prefab.meta rename to Assets/UI/HUD/Minimap/MinimapPanel.prefab.meta diff --git a/Assets/HUD/Minimap/MinimapTexture.renderTexture b/Assets/UI/HUD/Minimap/MinimapTexture.renderTexture similarity index 100% rename from Assets/HUD/Minimap/MinimapTexture.renderTexture rename to Assets/UI/HUD/Minimap/MinimapTexture.renderTexture diff --git a/Assets/HUD/Minimap/MinimapTexture.renderTexture.meta b/Assets/UI/HUD/Minimap/MinimapTexture.renderTexture.meta similarity index 100% rename from Assets/HUD/Minimap/MinimapTexture.renderTexture.meta rename to Assets/UI/HUD/Minimap/MinimapTexture.renderTexture.meta diff --git a/Assets/HUD/Minimap/cirlce_mask.png b/Assets/UI/HUD/Minimap/cirlce_mask.png similarity index 100% rename from Assets/HUD/Minimap/cirlce_mask.png rename to Assets/UI/HUD/Minimap/cirlce_mask.png diff --git a/Assets/HUD/Minimap/cirlce_mask.png.meta b/Assets/UI/HUD/Minimap/cirlce_mask.png.meta similarity index 100% rename from Assets/HUD/Minimap/cirlce_mask.png.meta rename to Assets/UI/HUD/Minimap/cirlce_mask.png.meta