etc
/
HeavenStudioPlus
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from jakobwcrowe/megaminerzero 

Karate Man: Resolved layering issues with pot sprites
This commit is contained in:
Braedon 2022-02-03 11:57:16 -05:00 committed by GitHub
parent 9c5c6d13f9 8a1a159bfb
commit b4483ef479
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Resources/Games/karateman.prefab
View File

@ -668,7 +668,7 @@ SpriteRenderer:
m_Size: {x: 17.777779, y: 10} m_Size: {x: 17.777779, y: 10}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 0
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1 &2786846297550947310 --- !u!1 &2786846297550947310
@ -6598,7 +6598,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 60 m_SortingOrder: 50
m_Sprite: {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} m_Sprite: {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@ -17651,7 +17651,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 60 m_SortingOrder: 50
m_Sprite: {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3} m_Sprite: {fileID: -348202296468608855, guid: 868cd67f05ca7c646bae00fcc2ba7eaa, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0

23
Assets/Scripts/Games/KarateMan/Pot.cs
View File

@ -15,7 +15,9 @@ namespace RhythmHeavenMania.Games.KarateMan
public GameObject Holder; public GameObject Holder;
private GameObject newHolder; private GameObject newHolder;
public GameObject Sprite; public GameObject Sprite;
private SpriteRenderer spriteComp;
public GameObject Shadow; public GameObject Shadow;
private SpriteRenderer shadowSpriteComp;
public bool isThrown; public bool isThrown;
public bool isHit = false; public bool isHit = false;
@ -54,6 +56,8 @@ namespace RhythmHeavenMania.Games.KarateMan
private void Start() private void Start()
{ {
anim = GetComponent<Animator>(); anim = GetComponent<Animator>();
spriteComp = Sprite.GetComponent<SpriteRenderer>();
shadowSpriteComp = Shadow.GetComponent<SpriteRenderer>();
Sprite.transform.eulerAngles = new Vector3(0, 0, Random.Range(0, 360)); Sprite.transform.eulerAngles = new Vector3(0, 0, Random.Range(0, 360));
@ -82,7 +86,7 @@ namespace RhythmHeavenMania.Games.KarateMan
PlayerActionInit(this.gameObject, createBeat); PlayerActionInit(this.gameObject, createBeat);
Sprite.GetComponent<SpriteRenderer>().enabled = false; spriteComp.enabled = false;
} }
public override void OnAce() public override void OnAce()
@ -108,9 +112,9 @@ namespace RhythmHeavenMania.Games.KarateMan
private void Update() private void Update()
{ {
if (Conductor.instance.songPositionInBeats >= createBeat) if (Conductor.instance.songPositionInBeats >= createBeat)
Sprite.GetComponent<SpriteRenderer>().enabled = true; spriteComp.enabled = true;
else else
Sprite.GetComponent<SpriteRenderer>().enabled = false; spriteComp.enabled = false;
float time2Destroy = Conductor.instance.GetLoopPositionFromBeat(createBeat, 4); float time2Destroy = Conductor.instance.GetLoopPositionFromBeat(createBeat, 4);
@ -194,8 +198,13 @@ namespace RhythmHeavenMania.Games.KarateMan
if (normalizedBeat > 1) if (normalizedBeat > 1)
{ {
Sprite.GetComponent<SpriteRenderer>().sortingOrder = -20; spriteComp.sortingOrder = -20;
Shadow.GetComponent<SpriteRenderer>().sortingOrder = -30; shadowSpriteComp.sortingOrder = -30;
}
else
{
// Pots closer to Joe are sorted further back.
spriteComp.sortingOrder = 60 - Mathf.RoundToInt(10f * normalizedBeat);
} }
} }
@ -279,7 +288,7 @@ namespace RhythmHeavenMania.Games.KarateMan
isThrown = false; isThrown = false;
isHit = true; isHit = true;
Sprite.GetComponent<SpriteRenderer>().sortingOrder = 49; spriteComp.sortingOrder = 49;
} }
public void Miss() public void Miss()
@ -295,7 +304,7 @@ namespace RhythmHeavenMania.Games.KarateMan
isHit = false; isHit = false;
isThrown = false; isThrown = false;
anim.enabled = false; anim.enabled = false;
Sprite.GetComponent<SpriteRenderer>().sortingOrder = 49; spriteComp.sortingOrder = 49;
} }
private void NewHolder() private void NewHolder()