Skip to content

Commit

Permalink
Bugfix: Activators are now colored correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
EscapeNumber001 committed Apr 18, 2023
1 parent e8454cf commit b654cb8
Show file tree
Hide file tree
Showing 7 changed files with 1,518 additions and 15 deletions.
6 changes: 6 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
5 changes: 3 additions & 2 deletions Assets/Script/PlayMode/DrumsTrack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ protected override void UpdateTrack() {
// TODO: Only one note should be an activator at any given timestamp
if (player.track.FillSection?.EndTime == noteInfo.time
&& starpowerCharge >= 0.5f
&& !starpowerActive) {
&& !starpowerActive
) {
noteInfo.isActivator = true;
}

Expand Down Expand Up @@ -330,7 +331,7 @@ private void SpawnNote(NoteInfo noteInfo, float time) {

// Set note info
var noteComp = notePool.AddNote(noteInfo, pos);
noteComp.SetInfo(drumColors[noteInfo.fret], noteInfo.length, model, noteInfo.isActivator);
noteComp.SetInfo(drumColors[noteInfo.fret], drumColors[noteInfo.fret], noteInfo.length, model, noteInfo.isActivator);
}
}
}
9 changes: 4 additions & 5 deletions Assets/Script/Pools/NoteComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ private Color ColorCacheSustains {
return Color.white;
}

// DEBUG: Temporary test code
if (isActivatorNote) {
return Color.magenta;
}

return _colorCacheSustains;
}
set => _colorCacheSustains = value;
Expand All @@ -60,6 +55,10 @@ private Color ColorCacheNotes {
return Color.white;
}

if (isActivatorNote) {
return Color.magenta;
}

return _colorCacheNotes;
}
set => _colorCacheNotes = value;
Expand Down

This file was deleted.

62 changes: 62 additions & 0 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"scopedRegistries": [
{
"name": "Keijiro",
"url": "https://registry.npmjs.com",
"scopes": [
"jp.keijiro"
]
}
],
"dependencies": {
"com.thenathannator.hidrogen": "https://github.com/TheNathannator/HIDrogen.git?path=/Packages/com.thenathannator.hidrogen",
"com.thenathannator.plasticband": "https://github.com/TheNathannator/PlasticBand-Unity.git?path=/Packages/com.thenathannator.plasticband",
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "1.21.9",
"com.unity.ai.navigation": "1.1.1",
"com.unity.ide.rider": "3.0.18",
"com.unity.ide.visualstudio": "2.0.17",
"com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.5.0",
"com.unity.localization": "1.3.2",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.probuilder": "5.0.6",
"com.unity.render-pipelines.universal": "12.1.10",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.3",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4",
"com.unity.ugui": "1.0.0",
"jp.keijiro.minis": "1.0.10",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
}
}
Loading

0 comments on commit b654cb8

Please sign in to comment.