Skip to content
Snippets Groups Projects
Commit 6cdb5ae7 authored by Julius Fredrik Einum's avatar Julius Fredrik Einum
Browse files

Merge branch 'master' into JuliusesNyeSuperBranch

parents 5306df7c 31761dde
No related branches found
No related tags found
2 merge requests!52Updating master,!51Juliuses nye super branch
Hide whitespace changes
Inline Side-by-side
Showing
with 146 additions and 133 deletions
MrBigsock/Assets/Code/PlayerController.cs
+ 1
− 1
View file @ 6cdb5ae7
......@@ -72,7 +72,7 @@ namespace BigSock {
TryPickUpItem(ItemService.SINGLETON.Get(101));
*/
//var tmp = PrefabService.SINGLETON;
var tmp = SpriteService.SINGLETON;
//var tmp = SpriteService.SINGLETON;
_testAttack = (IAttack) AbilityService.SINGLETON.Get(101);
_testAttack2 = (IAttack) AbilityService.SINGLETON.Get(102);
......
MrBigsock/Assets/Code/Services/AbilityService.cs
+ 3
− 3
View file @ 6cdb5ae7
......@@ -70,9 +70,9 @@ namespace BigSock.Service {
_abilities = _abilityList
.ToDictionary(t => t.Id);
foreach(var a in _abilityList) {
Debug.Log($"[AbilityService._loadItems()] {a.Id}");
}
//foreach(var a in _abilityList) {
// Debug.Log($"[AbilityService._loadItems()] {a.Id}");
//}
}
/*
......
MrBigsock/Assets/Code/Services/PrefabService.cs
+ 1
− 1
View file @ 6cdb5ae7
......@@ -80,7 +80,7 @@ namespace BigSock.Service {
var name = _sanitize(path.Replace(".prefab", "").Replace("Assets/Prefabs/", ""));
GameObject go = AssetDatabase.LoadAssetAtPath<GameObject>( path );
Debug.Log($"[PrefabService._loadItems()] {name}");
//Debug.Log($"[PrefabService._loadItems()] {name}");
dict[name] = go;
}
......
MrBigsock/Assets/Code/Services/SpriteService.cs
+ 1
− 1
View file @ 6cdb5ae7
......@@ -55,7 +55,7 @@ namespace BigSock.Service {
var name = _sanitize(path.Replace(".png", "").Replace(".jpg", "").Replace("Assets/Sprites/", ""));
Sprite go = AssetDatabase.LoadAssetAtPath<Sprite>( path );
Debug.Log($"[SpriteService._loadItems()] {name}");
//Debug.Log($"[SpriteService._loadItems()] {name}");
dict[name] = go;
}
......
MrBigsock/Assets/Code/UI/InventoryPanel.cs
+ 90
− 98
View file @ 6cdb5ae7
......@@ -7,107 +7,99 @@ using UnityEngine.UI;
namespace BigSock.UI
{
public class InventoryPanel : MonoBehaviour
{
public PlayerController player;
public const string INVSLOT = "UI/Inventoryslot";
public const string ITEM = "UI/Item";
public class InventoryPanel : MonoBehaviour
{
public PlayerController player;
public const string INVSLOT = "UI/Inventoryslot";
public const string ITEM = "UI/Item";
public GridLayoutGroup gridBackPack;
public GridLayoutGroup gridTools;
public GridLayoutGroup gridAccessory;
public GridLayoutGroup gridEquipment;
public GridLayoutGroup gridBackPack;
public GridLayoutGroup gridTools;
public GridLayoutGroup gridAccessory;
public GridLayoutGroup gridEquipment;
//var bullet = PrefabService.SINGLETON.Instance(PROJECTILE_NAME, actor.transform.position);
//var bulletScript = bullet.GetComponent<AttackMovement>();
public void Start() {
GenerateInv();
}
public void Start()
{
GenerateInv();
}
public void GenerateInv()
{
var inventory = player.Inventory;
for (int i = 0; i < inventory.Backpack.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridBackPack.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Backpack;
invScript.position = i;
var item = inventory.Backpack[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
}
}
for (int i = 0; i < inventory.Tools.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridTools.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Tool;
invScript.position = i;
var item = inventory.Tools[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
public void GenerateInv()
{
var inventory = player.Inventory;
for (int i = 0; i < inventory.Backpack.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridBackPack.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Backpack;
invScript.position = i;
var item = inventory.Backpack[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
}
}
for (int i = 0; i < inventory.Tools.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridTools.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Tool;
invScript.position = i;
var item = inventory.Tools[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
}
}
for (int i = 0; i < inventory.Equipment.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridEquipment.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Equipment;
invScript.position = i;
var item = inventory.Equipment[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
}
}
for (int i = 0; i < inventory.Accessories.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridAccessory.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Accessory;
invScript.position = i;
var item = inventory.Accessories[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
}
}
}
}
for (int i = 0; i < inventory.Equipment.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridEquipment.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Equipment;
invScript.position = i;
var item = inventory.Equipment[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
}
}
for (int i = 0; i < inventory.Accessories.Count; ++i)
{
var invSlot = PrefabService.SINGLETON.Instance(INVSLOT, gridAccessory.transform);
var invScript = invSlot.GetComponent<ItemSlot>();
invScript.inventory = inventory;
invScript.inventoryType = InventoryType.Accessory;
invScript.position = i;
var item = inventory.Accessories[i];
if (item != null)
{
var itemPref = PrefabService.SINGLETON.Instance(ITEM, transform);
var itemScript = itemPref.GetComponent<ItemPref>();
itemScript.item = item;
itemScript.itemSlot = invScript;
invScript.item = itemScript;
itemScript.transform.position = invScript.transform.position;
}
}
}
}
}
}
}
MrBigsock/Assets/Code/UI/ItemPref.cs
+ 0
− 1
View file @ 6cdb5ae7
......@@ -27,7 +27,6 @@ namespace BigSock.UI
{
rectTransform = GetComponent<RectTransform>();
canvasGroup = GetComponent<CanvasGroup>();
}
public void OnBeginDrag(PointerEventData eventData)
{
......
MrBigsock/Assets/Code/UI/ItemSlot.cs
+ 50
− 28
View file @ 6cdb5ae7
......@@ -7,33 +7,55 @@ using BigSock.Item;
namespace BigSock.UI
{
public class ItemSlot : MonoBehaviour, IDropHandler
{
public InventoryType inventoryType;
public int position;
public ItemPref item;
public Inventory inventory;
public void OnDrop(PointerEventData eventData)
{
if (eventData.pointerDrag != null)
{
//eventData.pointerDrag.GetComponent<DragDrop>()?.position = null;
var itemPref = eventData.pointerDrag.GetComponent<ItemPref>();
if (itemPref != null)
{
var didMove = inventory.MoveItem(itemPref.item, itemPref.itemSlot.inventoryType,
itemPref.itemSlot.position, inventoryType, position);
if (didMove)
{
itemPref.itemSlot.item = null;
itemPref.itemSlot = this;
item = itemPref;
eventData.pointerDrag.transform.position = transform.position;
itemPref.position = null;
public class ItemSlot : MonoBehaviour, IDropHandler
{
public InventoryType inventoryType;
public int position;
public ItemPref item;
public Inventory inventory;
}
}
}
}
}
bool firstRan = false;
public void Start() {
transform.hasChanged = false;
if(transform.hasChanged) {
//Debug.Log($"[ItemSlot.Start({GetInstanceID()})] {transform.position}");
}
}
public void Update() {
// If it hasn't ran before, and the position has changed, update the ItemPref.
if(!firstRan && transform.hasChanged) {
transform.hasChanged = false;
firstRan = true;
if(item != null) {
//Debug.Log($"[ItemSlot.Update({GetInstanceID()})] Item: {item?.transform?.position}, Slot: {transform.position}");
item.transform.position = transform.position;
}
}
}
public void OnDrop(PointerEventData eventData)
{
if (eventData.pointerDrag != null)
{
var itemPref = eventData.pointerDrag.GetComponent<ItemPref>();
if (itemPref != null)
{
var didMove = inventory.MoveItem(itemPref.item, itemPref.itemSlot.inventoryType,
itemPref.itemSlot.position, inventoryType, position);
if (didMove)
{
itemPref.itemSlot.item = null;
itemPref.itemSlot = this;
item = itemPref;
eventData.pointerDrag.transform.position = transform.position;
itemPref.position = null;
}
}
}
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment