Skip to content
Snippets Groups Projects
Commit c15f043b authored by Robin Halseth Sandvik's avatar Robin Halseth Sandvik
Browse files

Made ItemPref use the icon of the item it represents.

parent 282095da
No related branches found
No related tags found
1 merge request!45Alexander
Hide whitespace changes
Inline Side-by-side
MrBigsock/Assets/Code/PlayerController.cs
+ 71
− 71
View file @ c15f043b
...@@ -16,33 +16,33 @@ namespace BigSock { ...@@ -16,33 +16,33 @@ namespace BigSock {
public partial class PlayerController : Character public partial class PlayerController : Character
{ {
public UtilBar utilBar; public UtilBar utilBar;
public float collisionOffset = 0.05f; public float collisionOffset = 0.05f;
public ContactFilter2D movementFilter; public ContactFilter2D movementFilter;
public GameObject attack; public GameObject attack;
Vector2 movementInput; Vector2 movementInput;
SpriteRenderer spriteRenderer; SpriteRenderer spriteRenderer;
//Rigidbody2D rb; //Rigidbody2D rb;
Animator animator; Animator animator;
List<RaycastHit2D> castCollisions = new List<RaycastHit2D>(); List<RaycastHit2D> castCollisions = new List<RaycastHit2D>();
bool canMove = true; bool canMove = true;
protected IAttack _testAttack; protected IAttack _testAttack;
protected IAttack _testAttack2; protected IAttack _testAttack2;
protected IAbility _dodge; protected IAbility _dodge;
public DateTime NextTimeCanAttack { get; private set; } = DateTime.Now; public DateTime NextTimeCanAttack { get; private set; } = DateTime.Now;
public PlayerController() public PlayerController()
{ {
TryPickUpItem(ItemService.SINGLETON.Get(201)); TryPickUpItem(ItemService.SINGLETON.Get(201));
TryPickUpItem(ItemService.SINGLETON.Get(201)); TryPickUpItem(ItemService.SINGLETON.Get(201));
TryPickUpItem(ItemService.SINGLETON.Get(202)); TryPickUpItem(ItemService.SINGLETON.Get(202));
...@@ -51,70 +51,70 @@ namespace BigSock { ...@@ -51,70 +51,70 @@ namespace BigSock {
// Start is called before the first frame update // Start is called before the first frame update
protected override void Start() protected override void Start()
{ {
base.Start(); base.Start();
utilBar?.WithXP((int)xp, (int)maxXp) utilBar?.WithXP((int)xp, (int)maxXp)
?.WithHealth(Convert.ToInt32(HP), Convert.ToInt32(MaxHP)); ?.WithHealth(Convert.ToInt32(HP), Convert.ToInt32(MaxHP));
animator = GetComponent<Animator>(); animator = GetComponent<Animator>();
spriteRenderer = GetComponent<SpriteRenderer>(); spriteRenderer = GetComponent<SpriteRenderer>();
//!! DEBUG: Add item to player at start to test if it works. //!! DEBUG: Add item to player at start to test if it works.
/* /*
TryPickUpItem(ItemService.SINGLETON.Get(201)); TryPickUpItem(ItemService.SINGLETON.Get(201));
TryPickUpItem(ItemService.SINGLETON.Get(201)); TryPickUpItem(ItemService.SINGLETON.Get(201));
TryPickUpItem(ItemService.SINGLETON.Get(202)); TryPickUpItem(ItemService.SINGLETON.Get(202));
TryPickUpItem(ItemService.SINGLETON.Get(101)); TryPickUpItem(ItemService.SINGLETON.Get(101));
*/ */
//var tmp = PrefabService.SINGLETON; //var tmp = PrefabService.SINGLETON;
var tmp = SpriteService.SINGLETON; var tmp = SpriteService.SINGLETON;
_testAttack = (IAttack) AbilityService.SINGLETON.Get(101); _testAttack = (IAttack) AbilityService.SINGLETON.Get(101);
_testAttack2 = (IAttack) AbilityService.SINGLETON.Get(102); _testAttack2 = (IAttack) AbilityService.SINGLETON.Get(102);
_dodge = AbilityService.SINGLETON.Get(201); _dodge = AbilityService.SINGLETON.Get(201);
} }
private void FixedUpdate() { private void FixedUpdate() {
if(canMove) { if(canMove) {
// If movement input is not 0, try to move // If movement input is not 0, try to move
if(movementInput != Vector2.zero){ if(movementInput != Vector2.zero){
bool success = TryMove(movementInput); bool success = TryMove(movementInput);
if(!success) { if(!success) {
success = TryMove(new Vector2(movementInput.x, 0)); success = TryMove(new Vector2(movementInput.x, 0));
} }
if(!success) { if(!success) {
success = TryMove(new Vector2(0, movementInput.y)); success = TryMove(new Vector2(0, movementInput.y));
} }
animator.SetBool("isMoving", success); animator.SetBool("isMoving", success);
} else { } else {
animator.SetBool("isMoving", false); animator.SetBool("isMoving", false);
} }
// Set direction of sprite to movement direction // Set direction of sprite to movement direction
var mouse = Camera.main.ScreenToWorldPoint(Input.mousePosition); var mouse = Camera.main.ScreenToWorldPoint(Input.mousePosition);
var pos = transform.position; var pos = transform.position;
var temp = (mouse - pos); var temp = (mouse - pos);
//temp.z = 0; //temp.z = 0;
//direction = temp.normalized; //direction = temp.normalized;
if(temp.x < 0) { if(temp.x < 0) {
spriteRenderer.flipX = true; spriteRenderer.flipX = true;
} else if (temp.x > 0) { } else if (temp.x > 0) {
spriteRenderer.flipX = false; spriteRenderer.flipX = false;
} }
} }
} }
......
MrBigsock/Assets/Code/UI/ItemPref.cs
+ 56
− 47
View file @ c15f043b
...@@ -7,52 +7,61 @@ using BigSock.Item; ...@@ -7,52 +7,61 @@ using BigSock.Item;
namespace BigSock.UI namespace BigSock.UI
{ {
public class ItemPref : MonoBehaviour, IPointerDownHandler, IBeginDragHandler, IEndDragHandler, IDragHandler public class ItemPref : MonoBehaviour, IPointerDownHandler, IBeginDragHandler, IEndDragHandler, IDragHandler
{ {
public IItem item; public IItem item;
public ItemSlot itemSlot; public ItemSlot itemSlot;
private RectTransform rectTransform; private RectTransform rectTransform;
private CanvasGroup canvasGroup; private CanvasGroup canvasGroup;
public Vector2? position; public Vector2? position;
private void Awake() void Start()
{ {
rectTransform = GetComponent<RectTransform>(); // Change the sprite if the item has one.
canvasGroup = GetComponent<CanvasGroup>(); var sprite = item?.Icon;
} if(sprite != null)
public void OnBeginDrag(PointerEventData eventData) GetComponent<UnityEngine.UI.Image>().overrideSprite = sprite;
{ }
position = transform.position; private void Awake()
canvasGroup.alpha = .6f; {
canvasGroup.blocksRaycasts = false; rectTransform = GetComponent<RectTransform>();
} canvasGroup = GetComponent<CanvasGroup>();
public void OnDrag(PointerEventData eventData) }
{ public void OnBeginDrag(PointerEventData eventData)
{
rectTransform.anchoredPosition += eventData.delta;
position = transform.position;
} canvasGroup.alpha = .6f;
canvasGroup.blocksRaycasts = false;
public void OnEndDrag(PointerEventData eventData) }
{
public void OnDrag(PointerEventData eventData)
if (position != null) {
{
transform.position = position.Value; rectTransform.anchoredPosition += eventData.delta;
}
}
canvasGroup.alpha = 1f;
canvasGroup.blocksRaycasts = true; public void OnEndDrag(PointerEventData eventData)
} {
public void OnPointerDown(PointerEventData eventData) if (position != null)
{ {
transform.position = position.Value;
} }
canvasGroup.alpha = 1f;
} canvasGroup.blocksRaycasts = true;
}
public void OnPointerDown(PointerEventData eventData)
{
}
}
} }
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