Fixed Wizard's Waltz FOV/Fake 3D

This commit is contained in:
Carson Kompon 2022-03-05 12:46:10 -05:00
parent 91ad96cc91
commit cc5e0e4f3e
5 changed files with 17 additions and 14 deletions

View file

@ -241,7 +241,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1172109260453278802} m_GameObject: {fileID: 1172109260453278802}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6, y: -2.5, z: 10} m_LocalPosition: {x: -6, y: -2.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 7248900333300803150} m_Father: {fileID: 7248900333300803150}
@ -286,7 +286,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: -32767
m_Sprite: {fileID: -4983146447318673554, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Sprite: {fileID: -4983146447318673554, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3}
m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0.33333334} m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0.33333334}
m_FlipX: 0 m_FlipX: 0
@ -1389,7 +1389,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7509558683071972976} m_GameObject: {fileID: 7509558683071972976}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -2.76, z: 3.57} m_LocalPosition: {x: 0, y: -2.25, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 6267059327452545344} - {fileID: 6267059327452545344}
@ -1659,7 +1659,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -1 m_SortingOrder: -32767
m_Sprite: {fileID: -4983146447318673554, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3} m_Sprite: {fileID: -4983146447318673554, guid: a7ebfee08631d124d9385ba110cd71c0, type: 3}
m_Color: {r: 0.90588236, g: 0.90588236, b: 0.90588236, a: 0.33333334} m_Color: {r: 0.90588236, g: 0.90588236, b: 0.90588236, a: 0.33333334}
m_FlipX: 0 m_FlipX: 0

View file

@ -18739,9 +18739,9 @@ RectTransform:
m_Father: {fileID: 1671351975} m_Father: {fileID: 1671351975}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 112, y: -25.34875} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 224, y: 50.6975} m_SizeDelta: {x: 224, y: 50.6975}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1906769994 --- !u!114 &1906769994

View file

@ -15,6 +15,8 @@ namespace RhythmHeavenMania.Games.WizardsWaltz
private bool hit = false; private bool hit = false;
private bool passed = false; private bool passed = false;
public int order = 0;
private void Awake() private void Awake()
{ {
game = WizardsWaltz.instance; game = WizardsWaltz.instance;
@ -22,7 +24,7 @@ namespace RhythmHeavenMania.Games.WizardsWaltz
private void Start() private void Start()
{ {
spriteRenderer.sortingOrder = (int)Math.Round((transform.position.z - 2) * 1000); spriteRenderer.sortingOrder = order;
animator.Play("Appear", 0, 0); animator.Play("Appear", 0, 0);
} }

View file

@ -26,11 +26,11 @@ namespace RhythmHeavenMania.Games.WizardsWaltz
songPos = Conductor.instance.songPositionInBeats; songPos = Conductor.instance.songPositionInBeats;
var am = game.beatInterval / 2f; var am = game.beatInterval / 2f;
var x = Mathf.Sin(Mathf.PI * songPos / am) * 6; var x = Mathf.Sin(Mathf.PI * songPos / am) * 6;
var y = Mathf.Cos(Mathf.PI * songPos / am) * 2f; var y = Mathf.Cos(Mathf.PI * songPos / am) * 1.5f;
var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.35f; var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.35f;
transform.position = new Vector3(x, 1f + y, scale * 2); transform.position = new Vector3(x, 1.5f + y, 0);
shadow.transform.position = new Vector3(x, -3.5f + y, scale * 2 + 0.1f); shadow.transform.position = new Vector3(x, -3f + y, 0);
var xscale = scale; var xscale = scale;
if (y > 0) xscale *= -1; if (y > 0) xscale *= -1;

View file

@ -53,7 +53,7 @@ namespace RhythmHeavenMania.Games.WizardsWaltz
MagicFX magic = Instantiate(fxBase, fxHolder.transform).GetComponent<MagicFX>(); MagicFX magic = Instantiate(fxBase, fxHolder.transform).GetComponent<MagicFX>();
magic.transform.position = new Vector3(x, 0.5f + y, scale * 2); magic.transform.position = new Vector3(x, 0.5f + y, 0);
magic.transform.localScale = wizard.gameObject.transform.localScale; magic.transform.localScale = wizard.gameObject.transform.localScale;
magic.gameObject.SetActive(true); magic.gameObject.SetActive(true);
} }
@ -86,14 +86,15 @@ namespace RhythmHeavenMania.Games.WizardsWaltz
var songPos = Conductor.instance.songPositionInBeats; var songPos = Conductor.instance.songPositionInBeats;
var am = (beatInterval / 2f); var am = (beatInterval / 2f);
var x = Mathf.Sin(Mathf.PI * songPos / am) * 6; var x = Mathf.Sin(Mathf.PI * songPos / am) * 6;
var y = -3.5f + Mathf.Cos(Mathf.PI * songPos / am) * 2f; var y = -3f + Mathf.Cos(Mathf.PI * songPos / am) * 1.5f;
var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.35f; var scale = 1 - Mathf.Cos(Mathf.PI * songPos / am) * 0.35f;
var xscale = scale; var xscale = scale;
if (y > -3.5f) xscale *= -1; if (y > -3.5f) xscale *= -1;
plant.transform.localPosition = new Vector3(x, y, scale * 2); plant.transform.localPosition = new Vector3(x, y, 0);
plant.transform.localScale = new Vector3(xscale, scale, 1); plant.transform.localScale = new Vector3(xscale, scale, 1);
plant.order = (int)Math.Round((scale - 1) * 1000);
plant.gameObject.SetActive(true); plant.gameObject.SetActive(true);
plant.createBeat = beat; plant.createBeat = beat;