Fixed bugs
This commit is contained in:
@@ -2606,9 +2606,7 @@ Transform:
|
|||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children: []
|
||||||
- {fileID: 1672574592}
|
|
||||||
- {fileID: 2005609925}
|
|
||||||
m_Father: {fileID: 1886023632}
|
m_Father: {fileID: 1886023632}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1001 &106686679
|
--- !u!1001 &106686679
|
||||||
@@ -22307,6 +22305,8 @@ Transform:
|
|||||||
- {fileID: 2841572}
|
- {fileID: 2841572}
|
||||||
- {fileID: 1381489908}
|
- {fileID: 1381489908}
|
||||||
- {fileID: 963448677}
|
- {fileID: 963448677}
|
||||||
|
- {fileID: 1672574592}
|
||||||
|
- {fileID: 2005609925}
|
||||||
m_Father: {fileID: 1886023632}
|
m_Father: {fileID: 1886023632}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!4 &712932630 stripped
|
--- !u!4 &712932630 stripped
|
||||||
@@ -51541,12 +51541,12 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1672574591}
|
m_GameObject: {fileID: 1672574591}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
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: 0, z: 0}
|
m_LocalPosition: {x: 4.266148, y: 14.909718, z: -30.038902}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 106401850}
|
m_Father: {fileID: 712073434}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1673553850
|
--- !u!1 &1673553850
|
||||||
GameObject:
|
GameObject:
|
||||||
@@ -62172,12 +62172,12 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2005609924}
|
m_GameObject: {fileID: 2005609924}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
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: 0, z: 0}
|
m_LocalPosition: {x: 4.266148, y: 14.909718, z: -30.038902}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 106401850}
|
m_Father: {fileID: 712073434}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!4 &2008316875 stripped
|
--- !u!4 &2008316875 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using VRC.SDKBase;
|
using VRC.SDKBase;
|
||||||
using VRC.Udon;
|
using VRC.Udon;
|
||||||
|
using static Cinemachine.DocumentationSortingAttribute;
|
||||||
|
|
||||||
namespace Marro.PacManUdon
|
namespace Marro.PacManUdon
|
||||||
{
|
{
|
||||||
@@ -34,6 +35,7 @@ namespace Marro.PacManUdon
|
|||||||
_ghost = ghost;
|
_ghost = ghost;
|
||||||
_gameManager = gameManager;
|
_gameManager = gameManager;
|
||||||
_animator = GetComponent<Animator>();
|
_animator = GetComponent<Animator>();
|
||||||
|
SetActive(false); // Should only activate for intermission 2
|
||||||
Reset();
|
Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,11 +43,11 @@ namespace Marro.PacManUdon
|
|||||||
{
|
{
|
||||||
_lastUpdate = PoleStrechLevels.None;
|
_lastUpdate = PoleStrechLevels.None;
|
||||||
SetStrechLevel(PoleStrechLevels.None);
|
SetStrechLevel(PoleStrechLevels.None);
|
||||||
SetActive(false); // Should only activate for intermission 2
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetActive(bool isActive)
|
public void SetActive(bool isActive)
|
||||||
{
|
{
|
||||||
|
Debug.Log($"({nameof(PacManUdon)} {nameof(Intermission2Pole)}) SetActive {isActive}.");
|
||||||
gameObject.SetActive(isActive);
|
gameObject.SetActive(isActive);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,6 +115,7 @@ namespace Marro.PacManUdon
|
|||||||
|
|
||||||
public void SetStrechLevel(PoleStrechLevels level)
|
public void SetStrechLevel(PoleStrechLevels level)
|
||||||
{
|
{
|
||||||
|
Debug.Log($"({nameof(PacManUdon)} {nameof(Intermission2Pole)}) Set strech level to {level}.");
|
||||||
_animator.SetFloat("Strech", GetAnimatorValueForStrechLevel(level));
|
_animator.SetFloat("Strech", GetAnimatorValueForStrechLevel(level));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ namespace Marro.PacManUdon
|
|||||||
case 1:
|
case 1:
|
||||||
// Show pole
|
// Show pole
|
||||||
SetIntermissionScreenVisible(true);
|
SetIntermissionScreenVisible(true);
|
||||||
intermission2Pole.Reset();
|
|
||||||
intermission2Pole.SetActive(true);
|
intermission2Pole.SetActive(true);
|
||||||
|
intermission2Pole.Reset();
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
// Start music
|
// Start music
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ namespace Marro.PacManUdon
|
|||||||
// Increment level, show ready, show pellets, show lives indicators
|
// Increment level, show ready, show pellets, show lives indicators
|
||||||
IncrementLevel();
|
IncrementLevel();
|
||||||
statusDisplay.SetExtraLivesDisplayVisible(true);
|
statusDisplay.SetExtraLivesDisplayVisible(true);
|
||||||
|
statusDisplay.SetLevelDisplayVisible(true);
|
||||||
statusDisplay.SetReadyTextVisible(true);
|
statusDisplay.SetReadyTextVisible(true);
|
||||||
SetPelletsActive(true);
|
SetPelletsActive(true);
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user