Skip to content

Commit

Permalink
Art folder + UI stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
EliteAsian123 committed Dec 10, 2022
1 parent 79fc3e1 commit 786c30e
Show file tree
Hide file tree
Showing 80 changed files with 148 additions and 51 deletions.
8 changes: 8 additions & 0 deletions Assets/Art.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
48 changes: 48 additions & 0 deletions Assets/Scenes/MenuScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,54 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 498502115}
m_CullTransparentMesh: 1
--- !u!1 &965740405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 965740407}
- component: {fileID: 965740406}
m_Layer: 5
m_Name: UIDocument
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &965740406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 965740405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PanelSettings: {fileID: 11400000, guid: 1d5225406c6ce6c49bfefc89de704cfb, type: 2}
m_ParentUI: {fileID: 0}
sourceAsset: {fileID: 0}
m_SortingOrder: 0
--- !u!4 &965740407
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 965740405}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &972828514
GameObject:
m_ObjectHideFlags: 0
Expand Down
33 changes: 16 additions & 17 deletions Assets/Script/Game.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public static Game Instance {
private set;
} = null;

private YargInput input;
private bool songStarted = false;

private float realSongTime = 0f;
Expand Down Expand Up @@ -64,22 +63,22 @@ private void Awake() {

// Input

input = new YargInput();
input.Enable();

input._5Fret.Green.started += _ => FretPress(0);
input._5Fret.Red.started += _ => FretPress(1);
input._5Fret.Yellow.started += _ => FretPress(2);
input._5Fret.Blue.started += _ => FretPress(3);
input._5Fret.Orange.started += _ => FretPress(4);
input._5Fret.Strum.started += _ => Strum(true);

input._5Fret.Green.canceled += _ => FretRelease(0);
input._5Fret.Red.canceled += _ => FretRelease(1);
input._5Fret.Yellow.canceled += _ => FretRelease(2);
input._5Fret.Blue.canceled += _ => FretRelease(3);
input._5Fret.Orange.canceled += _ => FretRelease(4);
input._5Fret.Strum.canceled += _ => Strum(false);
// input = new YargInput();
// input.Enable();

// input._5Fret.Green.started += _ => FretPress(0);
// input._5Fret.Red.started += _ => FretPress(1);
// input._5Fret.Yellow.started += _ => FretPress(2);
// input._5Fret.Blue.started += _ => FretPress(3);
// input._5Fret.Orange.started += _ => FretPress(4);
// input._5Fret.Strum.started += _ => Strum(true);

// input._5Fret.Green.canceled += _ => FretRelease(0);
// input._5Fret.Red.canceled += _ => FretRelease(1);
// input._5Fret.Yellow.canceled += _ => FretRelease(2);
// input._5Fret.Blue.canceled += _ => FretRelease(3);
// input._5Fret.Orange.canceled += _ => FretRelease(4);
// input._5Fret.Strum.canceled += _ => Strum(false);

// Song

Expand Down
8 changes: 8 additions & 0 deletions Assets/UI Toolkit.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions Assets/UI Toolkit/PanelSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
m_Name: PanelSettings
m_EditorClassIdentifier:
themeUss: {fileID: -4733365628477956816, guid: 562f3986c8251d74da7116d64f7e94cb,
type: 3}
m_TargetTexture: {fileID: 0}
m_ScaleMode: 1
m_ReferenceSpritePixelsPerUnit: 100
m_Scale: 1
m_ReferenceDpi: 96
m_FallbackDpi: 96
m_ReferenceResolution: {x: 1200, y: 800}
m_ScreenMatchMode: 0
m_Match: 0
m_SortingOrder: 0
m_TargetDisplay: 0
m_ClearDepthStencil: 1
m_ClearColor: 0
m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0}
m_DynamicAtlasSettings:
m_MinAtlasSize: 64
m_MaxAtlasSize: 4096
m_MaxSubTextureSize: 64
m_ActiveFilters: -1
m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
textSettings: {fileID: 0}
8 changes: 8 additions & 0 deletions Assets/UI Toolkit/PanelSettings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/UI Toolkit/UnityThemes.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import url("unity-theme://default");
11 changes: 11 additions & 0 deletions Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions Assets/YargInput.cs.meta

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/YargInput.inputactions.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
"com.unity.ai.navigation": "1.1.0-pre.1",
"com.unity.collab-proxy": "1.17.1",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.4.4",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.probuilder": "5.0.6",
"com.unity.render-pipelines.universal": "14.0.3",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.1",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.3",
Expand Down
20 changes: 0 additions & 20 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@
},
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.16",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.9"
},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.5",
"depth": 0,
Expand Down Expand Up @@ -165,17 +156,6 @@
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.31",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ext.nunit": "1.0.6",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "3.0.6",
"depth": 0,
Expand Down

0 comments on commit 786c30e

Please sign in to comment.