Skip to content
Snippets Groups Projects
Verified Commit 011e1fdb authored by Adrian Paschkowski's avatar Adrian Paschkowski :thinking:
Browse files

Fix Archer drag pivot

parent e8350da5
No related branches found
No related tags found
No related merge requests found
......@@ -79,7 +79,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 7146f39fc0ed43644b4c1d528fbbe587, type: 3}
m_Sprite: {fileID: 21300000, guid: ffceb3401f02a4a4aa05ecbea80f844b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -145,7 +145,7 @@ Rigidbody2D:
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
m_Constraints: 4
--- !u!61 &2855932740240781457
BoxCollider2D:
m_ObjectHideFlags: 0
......
......@@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: Archer
m_EditorClassIdentifier:
enemyName: Archer
enemySprite: {fileID: 21300000, guid: 7146f39fc0ed43644b4c1d528fbbe587, type: 3}
enemySprite: {fileID: 21300000, guid: ffceb3401f02a4a4aa05ecbea80f844b, type: 3}
enemyPrefab: {fileID: 1601947692949862, guid: 7aed946b5664405459098c6b3528627a, type: 3}
enemyCost: 150
dragPivot: {x: 0.2, y: 0}
......@@ -16,3 +16,4 @@ MonoBehaviour:
enemySprite: {fileID: 21300000, guid: f2ed27d6c1c3ccc48959bcca269d88f0, type: 3}
enemyPrefab: {fileID: 1689866831511430, guid: 47f4e1f4f52a8ea4e8c4afb1cce6a3f5, type: 3}
enemyCost: 200
dragPivot: {x: 0, y: 0.6}
......@@ -8,5 +8,6 @@ public class Opponent : ScriptableObject
public Sprite enemySprite;
public GameObject enemyPrefab;
public int enemyCost;
public Vector2 dragPivot;
}
......@@ -16,3 +16,4 @@ MonoBehaviour:
enemySprite: {fileID: 21300000, guid: 317b8365a4649ab459f6cb58ec8f9f18, type: 3}
enemyPrefab: {fileID: 1463392086428580, guid: 24b6178ea31b57743ac5b5b95a7d8cf8, type: 3}
enemyCost: 400
dragPivot: {x: 0, y: 0.6}
......@@ -22,6 +22,7 @@ public class DragDestroyController : MonoBehaviour
bool draggingEnabled = true;
GameObject selectedEnemy;
SpriteRenderer selectedEnemySprite;
Opponent selectedOpponent;
Vector3 originalEnemyPosition;
int originalEnemyLayer;
IDragDropListener listener;
......@@ -38,6 +39,7 @@ public class DragDestroyController : MonoBehaviour
selectedEnemy = enemy;
originalEnemyPosition = enemy.transform.position;
selectedEnemySprite = enemy.GetComponent<SpriteRenderer>();
selectedOpponent = enemy.GetComponent<Enemy>().opponentType;
originalEnemyLayer = enemy.layer;
// So that raycasts don't hit the current Enemy
enemy.layer = noCollisionLayer;
......@@ -92,7 +94,7 @@ public class DragDestroyController : MonoBehaviour
if (enemy != null)
{
StatsManager.instance.ModifyMana(enemy.GetComponent<Enemy>().opponentType.enemyCost);
StatsManager.instance.ModifyMana(selectedOpponent.enemyCost);
Destroy(enemy);
cameraController.PlayRandomGlobalAudioClip(removeEnemySfx);
}
......@@ -112,7 +114,7 @@ public class DragDestroyController : MonoBehaviour
if (selectedEnemy != null)
{
// Move Enemy to mouse position
selectedEnemy.transform.position = GetMouseWorldPosition() - new Vector3(0, selectedEnemySprite.bounds.extents.y);
selectedEnemy.transform.position = GetMouseWorldPosition() - (Vector3)selectedOpponent.dragPivot;
// Indicate that Enemy can't be placed on top of other Enemies
selectedEnemySprite.color = RayCastForFighter(true) != null ? disabledColor : Color.white;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment