diff --git a/.vs/osu-trigen/v16/.suo b/.vs/osu-trigen/v16/.suo index 648c3b11..cb3f33c5 100644 Binary files a/.vs/osu-trigen/v16/.suo and b/.vs/osu-trigen/v16/.suo differ diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_BPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_BPicker.mat index 9ec50975..0f9c7b8d 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_BPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_BPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.22285073, g: 0.10353859, b: 0, a: 1} - - _Color2: {r: 0.22285073, g: 0.10353859, b: 1, a: 1} + - _Color1: {r: 1, g: 1, b: 0, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_GPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_GPicker.mat index 8e22c8ea..26e9b476 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_GPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_GPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.22285073, g: 0, b: 0.10353859, a: 1} - - _Color2: {r: 0.22285073, g: 1, b: 0.10353859, a: 1} + - _Color1: {r: 1, g: 0, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_HPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_HPicker.mat index 0deccd66..faacf597 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_HPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_HPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.22285073, g: 0.10353859, b: 0.10353859, a: 1} - - _Color2: {r: 0.22285073, g: 0.10353859, b: 0.10355054, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_MainPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_MainPicker.mat index 8507e1c4..6d124def 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_MainPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_MainPicker.mat @@ -78,4 +78,5 @@ Material: - _Color1: {r: 0, g: 0, b: 0, a: 1} - _Color2: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_Preview.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_Preview.mat index 3f9bf7c3..06026105 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_Preview.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_Preview.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.22285073, g: 0.10353859, b: 0.10353859, a: 1} - - _Color2: {r: 0.22285073, g: 0.10353859, b: 0.10353859, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_RPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_RPicker.mat index b69b7543..6ce07f72 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_RPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_RPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0, g: 0.10353859, b: 0.10353859, a: 1} - - _Color2: {r: 1, g: 0.10353859, b: 0.10353859, a: 1} + - _Color1: {r: 0, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_SPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_SPicker.mat index b47d75cc..db750771 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_SPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_SPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.22285073, g: 0.22285073, b: 0.22285073, a: 1} - - _Color2: {r: 0.22285073, g: 0, b: 0, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_VPicker.mat b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_VPicker.mat index 3bb5c34f..b571749c 100644 --- a/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_VPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/BGColourMaterials/FCP_VPicker.mat @@ -76,6 +76,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _Color1: {r: 0, g: 0, b: 0, a: 1} - - _Color2: {r: 1, g: 0.46460962, b: 0.46460962, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0.5353904, b: 0.22285073, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_BPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_BPicker.mat index ef03df39..0f9c7b8d 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_BPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_BPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.5941611, g: 0.5941611, b: 0, a: 1} - - _Color2: {r: 0.5941611, g: 0.5941611, b: 1, a: 1} + - _Color1: {r: 1, g: 1, b: 0, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_GPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_GPicker.mat index 7ae31a16..26e9b476 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_GPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_GPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.5941611, g: 0, b: 0.5941611, a: 1} - - _Color2: {r: 0.5941611, g: 1, b: 0.5941611, a: 1} + - _Color1: {r: 1, g: 0, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_HPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_HPicker.mat index 403e7dbd..faacf597 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_HPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_HPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1} - - _Color2: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_MainPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_MainPicker.mat index 9f7c5344..6d124def 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_MainPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_MainPicker.mat @@ -78,4 +78,5 @@ Material: - _Color1: {r: 0, g: 0, b: 0, a: 1} - _Color2: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_Preview.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_Preview.mat index f64a993c..06026105 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_Preview.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_Preview.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1} - - _Color2: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_RPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_RPicker.mat index f588598d..6ce07f72 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_RPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_RPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0, g: 0.5941611, b: 0.5941611, a: 1} - - _Color2: {r: 1, g: 0.5941611, b: 0.5941611, a: 1} + - _Color1: {r: 0, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_SPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_SPicker.mat index 5a7ae980..db750771 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_SPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_SPicker.mat @@ -75,7 +75,8 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.5941611, g: 0.5941611, b: 0.5941611, a: 1} - - _Color2: {r: 0.5941611, g: 0, b: 0, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Addons/FlexibleColorPicker/Materials/FCP_VPicker.mat b/Assets/Addons/FlexibleColorPicker/Materials/FCP_VPicker.mat index 3ba42b6e..b571749c 100644 --- a/Assets/Addons/FlexibleColorPicker/Materials/FCP_VPicker.mat +++ b/Assets/Addons/FlexibleColorPicker/Materials/FCP_VPicker.mat @@ -78,4 +78,5 @@ Material: - _Color1: {r: 0, g: 0, b: 0, a: 1} - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _HSV: {r: 0, g: 0, b: 0.5941611, a: 1} + - _HSV: {r: 0, g: 0, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/Tri.prefab b/Assets/Prefabs/Tri.prefab index 05417720..e0ac8ddc 100644 --- a/Assets/Prefabs/Tri.prefab +++ b/Assets/Prefabs/Tri.prefab @@ -1,35 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2403520182960563424 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7216553239716735542} - m_Layer: 8 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7216553239716735542 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2403520182960563424} - 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_Children: [] - m_Father: {fileID: 5048106504107860607} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5048106504107860594 GameObject: m_ObjectHideFlags: 0 @@ -60,9 +30,7 @@ Transform: 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_Children: - - {fileID: 7216553239716735542} - - {fileID: 1075663844432516530} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -81,6 +49,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -152,8 +121,9 @@ MonoBehaviour: hextext: clicked: 0 finalspeedsaved: 0 - selectionbox: {fileID: 5981298913771357358} + selectionbox: {fileID: 0} hexcodetext: + sr: {fileID: 0} --- !u!58 &721770064225118233 CircleCollider2D: m_ObjectHideFlags: 0 @@ -266,84 +236,3 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &5981298913771357358 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1075663844432516530} - - component: {fileID: 2035819112348166496} - m_Layer: 0 - m_Name: selection-square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1075663844432516530 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5981298913771357358} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -4.39} - m_LocalScale: {x: 1, y: 1, z: 7.12} - m_Children: [] - m_Father: {fileID: 5048106504107860607} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2035819112348166496 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5981298913771357358} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 84c5832b80460df4cb31ed75a47bb3a4, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.48, y: 20.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Assets/Scripts/ColourMan.cs b/Assets/Scripts/ColourMan.cs index 0304899d..9f59cb10 100644 --- a/Assets/Scripts/ColourMan.cs +++ b/Assets/Scripts/ColourMan.cs @@ -261,8 +261,6 @@ void HideShowUI() } void Update() { - - accentr = sld_accentr .value; pancolr = sld_pancolr .value; textcolr = sld_textcolr .value; @@ -366,7 +364,6 @@ public void resetcol() public void SavePressed() { - // sets string "fileoutput" to all the variablenames and the variables themselves string fileOutput //sld_accentr.value diff --git a/Assets/Scripts/ThemeInitiator.cs b/Assets/Scripts/ThemeInitiator.cs index 8e2f6e25..3b304a73 100644 --- a/Assets/Scripts/ThemeInitiator.cs +++ b/Assets/Scripts/ThemeInitiator.cs @@ -18,8 +18,6 @@ public class ThemeInitiator : MonoBehaviour public ColourMan colourman; public GameObject colcontrol; public Button open; - // Start is called before the first frame update - public string GetHtmlFromUri(string resource) { @@ -34,9 +32,6 @@ public string GetHtmlFromUri(string resource) { using (StreamReader reader = new StreamReader(resp.GetResponseStream())) { - //We are limiting the array to 80 so we don't have - //to parse the entire html document feel free to - //adjust (probably stay under 300) char[] cs = new char[80]; reader.Read(cs, 0, cs.Length); foreach (char ch in cs) @@ -137,9 +132,6 @@ public void addfilestoarray() // Update is called once per frame void Update() { - - - if (www.isDone && !isUnzipped) { string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); diff --git a/Assets/Scripts/Toolbarman.cs b/Assets/Scripts/Toolbarman.cs deleted file mode 100644 index 209ce5f7..00000000 --- a/Assets/Scripts/Toolbarman.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Toolbarman : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Toolbarman.cs.meta b/Assets/Scripts/Toolbarman.cs.meta deleted file mode 100644 index ff10cae9..00000000 --- a/Assets/Scripts/Toolbarman.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c22591646cccffe469ee69e8b973edd0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Triangle/Triangle.cs b/Assets/Scripts/Triangle/Triangle.cs index a185b40b..418549c1 100644 --- a/Assets/Scripts/Triangle/Triangle.cs +++ b/Assets/Scripts/Triangle/Triangle.cs @@ -8,8 +8,6 @@ public class Triangle : MonoBehaviour { // Set the variables! - - AudioSource m_MyAudioSource; public GameObject TriPrefab; public GameObject Savedialog; public float YSpeedMin; @@ -40,9 +38,11 @@ public class Triangle : MonoBehaviour public GameObject selectionbox; public string hexcodetext; - Collider m_Collider; - // ET TRIGEN TRIANGLE V3 + + public SpriteRenderer sr; + + // TRIGEN TRIANGLE V3 public static byte[] ConvertHexStringToByteArray(string hexString) { @@ -63,28 +63,27 @@ public static byte[] ConvertHexStringToByteArray(string hexString) private void Awake() { - GetComponent().sprite = trianglespr; // gets the spriterenderer again for the third time + sr = this.GetComponent(); + sr.sprite = trianglespr; // gets the spriterenderer again for the third time } public void Init() { byte[] colors = ConvertHexStringToByteArray("FFAB02"); //converts hex to rgb randomadd = UnityEngine.Random.Range(trivars.CVRem, trivars.CVAdd); // sets randomadd to add to value in updatecolor() - - m_Collider = GetComponent(); // set collider + clicked = 0; // set clicked to 0 waitamount = 0; // sets waitamount to 0 wait = 0; // sets wait to 0 - m_MyAudioSource = GetComponent(); // adds audiosource for osumode YSpeedMin = trivars.speed; //more slider stuff OpacityMin = trivars.opacity; //more slider stuff ScaleMin = trivars.smin; //more slider stuff ScaleMax = trivars.smax; //more slider stuff - SpriteRenderer spRend = transform.GetComponent(); //Sets the spriterendererr spRend to the SpriteRenderer component. - Color col = spRend.color; //Sets the colour "col" to spRend.color which we set just abov ethis + + Color col = sr.color; //Sets the colour "col" to spRend.color which we set just abov ethis FinalOpacity = OpacityMin; // Sets FinalOpacity to the minimum opacity. col.a = FinalOpacity; // Sets col.a (colour alpha) to the FinalOpacity - spRend.color = col; // Sets spRend colour to col, while your at it why not paint yourself invisible + sr.color = col; // Sets spRend colour to col, while your at it why not paint yourself invisible FinalScale = UnityEngine.Random.Range(ScaleMin, ScaleMax); //Sets FinalScale to a random number between ScaleMin and ScaleMax FinalSpeed = UnityEngine.Random.Range(YSpeedMin, YSpeedMax); //Sets FinalSpeed to a random number between YSpeedMin and YSpeedMax @@ -122,28 +121,9 @@ public void Init() FinalSpeed = 0.2f; //makes speed high enough to move the triangle at an acceptable speed } updatecolor(); // run updatecolor to update the triangle colour at init - // Examples - // - // If a triangle was the size of two, and the speed was set to 8, the speed would end out as 4. - // Meanwhile if another triangle was set to the size of 0.2, same speed, it'd end out as 7.6 - //S_YSpeedMin.onValueChanged.AddListener(SET_S_YSMIN); // adds listeners - //S_YSpeedMax.onValueChanged.AddListener(SET_S_YSMAX); // adds listeners - //S_OpacityMin.onValueChanged.AddListener(SET_S_OMIN); // adds listeners - //S_OpacityMax.onValueChanged.AddListener(SET_S_OMAX); // adds listeners - //S_ScaleMin.onValueChanged.AddListener(SET_S_SMIN); // adds listeners - //S_ScaleMax.onValueChanged.AddListener(SET_S_SMAX); // adds listeners - // commented due to new global variable structure - - SpriteRenderer spRenda = selectionbox.GetComponent(); // gets sprite renderer - Color cola = spRenda.color; // sets colour "col" to the sprite colour - cola.a = 0f; // removes 0.1 from alpha - spRenda.color = cola; // set sprend to col } - - - -void Update() + void Update() { updatecolor(); //hexcodetext = hexcode.text; @@ -183,49 +163,6 @@ void Update() } } } - else - { - if (Input.GetMouseButtonDown(0)) - { - //SpriteRenderer spRend = selectionbox.GetComponent(); // gets sprite renderer - //Color col = spRend.color; // sets colour "col" to the sprite colour - //col.a = 1f; // removes 0.1 from alpha - //spRend.color = col; // set sprend to col - - } - } - - - - - - - - - - - - - if (osumodecontroller.omode == 1) - { - GetComponent().sprite = hitcircle; // gets spriterenderer and sets it to a hitcircle - print(osumodecontroller.omode); // we off - GetComponent().material.color = UnityEngine.Random.ColorHSV(1f, 1f, 0f, 0f, 1f, 1f); // no clue - } - else - { - //GetComponent().sprite = trianglespr; (commented out & moved cause it overrides replacement) - - } - if(clicked == 1) - { - SpriteRenderer spRend = transform.GetComponent(); // gets sprite renderer - Color col = spRend.color; // sets colour "col" to the sprite colour - col.a -= 0.1f; // removes 0.1 from alpha - spRend.color = col; // set sprend to col - transform.localScale += new Vector3(1.0f, 1.0f, 1.0f) * Time.deltaTime / 2; // moves somewhere, where i dont know, i forgot - } - } void updatecolor() { @@ -256,65 +193,5 @@ void updatecolor() Color c2 = Color.HSVToRGB(h, s, v); // converts back to RGB Color32 finalColor = new Color32((byte)(c2.r * 255), (byte)(c2.g * 255), (byte)(c2.b * 255), 255); // sets finalcolor to c2.r, c2.g, and c2.b timsed by 255 GetComponent().material.color = finalColor; // sets triangle colour to finalcolor - } - // all of this stuff just sets the variables to the slider variables - - void SET_S_YSMIN(float value) - { - - YSpeedMin = value; - } - void SET_S_YSMAX(float value) - { - - YSpeedMax = value; - } - void SET_S_OMIN(float value) - { - - OpacityMin = value; - } - void SET_S_OMAX(float value) - { - - OpacityMax = value; - } - void SET_S_SMIN(float value) - { - - ScaleMin = value; - } - void SET_S_SMAX(float value) - { - - ScaleMax = value; - } - - - - void OnMouseDown() - { - Debug.Log("me was clicc"); - - if(trivars.tripaused = true) - { - //SpriteRenderer spRend = selectionbox.GetComponent(); // gets sprite renderer - //Color col = spRend.color; // sets colour "col" to the sprite colour - //col.a = 1f; // removes 0.1 from alpha - //spRend.color = col; // set sprend to col - } - - if (osumodecontroller.omode == 1) // checks if the osumode is set to 1 - { - if (clicked == 0) // if clicked is set to... 0? - { - Debug.Log("Hit"); // tells me i hit something - m_MyAudioSource.Play(); // plays hitcircle - Destroy(gameObject, 1); // destroys hitcircle - clicked = 1; // sets clicked to 1, now its clicked? - m_Collider.enabled = false; // rip the collider - } - } - } } diff --git a/Assets/Scripts/Triangle/TriangleSpawner.cs b/Assets/Scripts/Triangle/TriangleSpawner.cs index 58e452f8..30261584 100644 --- a/Assets/Scripts/Triangle/TriangleSpawner.cs +++ b/Assets/Scripts/Triangle/TriangleSpawner.cs @@ -9,6 +9,8 @@ using SFB; using System.IO; +// this script simply spawns the triangles, the triangles set their own colour and move themselves. + public class TriangleSpawner : MonoBehaviour { @@ -17,34 +19,22 @@ public class TriangleSpawner : MonoBehaviour public float SpawnSpeedFinal; public Text hex; public GameObject Savedialog; - // Start is called before the first frame update - void Start() - { - - } // Update is called once per frame void Update() { - SpawnSpeed = trivars.spawnspeed; - SpawnSpeedFinal = Random.Range(0, SpawnSpeed); - if (SpawnSpeedFinal > 5) + SpawnSpeed = trivars.spawnspeed; // gets spawnspeed from slider + SpawnSpeedFinal = Random.Range(0, SpawnSpeed); // grabs a random range from 0 to the spawnspeed + if (SpawnSpeedFinal > 5 && trivars.tripaused == false) // as long as the grabbed range is above 5, and the triangles aren't paused... { - + // spawn a triangle GameObject go = Instantiate(triangle, new Vector3(0, 0, 0), Quaternion.identity); Triangle tri = go.GetComponent(); - tri.Init(); + tri.Init(); // initiate triangle } - osumodecontroller.hex = hex.GetComponent().text; - osumodecontroller.hex = osumodecontroller.hex.Replace("#", ""); - //Removed Hex Length Fallback (Issue Fixed) - Debug.Log(osumodecontroller.hex); + osumodecontroller.hex = hex.GetComponent().text; // grab text + osumodecontroller.hex = osumodecontroller.hex.Replace("#", ""); // remove the # + Debug.Log(osumodecontroller.hex); // log it, no clue why we do this lol } - - // public void SetVariables(float LoadedSS, float LoadedYSpeedMin, float LoadedYSpeedMax, float LoadedOMin, float LoadedOMax, float LoadedSMin, float LoadedSMax) - // { - // LoadedSS = SpawnSpeed; - // LoadedYSpeedMin = tri.YSpeedMin; - // } } diff --git a/Assets/Scripts/garbage.cs b/Assets/Scripts/garbage.cs index 42fdb15a..47714d25 100644 --- a/Assets/Scripts/garbage.cs +++ b/Assets/Scripts/garbage.cs @@ -13,7 +13,7 @@ void Start() // Update is called once per frame void Update() { - Resources.UnloadUnusedAssets(); - System.GC.Collect(); + //Resources.UnloadUnusedAssets(); + //System.GC.Collect(); } } diff --git a/Assets/Scripts/tipman.cs b/Assets/Scripts/tipman.cs index 59a3fa9a..327cdc5a 100644 --- a/Assets/Scripts/tipman.cs +++ b/Assets/Scripts/tipman.cs @@ -17,22 +17,14 @@ public class tipman : MonoBehaviour // Start is called before the first frame update void Start() { - StartCoroutine(playAnimation()); closebutt.onClick.AddListener(hideslide); } - // Update is called once per frame - void Update() - { - - - } void hideslide() { animator.Play(); buttpressed = true; - } public IEnumerator playAnimation() {