Skip to content

Commit

Permalink
Merge pull request #2 from Joshuarox100/development
Browse files Browse the repository at this point in the history
v1.0.0 Merge
  • Loading branch information
Joshuarox100 authored Sep 5, 2020
2 parents c67364f + bbe74fe commit 52f6fb7
Show file tree
Hide file tree
Showing 60 changed files with 32,384 additions and 1,765 deletions.
28 changes: 28 additions & 0 deletions Editor/Assets/GroupItem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System;
using UnityEngine;

[Serializable]
public class GroupItem : ScriptableObject
{
public PageItem Item { get { return m_Item; } set { m_Item = value; } }
[SerializeField]
private PageItem m_Item;

public GroupType Reaction { get { return m_Reaction; } set { m_Reaction = value; } }
[SerializeField]
private GroupType m_Reaction;

public enum GroupType
{
Disable = 0,
//Toggle = 1,
Enable = 1
};

//Constructors
public GroupItem()
{
Item = null;
Reaction = GroupType.Enable;
}
}
10 changes: 10 additions & 0 deletions Editor/Assets/GroupItemEditor.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using UnityEditor;

[CustomEditor(typeof(GroupItem))]
public class GroupItemEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
}
}
10 changes: 10 additions & 0 deletions Editor/Assets/InventoryPreset.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System.Collections.Generic;
using UnityEngine;

[CreateAssetMenu(fileName = "Preset", menuName = "Inventory Inventor/Preset", order = 1)]
public class InventoryPreset : ScriptableObject
{
public List<Page> Pages { get { return m_Pages; } set { m_Pages = value; } }
[SerializeField]
private List<Page> m_Pages = new List<Page>();
}
Loading

0 comments on commit 52f6fb7

Please sign in to comment.