Skip to content
Snippets Groups Projects
Commit 7a145419 authored by BenniHome's avatar BenniHome
Browse files

Added GUI Dragging

parent c17e65eb
No related branches found
No related tags found
No related merge requests found
Showing
with 3078 additions and 8426 deletions
......@@ -32,7 +32,6 @@ public void UpdateDisplay()
var item = inventory.Scrolls[i].item;
var obj = Instantiate(item.IconPrefab, Vector3.zero, Quaternion.identity, transform);
obj.GetComponent<RectTransform>().localPosition = GetPosition(i);
obj.GetComponentInChildren<Text>().text = inventory.Scrolls[i].item.Description;
inventory.Scrolls[i].isDisplayed = true;
}
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class DragHandling : MonoBehaviour, IDragHandler, IEndDragHandler
{
private Vector3 StartingPosition;
private bool dragged = false;
public void OnDrag(PointerEventData eventData){
if(! dragged ){
StartingPosition = transform.localPosition;
GetComponent<CanvasGroup>().blocksRaycasts = false;
dragged = true;
}
transform.position = Input.mousePosition;
}
public void OnEndDrag(PointerEventData eventData){
transform.localPosition = StartingPosition;
GetComponent<CanvasGroup>().blocksRaycasts = true ;
dragged = false;
}
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
fileFormatVersion: 2
guid: a091cb23127eb7347955cb7f747af431
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class DropHandling : MonoBehaviour, IDropHandler
{
GameObject current;
public void OnDrop(PointerEventData eventData){
Debug.Log(eventData.pointerDrag + "was dropped on "+ gameObject.name);
Destroy(current);
current = Instantiate(eventData.pointerDrag,Vector3.zero, Quaternion.identity);
current.transform.SetParent(gameObject.transform, false);
}
}
fileFormatVersion: 2
guid: 714c3b3ded45aea408421f43873d5e17
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -5,26 +5,39 @@
[CreateAssetMenu(fileName = "New Inventory", menuName= "Inventory System/Inventory" )]
public class Inventory : ScriptableObject
{
public List<InventorySlot<ItemObject>> Facts = new List<InventorySlot<ItemObject>>();
public List<InventorySlot<DefaultScroll>> Scrolls = new List<InventorySlot<DefaultScroll>>();
public List<InventorySlotFact> Facts = new List<InventorySlotFact>();
public List<InventorySlotScroll> Scrolls = new List<InventorySlotScroll>();
public void AddFact(ItemObject fact){
Facts.Add(new InventorySlot<ItemObject>(fact));
Facts.Add(new InventorySlotFact(fact));
}
public void AddScroll(DefaultScroll scroll){
Scrolls.Add(new InventorySlot<DefaultScroll>(scroll));
Scrolls.Add(new InventorySlotScroll(scroll));
}
}
[System.Serializable]
public class InventorySlotFact{
public ItemObject item;
public bool isDisplayed;
public InventorySlotFact(ItemObject _item){
item = _item;
isDisplayed = false;
}
}
[System.Serializable]
public class InventorySlot<T>
{
public T item;
public class InventorySlotScroll{
public DefaultScroll item;
public bool isDisplayed;
public InventorySlot( T _item){
public InventorySlotScroll( DefaultScroll _item){
item = _item;
isDisplayed = false;
}
}
......@@ -12,3 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 14aa6bfc325535540999d9ee4927d556, type: 3}
m_Name: THE_INVENTORY
m_EditorClassIdentifier:
Facts: []
Scrolls:
- item: {fileID: 11400000, guid: b8e04ce999b77dc48a7f225e635bc2ce, type: 2}
isDisplayed: 0
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4863e36a3d5b58b47a13400c96dce2fd, type: 3}
m_Name: Pythagoras
m_EditorClassIdentifier:
type: 2
Description:
IconPrefab: {fileID: 1096499547874235316, guid: ace2327d1a24b6b4a9fcdbd943b0d23b,
type: 3}
UsagePrefab: {fileID: 4362180880950796636, guid: 170ab14de1eba214fb78abe18aaf388c,
type: 3}
fileFormatVersion: 2
guid: b8e04ce999b77dc48a7f225e635bc2ce
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -44,16 +44,12 @@ public void AddPointFact(){
inventory.AddFact(fact);
}
public void AddDemoScroll(){
DefaultScroll scroll = ScriptableObject.CreateInstance<DefaultScroll>();
scroll.Description = "Dis is Scroll";
inventory.AddScroll(scroll);
}
private void OnApplicationQuit()
{
inventory.Facts.Clear();
for(int i = 0; i < inventory.Scrolls.Count; i++){
inventory.Scrolls[i].isDisplayed = false;
}
}
}
......@@ -476,6 +476,8 @@ GameObject:
- component: {fileID: 6643637775379894485}
- component: {fileID: 6643637775379894487}
- component: {fileID: 6643637775379894486}
- component: {fileID: 225831940989964384}
- component: {fileID: 114522817932931646}
m_Layer: 5
m_Name: AngleDisplay
m_TagString: Untagged
......@@ -540,3 +542,27 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!225 &225831940989964384
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6643637775379894484}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &114522817932931646
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6643637775379894484}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3}
m_Name:
m_EditorClassIdentifier:
......@@ -11,6 +11,8 @@ GameObject:
- component: {fileID: 858001163752551618}
- component: {fileID: 858001163752551616}
- component: {fileID: 858001163752551617}
- component: {fileID: 114132791164475416}
- component: {fileID: 225408562469983378}
m_Layer: 5
m_Name: DisplayPoint
m_TagString: Untagged
......@@ -73,6 +75,30 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &114132791164475416
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 858001163752551619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!225 &225408562469983378
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 858001163752551619}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &858001164857725565
GameObject:
m_ObjectHideFlags: 0
......
......@@ -11,6 +11,8 @@ GameObject:
- component: {fileID: 7299404996771626324}
- component: {fileID: 2318968178306689515}
- component: {fileID: 1241458608524046696}
- component: {fileID: 2785940634305866798}
- component: {fileID: 9035428711241438515}
m_Layer: 5
m_Name: DistanceDisplay
m_TagString: Untagged
......@@ -74,6 +76,30 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &2785940634305866798
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4221381813544557775}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!225 &9035428711241438515
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4221381813544557775}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &6379254425133528592
GameObject:
m_ObjectHideFlags: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1096499547874235316
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3034026415523795643}
- component: {fileID: 1128051559874898766}
- component: {fileID: 4377593509458917284}
m_Layer: 5
m_Name: PythagorasDisplay
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3034026415523795643
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1096499547874235316}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.2170901, y: 2.2170901, z: 2.2170901}
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: -1314.7345, y: -268.06842}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1128051559874898766
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1096499547874235316}
m_CullTransparentMesh: 0
--- !u!114 &4377593509458917284
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1096499547874235316}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e706f1d2fb068e342b1c80c357d84b40, 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
fileFormatVersion: 2
guid: ace2327d1a24b6b4a9fcdbd943b0d23b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 170ab14de1eba214fb78abe18aaf388c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment