diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 0c53f8f..e4829a0 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -4349,6 +4349,55 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320667839} m_CullTransparentMesh: 1 +--- !u!1 &322679540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 322679541} + - component: {fileID: 322679542} + m_Layer: 5 + m_Name: TooltipHandler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &322679541 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322679540} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + 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: 533.3334, y: 300} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &322679542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322679540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff63195da43e3a145abba1304336b467, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltip: {fileID: 426763426} --- !u!1 &323421655 GameObject: m_ObjectHideFlags: 0 @@ -6219,6 +6268,79 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 425026727} m_CullTransparentMesh: 1 +--- !u!1 &426763426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 426763427} + - component: {fileID: 426763429} + - component: {fileID: 426763428} + m_Layer: 5 + m_Name: pnlTooltip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &426763427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426763426} + 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: 2111801030} + m_Father: {fileID: 1456932137} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.25, y: 0.25} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &426763428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426763426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 601e7200a7725db45961e7ceb51b07cc, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &426763429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 426763426} + m_CullTransparentMesh: 1 --- !u!1 &441464071 GameObject: m_ObjectHideFlags: 0 @@ -8730,6 +8852,7 @@ GameObject: - component: {fileID: 640974227} - component: {fileID: 640974229} - component: {fileID: 640974228} + - component: {fileID: 640974230} m_Layer: 5 m_Name: pnlIntelligence m_TagString: Untagged @@ -8797,6 +8920,52 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640974226} m_CullTransparentMesh: 1 +--- !u!114 &640974230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640974226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 322679542} + m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp + m_MethodName: showTooltip + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Intelligence affects your range damage and your secondary + regenaration rate + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 322679542} + m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp + m_MethodName: hideToolTip + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &643507027 GameObject: m_ObjectHideFlags: 0 @@ -9435,6 +9604,7 @@ MonoBehaviour: playerHUD: {fileID: 1601343527} questlog: {fileID: 1568120506} tutorial: {fileID: 2038188361} + tooltip: {fileID: 426763426} state: 0 --- !u!4 &659994603 Transform: @@ -12329,7 +12499,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -14.9999695, y: 0} + m_AnchoredPosition: {x: -14.999939, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &813710393 @@ -18744,7 +18914,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1215000332 GameObject: @@ -20108,6 +20278,7 @@ GameObject: - component: {fileID: 1343558895} - component: {fileID: 1343558897} - component: {fileID: 1343558896} + - component: {fileID: 1343558898} m_Layer: 5 m_Name: pnlStrength m_TagString: Untagged @@ -20175,6 +20346,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343558894} m_CullTransparentMesh: 1 +--- !u!114 &1343558898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343558894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 322679542} + m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp + m_MethodName: showTooltip + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Strenght affects how hard you can hit your enemy. + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 322679542} + m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp + m_MethodName: hideToolTip + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1345005225 GameObject: m_ObjectHideFlags: 0 @@ -21233,6 +21449,7 @@ RectTransform: - {fileID: 1601343528} - {fileID: 1568120507} - {fileID: 2038188362} + - {fileID: 426763427} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -24457,6 +24674,7 @@ GameObject: - component: {fileID: 1692975129} - component: {fileID: 1692975131} - component: {fileID: 1692975130} + - component: {fileID: 1692975132} m_Layer: 5 m_Name: pnlDexterity m_TagString: Untagged @@ -24524,6 +24742,52 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1692975128} m_CullTransparentMesh: 1 +--- !u!114 &1692975132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1692975128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 322679542} + m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp + m_MethodName: showTooltip + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Dexterity affects your chance to land a critical hit + and dogde an attack. + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 322679542} + m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp + m_MethodName: hideToolTip + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1698559130 GameObject: m_ObjectHideFlags: 0 @@ -30063,6 +30327,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2110975652} m_CullTransparentMesh: 1 +--- !u!1 &2111801029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2111801030} + - component: {fileID: 2111801032} + - component: {fileID: 2111801031} + m_Layer: 5 + m_Name: txtTooltip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2111801030 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111801029} + 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: 426763427} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.19, y: 0.19} + m_AnchorMax: {x: 0.81, y: 0.81} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2111801031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111801029} + 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: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &2111801032 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111801029} + m_CullTransparentMesh: 1 --- !u!1 &2136655236 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerCamera.cs b/Assets/Scripts/PlayerCamera.cs index 8ecb9e6..d14995f 100644 --- a/Assets/Scripts/PlayerCamera.cs +++ b/Assets/Scripts/PlayerCamera.cs @@ -8,6 +8,7 @@ namespace Assets.Scripts public class PlayerCamera : MonoBehaviour { UIHandler uihandler; + // Start is called before the first frame update void Start() { diff --git a/Assets/Scripts/TooltipHandler.cs b/Assets/Scripts/TooltipHandler.cs new file mode 100644 index 0000000..fa4c248 --- /dev/null +++ b/Assets/Scripts/TooltipHandler.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.EventSystems; + +namespace Assets.Scripts +{ + public class TooltipHandler : MonoBehaviour + { + public GameObject tooltip; + Player player; + UIHandler uihandler; + + // Start is called before the first frame update + void Start() + { + player = GameObject.Find("Player").GetComponent(); + uihandler = GameObject.Find("UIHandler").GetComponent(); + } + + // Update is called once per frame + void Update() + { + + } + + public void showTooltip(string text) + { + tooltip.transform.Find("txtTooltip").GetComponent().text = text; + tooltip.transform.localScale = new Vector3(1,1,1); + } + + public void hideToolTip() + { + tooltip.transform.localScale = new Vector3(0,0,0); + } + } + +} \ No newline at end of file diff --git a/Assets/Scripts/TooltipHandler.cs.meta b/Assets/Scripts/TooltipHandler.cs.meta new file mode 100644 index 0000000..8ac774b --- /dev/null +++ b/Assets/Scripts/TooltipHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ff63195da43e3a145abba1304336b467 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIHandler.cs b/Assets/Scripts/UIHandler.cs index 7265cd1..6298ac3 100644 --- a/Assets/Scripts/UIHandler.cs +++ b/Assets/Scripts/UIHandler.cs @@ -24,6 +24,7 @@ namespace Assets.Scripts public GameObject playerHUD; public GameObject questlog; public GameObject tutorial; + public GameObject tooltip; public UIState state;