Skip to content

Commit 4d77d32

Browse files
committed
Adds three LARGE monster spritesheets
1 parent 71cfcd7 commit 4d77d32

File tree

10 files changed

+11662
-7
lines changed

10 files changed

+11662
-7
lines changed

Assets/_Project/Scenes/tally-viz-master.unity

Lines changed: 456 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/_Project/Scripts/Data/Timeline.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected Timeline () { }
1818

1919

2020

21-
// PREFAB REFERENCES
21+
// REFERENCES INSIDE PREFABS
2222

2323
[Space (10)]
2424
[Header ("REFERENCES IN PREFABS")]

Assets/_Project/Scripts/Players/MonsterAddSpritesFrameAnim.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private void Awake ()
2424
spriteRenderer = GetComponent<SpriteRenderer> ();
2525

2626
// test
27-
spriteRenderer.sprite = MonsterManager.Instance.monsters [0];
27+
spriteRenderer.sprite = MonsterManager.Instance.monstersFromSheets [0];
2828
Debug.Log (spriteRenderer.sprite);
2929

3030
// TEMP
@@ -39,9 +39,9 @@ private void Awake ()
3939
}
4040

4141
// set the next three as the sprites for this animation
42-
frameAnimation.sprites [0] = MonsterManager.Instance.monsters [spriteIndex + 1];
43-
frameAnimation.sprites [1] = MonsterManager.Instance.monsters [spriteIndex + 2];
44-
frameAnimation.sprites [2] = MonsterManager.Instance.monsters [spriteIndex + 3];
42+
frameAnimation.sprites [0] = MonsterManager.Instance.monstersFromSheets [spriteIndex + 1];
43+
frameAnimation.sprites [1] = MonsterManager.Instance.monstersFromSheets [spriteIndex + 2];
44+
frameAnimation.sprites [2] = MonsterManager.Instance.monstersFromSheets [spriteIndex + 3];
4545

4646
}
4747

Assets/_Project/Scripts/Players/MonsterManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ protected MonsterManager () { }
1313
public Sprite [] monsters;
1414

1515

16+
// temp sprites for assigning monsters
17+
public Sprite [] monstersFromSheets;
1618

1719

1820

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)