removed not needed tooltip

This commit is contained in:
TAASONI3 2023-12-26 19:40:38 +01:00
parent bf705a52a8
commit a8c4cdcf3c
7 changed files with 122 additions and 92 deletions

View File

@ -1,41 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.EventSystems;
using Assets.Scripts.Player;
namespace Assets.Scripts
{
public class TooltipHandler : MonoBehaviour
{
public GameObject tooltip;
PlayerGameObject player;
UIHandler uihandler;
// Start is called before the first frame update
void Start()
{
player = GameObject.Find("Player").GetComponent<PlayerGameObject>();
uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
}
// Update is called once per frame
void Update()
{
}
public void showTooltip(string text)
{
tooltip.transform.Find("txtTooltip").GetComponent<Text>().text = text;
tooltip.transform.localScale = new Vector3(1,1,1);
}
public void hideToolTip()
{
tooltip.transform.localScale = new Vector3(0,0,0);
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: ff63195da43e3a145abba1304336b467
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -22,7 +22,6 @@ namespace Assets.Scripts
public GameObject playerHUD; public GameObject playerHUD;
public GameObject questlog; public GameObject questlog;
public GameObject introduction; public GameObject introduction;
public GameObject tooltip;
public GameObject tutorial; public GameObject tutorial;
public GameObject inventory; public GameObject inventory;
public GameObject waterLayer; public GameObject waterLayer;

View File

@ -26,15 +26,12 @@ namespace Assets.Scripts
public int currentBag = -1; public int currentBag = -1;
TooltipHandler tooltip;
public GameObject currentSlot; public GameObject currentSlot;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
createStatBoost(); createStatBoost();
tooltip = GameObject.Find("TooltipHandler").GetComponent<TooltipHandler>();
itemDisplay.transform.localScale = new Vector3(0,0,0); itemDisplay.transform.localScale = new Vector3(0,0,0);
changeCurrentBag(0); changeCurrentBag(0);
} }

View File

@ -10,7 +10,6 @@ namespace Assets.Scripts
{ {
public class InventorySlot : MonoBehaviour public class InventorySlot : MonoBehaviour
{ {
TooltipHandler tooltip;
Item[] items = new Item[3]; Item[] items = new Item[3];
int currentBag = 0; int currentBag = 0;
public ItemPlace place; public ItemPlace place;
@ -19,7 +18,6 @@ namespace Assets.Scripts
private void Start() private void Start()
{ {
tooltip = GameObject.Find("TooltipHandler").GetComponent<TooltipHandler>();
inventory = GameObject.Find("Inventory").GetComponent<Inventory>(); inventory = GameObject.Find("Inventory").GetComponent<Inventory>();
loadImages(); loadImages();
} }

View File

@ -9,16 +9,16 @@ EditorUserSettings:
value: 05550c040100590e5c0c097446220f164e164d732a7072682c2a1f31b7b7666c value: 05550c040100590e5c0c097446220f164e164d732a7072682c2a1f31b7b7666c
flags: 0 flags: 0
RecentlyUsedSceneGuid-1: RecentlyUsedSceneGuid-1:
value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d
flags: 0
RecentlyUsedSceneGuid-2:
value: 0503045757070c095e0b087612765b40474f4979757d24647c71496ae7b8313e value: 0503045757070c095e0b087612765b40474f4979757d24647c71496ae7b8313e
flags: 0 flags: 0
RecentlyUsedSceneGuid-2:
value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d
flags: 0
RecentlyUsedSceneGuid-3: RecentlyUsedSceneGuid-3:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
flags: 0 flags: 0
RecentlyUsedSceneGuid-4: RecentlyUsedSceneGuid-4:
value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0 flags: 0
RecentlyUsedScenePath-0: RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d

146
save.json
View File

@ -14,7 +14,6 @@
"race": "Human", "race": "Human",
"role": "Warrior", "role": "Warrior",
"points": 0, "points": 0,
"healthRegen": 30,
"secondaryRegen": 5, "secondaryRegen": 5,
"isDodging": "False", "isDodging": "False",
"killcount": 0, "killcount": 0,
@ -24,7 +23,7 @@
"world": { "world": {
"cityAmount": 5, "cityAmount": 5,
"maxCityAmount": 5, "maxCityAmount": 5,
"currentTile": "0/0/-1", "currentTile": "0/0/0",
"map": { "map": {
"tile0": "./save/tile0.json", "tile0": "./save/tile0.json",
"tile1": "./save/tile1.json", "tile1": "./save/tile1.json",
@ -34,10 +33,7 @@
"tile5": "./save/tile5.json", "tile5": "./save/tile5.json",
"tile6": "./save/tile6.json", "tile6": "./save/tile6.json",
"tile7": "./save/tile7.json", "tile7": "./save/tile7.json",
"tile8": "./save/tile8.json", "tile8": "./save/tile8.json"
"tile9": "./save/tile9.json",
"tile10": "./save/tile10.json",
"tile11": "./save/tile11.json"
} }
}, },
"inventory": { "inventory": {
@ -57,7 +53,11 @@
"itemName": "Wood", "itemName": "Wood",
}, },
"bag2": "empty", "bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot1": { "slot1": {
@ -66,7 +66,11 @@
"itemName": "Wood", "itemName": "Wood",
}, },
"bag2": "empty", "bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot2": { "slot2": {
@ -75,7 +79,11 @@
"itemName": "Wood", "itemName": "Wood",
}, },
"bag2": "empty", "bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot3": { "slot3": {
@ -84,7 +92,11 @@
"itemName": "Wood", "itemName": "Wood",
}, },
"bag2": "empty", "bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot4": { "slot4": {
@ -93,71 +105,147 @@
"itemName": "Wood", "itemName": "Wood",
}, },
"bag2": "empty", "bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot5": { "slot5": {
"bag1": "empty", "bag1": {
"bag2": "empty", "rarity": "COMMON",
"itemName": "Wood",
},
"bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot6": { "slot6": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
}, },
"slot7": { "slot7": {
"bag1": "empty", "bag1": {
"bag2": "empty", "rarity": "COMMON",
"itemName": "Wood",
},
"bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot8": { "slot8": {
"bag1": "empty", "bag1": {
"bag2": "empty", "rarity": "COMMON",
"itemName": "Wood",
},
"bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot9": { "slot9": {
"bag1": "empty", "bag1": {
"bag2": "empty", "rarity": "COMMON",
"itemName": "Wood",
},
"bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot10": { "slot10": {
"bag1": "empty", "bag1": {
"bag2": "empty", "rarity": "COMMON",
"itemName": "Wood",
},
"bag2": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag3": "empty" "bag3": "empty"
}, },
"slot11": { "slot11": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
}, },
"slot12": { "slot12": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
}, },
"slot13": { "slot13": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
}, },
"slot14": { "slot14": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
}, },
"slot15": { "slot15": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
}, },
"slot16": { "slot16": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
}, },
"slot17": { "slot17": {
"bag1": "empty", "bag1": {
"rarity": "COMMON",
"itemName": "Wood",
},
"bag2": "empty", "bag2": "empty",
"bag3": "empty" "bag3": "empty"
} }