etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 03:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

start gearing up for track 5

Browse source 
it is battery acid color (i will change it)

i probably did this wrong
This commit is contained in:
ThatZeoMan 2022-07-28 00:17:02 -05:00
parent 9bca79b2a0
commit e2a677ebdf
8 changed files with 225 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

248
Assets/Resources/Fonts/rodin/FOT-Rodin Pro M SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

2
Assets/Scripts/Beatmap.cs
View file

@ -77,7 +77,7 @@ namespace HeavenStudio
} }
catch (Exception ex) catch (Exception ex)
{ {
UnityEngine.Debug.LogError($"You probably misspelled a paramater, or defined the object type wrong. Exception log: {ex}"); UnityEngine.Debug.LogError($"You probably misspelled a parameter, or defined the object type wrong. Exception log: {ex}");
} }
} }
} }

3
Assets/Scripts/LevelEditor/EditorTheme.cs
View file

@ -59,6 +59,9 @@ namespace HeavenStudio.Editor
case 3: case 3:
c = theme.properties.Layer4Col.Hex2RGB(); c = theme.properties.Layer4Col.Hex2RGB();
break; break;
case 4:
c = theme.properties.Layer5Col.Hex2RGB();
break;
} }
layer.GetComponent<Image>().color = c; layer.GetComponent<Image>().color = c;

1
Assets/Scripts/LevelEditor/Theme.cs
View file

@ -19,6 +19,7 @@ namespace HeavenStudio.Editor
public string Layer2Col; public string Layer2Col;
public string Layer3Col; public string Layer3Col;
public string Layer4Col; public string Layer4Col;
public string Layer5Col;
public string EventSelectedCol; public string EventSelectedCol;
public string EventNormalCol; public string EventNormalCol;

2
Assets/Scripts/LevelEditor/Timeline/LayerLabel.cs
View file

@ -24,7 +24,7 @@ namespace HeavenStudio.Editor.Track
cam = Editor.instance.EditorCamera; cam = Editor.instance.EditorCamera;
float layerScaleDist = cam.WorldToScreenPoint(Timeline.instance.LayerCorners[1]).y - Camera.main.WorldToScreenPoint(Timeline.instance.LayerCorners[0]).y; float layerScaleDist = cam.WorldToScreenPoint(Timeline.instance.LayerCorners[1]).y - Camera.main.WorldToScreenPoint(Timeline.instance.LayerCorners[0]).y;
float modScale = Timeline.GetScaleModifier(); float modScale = Timeline.GetScaleModifier();
rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, layerScaleDist/4 * (1/modScale)); rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, layerScaleDist/5 * (1/modScale));
} }
catch (System.NullReferenceException) catch (System.NullReferenceException)
{ {

6
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -21,7 +21,7 @@ namespace HeavenStudio.Editor.Track
private Vector2 lastMousePos; private Vector2 lastMousePos;
public List<TimelineEventObj> eventObjs = new List<TimelineEventObj>(); public List<TimelineEventObj> eventObjs = new List<TimelineEventObj>();
private bool lastFrameDrag; private bool lastFrameDrag;
public int LayerCount = 4; public int LayerCount = 5;
public bool metronomeEnabled; public bool metronomeEnabled;
public bool resizable; public bool resizable;
private bool movingPlayback; private bool movingPlayback;
@ -652,12 +652,12 @@ namespace HeavenStudio.Editor.Track
public float SnapToLayer(float y) public float SnapToLayer(float y)
{ {
float size = LayerHeight(); float size = LayerHeight();
return Mathf.Clamp(Mathp.Round2Nearest(y, size), -size * 3f, 0f); return Mathf.Clamp(Mathp.Round2Nearest(y, size), -size * 4f, 0f);
} }
public float LayerHeight() public float LayerHeight()
{ {
return LayersRect.rect.height / 4f; return LayersRect.rect.height / 5f;
} }
public void SetPlaybackSpeed(float speed) public void SetPlaybackSpeed(float speed)

3
Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
View file

@ -452,6 +452,9 @@ namespace HeavenStudio.Editor.Track
case 3: case 3:
c = EditorTheme.theme.properties.Layer4Col.Hex2RGB(); c = EditorTheme.theme.properties.Layer4Col.Hex2RGB();
break; break;
case 4:
c = EditorTheme.theme.properties.Layer5Col.Hex2RGB();
break;
} }
// c = new Color(c.r, c.g, c.b, 0.85f); // c = new Color(c.r, c.g, c.b, 0.85f);

3
Assets/Scripts/LevelEditor/editortheme.json
View file

@ -2,7 +2,7 @@
{ {
"name": "Rhythm Heaven Mania Default Editor Theme", "name": "Heaven Studio Default Editor Theme",
"properties": { "properties": {
"TempoLayerCol": "6cbcc4", "TempoLayerCol": "6cbcc4",
@ -12,6 +12,7 @@
"Layer2Col": "ffd166", "Layer2Col": "ffd166",
"Layer3Col": "06d6a0", "Layer3Col": "06d6a0",
"Layer4Col": "118ab2", "Layer4Col": "118ab2",
"Layer5Col": "34eb55",
"EventSelectedCol": "61e5ff", "EventSelectedCol": "61e5ff",
"EventNormalCol": "FFFFFF", "EventNormalCol": "FFFFFF",