From 72e39a92be2e5e1126b1a2da4c3774ad181b9009 Mon Sep 17 00:00:00 2001 From: Evan Nydahl Date: Mon, 31 Jan 2022 12:09:46 -0600 Subject: [PATCH] Started Fixing UI --- Assets/Prefabs/Game/Image.prefab | 90 +++++++++++++++++++++++++ Assets/Prefabs/Game/Image.prefab.meta | 7 ++ Assets/Scenes/Demos/graybox scene.unity | 10 ++- Assets/Scripts/CoolDown.cs | 25 +++---- UserSettings/EditorUserSettings.asset | 10 ++- 5 files changed, 123 insertions(+), 19 deletions(-) create mode 100644 Assets/Prefabs/Game/Image.prefab create mode 100644 Assets/Prefabs/Game/Image.prefab.meta diff --git a/Assets/Prefabs/Game/Image.prefab b/Assets/Prefabs/Game/Image.prefab new file mode 100644 index 0000000..ca15692 --- /dev/null +++ b/Assets/Prefabs/Game/Image.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5756063885148329735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5756063885148329752} + - component: {fileID: 5756063885148329754} + - component: {fileID: 5756063885148329753} + - component: {fileID: 5143056936348118060} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5756063885148329752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5756063885148329735} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5756063885148329754 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5756063885148329735} + m_CullTransparentMesh: 1 +--- !u!114 &5756063885148329753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5756063885148329735} + 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: 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!114 &5143056936348118060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5756063885148329735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdff95fc2112c6040a748eeeeb659204, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Game/Image.prefab.meta b/Assets/Prefabs/Game/Image.prefab.meta new file mode 100644 index 0000000..4434878 --- /dev/null +++ b/Assets/Prefabs/Game/Image.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8150580546fbb0d48bcd414238e2be89 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demos/graybox scene.unity b/Assets/Scenes/Demos/graybox scene.unity index 0eb89b1..060b4cf 100644 --- a/Assets/Scenes/Demos/graybox scene.unity +++ b/Assets/Scenes/Demos/graybox scene.unity @@ -34202,6 +34202,14 @@ PrefabInstance: propertyPath: nitroItem value: objectReference: {fileID: 11400000, guid: b91f668477f6b3244b3fea3204e6cd87, type: 2} + - target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} + propertyPath: hasDash + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} + propertyPath: hasNitro + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} --- !u!1 &1457776488 @@ -40048,7 +40056,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Inv: {fileID: 348746306} - uiPrebab: {fileID: 2234979236645149946, guid: 757a136ec05bee247970d9f727f6b5f2, type: 3} + uiPrebab: {fileID: 5756063885148329735, guid: 8150580546fbb0d48bcd414238e2be89, type: 3} --- !u!1 &1734064827 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CoolDown.cs b/Assets/Scripts/CoolDown.cs index 9d0f646..a6f8694 100644 --- a/Assets/Scripts/CoolDown.cs +++ b/Assets/Scripts/CoolDown.cs @@ -5,26 +5,19 @@ using UnityEngine; public class CoolDown : MonoBehaviour { - public PlayerInventory Inv; - private List specialItems = new List(); + //used to check if the playr has abillities + public PlayerStats stats; public GameObject uiPrebab; // Start is called before the first frame update void Start(){ - //retrieve all items that are special items here - foreach(var I in Inv.PlayerItemDict){ - if(I.Value.GetType() == typeof(SpecialItem)){ - SpecialItem temp = (SpecialItem)I.Value; - //if not - if(temp.cooldownM == 0 || I.Value.GetType() != typeof(SpecialItem)){ - Debug.Log("Item not fully intialized"); - //throw assert - Debug.Assert(temp.cooldownM != 0); - Debug.Assert(I.Value.GetType() == typeof(SpecialItem)); - - } - specialItems.Add(temp); - } + //check if player has abillity + if(stats.HasNitro == true){ + GameObject temp = Instantiate(uiPrebab); + temp.transform.SetParent(this.gameObject.transform); + temp.name = "Nitro"; } + + } //set up ui elements for special items for(int i = 0; i < specialItems.Count; i++){ //instantiate prefab diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 5b7ab09..bccad74 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,16 @@ EditorUserSettings: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c7b151b180b65093e273e12190f3cf6ef2021f2e225a7f234362820 + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 vcSharedLogLevel: value: 0d5e400f0650