etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-23 18:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #53 from jakobwcrowe/master

Browse source 
Rhythm Rally bg bugfix + debug cam toggle
This commit is contained in:
Jenny Crowe 2022-02-20 06:58:04 -07:00 committed by GitHub
commit 419125fc5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Resources/Games/builtToScaleDS.prefab
View file

@ -311,7 +311,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4052947733920485538} m_GameObject: {fileID: 4052947733920485538}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a0e5d5d77f9b8824b997a02d704003ef, type: 3} m_Script: {fileID: 11500000, guid: a0e5d5d77f9b8824b997a02d704003ef, type: 3}
m_Name: m_Name:

6
Assets/Resources/Games/rhythmRally.prefab
View file

@ -407,7 +407,7 @@ SpriteRenderer:
m_Size: {x: 1, y: 1} m_Size: {x: 1, y: 1}
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 &1871413452992259420 --- !u!1 &1871413452992259420
@ -974,7 +974,7 @@ Camera:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 2 m_ClearFlags: 2
m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} m_BackGroundColor: {r: 1, g: 1, b: 1, a: 1}
m_projectionMatrixMode: 1 m_projectionMatrixMode: 1
m_GateFitMode: 2 m_GateFitMode: 2
m_FOVAxisMode: 0 m_FOVAxisMode: 0
@ -1047,7 +1047,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4052947733920485538} m_GameObject: {fileID: 4052947733920485538}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a0e5d5d77f9b8824b997a02d704003ef, type: 3} m_Script: {fileID: 11500000, guid: a0e5d5d77f9b8824b997a02d704003ef, type: 3}
m_Name: m_Name:

2
Assets/Scripts/GameManager.cs
View file

@ -34,7 +34,7 @@ namespace RhythmHeavenMania
public float startOffset; public float startOffset;
public bool playOnStart; public bool playOnStart;
public float startBeat; public float startBeat;
private GameObject currentGameO; [NonSerialized] public GameObject currentGameO;
public bool autoplay; public bool autoplay;
public event Action<float> onBeatChanged; public event Action<float> onBeatChanged;

21
Assets/Scripts/LevelEditor/Editor.cs
View file

@ -134,6 +134,14 @@ namespace RhythmHeavenMania.Editor
{ {
CommandManager.instance.Redo(); CommandManager.instance.Redo();
} }
if (Input.GetKey(KeyCode.LeftShift))
{
if (Input.GetKeyDown(KeyCode.D))
{
ToggleDebugCam();
}
}
} }
if (Timeline.instance.timelineState.selected && Editor.instance.canSelect) if (Timeline.instance.timelineState.selected && Editor.instance.canSelect)
@ -415,5 +423,18 @@ namespace RhythmHeavenMania.Editor
{ {
return (rectTransform.gameObject.activeSelf && RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Editor.instance.EditorCamera)); return (rectTransform.gameObject.activeSelf && RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Editor.instance.EditorCamera));
} }
public void ToggleDebugCam()
{
var game = GameManager.instance.currentGameO;
if (game != null)
{
foreach(FreeCam c in game.GetComponentsInChildren<FreeCam>(true))
{
c.enabled = !c.enabled;
}
}
}
} }
} }