From ae6e655df17969e0ff2c8ed66bd62d97a6c37f5e Mon Sep 17 00:00:00 2001 From: AllPoland Date: Thu, 31 Aug 2023 11:48:33 -0600 Subject: [PATCH 01/13] fix V2 custom direction not matching up with replay --- Assets/__Scripts/BeatmapData/BeatmapDifficultyV2.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/__Scripts/BeatmapData/BeatmapDifficultyV2.cs b/Assets/__Scripts/BeatmapData/BeatmapDifficultyV2.cs index d328867c..fa372ff7 100644 --- a/Assets/__Scripts/BeatmapData/BeatmapDifficultyV2.cs +++ b/Assets/__Scripts/BeatmapData/BeatmapDifficultyV2.cs @@ -72,6 +72,14 @@ public BeatmapDifficulty ConvertToV3() if(n._type == 0 || n._type == 1) { + int cutDirection = n._cutDirection; + if(n._customData?._cutDirection != null) + { + //Notes with custom cut direction are serialized as 1 _cutDirection + //Except for dot notes + cutDirection = cutDirection != 8 ? 1 : 8; + } + //Color note colorNotes.Add( new BeatmapColorNote @@ -80,7 +88,7 @@ public BeatmapDifficulty ConvertToV3() x = n._lineIndex, y = n._lineLayer, c = n._type, - d = n._cutDirection, + d = cutDirection, a = 0, customData = n._customData?.ConvertToV3() ?? null } From 35b565f11514d717e0cfe89f6d8da257a489fef4 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Thu, 31 Aug 2023 12:03:49 -0600 Subject: [PATCH 02/13] clamp arc segment count cause cross map arcs obliterated performance smil --- Assets/Rendering/BloomfogRenderer.asset | 2 +- Assets/__Scripts/Previewer/MapControl/Objects/ArcManager.cs | 3 ++- Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/Rendering/BloomfogRenderer.asset b/Assets/Rendering/BloomfogRenderer.asset index 11899b62..f09591da 100644 --- a/Assets/Rendering/BloomfogRenderer.asset +++ b/Assets/Rendering/BloomfogRenderer.asset @@ -75,7 +75,7 @@ MonoBehaviour: fogOffset: 0 fogHeight: 25 fogStartY: -80 - referenceScreenHeight: 640 + referenceScreenHeight: 720 blurMaterial: {fileID: 2100000, guid: bb0d314e7f1b9414ab8ffe0ca05d43aa, type: 2} backgroundBrightness: 0.6 backgroundMaterial: {fileID: 2100000, guid: 9573e4979efb331419586eaca156b34b, type: 2} diff --git a/Assets/__Scripts/Previewer/MapControl/Objects/ArcManager.cs b/Assets/__Scripts/Previewer/MapControl/Objects/ArcManager.cs index d50a1f56..4b10f876 100644 --- a/Assets/__Scripts/Previewer/MapControl/Objects/ArcManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Objects/ArcManager.cs @@ -273,7 +273,8 @@ public static Vector3[] GetArcBaseCurve(Arc a) //Calculate the number of points we'll need to make this arc based on the density setting //A minimum value is given because very short arcs would otherwise potentially get no segments at all (very bad) - int pointCount = Mathf.Max((int)ArcSegmentDensity / 2, (int)(ArcSegmentDensity * duration) + 1); + //A maximum value is given to avoid cross-map arcs destroying performance + int pointCount = Mathf.Clamp((int)(ArcSegmentDensity * duration) + 1, (int)ArcSegmentDensity / 2, (int)ArcSegmentDensity * 5); if(a.MidRotationDirection != ArcRotationDirection.None) { //Calculating points is different with a midpoint rotation direction diff --git a/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs b/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs index 0a1dc5ff..f8c9eeba 100644 --- a/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs @@ -208,7 +208,7 @@ public static float SpawnParabola(float targetHeight, float baseHeight, float ha float movementRange = targetHeight - baseHeight; - return -(movementRange / dSquared) * tSquared + targetHeight; + return Mathf.Clamp(-(movementRange / dSquared) * tSquared + targetHeight, -9999f, 9999f); } From 35b306c4682ee239fa6e24bd300f93b0f66e73c4 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Fri, 1 Sep 2023 15:44:22 -0600 Subject: [PATCH 03/13] account for practice mode speed --- .../Previewer/MapControl/Replays/ReplayManager.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs index 56816e35..3f1041d6 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs @@ -82,7 +82,12 @@ public static void SetReplay(Replay newReplay) NoWalls = HasModifier("NO"); NoBombs = HasModifier("NB"); - if(HasModifier("SF")) + if(CurrentReplay.info.speed > 0f) + { + //Speed is saved in practice mode + ReplayTimeScale = CurrentReplay.info.speed; + } + else if(HasModifier("SF")) { //Super fast song ReplayTimeScale = 1.5f; From 53559eb8655be21d236ea3384b065d8038bc45de Mon Sep 17 00:00:00 2001 From: AllPoland Date: Fri, 1 Sep 2023 15:56:05 -0600 Subject: [PATCH 04/13] minor hitsound optimizations --- Assets/__Scripts/Sound/HitSoundManager.cs | 83 ++++++++++++----------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/Assets/__Scripts/Sound/HitSoundManager.cs b/Assets/__Scripts/Sound/HitSoundManager.cs index 8d427a58..1812bd2b 100644 --- a/Assets/__Scripts/Sound/HitSoundManager.cs +++ b/Assets/__Scripts/Sound/HitSoundManager.cs @@ -137,6 +137,7 @@ public void UpdatePlaying(bool playing) public void UpdateTimeScale(float newScale) { + float currentTime = SongManager.GetSongTime(); for(int i = scheduledSounds.Count - 1; i >= 0; i--) { ScheduledSound sound = scheduledSounds[i]; @@ -147,7 +148,7 @@ public void UpdateTimeScale(float newScale) sound.source.Stop(); sound.scheduled = false; - sound.UpdateTime(); + sound.UpdateTime(currentTime); } } } @@ -155,10 +156,11 @@ public void UpdateTimeScale(float newScale) private void Update() { + float currentTime = SongManager.GetSongTime(); for(int i = scheduledSounds.Count - 1; i >= 0; i--) { //Update each sound's priority and queue and such - scheduledSounds[i].UpdateTime(); + scheduledSounds[i].UpdateTime(currentTime); } } @@ -197,7 +199,7 @@ public void Destroy() } - public void UpdateTime() + public void UpdateTime(float currentTime) { if(source == null || !source.isActiveAndEnabled) { @@ -205,53 +207,58 @@ public void UpdateTime() return; } - float currentTime = SongManager.GetSongTime(); - //Account for time scale and sound offset float timeDifference = (time - currentTime) / TimeSyncHandler.TimeScale; - float scheduleIn = timeDifference + (HitSoundManager.SoundOffset / source.pitch); - if(!scheduled && timeDifference <= 0) + if(!scheduled) { - //The sound should already be playing by this point - //Trying to schedule now would just make it off-time and wouldn't be worth it - Destroy(); - return; - } - - if(HitSoundManager.DynamicPriority) - { - //Dynamically set sound priority so playing sounds don't get overridden by scheduled sounds - //Thanks galx for making this code - if(currentTime - time > 0) + if(timeDifference <= 0) { - const float priorityFalloff = 384; - source.priority = Mathf.Clamp(1 + Mathf.RoundToInt((float)(currentTime - time) * priorityFalloff), 1, 254); + //The sound should already be playing by this point + //Trying to schedule now would just make it off-time and wouldn't be worth it + Destroy(); + return; } - else + + float scheduleIn = timeDifference + (HitSoundManager.SoundOffset / source.pitch); + if(!source.isPlaying && scheduleIn <= HitSoundManager.ScheduleBuffer) { - const float priorityRampup = 192; - source.priority = Mathf.Clamp(1 + Mathf.RoundToInt((float)(time - currentTime) * priorityRampup), 1, 255); + if(scheduleIn <= 0) + { + //The sound should already be playing the windup + //Instead, schedule the sound exactly on beat with no offset + source.time = -HitSoundManager.SoundOffset; + source.PlayScheduled(AudioSettings.dspTime + timeDifference); + } + else + { + source.time = 0; + source.PlayScheduled(AudioSettings.dspTime + scheduleIn); + } + + scheduled = true; } } - else source.priority = 100; - - if(!scheduled && !source.isPlaying && scheduleIn <= HitSoundManager.ScheduleBuffer) +#if !UNITY_WEBGL || UNITY_EDITOR + else { - if(scheduleIn <= 0) - { - //The sound should already be playing the windup - //Instead, schedule the sound exactly on beat with no offset - source.time = -HitSoundManager.SoundOffset; - source.PlayScheduled(AudioSettings.dspTime + timeDifference); - } - else + if(HitSoundManager.DynamicPriority) { - source.time = 0; - source.PlayScheduled(AudioSettings.dspTime + scheduleIn); + //Dynamically set sound priority so playing sounds don't get overridden by scheduled sounds + //Thanks galx for making this code + if(currentTime - time > 0) + { + const float priorityFalloff = 384; + source.priority = Mathf.Clamp(1 + Mathf.RoundToInt((float)(currentTime - time) * priorityFalloff), 1, 254); + } + else + { + const float priorityRampup = 192; + source.priority = Mathf.Clamp(1 + Mathf.RoundToInt((float)(time - currentTime) * priorityRampup), 1, 255); + } } - - scheduled = true; + else source.priority = 100; } +#endif } } \ No newline at end of file From 517f4b460dfae22aaf18b94304e90e09f9535a3e Mon Sep 17 00:00:00 2001 From: AllPoland Date: Sun, 3 Sep 2023 18:11:03 -0600 Subject: [PATCH 05/13] play bomb badcut sounds at actual hit time --- Assets/__Scripts/Previewer/MapControl/MapElement.cs | 1 - Assets/__Scripts/Previewer/MapControl/Objects/BombManager.cs | 1 + Assets/__Scripts/Previewer/MapControl/Objects/ChainManager.cs | 1 + Assets/__Scripts/Previewer/MapControl/Objects/NoteManager.cs | 1 + Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs | 1 + Assets/__Scripts/Sound/HitSoundManager.cs | 2 +- 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/__Scripts/Previewer/MapControl/MapElement.cs b/Assets/__Scripts/Previewer/MapControl/MapElement.cs index ce38f80a..637c0c0e 100644 --- a/Assets/__Scripts/Previewer/MapControl/MapElement.cs +++ b/Assets/__Scripts/Previewer/MapControl/MapElement.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using UnityEngine; public class MapElement : IComparable diff --git a/Assets/__Scripts/Previewer/MapControl/Objects/BombManager.cs b/Assets/__Scripts/Previewer/MapControl/Objects/BombManager.cs index b1eaba0b..5769491a 100644 --- a/Assets/__Scripts/Previewer/MapControl/Objects/BombManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Objects/BombManager.cs @@ -171,6 +171,7 @@ public Bomb(BeatmapBombNote b) WasHit = false; WasBadCut = false; HitOffset = 0f; + ActualHitTime = true; if(b.customData?.color != null) { diff --git a/Assets/__Scripts/Previewer/MapControl/Objects/ChainManager.cs b/Assets/__Scripts/Previewer/MapControl/Objects/ChainManager.cs index 008160c3..7d65d81e 100644 --- a/Assets/__Scripts/Previewer/MapControl/Objects/ChainManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Objects/ChainManager.cs @@ -372,5 +372,6 @@ public ChainLink() WasHit = true; WasBadCut = false; HitOffset = 0f; + ActualHitTime = false; } } \ No newline at end of file diff --git a/Assets/__Scripts/Previewer/MapControl/Objects/NoteManager.cs b/Assets/__Scripts/Previewer/MapControl/Objects/NoteManager.cs index c9fed41a..ee86fde5 100644 --- a/Assets/__Scripts/Previewer/MapControl/Objects/NoteManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Objects/NoteManager.cs @@ -467,6 +467,7 @@ public Note(BeatmapColorNote n) WasHit = true; WasBadCut = false; HitOffset = 0f; + ActualHitTime = false; if(n.customData?.color != null) { diff --git a/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs b/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs index f8c9eeba..92da2e28 100644 --- a/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Objects/ObjectManager.cs @@ -844,6 +844,7 @@ public abstract class HitSoundEmitter : MapObject public bool wasMissed; public bool WasBadCut; public float HitOffset; + public bool ActualHitTime; } diff --git a/Assets/__Scripts/Sound/HitSoundManager.cs b/Assets/__Scripts/Sound/HitSoundManager.cs index 1812bd2b..806723e1 100644 --- a/Assets/__Scripts/Sound/HitSoundManager.cs +++ b/Assets/__Scripts/Sound/HitSoundManager.cs @@ -111,7 +111,7 @@ public static void ScheduleHitsound(HitSoundEmitter emitter) { parentList = scheduledSounds, source = source, - time = emitter.Time + time = emitter.ActualHitTime ? emitter.Time - emitter.HitOffset : emitter.Time }; scheduledSounds.Add(sound); } From 12ca833ae56fe0db5441aeaa1914b89630d8f2f0 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Sun, 3 Sep 2023 20:39:38 -0600 Subject: [PATCH 06/13] set grade letter based on modifiers --- .../MapControl/Replays/ReplayManager.cs | 50 +++++++++++++++++++ .../MapControl/Replays/ScoreManager.cs | 8 ++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs index 3f1041d6..6f8f44b0 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ReplayManager.cs @@ -34,6 +34,8 @@ public class ReplayManager : MonoBehaviour public static bool NoWalls { get; private set; } public static bool NoBombs { get; private set; } + public static float ModifierMult { get; private set; } + public static bool Failed = false; public static float FailTime = 0f; public static bool HasFailed => Failed && TimeManager.CurrentTime >= FailTime; @@ -53,6 +55,51 @@ private static bool HasModifier(string modifier) } + private static void UpdateModifierMult() + { + ModifierMult = 1f; + + if(NoBombs) + { + ModifierMult -= 0.1f; + } + if(NoWalls) + { + ModifierMult -= 0.05f; + } + if(NoArrows) + { + ModifierMult -= 0.3f; + } + + if(HasModifier("GN")) + { + ModifierMult += 0.11f; + } + else if(HasModifier("DA")) + { + ModifierMult += 0.07f; + } + + if(ReplayTimeScale < 0.86f) + { + //Slower Song + //This is a scuffed way to check but uhh huhhmum uhhh y'roure mother + ModifierMult -= 0.3f; + } + else if(ReplayTimeScale > 1.49f) + { + //Super Fast Song + ModifierMult += 0.1f; + } + else if(ReplayTimeScale > 1.19f) + { + //Faster song + ModifierMult += 0.08f; + } + } + + public static void SetReplay(Replay newReplay) { if(newReplay == null) @@ -104,6 +151,8 @@ public static void SetReplay(Replay newReplay) } else ReplayTimeScale = 1f; + UpdateModifierMult(); + TimeManager.OnBeatChangedEarly += UpdateBeat; ReplayInfo info = CurrentReplay.info; @@ -183,6 +232,7 @@ private static void Reset() CurrentReplay = null; PlayerHeight = ObjectManager.DefaultPlayerHeight; Modifiers = new string[0]; + ModifierMult = 1f; Failed = false; FailTime = 0f; diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs index 23761a5d..5bde262c 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs @@ -491,7 +491,11 @@ private void UpdateBeat(float beat) comboText.text = currentCombo.ToString(); missText.text = currentMisses.ToString(); - float effectivePercentage = ReplayManager.HasFailed ? currentPercentage / 2 : currentPercentage; + float effectivePercentage = currentPercentage * ReplayManager.ModifierMult; + if(ReplayManager.HasFailed) + { + effectivePercentage *= 0.5f; + } gradeText.text = GradeFromPercentage(effectivePercentage); //The score gets a space inserted between every 3 decimals @@ -518,7 +522,7 @@ private void UpdateBeat(float beat) scoreText.text = scoreString; - scorePercentageText.text = GetPercentageString(effectivePercentage); + scorePercentageText.text = GetPercentageString(currentPercentage); fcPercentageText.text = $"FC : {GetPercentageString(currentFCPercentage)}"; multiplierText.text = multiplierPrefix + ComboMultipliers[currentComboMult].ToString(); From c616821bd4873e30f16bbdd706237bc5bcd61825 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Sun, 3 Sep 2023 20:53:11 -0600 Subject: [PATCH 07/13] mark environment as static --- Assets/Scenes/Previewer.unity | 410 +++++++++--------- .../Environment/Platform/Buildings.prefab | 42 +- 2 files changed, 234 insertions(+), 218 deletions(-) diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity index 485ceafb..4b06d10c 100644 --- a/Assets/Scenes/Previewer.unity +++ b/Assets/Scenes/Previewer.unity @@ -4095,7 +4095,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &133203991 Transform: @@ -5899,7 +5899,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchoredPosition.y - value: -35 + value: -35.00006 objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6041,7 +6041,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &219405720 Transform: @@ -6534,7 +6534,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &231705834 Transform: @@ -7560,7 +7560,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &278545450 Transform: @@ -9471,7 +9471,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &308276082 Transform: @@ -10441,6 +10441,170 @@ MonoBehaviour: m_EditorClassIdentifier: enableWebGL: 0 enableDesktop: 1 +--- !u!43 &340693573 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1, y: 1, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020003000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 48 + _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 50000000, y: 50000000, z: 50000000} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &344369453 GameObject: m_ObjectHideFlags: 0 @@ -10592,7 +10756,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &344434219 Transform: @@ -11127,7 +11291,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &380407834 Transform: @@ -11374,7 +11538,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &389969770 Transform: @@ -11500,7 +11664,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &395744162 Transform: @@ -11760,7 +11924,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &397411919 Transform: @@ -12213,170 +12377,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} m_PrefabInstance: {fileID: 414707491} m_PrefabAsset: {fileID: 0} ---- !u!43 &414823157 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200020003000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 48 - _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 50000000, y: 50000000, z: 50000000} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &415920783 GameObject: m_ObjectHideFlags: 0 @@ -12589,7 +12589,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &422520096 Transform: @@ -13920,7 +13920,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &492280306 Transform: @@ -14711,7 +14711,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &512878271 Transform: @@ -16777,7 +16777,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchoredPosition.y - value: -35 + value: -35.00006 objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -17730,7 +17730,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 623593663} - m_Mesh: {fileID: 414823157} + m_Mesh: {fileID: 340693573} --- !u!1 &626604732 GameObject: m_ObjectHideFlags: 0 @@ -21038,7 +21038,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &758716421 Transform: @@ -22235,7 +22235,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &789587982 Transform: @@ -22542,7 +22542,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &795256845 Transform: @@ -24607,7 +24607,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchoredPosition.y - value: -35 + value: -35.00006 objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -25419,7 +25419,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &922703679 Transform: @@ -25734,7 +25734,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &929557077 Transform: @@ -26798,7 +26798,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &970097957 Transform: @@ -27415,7 +27415,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &987970342 Transform: @@ -30488,7 +30488,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchoredPosition.y - value: -35 + value: -35.00006 objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -30819,7 +30819,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1073743722 Transform: @@ -32246,7 +32246,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1145669364 Transform: @@ -32960,7 +32960,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1175961634 Transform: @@ -34063,7 +34063,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 349.99988, y: 0} + m_AnchoredPosition: {x: 349.99994, y: 0} m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!1001 &1215583364 @@ -35544,7 +35544,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1334009861 Transform: @@ -38307,7 +38307,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1415022497 Transform: @@ -38629,7 +38629,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1423842652 Transform: @@ -38864,7 +38864,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchoredPosition.y - value: -35 + value: -35.00006 objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -39089,7 +39089,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1442941935 Transform: @@ -44509,7 +44509,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1671809709 Transform: @@ -53700,7 +53700,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1952210298 Transform: @@ -56683,7 +56683,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2032384641 Transform: @@ -58621,7 +58621,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2081475595 Transform: @@ -58868,7 +58868,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &2082860764 Transform: @@ -60300,7 +60300,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!1001 &1402659132485793601 PrefabInstance: @@ -61736,7 +61736,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchoredPosition.y - value: -35 + value: -35.00006 objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/_Prefabs/Environment/Platform/Buildings.prefab b/Assets/_Prefabs/Environment/Platform/Buildings.prefab index d5a331d4..77cb8598 100644 --- a/Assets/_Prefabs/Environment/Platform/Buildings.prefab +++ b/Assets/_Prefabs/Environment/Platform/Buildings.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8327181266736472284 Transform: @@ -99,7 +99,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8076624089460591620 Transform: @@ -182,7 +182,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8058451781558338404 Transform: @@ -265,7 +265,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &578720281611447767 Transform: @@ -346,7 +346,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &578720281822053467 Transform: @@ -382,7 +382,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &578720282138832976 Transform: @@ -465,7 +465,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1102472553008133312 Transform: @@ -547,7 +547,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8075158375035598238 Transform: @@ -589,7 +589,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8142696747259792503 Transform: @@ -672,7 +672,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8546427100730911395 Transform: @@ -755,7 +755,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8760500746775169651 Transform: @@ -838,7 +838,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &6315252959389475663 Transform: @@ -921,7 +921,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &4971560122694557817 Transform: @@ -1012,6 +1012,10 @@ PrefabInstance: propertyPath: m_LocalRotation.y value: -0.439888 objectReference: {fileID: 0} + - target: {fileID: 5385859617025476433, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 6313713894679119672, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1116,6 +1120,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6313713894679119677, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} --- !u!4 &6887928329485410005 stripped @@ -1146,6 +1154,10 @@ PrefabInstance: propertyPath: m_LocalRotation.y value: -0.34988713 objectReference: {fileID: 0} + - target: {fileID: 5385859617025476433, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 6313713894679119672, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -1250,6 +1262,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6313713894679119677, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd36fa4b6006aad42a3b87486708a129, type: 3} --- !u!4 &6887928327858674284 stripped From 79e62ab29abd4901423e47d845ecacd3b5f57f6c Mon Sep 17 00:00:00 2001 From: AllPoland Date: Tue, 5 Sep 2023 13:13:51 -0600 Subject: [PATCH 08/13] prep score indicators for hsv --- Assets/Scenes/Previewer.unity | 384 ++++++++++-------- .../MapControl/Replays/ScoreColorSettings.cs | 62 ++- .../MapControl/Replays/ScoreManager.cs | 2 +- .../MapControl/Replays/ScoringEvent.cs | 4 + 4 files changed, 273 insertions(+), 179 deletions(-) diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity index 4b06d10c..a94d47d6 100644 --- a/Assets/Scenes/Previewer.unity +++ b/Assets/Scenes/Previewer.unity @@ -7338,49 +7338,89 @@ MonoBehaviour: missString: MISS badColor: {r: 1, g: 0.050980393, b: 0.050980393, a: 1} colorSettings: - - scoreColors: + - scoreJudgements: - color: {r: 1, g: 1, b: 1, a: 1} scoreThreshold: 0 + text: '%s' + fade: 0 chainLinkColor: {r: 1, g: 1, b: 1, a: 1} - - scoreColors: + - scoreJudgements: - color: {r: 0, g: 1, b: 1, a: 1} scoreThreshold: 115 + text: '%s' + fade: 0 - color: {r: 1, g: 1, b: 1, a: 1} scoreThreshold: 110 + text: '%s' + fade: 0 - color: {r: 0, g: 1, b: 0, a: 1} scoreThreshold: 100 + text: '%s' + fade: 0 - color: {r: 1, g: 1, b: 0, a: 1} scoreThreshold: 80 + text: '%s' + fade: 0 - color: {r: 1, g: 0.5019608, b: 0, a: 1} scoreThreshold: 50 + text: '%s' + fade: 1 - color: {r: 1, g: 0, b: 0, a: 1} scoreThreshold: 0 + text: '%s' + fade: 1 chainLinkColor: {r: 1, g: 1, b: 1, a: 1} - - scoreColors: + - scoreJudgements: - color: {r: 0, g: 1, b: 1, a: 1} scoreThreshold: 115 + text: '%s' + fade: 0 - color: {r: 1, g: 1, b: 1, a: 1} - scoreThreshold: 111 + scoreThreshold: 113 + text: '%s' + fade: 0 - color: {r: 0, g: 1, b: 0, a: 1} - scoreThreshold: 106 + scoreThreshold: 110 + text: '%s' + fade: 0 - color: {r: 1, g: 1, b: 0, a: 1} + scoreThreshold: 105 + text: '%s' + fade: 0 + - color: {r: 1, g: 0.5019608, b: 0, a: 1} scoreThreshold: 100 + text: '%s' + fade: 0 - color: {r: 1, g: 0, b: 0, a: 1} scoreThreshold: 0 + text: '%s' + fade: 0 chainLinkColor: {r: 1, g: 1, b: 1, a: 1} - - scoreColors: + - scoreJudgements: - color: {r: 1, g: 1, b: 1, a: 1} scoreThreshold: 115 - - color: {r: 0.53009605, g: 0.0990566, b: 0.8627451, a: 1} + text: '%s' + fade: 0 + - color: {r: 0.5294118, g: 0.09803922, b: 0.8627451, a: 1} scoreThreshold: 113 + text: '%s' + fade: 0 - color: {r: 0, g: 0.5019608, b: 1, a: 1} scoreThreshold: 110 + text: '%s' + fade: 0 - color: {r: 0, g: 1, b: 0, a: 1} scoreThreshold: 105 + text: '%s' + fade: 0 - color: {r: 1, g: 1, b: 0, a: 1} scoreThreshold: 100 + text: '%s' + fade: 0 - color: {r: 1, g: 0, b: 0, a: 1} scoreThreshold: 0 + text: '%s' + fade: 0 chainLinkColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &272283317 GameObject: @@ -10441,170 +10481,6 @@ MonoBehaviour: m_EditorClassIdentifier: enableWebGL: 0 enableDesktop: 1 ---- !u!43 &340693573 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200020003000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 48 - _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 50000000, y: 50000000, z: 50000000} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &344369453 GameObject: m_ObjectHideFlags: 0 @@ -17730,7 +17606,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 623593663} - m_Mesh: {fileID: 340693573} + m_Mesh: {fileID: 835294225} --- !u!1 &626604732 GameObject: m_ObjectHideFlags: 0 @@ -23603,6 +23479,170 @@ MonoBehaviour: disabledPos: {x: 0, y: -30} transitionTime: 0.1 disableOnHide: 1 +--- !u!43 &835294225 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1, y: 1, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020003000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 48 + _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 50000000, y: 50000000, z: 50000000} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &836221704 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs index 225edfce..be30674c 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs @@ -1,26 +1,76 @@ using System; using System.Collections.Generic; -using System.Linq; using UnityEngine; [Serializable] public class ScoreColorSettings { - [SerializeField] public List scoreColors = new List { new ScoreColor() }; + [SerializeField] public List scoreJudgements = new List { new ScoreJudgement() }; [SerializeField] public Color chainLinkColor = Color.white; - public Color GetScoreColor(int score) + private ScoreTextInfo ScoreTextFromJudgement(ScoreJudgement judgement, ScoreJudgement lastJudgement, ScoringEvent scoringEvent) { - ScoreColor lastColor = scoreColors.FirstOrDefault(x => x.scoreThreshold <= score); - return lastColor?.color ?? Color.white; + ScoreTextInfo newInfo = new ScoreTextInfo(); + + if(judgement.fade && lastJudgement != null) + { + int thresholdDifference = lastJudgement.scoreThreshold - judgement.scoreThreshold; + int scoreDifference = lastJudgement.scoreThreshold - scoringEvent.ScoreGained; + + float fadeProgress = (float)scoreDifference / thresholdDifference; + newInfo.color = Color.Lerp(lastJudgement.color, judgement.color, fadeProgress); + } + else newInfo.color = judgement.color; + + string scoreText = judgement.text.Replace("%s", scoringEvent.ScoreGained.ToString()); + scoreText = scoreText.Replace("%b", scoringEvent.PreSwingScore.ToString()); + scoreText = scoreText.Replace("%c", scoringEvent.AccuracyScore.ToString()); + scoreText = scoreText.Replace("%a", scoringEvent.PostSwingScore.ToString()); + scoreText = scoreText.Replace("%n", "
"); + + return newInfo; + } + + + public ScoreTextInfo GetScoreText(ScoringEvent scoringEvent) + { + for(int i = 0; i < scoreJudgements.Count; i++) + { + ScoreJudgement judgement = scoreJudgements[i]; + + if(judgement.scoreThreshold <= scoringEvent.ScoreGained) + { + ScoreJudgement lastJudgement = i > 0 ? scoreJudgements[i - 1] : null; + return ScoreTextFromJudgement(judgement, lastJudgement, scoringEvent); + } + } + + return new ScoreTextInfo(scoringEvent.ScoreGained); } } [Serializable] -public class ScoreColor +public class ScoreJudgement { public Color color = Color.white; public int scoreThreshold = 0; + public string text = "%s"; + public bool fade; +} + + +public class ScoreTextInfo +{ + public Color color = Color.white; + public string text = ""; + + + public ScoreTextInfo() { } + + public ScoreTextInfo(int score) + { + text = score.ToString(); + } } \ No newline at end of file diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs index 5bde262c..0aaac67d 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs @@ -344,7 +344,7 @@ private Color GetIndicatorColor(ScoringEvent scoringEvent) //Adjust for the missing post swing points on chain heads scoreGained += postSwingValue; } - return currentColorSettings.GetScoreColor(scoreGained); + return currentColorSettings.GetScoreText(scoringEvent).color; } } diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs index eebb70b8..9dc39e7c 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs @@ -19,6 +19,10 @@ public class ScoringEvent : MapElement public float HitTimeOffset; public int ScoreGained; + public int PreSwingScore; + public int PostSwingScore; + public int AccuracyScore; + public int TotalScore; public int FCScore; public int MaxScore; From 38abf8e505da154b02dc185f41a79e579057fcc1 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Tue, 5 Sep 2023 13:47:39 -0600 Subject: [PATCH 09/13] simplify wall edge shader --- .../Objects/WallEdgeShader.shadergraph | 2637 ++++++----------- 1 file changed, 891 insertions(+), 1746 deletions(-) diff --git a/Assets/Shaders/Objects/WallEdgeShader.shadergraph b/Assets/Shaders/Objects/WallEdgeShader.shadergraph index 82064b5e..0639f5a3 100644 --- a/Assets/Shaders/Objects/WallEdgeShader.shadergraph +++ b/Assets/Shaders/Objects/WallEdgeShader.shadergraph @@ -39,18 +39,9 @@ { "m_Id": "41d76e2414f14806bc2acfce40c71340" }, - { - "m_Id": "eddc621814b748c090804c8d52958422" - }, { "m_Id": "46f941abe8d04a2a81bd53f1f2b6ea9e" }, - { - "m_Id": "67c32907bde24e48b1614c81896ed437" - }, - { - "m_Id": "ce405f594edf47cdaee0cfac24203360" - }, { "m_Id": "05920d9b07da4e478556b807acf76c92" }, @@ -63,24 +54,6 @@ { "m_Id": "22fc1886cebc4dddaeb6d9f515766f84" }, - { - "m_Id": "76a1f96719ee43bf8fa0b5a1602af2fd" - }, - { - "m_Id": "f43489f20a9d4b9f890af2ba6f7fe7aa" - }, - { - "m_Id": "570418a1e4f044a5964840a85dcb8f90" - }, - { - "m_Id": "4cb32ab7a6694f62a9cfcbd1aee183e1" - }, - { - "m_Id": "ca8c5472cc304ffe8e81d4a5a5c37758" - }, - { - "m_Id": "e04fe4f58fb34c4b9f23b992b40bc691" - }, { "m_Id": "def5df6f2fb44b2294b9c7cb693fa408" }, @@ -105,9 +78,6 @@ { "m_Id": "dc96e461f36d4e289fe13a80aeef75cb" }, - { - "m_Id": "c17208370e3a468e9e89c9eac60e90f9" - }, { "m_Id": "b3cd4e1789f74961b68a397c31a475c2" }, @@ -123,9 +93,6 @@ { "m_Id": "da94cfbd02924eb590403b589e4e895f" }, - { - "m_Id": "00fa4798966949f39abcada5809afec0" - }, { "m_Id": "f3b7086dcf964db7910fde45107d78bb" }, @@ -160,19 +127,40 @@ "m_Id": "f69b87b2a9b24187aa38230b5d69d09f" }, { - "m_Id": "776ddc9370354840a4e25bc90a8b4ac4" + "m_Id": "e9ada7bda5e041b3949b2e3628af2eb4" }, { - "m_Id": "81e26a19cf3542d7a315317642faa965" + "m_Id": "59036c718731468d9f47f5a062429619" }, { - "m_Id": "79dbb8951218442490cbb4911903ad7b" + "m_Id": "565e3c46d28d46e0ae7b7a872a3431ac" }, { - "m_Id": "58bca490907644fdae8252eda830e7b1" + "m_Id": "26c0ef7acf554de085f99334ac9f4379" }, { - "m_Id": "e9ada7bda5e041b3949b2e3628af2eb4" + "m_Id": "708acaa82acf4a6d991d5b7f326ebb5b" + }, + { + "m_Id": "2c85ce0d11d34303abb19290184f62bb" + }, + { + "m_Id": "b56c8bc46e7245c4972f91d6d286cede" + }, + { + "m_Id": "1dca2d440ba241c4b6b26b4136258116" + }, + { + "m_Id": "e5748e299ff348cea7702f113c439dd3" + }, + { + "m_Id": "0ae8218d98834146aa1754758efc88b6" + }, + { + "m_Id": "e8d7b5164e654288a8b70ad7f024e095" + }, + { + "m_Id": "678c53dcd1724ebab6e24e28ecb7c9c9" } ], "m_GroupDatas": [], @@ -181,13 +169,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "00fa4798966949f39abcada5809afec0" + "m_Id": "05920d9b07da4e478556b807acf76c92" }, - "m_SlotId": 2 + "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "ce405f594edf47cdaee0cfac24203360" + "m_Id": "b3cd4e1789f74961b68a397c31a475c2" }, "m_SlotId": 0 } @@ -195,13 +183,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "05920d9b07da4e478556b807acf76c92" + "m_Id": "060af5845cef4b429467ae107fa28de7" }, "m_SlotId": 0 }, "m_InputSlot": { "m_Node": { - "m_Id": "b3cd4e1789f74961b68a397c31a475c2" + "m_Id": "909956ab7e1d4b13a04ae19e68d6a1d1" }, "m_SlotId": 0 } @@ -215,7 +203,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "909956ab7e1d4b13a04ae19e68d6a1d1" + "m_Id": "a8429e406f1f47be90c85288e4be8233" }, "m_SlotId": 0 } @@ -223,13 +211,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "060af5845cef4b429467ae107fa28de7" + "m_Id": "18b30eb4a01141118ea4c2ccf1e9632e" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "a8429e406f1f47be90c85288e4be8233" + "m_Id": "26c0ef7acf554de085f99334ac9f4379" }, "m_SlotId": 0 } @@ -237,13 +225,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "18b30eb4a01141118ea4c2ccf1e9632e" + "m_Id": "1dca2d440ba241c4b6b26b4136258116" }, - "m_SlotId": 2 + "m_SlotId": 3 }, "m_InputSlot": { "m_Node": { - "m_Id": "ca8c5472cc304ffe8e81d4a5a5c37758" + "m_Id": "a6c66c00985246ea9237810802973ac6" }, "m_SlotId": 0 } @@ -265,69 +253,69 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "4cb32ab7a6694f62a9cfcbd1aee183e1" + "m_Id": "26c0ef7acf554de085f99334ac9f4379" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "e04fe4f58fb34c4b9f23b992b40bc691" + "m_Id": "2c85ce0d11d34303abb19290184f62bb" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "4db8453c36f445b082ae2f9139236b28" + "m_Id": "2c85ce0d11d34303abb19290184f62bb" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "a5ed7945b1b14dca9a1c647519d51f39" + "m_Id": "b56c8bc46e7245c4972f91d6d286cede" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "570418a1e4f044a5964840a85dcb8f90" + "m_Id": "4db8453c36f445b082ae2f9139236b28" }, - "m_SlotId": 0 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "ca8c5472cc304ffe8e81d4a5a5c37758" + "m_Id": "a5ed7945b1b14dca9a1c647519d51f39" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "58bca490907644fdae8252eda830e7b1" + "m_Id": "565e3c46d28d46e0ae7b7a872a3431ac" }, - "m_SlotId": 3 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "776ddc9370354840a4e25bc90a8b4ac4" + "m_Id": "b56c8bc46e7245c4972f91d6d286cede" }, - "m_SlotId": 1 + "m_SlotId": 0 } }, { "m_OutputSlot": { "m_Node": { - "m_Id": "58bca490907644fdae8252eda830e7b1" + "m_Id": "59036c718731468d9f47f5a062429619" }, - "m_SlotId": 3 + "m_SlotId": 1 }, "m_InputSlot": { "m_Node": { - "m_Id": "a6c66c00985246ea9237810802973ac6" + "m_Id": "da94cfbd02924eb590403b589e4e895f" }, "m_SlotId": 0 } @@ -335,13 +323,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "65dc0d94767943b1aeaf5ccceb172bfa" + "m_Id": "59036c718731468d9f47f5a062429619" }, - "m_SlotId": 2 + "m_SlotId": 1 }, "m_InputSlot": { "m_Node": { - "m_Id": "e04fe4f58fb34c4b9f23b992b40bc691" + "m_Id": "dc96e461f36d4e289fe13a80aeef75cb" }, "m_SlotId": 0 } @@ -349,13 +337,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "67dd2eaf420f4c77865299d235aa98a2" + "m_Id": "65dc0d94767943b1aeaf5ccceb172bfa" }, - "m_SlotId": 1 + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "dbade9c0c252477fb8547772b6d32fd7" + "m_Id": "708acaa82acf4a6d991d5b7f326ebb5b" }, "m_SlotId": 0 } @@ -363,13 +351,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "76a1f96719ee43bf8fa0b5a1602af2fd" + "m_Id": "67dd2eaf420f4c77865299d235aa98a2" }, - "m_SlotId": 3 + "m_SlotId": 1 }, "m_InputSlot": { "m_Node": { - "m_Id": "00fa4798966949f39abcada5809afec0" + "m_Id": "dbade9c0c252477fb8547772b6d32fd7" }, "m_SlotId": 0 } @@ -377,15 +365,15 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "776ddc9370354840a4e25bc90a8b4ac4" + "m_Id": "708acaa82acf4a6d991d5b7f326ebb5b" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "f69b87b2a9b24187aa38230b5d69d09f" + "m_Id": "2c85ce0d11d34303abb19290184f62bb" }, - "m_SlotId": 3 + "m_SlotId": 1 } }, { @@ -439,9 +427,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "776ddc9370354840a4e25bc90a8b4ac4" + "m_Id": "f69b87b2a9b24187aa38230b5d69d09f" }, - "m_SlotId": 0 + "m_SlotId": 3 } }, { @@ -495,7 +483,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "f43489f20a9d4b9f890af2ba6f7fe7aa" + "m_Id": "565e3c46d28d46e0ae7b7a872a3431ac" }, "m_SlotId": 1 } @@ -509,7 +497,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "570418a1e4f044a5964840a85dcb8f90" + "m_Id": "26c0ef7acf554de085f99334ac9f4379" }, "m_SlotId": 1 } @@ -523,7 +511,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "4cb32ab7a6694f62a9cfcbd1aee183e1" + "m_Id": "708acaa82acf4a6d991d5b7f326ebb5b" }, "m_SlotId": 1 } @@ -559,13 +547,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "c07b037c5efa4db2a65c62bd0c756bb6" + "m_Id": "b56c8bc46e7245c4972f91d6d286cede" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "65dc0d94767943b1aeaf5ccceb172bfa" + "m_Id": "1dca2d440ba241c4b6b26b4136258116" }, "m_SlotId": 0 } @@ -573,69 +561,13 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "c17208370e3a468e9e89c9eac60e90f9" - }, - "m_SlotId": 1 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "f43489f20a9d4b9f890af2ba6f7fe7aa" - }, - "m_SlotId": 2 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "c17208370e3a468e9e89c9eac60e90f9" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "570418a1e4f044a5964840a85dcb8f90" - }, - "m_SlotId": 2 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "c17208370e3a468e9e89c9eac60e90f9" - }, - "m_SlotId": 3 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "4cb32ab7a6694f62a9cfcbd1aee183e1" - }, - "m_SlotId": 2 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "ca8c5472cc304ffe8e81d4a5a5c37758" - }, - "m_SlotId": 3 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "00fa4798966949f39abcada5809afec0" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "ce405f594edf47cdaee0cfac24203360" + "m_Id": "c07b037c5efa4db2a65c62bd0c756bb6" }, "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { - "m_Id": "58bca490907644fdae8252eda830e7b1" + "m_Id": "65dc0d94767943b1aeaf5ccceb172bfa" }, "m_SlotId": 0 } @@ -794,20 +726,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "dc96e461f36d4e289fe13a80aeef75cb" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "c17208370e3a468e9e89c9eac60e90f9" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -822,20 +740,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "e04fe4f58fb34c4b9f23b992b40bc691" - }, - "m_SlotId": 3 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "ce405f594edf47cdaee0cfac24203360" - }, - "m_SlotId": 1 - } - }, { "m_OutputSlot": { "m_Node": { @@ -873,21 +777,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "76a1f96719ee43bf8fa0b5a1602af2fd" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "f3b7086dcf964db7910fde45107d78bb" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "da94cfbd02924eb590403b589e4e895f" + "m_Id": "565e3c46d28d46e0ae7b7a872a3431ac" }, "m_SlotId": 0 } @@ -901,23 +791,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "dc96e461f36d4e289fe13a80aeef75cb" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "f43489f20a9d4b9f890af2ba6f7fe7aa" + "m_Id": "59036c718731468d9f47f5a062429619" }, "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "76a1f96719ee43bf8fa0b5a1602af2fd" - }, - "m_SlotId": 1 } }, { @@ -965,22 +841,22 @@ "m_Id": "46f941abe8d04a2a81bd53f1f2b6ea9e" }, { - "m_Id": "eddc621814b748c090804c8d52958422" + "m_Id": "494b391ed71f4a54879823ae7513dd23" }, { - "m_Id": "67c32907bde24e48b1614c81896ed437" + "m_Id": "a6c66c00985246ea9237810802973ac6" }, { - "m_Id": "a6c66c00985246ea9237810802973ac6" + "m_Id": "e5748e299ff348cea7702f113c439dd3" }, { - "m_Id": "494b391ed71f4a54879823ae7513dd23" + "m_Id": "0ae8218d98834146aa1754758efc88b6" }, { - "m_Id": "81e26a19cf3542d7a315317642faa965" + "m_Id": "e8d7b5164e654288a8b70ad7f024e095" }, { - "m_Id": "79dbb8951218442490cbb4911903ad7b" + "m_Id": "678c53dcd1724ebab6e24e28ecb7c9c9" } ] }, @@ -1033,138 +909,125 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MaximumNode", - "m_ObjectId": "00fa4798966949f39abcada5809afec0", + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "0302bebd6fc34c8488bb1ae6251cb6f8", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "04cd5968861f4d8382f542ebb30ca63a", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.PositionNode", + "m_ObjectId": "05920d9b07da4e478556b807acf76c92", "m_Group": { "m_Id": "" }, - "m_Name": "Maximum", + "m_Name": "Position", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1178.9998779296875, - "y": 487.9999694824219, - "width": 126.0, - "height": 118.00009155273438 + "x": -1780.9998779296875, + "y": 543.0, + "width": 206.0, + "height": 131.0 } }, "m_Slots": [ { - "m_Id": "a57e72ab8b764f09b681c0b7bc3784cc" - }, - { - "m_Id": "04e9dc12319a447eb03d8f09cf61e208" - }, - { - "m_Id": "33e5468310504c4ca93c2c1458d753e9" + "m_Id": "e33e70ea17b4496d93f5cd3449b2723a" } ], - "synonyms": [], - "m_Precision": 0, + "synonyms": [ + "location" + ], + "m_Precision": 1, "m_PreviewExpanded": false, - "m_PreviewMode": 0, + "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] - } + }, + "m_Space": 0, + "m_PositionSource": 0 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "04cd5968861f4d8382f542ebb30ca63a", - "m_Id": 2, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "04e9dc12319a447eb03d8f09cf61e208", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.PositionNode", - "m_ObjectId": "05920d9b07da4e478556b807acf76c92", + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "060af5845cef4b429467ae107fa28de7", "m_Group": { "m_Id": "" }, - "m_Name": "Position", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2413.999755859375, - "y": 520.0000610351563, - "width": 206.0, - "height": 130.99993896484376 + "x": -1140.9998779296875, + "y": -9.99996280670166, + "width": 131.0, + "height": 33.99998092651367 } }, "m_Slots": [ { - "m_Id": "e33e70ea17b4496d93f5cd3449b2723a" + "m_Id": "0db084b2d06f401d997a41faee21522f" } ], - "synonyms": [ - "location" - ], - "m_Precision": 1, - "m_PreviewExpanded": false, - "m_PreviewMode": 2, + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, - "m_Space": 0, - "m_PositionSource": 0 + "m_Property": { + "m_Id": "d8b68e388f3c4ddf9db40479e61f0be8" + } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "060af5845cef4b429467ae107fa28de7", + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0ae8218d98834146aa1754758efc88b6", "m_Group": { "m_Id": "" }, - "m_Name": "Property", + "m_Name": "SurfaceDescription.NormalTS", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1184.0, - "y": -34.0000114440918, - "width": 131.0, - "height": 34.0000114440918 + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 } }, "m_Slots": [ { - "m_Id": "0db084b2d06f401d997a41faee21522f" + "m_Id": "2a86496e8e6b4398b59f28db03e76dbc" } ], "synonyms": [], @@ -1174,9 +1037,22 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_Property": { - "m_Id": "d8b68e388f3c4ddf9db40479e61f0be8" - } + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0bd749bff6dc45068a62343e6a684db6", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] } { @@ -1204,30 +1080,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", - "m_ObjectId": "0db16648c66b493e8136968204bbc5b4", - "m_Id": 0, - "m_DisplayName": "Normal (Tangent Space)", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "NormalTS", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 3 -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1266,21 +1118,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "0f269f9893e8410b80c330ed0053f772", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Smoothness", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1404,8 +1241,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1628.9998779296875, - "y": 632.0000610351563, + "x": -992.9999389648438, + "y": 530.0, "width": 126.0, "height": 118.0 } @@ -1437,25 +1274,60 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "1cbcca43ed654adfbde9e7299aa670df", - "m_Id": 3, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "195dcc7bf6814a07a458d15587f66242", + "m_Id": 2, "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "m_Value": false, + "m_DefaultValue": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "1dca2d440ba241c4b6b26b4136258116", + "m_Group": { + "m_Id": "" }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "m_Name": "Branch", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": -302.9998474121094, + "y": 436.0000305175781, + "width": 170.0, + "height": 93.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "4b19fe391bec4a9a8264d5f622646093" + }, + { + "m_Id": "e363d3ed09b6473f9d451825cb07d37b" + }, + { + "m_Id": "2da5ab71972445c088ed78c145315dda" + }, + { + "m_Id": "5ecd37cd5e3c47d28e670c11f7dd921e" + } + ], + "synonyms": [ + "switch", + "if", + "else" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] } } @@ -1474,21 +1346,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "20f18882bfb146ceaa2a85008923d6a8", - "m_Id": 4, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1501,9 +1358,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2160.0, - "y": 955.9999389648438, - "width": 151.0001220703125, + "x": -1526.9998779296875, + "y": 978.9999389648438, + "width": 132.0, "height": 34.00006103515625 } }, @@ -1549,26 +1406,45 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "27e15fddaa374a2d8184e0c9689e0570", - "m_Id": 1, - "m_DisplayName": "Min", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Min", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + "m_Type": "UnityEditor.ShaderGraph.ComparisonNode", + "m_ObjectId": "26c0ef7acf554de085f99334ac9f4379", + "m_Group": { + "m_Id": "" }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "m_Name": "Comparison", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -785.9999389648438, + "y": 779.0000610351563, + "width": 145.00006103515626, + "height": 135.99993896484376 + } + }, + "m_Slots": [ + { + "m_Id": "87db367837da4305b2d98db8a68a3ca3" + }, + { + "m_Id": "5027022e89804a2d9d7c7f31a2f24dec" + }, + { + "m_Id": "d861f73a0d9c40c7a5e0f025876dbb30" + } + ], + "synonyms": [ + "equal", + "greater than", + "less than" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_ComparisonType": 4 } { @@ -1628,6 +1504,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "2a86496e8e6b4398b59f28db03e76dbc", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1667,21 +1567,59 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OrNode", + "m_ObjectId": "2c85ce0d11d34303abb19290184f62bb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Or", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -609.0, + "y": 813.9999389648438, + "width": 130.00009155273438, + "height": 101.00006103515625 + } + }, + "m_Slots": [ + { + "m_Id": "0302bebd6fc34c8488bb1ae6251cb6f8" + }, + { + "m_Id": "ec3fbe4681cf47d19899701dd1b5307d" + }, + { + "m_Id": "b7c74be7291645af92aebb2733a68836" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "319d2c7d428540f290e1915dedfa71de", - "m_Id": 0, - "m_DisplayName": "In", + "m_ObjectId": "2da5ab71972445c088ed78c145315dda", + "m_Id": 2, + "m_DisplayName": "False", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "In", + "m_ShaderOutputName": "False", "m_StageCapability": 3, "m_Value": { - "x": -1.0, - "y": -1.0, - "z": -1.0, - "w": -1.0 + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 }, "m_DefaultValue": { "x": 0.0, @@ -1694,12 +1632,12 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "33e5468310504c4ca93c2c1458d753e9", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, + "m_ObjectId": "33f4c8d52e8f44e08a5bb171f43009df", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Out", + "m_ShaderOutputName": "In", "m_StageCapability": 3, "m_Value": { "x": 0.0, @@ -1787,6 +1725,21 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "38aefa987d6b46b2ad38fad168a55637", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1811,6 +1764,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3a97040cab1b4cfaa0895b4f4fe3505e", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -1859,30 +1827,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "40b71152f5834ef29e393b8a23c06472", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1916,6 +1860,20 @@ "m_SerializedDescriptor": "SurfaceDescription.BaseColor" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "46f83492a9e4436db9f95fc99f6f3399", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1949,21 +1907,6 @@ "m_SerializedDescriptor": "SurfaceDescription.Emission" } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "481786560f834023aa0cbc2729d9d121", - "m_Id": 2, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -2023,49 +1966,16 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2Node", - "m_ObjectId": "4cb32ab7a6694f62a9cfcbd1aee183e1", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Vector 2", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1629.9998779296875, - "y": 1093.0001220703125, - "width": 128.0, - "height": 100.999755859375 - } - }, - "m_Slots": [ - { - "m_Id": "6328838c209f449784c8a59579fba0c6" - }, - { - "m_Id": "ee481ffbc4b644d1a10f94a5302128af" - }, - { - "m_Id": "7b825825baa243588815986559044995" - } - ], - "synonyms": [ - "2", - "v2", - "vec2", - "float2" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Value": { - "x": 0.0, - "y": 0.0 - } + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "4b19fe391bec4a9a8264d5f622646093", + "m_Id": 0, + "m_DisplayName": "Predicate", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Predicate", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false } { @@ -2080,9 +1990,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2009.9998779296875, - "y": 891.0, - "width": 130.0, + "x": -1377.0, + "y": 914.0, + "width": 130.0001220703125, "height": 118.0 } }, @@ -2141,12 +2051,12 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "503220ea0e244bb6a0f2c1b1f9225a5e", - "m_Id": 0, - "m_DisplayName": "Emission", - "m_SlotType": 1, + "m_ObjectId": "5027022e89804a2d9d7c7f31a2f24dec", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Out", + "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, @@ -2156,12 +2066,12 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "53863f9c1c3844cba358ee9dd4593eab", - "m_Id": 1, - "m_DisplayName": "R", + "m_ObjectId": "503220ea0e244bb6a0f2c1b1f9225a5e", + "m_Id": 0, + "m_DisplayName": "Emission", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "R", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, @@ -2171,150 +2081,131 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "5696f79c10b14b9cad983256a12969ca", - "m_Id": 3, - "m_DisplayName": "B", + "m_ObjectId": "53863f9c1c3844cba358ee9dd4593eab", + "m_Id": 1, + "m_DisplayName": "R", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "R", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, "m_Labels": [] } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "56b495d39be4439b8f94939e214eeb2f", - "m_Guid": { - "m_GuidSerialized": "9f01e795-db69-4b60-8b64-4e5f7a9816d8" - }, - "m_Name": "Emission", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Emission", - "m_DefaultReferenceName": "_Emission", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": 0.0, - "m_FloatType": 0, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - } -} - { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2Node", - "m_ObjectId": "570418a1e4f044a5964840a85dcb8f90", + "m_Type": "UnityEditor.ShaderGraph.ComparisonNode", + "m_ObjectId": "565e3c46d28d46e0ae7b7a872a3431ac", "m_Group": { "m_Id": "" }, - "m_Name": "Vector 2", + "m_Name": "Comparison", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1629.9998779296875, - "y": 992.0000610351563, - "width": 128.0, - "height": 101.00006103515625 + "x": -785.9999389648438, + "y": 643.0000610351563, + "width": 145.00006103515626, + "height": 136.0 } }, "m_Slots": [ { - "m_Id": "ae880b093be04f379d5cf97c29639a70" + "m_Id": "6fbc8be8e58f4dfb88af464638aa19e8" }, { - "m_Id": "d81ad8f35d2e44b7b3a318f83befe8ee" + "m_Id": "3a97040cab1b4cfaa0895b4f4fe3505e" }, { - "m_Id": "b6f0885132434f4db4cc7d69cbcecdca" + "m_Id": "46f83492a9e4436db9f95fc99f6f3399" } ], "synonyms": [ - "2", - "v2", - "vec2", - "float2" + "equal", + "greater than", + "less than" ], "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Value": { + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_ComparisonType": 4 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "56b495d39be4439b8f94939e214eeb2f", + "m_Guid": { + "m_GuidSerialized": "9f01e795-db69-4b60-8b64-4e5f7a9816d8" + }, + "m_Name": "Emission", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Emission", + "m_DefaultReferenceName": "_Emission", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 0, + "m_RangeValues": { "x": 0.0, - "y": 0.0 + "y": 1.0 } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "589a0853952e4db18f6be398a3cc6e24", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "58e213ce713c4d2292d53e6bbe1e2137", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "In", + "m_ShaderOutputName": "R", "m_StageCapability": 3, - "m_Value": { - "x": -1.0, - "y": -1.0, - "z": -1.0, - "w": -1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ClampNode", - "m_ObjectId": "58bca490907644fdae8252eda830e7b1", + "m_Type": "UnityEditor.ShaderGraph.AbsoluteNode", + "m_ObjectId": "59036c718731468d9f47f5a062429619", "m_Group": { "m_Id": "" }, - "m_Name": "Clamp", + "m_Name": "Absolute", "m_DrawState": { - "m_Expanded": false, + "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -833.9998168945313, - "y": 691.0000610351563, - "width": 127.9998779296875, - "height": 92.99993896484375 + "x": -1691.9998779296875, + "y": 900.0000610351563, + "width": 131.9998779296875, + "height": 94.0 } }, "m_Slots": [ { - "m_Id": "7f3f32c5407940918a44947f7fc27cca" - }, - { - "m_Id": "27e15fddaa374a2d8184e0c9689e0570" + "m_Id": "33f4c8d52e8f44e08a5bb171f43009df" }, { - "m_Id": "7008ca18b6a64580af8b1da40039349c" - }, - { - "m_Id": "1cbcca43ed654adfbde9e7299aa670df" + "m_Id": "701848dd52064d51966b5558ff1ee985" } ], "synonyms": [ - "limit" + "positive" ], "m_Precision": 0, "m_PreviewExpanded": false, @@ -2324,21 +2215,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "58e213ce713c4d2292d53e6bbe1e2137", - "m_Id": 1, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", @@ -2395,28 +2271,37 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "60a19297f85e47449b07f3e51b9c040a", - "m_Id": 4, - "m_DisplayName": "A", + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5ecd37cd5e3c47d28e670c11f7dd921e", + "m_Id": 3, + "m_DisplayName": "Out", "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "A", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } } { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "6328838c209f449784c8a59579fba0c6", - "m_Id": 1, - "m_DisplayName": "X", - "m_SlotType": 0, + "m_ObjectId": "60a19297f85e47449b07f3e51b9c040a", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "X", + "m_ShaderOutputName": "A", "m_StageCapability": 3, "m_Value": 0.0, "m_DefaultValue": 0.0, @@ -2522,10 +2407,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1628.9998779296875, - "y": 759.0, + "x": -992.9999389648438, + "y": 657.0000610351563, "width": 126.0, - "height": 118.00006103515625 + "height": 118.0 } }, "m_Slots": [ @@ -2568,31 +2453,14 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "678deb327742423380395b6137ab22ed", - "m_Id": 3, - "m_DisplayName": "Z", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Z", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [ - "Z" - ] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "67c32907bde24e48b1614c81896ed437", + "m_ObjectId": "678c53dcd1724ebab6e24e28ecb7c9c9", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.Occlusion", + "m_Name": "SurfaceDescription.Metallic", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -2605,7 +2473,7 @@ }, "m_Slots": [ { - "m_Id": "b7969c768300495c9a6df43a166b5b68" + "m_Id": "0bd749bff6dc45068a62343e6a684db6" } ], "synonyms": [], @@ -2615,7 +2483,24 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "SurfaceDescription.Occlusion" + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "678deb327742423380395b6137ab22ed", + "m_Id": 3, + "m_DisplayName": "Z", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Z", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [ + "Z" + ] } { @@ -2630,8 +2515,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2004.9998779296875, - "y": 389.00006103515627, + "x": -1371.9998779296875, + "y": 412.0000305175781, "width": 132.0, "height": 93.99996948242188 } @@ -2703,27 +2588,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "6a30c75405004519928965dc9cbc4faa", - "m_Id": 1, - "m_DisplayName": "In Min Max", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "InMinMax", - "m_StageCapability": 3, - "m_Value": { - "x": -1.0, - "y": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -2774,26 +2638,17 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "6eea1d4524414a0aabdcf838f35182fa", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "6fbc8be8e58f4dfb88af464638aa19e8", "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] } { @@ -2823,18 +2678,18 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "7008ca18b6a64580af8b1da40039349c", - "m_Id": 2, - "m_DisplayName": "Max", - "m_SlotType": 0, + "m_ObjectId": "701848dd52064d51966b5558ff1ee985", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Max", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, "m_Value": { - "x": 1.0, - "y": 1.0, - "z": 1.0, - "w": 1.0 + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 }, "m_DefaultValue": { "x": 0.0, @@ -2846,165 +2701,60 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "733cd1cb374c4d94b4998f3826be7f62", - "m_Id": 2, - "m_DisplayName": "Y", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Y", - "m_StageCapability": 3, - "m_Value": 1.0, - "m_DefaultValue": 0.0, - "m_Labels": [ - "Y" - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "73d38300abb443a6b69bcd2f7466f41d", - "m_Id": 1, - "m_DisplayName": "Saturation", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Saturation", - "m_StageCapability": 3, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.RemapNode", - "m_ObjectId": "76a1f96719ee43bf8fa0b5a1602af2fd", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Remap", - "m_DrawState": { - "m_Expanded": false, - "m_Position": { - "serializedVersion": "2", - "x": -1419.9998779296875, - "y": 487.9999694824219, - "width": 208.0, - "height": 301.0000915527344 - } - }, - "m_Slots": [ - { - "m_Id": "d14660a8f229467a86e66d0935edc1fe" - }, - { - "m_Id": "cbbdf868e6e54d68b2c612823cfaa511" - }, - { - "m_Id": "c69bfce900b5404ca9b6f43b0a9bbf13" - }, - { - "m_Id": "c8878861b5834e258b0eab80a4faf0fe" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "76c0995647484de99795d1ae2cba5b04", - "m_Id": 0, - "m_DisplayName": "Metallic", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Metallic", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "776ddc9370354840a4e25bc90a8b4ac4", + "m_Type": "UnityEditor.ShaderGraph.ComparisonNode", + "m_ObjectId": "708acaa82acf4a6d991d5b7f326ebb5b", "m_Group": { "m_Id": "" }, - "m_Name": "Multiply", + "m_Name": "Comparison", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -677.0, - "y": 323.0, - "width": 126.0, - "height": 118.0 + "x": -785.9999389648438, + "y": 914.0, + "width": 145.00006103515626, + "height": 135.9998779296875 } }, "m_Slots": [ { - "m_Id": "9e882aac58b149168f19e6a07e95227f" + "m_Id": "8e2866985aa04732899bf826573d9a37" }, { - "m_Id": "b90ff983c38b4505b4abe82fe7cf552b" + "m_Id": "38aefa987d6b46b2ad38fad168a55637" }, { - "m_Id": "965548405ad94e73861572a7ce1b530b" + "m_Id": "195dcc7bf6814a07a458d15587f66242" } ], "synonyms": [ - "multiplication", - "times", - "x" + "equal", + "greater than", + "less than" ], "m_Precision": 0, - "m_PreviewExpanded": false, + "m_PreviewExpanded": true, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - } + }, + "m_ComparisonType": 4 } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "79dbb8951218442490cbb4911903ad7b", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Metallic", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "76c0995647484de99795d1ae2cba5b04" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Metallic" + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "73d38300abb443a6b69bcd2f7466f41d", + "m_Id": 1, + "m_DisplayName": "Saturation", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Saturation", + "m_StageCapability": 3, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] } { @@ -3019,10 +2769,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -2075.999755859375, - "y": 520.0000610351563, - "width": 119.9998779296875, - "height": 124.0 + "x": -1442.9998779296875, + "y": 543.0, + "width": 120.0, + "height": 124.99993896484375 } }, "m_Slots": [ @@ -3055,22 +2805,16 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "7b825825baa243588815986559044995", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7bfe19d5aee246feb8172f8f614c4716", "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, "m_Labels": [] } @@ -3097,30 +2841,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "7f3f32c5407940918a44947f7fc27cca", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3136,39 +2856,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "81e26a19cf3542d7a315317642faa965", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Smoothness", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "0f269f9893e8410b80c330ed0053f772" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Smoothness" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -3289,6 +2976,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "87db367837da4305b2d98db8a68a3ca3", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -3301,9 +3003,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -827.0000610351563, - "y": 363.0, - "width": 121.0, + "x": -783.9999389648438, + "y": 387.0000305175781, + "width": 121.0001220703125, "height": 33.999969482421878 } }, @@ -3348,6 +3050,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8e2866985aa04732899bf826573d9a37", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3384,10 +3101,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1046.0, - "y": 214.00001525878907, - "width": 212.99993896484376, - "height": 130.99998474121095 + "x": -1002.9999389648438, + "y": 238.0, + "width": 213.00006103515626, + "height": 130.99996948242188 } }, "m_Slots": [ @@ -3426,27 +3143,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "936831a6c43a47c894cde1238d36dcf7", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3494,54 +3190,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "965548405ad94e73861572a7ce1b530b", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3656,57 +3304,33 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1854.9998779296875, - "y": 520.0000610351563, - "width": 126.0, - "height": 117.99993896484375 + "x": -1222.0, + "y": 543.0, + "width": 126.0001220703125, + "height": 118.00006103515625 } }, "m_Slots": [ { "m_Id": "d9e573f465134ab785e8d348fcda65ae" }, - { - "m_Id": "a05fdcadca69472486749db1dbb7cd11" - }, - { - "m_Id": "84dbe46a71d346b8bd6405eb4cc1feb6" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "99c1a496f92d4adba3a1ebbb13b81c90", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 + { + "m_Id": "a05fdcadca69472486749db1dbb7cd11" + }, + { + "m_Id": "84dbe46a71d346b8bd6405eb4cc1feb6" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] } } @@ -3722,10 +3346,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -388.9999694824219, - "y": 213.99998474121095, - "width": 212.99993896484376, - "height": 130.99998474121095 + "x": -346.0, + "y": 238.0, + "width": 213.00015258789063, + "height": 130.99996948242188 } }, "m_Slots": [ @@ -3751,50 +3375,16 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "9e882aac58b149168f19e6a07e95227f", + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "9eb9396ee88e4e759a708cc3039cc73f", "m_Id": 0, "m_DisplayName": "A", "m_SlotType": 0, "m_Hidden": false, "m_ShaderOutputName": "A", "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } + "m_Value": false, + "m_DefaultValue": false } { @@ -3961,30 +3551,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a57e72ab8b764f09b681c0b7bc3784cc", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SplitNode", @@ -3997,10 +3563,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1848.9998779296875, - "y": 891.0, + "x": -1215.9998779296875, + "y": 914.0, "width": 120.0, - "height": 124.00006103515625 + "height": 125.0 } }, "m_Slots": [ @@ -4054,27 +3620,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "a66b7a60aeb047aabc62cb41a5d911cb", - "m_Id": 1, - "m_DisplayName": "In Min Max", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "InMinMax", - "m_StageCapability": 3, - "m_Value": { - "x": -1.0, - "y": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -4087,10 +3632,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": 18.0, + "y": 536.0, + "width": 200.0, + "height": 41.0 } }, "m_Slots": [ @@ -4144,10 +3689,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -526.0, - "y": -67.00000762939453, - "width": 173.99996948242188, - "height": 118.00001525878906 + "x": -482.99993896484377, + "y": -42.99993896484375, + "width": 174.00003051757813, + "height": 117.9999771118164 } }, "m_Slots": [ @@ -4194,36 +3739,6 @@ "m_Space": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ace607be8ec24fa58e95ed395a839a48", - "m_Id": 1, - "m_DisplayName": "X", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "X", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ae880b093be04f379d5cf97c29639a70", - "m_Id": 1, - "m_DisplayName": "X", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "X", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -4251,30 +3766,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "afd58f0e644e48d29e9d2eaf27d3ca6f", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AbsoluteNode", @@ -4287,10 +3778,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2208.0, - "y": 520.0000610351563, - "width": 132.000244140625, - "height": 93.99993896484375 + "x": -1574.9998779296875, + "y": 543.0, + "width": 132.0, + "height": 94.0 } }, "m_Slots": [ @@ -4314,86 +3805,54 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "b6f0885132434f4db4cc7d69cbcecdca", - "m_Id": 0, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 + "m_Type": "UnityEditor.ShaderGraph.OrNode", + "m_ObjectId": "b56c8bc46e7245c4972f91d6d286cede", + "m_Group": { + "m_Id": "" }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 + "m_Name": "Or", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -453.9999084472656, + "y": 643.0000610351563, + "width": 129.9998779296875, + "height": 100.99993896484375 + } }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "b7969c768300495c9a6df43a166b5b68", - "m_Id": 0, - "m_DisplayName": "Ambient Occlusion", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Occlusion", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] + "m_Slots": [ + { + "m_Id": "9eb9396ee88e4e759a708cc3039cc73f" + }, + { + "m_Id": "e50d644b26244886a6533204ecba9d45" + }, + { + "m_Id": "f26a97fd677e4b7fa11f077e50b9f2fc" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "b90ff983c38b4505b4abe82fe7cf552b", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "b7c74be7291645af92aebb2733a68836", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "B", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": { - "e00": 2.0, - "e01": 2.0, - "e02": 2.0, - "e03": 2.0, - "e10": 2.0, - "e11": 2.0, - "e12": 2.0, - "e13": 2.0, - "e20": 2.0, - "e21": 2.0, - "e22": 2.0, - "e23": 2.0, - "e30": 2.0, - "e31": 2.0, - "e32": 2.0, - "e33": 2.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } + "m_Value": false, + "m_DefaultValue": false } { @@ -4459,27 +3918,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "bb52c8829b33467e85e6fe91d952f156", - "m_Id": 2, - "m_DisplayName": "Out Min Max", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "OutMinMax", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4507,10 +3945,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1854.9998779296875, - "y": 766.0, - "width": 126.0, - "height": 117.99993896484375 + "x": -1222.0, + "y": 788.9999389648438, + "width": 126.0001220703125, + "height": 118.0 } }, "m_Slots": [ @@ -4537,52 +3975,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SplitNode", - "m_ObjectId": "c17208370e3a468e9e89c9eac60e90f9", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Split", - "m_DrawState": { - "m_Expanded": false, - "m_Position": { - "serializedVersion": "2", - "x": -1848.9998779296875, - "y": 1056.0, - "width": 120.0, - "height": 124.0 - } - }, - "m_Slots": [ - { - "m_Id": "99c1a496f92d4adba3a1ebbb13b81c90" - }, - { - "m_Id": "c8721c5ca4844e96b4d617405db5ffab" - }, - { - "m_Id": "481786560f834023aa0cbc2729d9d121" - }, - { - "m_Id": "5696f79c10b14b9cad983256a12969ca" - }, - { - "m_Id": "20f18882bfb146ceaa2a85008923d6a8" - } - ], - "synonyms": [ - "separate" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -4630,27 +4022,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "c69bfce900b5404ca9b6f43b0a9bbf13", - "m_Id": 2, - "m_DisplayName": "Out Min Max", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "OutMinMax", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4675,86 +4046,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "c8721c5ca4844e96b4d617405db5ffab", - "m_Id": 1, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "c8878861b5834e258b0eab80a4faf0fe", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.RemapNode", - "m_ObjectId": "ca8c5472cc304ffe8e81d4a5a5c37758", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Remap", - "m_DrawState": { - "m_Expanded": false, - "m_Position": { - "serializedVersion": "2", - "x": -1419.9998779296875, - "y": 790.0, - "width": 208.0, - "height": 301.0 - } - }, - "m_Slots": [ - { - "m_Id": "589a0853952e4db18f6be398a3cc6e24" - }, - { - "m_Id": "6a30c75405004519928965dc9cbc4faa" - }, - { - "m_Id": "bb52c8829b33467e85e6fe91d952f156" - }, - { - "m_Id": "afd58f0e644e48d29e9d2eaf27d3ca6f" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4770,27 +4061,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "cbbdf868e6e54d68b2c612823cfaa511", - "m_Id": 1, - "m_DisplayName": "In Min Max", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "InMinMax", - "m_StageCapability": 3, - "m_Value": { - "x": -1.0, - "y": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4823,44 +4093,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MaximumNode", - "m_ObjectId": "ce405f594edf47cdaee0cfac24203360", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Maximum", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -993.9998779296875, - "y": 691.0000610351563, - "width": 126.0, - "height": 117.99993896484375 - } - }, - "m_Slots": [ - { - "m_Id": "6eea1d4524414a0aabdcf838f35182fa" - }, - { - "m_Id": "d0529a93b66b426fbcffca1a521834af" - }, - { - "m_Id": "f8e6887db8004a1598f2883941f6dcf7" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -4873,10 +4105,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -835.0000610351563, - "y": 70.99998474121094, - "width": 129.0, - "height": 34.00000762939453 + "x": -791.9998779296875, + "y": 95.00000762939453, + "width": 129.00006103515626, + "height": 33.999977111816409 } }, "m_Slots": [ @@ -4896,30 +4128,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "d0529a93b66b426fbcffca1a521834af", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -4943,30 +4151,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "d14660a8f229467a86e66d0935edc1fe", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": -1.0, - "y": -1.0, - "z": -1.0, - "w": -1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", @@ -4988,9 +4172,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1854.9998779296875, - "y": 638.0, - "width": 126.0, + "x": -1222.0, + "y": 661.0000610351563, + "width": 126.0001220703125, "height": 118.0 } }, @@ -5020,19 +4204,16 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d81ad8f35d2e44b7b3a318f83befe8ee", + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "d861f73a0d9c40c7a5e0f025876dbb30", "m_Id": 2, - "m_DisplayName": "Y", - "m_SlotType": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, "m_Hidden": false, - "m_ShaderOutputName": "Y", + "m_ShaderOutputName": "Out", "m_StageCapability": 3, - "m_Value": 1.0, - "m_DefaultValue": 0.0, - "m_Labels": [ - "Y" - ] + "m_Value": false, + "m_DefaultValue": false } { @@ -5124,10 +4305,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -2166.0, - "y": 759.0, - "width": 120.0001220703125, - "height": 123.99993896484375 + "x": -1532.9998779296875, + "y": 782.0001220703125, + "width": 119.9998779296875, + "height": 124.99981689453125 } }, "m_Slots": [ @@ -5170,10 +4351,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -1848.9998779296875, - "y": 389.00006103515627, + "x": -1215.9998779296875, + "y": 412.0000305175781, "width": 120.0, - "height": 123.99993896484375 + "height": 124.99996948242188 } }, "m_Slots": [ @@ -5216,10 +4397,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -826.0000610351563, - "y": 214.00001525878907, - "width": 120.0, - "height": 148.99998474121095 + "x": -782.9999389648438, + "y": 238.0, + "width": 120.0001220703125, + "height": 100.00003051757813 } }, "m_Slots": [ @@ -5262,10 +4443,10 @@ "m_Expanded": false, "m_Position": { "serializedVersion": "2", - "x": -2166.0, - "y": 1056.0, - "width": 130.0001220703125, - "height": 93.0 + "x": -1532.9998779296875, + "y": 1079.0, + "width": 129.9998779296875, + "height": 94.0 } }, "m_Slots": [ @@ -5323,68 +4504,27 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2230.0, - "y": 389.00006103515627, - "width": 206.0001220703125, - "height": 131.0 - } - }, - "m_Slots": [ - { - "m_Id": "23e8f94a6c904267a15122868b98fd9c" - } - ], - "synonyms": [ - "surface direction" - ], - "m_Precision": 0, - "m_PreviewExpanded": false, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.RemapNode", - "m_ObjectId": "e04fe4f58fb34c4b9f23b992b40bc691", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Remap", - "m_DrawState": { - "m_Expanded": false, - "m_Position": { - "serializedVersion": "2", - "x": -1419.9998779296875, - "y": 1092.0001220703125, - "width": 208.0, - "height": 300.9998779296875 + "x": -1596.9998779296875, + "y": 412.0000305175781, + "width": 205.9998779296875, + "height": 130.99996948242188 } }, "m_Slots": [ { - "m_Id": "319d2c7d428540f290e1915dedfa71de" - }, - { - "m_Id": "a66b7a60aeb047aabc62cb41a5d911cb" - }, - { - "m_Id": "ec83a81b23054016b3e005bb243a3cd9" - }, - { - "m_Id": "40b71152f5834ef29e393b8a23c06472" + "m_Id": "23e8f94a6c904267a15122868b98fd9c" } ], - "synonyms": [], + "synonyms": [ + "surface direction" + ], "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] - } + }, + "m_Space": 0 } { @@ -5434,6 +4574,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e363d3ed09b6473f9d451825cb07d37b", + "m_Id": 1, + "m_DisplayName": "True", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "True", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -5482,6 +4646,20 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "e50d644b26244886a6533204ecba9d45", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5497,6 +4675,39 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "e5748e299ff348cea7702f113c439dd3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "fdbede3e00414b5a892e5b7d83c2a7ef" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -5569,6 +4780,39 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "e8d7b5164e654288a8b70ad7f024e095", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "7bfe19d5aee246feb8172f8f614c4716" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -5581,10 +4825,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -677.0000610351563, - "y": 70.99998474121094, - "width": 126.0, - "height": 118.00003051757813 + "x": -634.0, + "y": 95.00000762939453, + "width": 126.00006103515625, + "height": 117.9999771118164 } }, "m_Slots": [ @@ -5623,10 +4867,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -1629.9998779296875, - "y": 514.0, - "width": 126.0, - "height": 118.00006103515625 + "x": -993.9998779296875, + "y": 412.0000305175781, + "width": 125.99993896484375, + "height": 117.99996948242188 } }, "m_Slots": [ @@ -5656,56 +4900,16 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "ec83a81b23054016b3e005bb243a3cd9", - "m_Id": 2, - "m_DisplayName": "Out Min Max", + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "ec3fbe4681cf47d19899701dd1b5307d", + "m_Id": 1, + "m_DisplayName": "B", "m_SlotType": 0, "m_Hidden": false, - "m_ShaderOutputName": "OutMinMax", + "m_ShaderOutputName": "B", "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "eddc621814b748c090804c8d52958422", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.NormalTS", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "0db16648c66b493e8136968204bbc5b4" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.NormalTS" + "m_Value": false, + "m_DefaultValue": false } { @@ -5723,23 +4927,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "ee481ffbc4b644d1a10f94a5302128af", - "m_Id": 2, - "m_DisplayName": "Y", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Y", - "m_StageCapability": 3, - "m_Value": 0.9399999976158142, - "m_DefaultValue": 0.0, - "m_Labels": [ - "Y" - ] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5764,6 +4951,20 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "f26a97fd677e4b7fa11f077e50b9f2fc", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -5776,10 +4977,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -2312.0, - "y": 891.0, + "x": -1844.9998779296875, + "y": 945.0000610351563, "width": 128.0, - "height": 34.00006103515625 + "height": 33.9998779296875 } }, "m_Slots": [ @@ -5799,53 +5000,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2Node", - "m_ObjectId": "f43489f20a9d4b9f890af2ba6f7fe7aa", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Vector 2", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1629.9998779296875, - "y": 891.0, - "width": 128.0, - "height": 101.00006103515625 - } - }, - "m_Slots": [ - { - "m_Id": "ace607be8ec24fa58e95ed395a839a48" - }, - { - "m_Id": "733cd1cb374c4d94b4998f3826be7f62" - }, - { - "m_Id": "936831a6c43a47c894cde1238d36dcf7" - } - ], - "synonyms": [ - "2", - "v2", - "vec2", - "float2" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Value": { - "x": 0.0, - "y": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5897,10 +5051,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -526.0, - "y": 213.99998474121095, - "width": 128.0, - "height": 124.99998474121094 + "x": -482.99993896484377, + "y": 238.0, + "width": 128.00006103515626, + "height": 125.00003051757813 } }, "m_Slots": [ @@ -5960,30 +5114,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "f8e6887db8004a1598f2883941f6dcf7", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -6047,6 +5177,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "fdbede3e00414b5a892e5b7d83c2a7ef", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", From b0f3dc7e5f87d5399b045bb22d04763138c69e7d Mon Sep 17 00:00:00 2001 From: AllPoland Date: Tue, 5 Sep 2023 15:59:03 -0600 Subject: [PATCH 10/13] HSV config model --- Assets/Scenes/Previewer.unity | 366 ++++++++++-------- Assets/_Materials/Objects/Walls/Wall.mat | 2 +- Assets/_Materials/Objects/Walls/WallEdges.mat | 2 +- Assets/__Scripts/Loading/Replays/HsvConfig.cs | 41 ++ .../Loading/Replays/HsvConfig.cs.meta | 11 + .../MapControl/Replays/ScoreColorSettings.cs | 149 ++++++- .../MapControl/Replays/ScoreManager.cs | 44 +-- .../MapControl/Replays/ScoringEvent.cs | 42 +- 8 files changed, 438 insertions(+), 219 deletions(-) create mode 100644 Assets/__Scripts/Loading/Replays/HsvConfig.cs create mode 100644 Assets/__Scripts/Loading/Replays/HsvConfig.cs.meta diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity index a94d47d6..ab981461 100644 --- a/Assets/Scenes/Previewer.unity +++ b/Assets/Scenes/Previewer.unity @@ -7338,13 +7338,23 @@ MonoBehaviour: missString: MISS badColor: {r: 1, g: 0.050980393, b: 0.050980393, a: 1} colorSettings: - - scoreJudgements: + - formatMode: 1 + timeDependencyDecimals: 0 + timeDependencyMult: 0 + scoreJudgements: - color: {r: 1, g: 1, b: 1, a: 1} scoreThreshold: 0 text: '%s' fade: 0 + preSwingJudgements: [] + accJudgements: [] + postSwingJudgements: [] + timeDependencyJudgements: [] chainLinkColor: {r: 1, g: 1, b: 1, a: 1} - - scoreJudgements: + - formatMode: 1 + timeDependencyDecimals: 0 + timeDependencyMult: 0 + scoreJudgements: - color: {r: 0, g: 1, b: 1, a: 1} scoreThreshold: 115 text: '%s' @@ -7369,8 +7379,15 @@ MonoBehaviour: scoreThreshold: 0 text: '%s' fade: 1 + preSwingJudgements: [] + accJudgements: [] + postSwingJudgements: [] + timeDependencyJudgements: [] chainLinkColor: {r: 1, g: 1, b: 1, a: 1} - - scoreJudgements: + - formatMode: 1 + timeDependencyDecimals: 0 + timeDependencyMult: 0 + scoreJudgements: - color: {r: 0, g: 1, b: 1, a: 1} scoreThreshold: 115 text: '%s' @@ -7395,8 +7412,15 @@ MonoBehaviour: scoreThreshold: 0 text: '%s' fade: 0 + preSwingJudgements: [] + accJudgements: [] + postSwingJudgements: [] + timeDependencyJudgements: [] chainLinkColor: {r: 1, g: 1, b: 1, a: 1} - - scoreJudgements: + - formatMode: 1 + timeDependencyDecimals: 0 + timeDependencyMult: 0 + scoreJudgements: - color: {r: 1, g: 1, b: 1, a: 1} scoreThreshold: 115 text: '%s' @@ -7421,6 +7445,10 @@ MonoBehaviour: scoreThreshold: 0 text: '%s' fade: 0 + preSwingJudgements: [] + accJudgements: [] + postSwingJudgements: [] + timeDependencyJudgements: [] chainLinkColor: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &272283317 GameObject: @@ -17606,7 +17634,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 623593663} - m_Mesh: {fileID: 835294225} + m_Mesh: {fileID: 1199504657} --- !u!1 &626604732 GameObject: m_ObjectHideFlags: 0 @@ -23479,170 +23507,6 @@ MonoBehaviour: disabledPos: {x: 0, y: -30} transitionTime: 0.1 disableOnHide: 1 ---- !u!43 &835294225 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200020003000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 48 - _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 50000000, y: 50000000, z: 50000000} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &836221704 PrefabInstance: m_ObjectHideFlags: 0 @@ -33918,6 +33782,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1198761461} m_CullTransparentMesh: 1 +--- !u!43 &1199504657 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1, y: 1, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020003000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 48 + _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 50000000, y: 50000000, z: 50000000} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1204756722 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Materials/Objects/Walls/Wall.mat b/Assets/_Materials/Objects/Walls/Wall.mat index 9798b6d2..ef3959ed 100644 --- a/Assets/_Materials/Objects/Walls/Wall.mat +++ b/Assets/_Materials/Objects/Walls/Wall.mat @@ -29,7 +29,7 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: diff --git a/Assets/_Materials/Objects/Walls/WallEdges.mat b/Assets/_Materials/Objects/Walls/WallEdges.mat index a6dc14ca..8889d39a 100644 --- a/Assets/_Materials/Objects/Walls/WallEdges.mat +++ b/Assets/_Materials/Objects/Walls/WallEdges.mat @@ -103,7 +103,7 @@ Material: - _DstBlend: 0 - _EdgeMaxWidth: 0 - _EdgeMinWidth: 0.2 - - _EdgeWidth: 0.6 + - _EdgeWidth: 0.04 - _Emission: 3 - _EnvironmentReflections: 1 - _GlossMapScale: 0 diff --git a/Assets/__Scripts/Loading/Replays/HsvConfig.cs b/Assets/__Scripts/Loading/Replays/HsvConfig.cs new file mode 100644 index 00000000..19f41f86 --- /dev/null +++ b/Assets/__Scripts/Loading/Replays/HsvConfig.cs @@ -0,0 +1,41 @@ +using System; + +[Serializable] +public class HsvConfig +{ + public string displayMode; + public int timeDependencyDecimalPrecision; + public int timeDependencyDecimalOffset; + + public HsvJudgement[] judgements; + public HsvJudgementSegment[] beforeCutAngleJudgements; + public HsvJudgementSegment[] accuracyJudgements; + public HsvJudgementSegment[] afterCutAngleJudgements; + public HsvTimeDependencyJudgement[] timeDependencyJudgements; +} + + +[Serializable] +public class HsvJudgement +{ + public int threshold; + public string text; + public float[] color; + public bool fade; +} + + +[Serializable] +public class HsvJudgementSegment +{ + public int threshold; + public string text; +} + + +[Serializable] +public class HsvTimeDependencyJudgement +{ + public float threshold; + public string text; +} \ No newline at end of file diff --git a/Assets/__Scripts/Loading/Replays/HsvConfig.cs.meta b/Assets/__Scripts/Loading/Replays/HsvConfig.cs.meta new file mode 100644 index 00000000..565258e7 --- /dev/null +++ b/Assets/__Scripts/Loading/Replays/HsvConfig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fbf4d4acbd285dd4790eeb42f507fa30 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs index be30674c..e00a2fad 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs @@ -1,15 +1,72 @@ using System; using System.Collections.Generic; +using System.Linq; +using System.Text; using UnityEngine; [Serializable] public class ScoreColorSettings { + [Header("Configuration")] + [SerializeField] public FormatMode formatMode = FormatMode.Numeric; + [SerializeField] public int timeDependencyDecimals; + [SerializeField] public int timeDependencyMult; + + [Header("Judgements")] [SerializeField] public List scoreJudgements = new List { new ScoreJudgement() }; + [SerializeField] public List preSwingJudgements = new List(); + [SerializeField] public List accJudgements = new List(); + [SerializeField] public List postSwingJudgements = new List(); + [SerializeField] public List timeDependencyJudgements = new List(); [SerializeField] public Color chainLinkColor = Color.white; - private ScoreTextInfo ScoreTextFromJudgement(ScoreJudgement judgement, ScoreJudgement lastJudgement, ScoringEvent scoringEvent) + private string GetFormattedScoreText(ScoreJudgement judgement, ScoringEvent scoringEvent) + { + float timeDependency = (float)Math.Round(scoringEvent.TimeDependency, timeDependencyDecimals) * timeDependencyMult; + + HsvJudgementSegment preSwingJudgement = preSwingJudgements.FirstOrDefault(x => x.threshold <= scoringEvent.PreSwingScore); + HsvJudgementSegment accJudgement = accJudgements.FirstOrDefault(x => x.threshold <= scoringEvent.AccuracyScore); + HsvJudgementSegment postSwingJudgement = postSwingJudgements.FirstOrDefault(x => x.threshold <= scoringEvent.PostSwingScore); + + HsvTimeDependencyJudgement timeDependencyJudgement = timeDependencyJudgements.FirstOrDefault(x => x.threshold <= timeDependency); + + StringBuilder builder = new StringBuilder(judgement.text); + builder.Replace("%b", scoringEvent.PreSwingScore.ToString()); + builder.Replace("%c", scoringEvent.AccuracyScore.ToString()); + builder.Replace("%a", scoringEvent.PostSwingScore.ToString()); + builder.Replace("%s", scoringEvent.ScoreGained.ToString()); + builder.Replace("%t", timeDependency.ToString()); + + builder.Replace("%B", preSwingJudgement.text); + builder.Replace("%C", accJudgement.text); + builder.Replace("%A", postSwingJudgement.text); + builder.Replace("%T", timeDependencyJudgement.text); + + builder.Replace("%n", "
"); + + return builder.ToString(); + } + + + private string GetScoreText(ScoreJudgement judgement, ScoringEvent scoringEvent) + { + switch(formatMode) + { + case FormatMode.Format: + return GetFormattedScoreText(judgement, scoringEvent); + case FormatMode.Numeric: + return scoringEvent.ScoreGained.ToString(); + case FormatMode.TextOnly: + return judgement.text; + case FormatMode.ScoreOnTop: + default: + return $"{judgement.text}
{scoringEvent.ScoreGained.ToString()}"; + } + } + + + private ScoreTextInfo GetTextInfoFromScore(ScoreJudgement judgement, ScoreJudgement lastJudgement, ScoringEvent scoringEvent) { ScoreTextInfo newInfo = new ScoreTextInfo(); @@ -23,11 +80,7 @@ private ScoreTextInfo ScoreTextFromJudgement(ScoreJudgement judgement, ScoreJudg } else newInfo.color = judgement.color; - string scoreText = judgement.text.Replace("%s", scoringEvent.ScoreGained.ToString()); - scoreText = scoreText.Replace("%b", scoringEvent.PreSwingScore.ToString()); - scoreText = scoreText.Replace("%c", scoringEvent.AccuracyScore.ToString()); - scoreText = scoreText.Replace("%a", scoringEvent.PostSwingScore.ToString()); - scoreText = scoreText.Replace("%n", "
"); + newInfo.text = GetScoreText(judgement, scoringEvent); return newInfo; } @@ -42,12 +95,77 @@ public ScoreTextInfo GetScoreText(ScoringEvent scoringEvent) if(judgement.scoreThreshold <= scoringEvent.ScoreGained) { ScoreJudgement lastJudgement = i > 0 ? scoreJudgements[i - 1] : null; - return ScoreTextFromJudgement(judgement, lastJudgement, scoringEvent); + return GetTextInfoFromScore(judgement, lastJudgement, scoringEvent); } } return new ScoreTextInfo(scoringEvent.ScoreGained); } + + + public ScoreColorSettings() + { + formatMode = FormatMode.Numeric; + } + + public ScoreColorSettings(HsvConfig config) + { + switch(config.displayMode) + { + case "format": + formatMode = FormatMode.Format; + break; + case "numeric": + formatMode = FormatMode.Numeric; + break; + case "textOnly": + formatMode = FormatMode.TextOnly; + break; + case "scoreOnTop": + default: + formatMode = FormatMode.ScoreOnTop; + break; + } + + timeDependencyDecimals = Mathf.Clamp(config.timeDependencyDecimalPrecision, 0, 99); + timeDependencyMult = (int)Mathf.Pow(Mathf.Clamp(config.timeDependencyDecimalOffset, 0, 38), 10); + + if(config.judgements != null && config.judgements.Length > 0) + { + scoreJudgements = new List(); + foreach(HsvJudgement judgement in config.judgements) + { + scoreJudgements.Add(new ScoreJudgement(judgement)); + } + } + scoreJudgements = scoreJudgements.OrderByDescending(x => x.scoreThreshold).ToList(); + + if(config.beforeCutAngleJudgements != null) + { + preSwingJudgements.AddRange(config.beforeCutAngleJudgements.OrderByDescending(x => x.threshold)); + } + if(config.accuracyJudgements != null) + { + accJudgements.AddRange(config.accuracyJudgements.OrderByDescending(x => x.threshold)); + } + if(config.afterCutAngleJudgements != null) + { + postSwingJudgements.AddRange(config.afterCutAngleJudgements.OrderByDescending(x => x.threshold)); + } + if(config.timeDependencyJudgements != null) + { + timeDependencyJudgements.AddRange(config.timeDependencyJudgements.OrderByDescending(x => x.threshold)); + } + } + + + public enum FormatMode + { + Format, + Numeric, + TextOnly, + ScoreOnTop + } } @@ -58,6 +176,23 @@ public class ScoreJudgement public int scoreThreshold = 0; public string text = "%s"; public bool fade; + + + public ScoreJudgement() { } + + public ScoreJudgement(HsvJudgement hsvJudgement) + { + scoreThreshold = hsvJudgement.threshold; + text = hsvJudgement.text; + fade = hsvJudgement.fade; + + float[] hsvColor = hsvJudgement.color; + if(hsvColor != null && hsvColor.Length >= 4) + { + color = new Color(hsvColor[0], hsvColor[1], hsvColor[2], hsvColor[3]); + } + else color = Color.white; + } } diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs index 0aaac67d..180fdd86 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs @@ -17,6 +17,9 @@ public class ScoreManager : MonoBehaviour public const int MaxChainHeadScore = 85; public const int MaxChainLinkScore = 20; + public const int PreSwingValue = 70; + public const int PostSwingValue = 30; + public static readonly byte[] ComboMultipliers = new byte[] { 1, @@ -78,45 +81,6 @@ public class ScoreManager : MonoBehaviour private ScoreColorSettings currentColorSettings = new ScoreColorSettings(); - private const int preSwingValue = 70; - private const int postSwingValue = 30; - - - private static int GetAccScoreFromCenterDistance(float centerDistance) - { - const int maxAccScore = 15; - return Mathf.RoundToInt(maxAccScore * (1f - Mathf.Clamp01(centerDistance / 0.3f))); - } - - - public static int GetNoteScore(ScoringType type, float preSwingAmount, float postSwingAmount, float centerDistance) - { - if(type == ScoringType.ChainLink) - { - return MaxChainLinkScore; - } - - if(type == ScoringType.ArcHead) - { - //Arc heads get post swing for free - postSwingAmount = 1f; - } - else if(type == ScoringType.ArcTail) - { - //Arc tails get pre swing for free - preSwingAmount = 1f; - } - else if(type == ScoringType.ChainHead) - { - //Chain heads don't get post swing points at all - postSwingAmount = 0f; - } - - int preSwingScore = Mathf.RoundToInt(Mathf.Clamp01(preSwingAmount) * preSwingValue); - int postSwingScore = Mathf.RoundToInt(Mathf.Clamp01(postSwingAmount) * postSwingValue); - return preSwingScore + postSwingScore + GetAccScoreFromCenterDistance(Mathf.Abs(centerDistance)); - } - public static void InitializeMapScore() { @@ -342,7 +306,7 @@ private Color GetIndicatorColor(ScoringEvent scoringEvent) if(scoringEvent.scoringType == ScoringType.ChainHead) { //Adjust for the missing post swing points on chain heads - scoreGained += postSwingValue; + scoreGained += PostSwingValue; } return currentColorSettings.GetScoreText(scoringEvent).color; } diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs index 9dc39e7c..81a4c1c1 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs @@ -22,6 +22,7 @@ public class ScoringEvent : MapElement public int PreSwingScore; public int PostSwingScore; public int AccuracyScore; + public float TimeDependency; public int TotalScore; public int FCScore; @@ -63,6 +64,7 @@ public ScoringEvent(NoteEvent noteEvent) PostSwingAmount = noteEvent.noteCutInfo.afterCutRating; SwingCenterDistance = noteEvent.noteCutInfo.cutDistanceToCenter; HitTimeOffset = noteEvent.noteCutInfo.timeDeviation; + TimeDependency = Mathf.Abs(noteEvent.noteCutInfo.cutNormal.z); } } @@ -81,6 +83,44 @@ public ScoringEvent(WallEvent wallEvent) } + private static int GetAccScoreFromCenterDistance(float centerDistance) + { + const int maxAccScore = 15; + return Mathf.RoundToInt(maxAccScore * (1f - Mathf.Clamp01(centerDistance / 0.3f))); + } + + + private void CalculateNoteScore() + { + if(scoringType == ScoringType.ChainLink) + { + ScoreGained = ScoreManager.MaxChainLinkScore; + PreSwingScore = 0; + PostSwingScore = 0; + } + + if(scoringType == ScoringType.ArcHead) + { + //Arc heads get post swing for free + PostSwingAmount = 1f; + } + else if(scoringType == ScoringType.ArcTail) + { + //Arc tails get pre swing for free + PreSwingAmount = 1f; + } + else if(scoringType == ScoringType.ChainHead) + { + //Chain heads don't get post swing points at all + PostSwingAmount = 0f; + } + + PreSwingScore = Mathf.RoundToInt(Mathf.Clamp01(PreSwingAmount) * ScoreManager.PreSwingValue); + PostSwingScore = Mathf.RoundToInt(Mathf.Clamp01(PostSwingAmount) * ScoreManager.PostSwingValue); + ScoreGained = PreSwingScore + PostSwingScore + GetAccScoreFromCenterDistance(Mathf.Abs(SwingCenterDistance)); + } + + public void SetEventValues(ScoringType newScoringType, Vector2 newPosition) { const float scoreIndicatorXRandomness = 0.15f; @@ -92,7 +132,7 @@ public void SetEventValues(ScoringType newScoringType, Vector2 newPosition) if(noteEventType == NoteEventType.good) { - ScoreGained = ScoreManager.GetNoteScore(scoringType, PreSwingAmount, PostSwingAmount, SwingCenterDistance); + CalculateNoteScore(); } Initialized = true; From 5310b762367b1e1c2a5a4ccf44eac449baaae0f9 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Tue, 5 Sep 2023 16:48:07 -0600 Subject: [PATCH 11/13] use formatting for score indicators --- Assets/Scenes/Previewer.unity | 330 +++++++++--------- Assets/_Materials/Objects/Notes/Note.mat | 2 +- .../MapControl/Replays/ScoreColorSettings.cs | 20 +- .../MapControl/Replays/ScoreManager.cs | 62 ++-- .../MapControl/Replays/ScoringEvent.cs | 1 + 5 files changed, 214 insertions(+), 201 deletions(-) diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity index ab981461..d5d1201b 100644 --- a/Assets/Scenes/Previewer.unity +++ b/Assets/Scenes/Previewer.unity @@ -17634,7 +17634,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 623593663} - m_Mesh: {fileID: 1199504657} + m_Mesh: {fileID: 1533468636} --- !u!1 &626604732 GameObject: m_ObjectHideFlags: 0 @@ -33782,170 +33782,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1198761461} m_CullTransparentMesh: 1 ---- !u!43 &1199504657 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200020003000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 48 - _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 50000000, y: 50000000, z: 50000000} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1204756722 PrefabInstance: m_ObjectHideFlags: 0 @@ -41666,6 +41502,170 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 51f2b8901d1fdc447b237b9a55307ad2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!43 &1533468636 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1, y: 1, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020003000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 48 + _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 50000000, y: 50000000, z: 50000000} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1533773245 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Materials/Objects/Notes/Note.mat b/Assets/_Materials/Objects/Notes/Note.mat index 0bd5fbe3..b7f5f5f9 100644 --- a/Assets/_Materials/Objects/Notes/Note.mat +++ b/Assets/_Materials/Objects/Notes/Note.mat @@ -113,7 +113,7 @@ Material: - _ClearCoatMask: 0 - _ClearCoatSmoothness: 1 - _CubemapBlur: 2.5 - - _CubemapStrength: 5 + - _CubemapStrength: 7.21 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs index e00a2fad..1c450c31 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs @@ -38,12 +38,13 @@ private string GetFormattedScoreText(ScoreJudgement judgement, ScoringEvent scor builder.Replace("%s", scoringEvent.ScoreGained.ToString()); builder.Replace("%t", timeDependency.ToString()); - builder.Replace("%B", preSwingJudgement.text); - builder.Replace("%C", accJudgement.text); - builder.Replace("%A", postSwingJudgement.text); - builder.Replace("%T", timeDependencyJudgement.text); - + builder.Replace("%B", preSwingJudgement?.text ?? ""); + builder.Replace("%C", accJudgement?.text ?? ""); + builder.Replace("%A", postSwingJudgement?.text ?? ""); + builder.Replace("%T", timeDependencyJudgement?.text ?? ""); + builder.Replace("%n", "
"); + builder.Replace("%%", "%"); return builder.ToString(); } @@ -86,7 +87,7 @@ private ScoreTextInfo GetTextInfoFromScore(ScoreJudgement judgement, ScoreJudgem } - public ScoreTextInfo GetScoreText(ScoringEvent scoringEvent) + public ScoreTextInfo GetScoreTextInfo(ScoringEvent scoringEvent) { for(int i = 0; i < scoreJudgements.Count; i++) { @@ -128,7 +129,7 @@ public ScoreColorSettings(HsvConfig config) } timeDependencyDecimals = Mathf.Clamp(config.timeDependencyDecimalPrecision, 0, 99); - timeDependencyMult = (int)Mathf.Pow(Mathf.Clamp(config.timeDependencyDecimalOffset, 0, 38), 10); + timeDependencyMult = (int)Mathf.Pow(10, Mathf.Clamp(config.timeDependencyDecimalOffset, 0, 38)); if(config.judgements != null && config.judgements.Length > 0) { @@ -208,4 +209,9 @@ public ScoreTextInfo(int score) { text = score.ToString(); } + + public ScoreTextInfo(Color scoreColor) + { + color = scoreColor; + } } \ No newline at end of file diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs index 180fdd86..865214cf 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs @@ -290,15 +290,15 @@ private static string GetPercentageString(float percentage) } - private Color GetIndicatorColor(ScoringEvent scoringEvent) + private ScoreTextInfo GetIndicatorInfo(ScoringEvent scoringEvent) { if(scoringEvent.IsBadHit) { - return badColor; + return new ScoreTextInfo(badColor); } else if(scoringEvent.scoringType == ScoringType.ChainLink) { - return currentColorSettings.chainLinkColor; + return new ScoreTextInfo(currentColorSettings.chainLinkColor); } else { @@ -308,13 +308,40 @@ private Color GetIndicatorColor(ScoringEvent scoringEvent) //Adjust for the missing post swing points on chain heads scoreGained += PostSwingValue; } - return currentColorSettings.GetScoreText(scoringEvent).color; + return currentColorSettings.GetScoreTextInfo(scoringEvent); } } private void UpdateScoreIndicator(ScoringEvent scoringEvent) { + if(scoringEvent.visual == null) + { + scoringEvent.visual = scoreIndicatorPool.GetObject(); + scoringEvent.visual.transform.SetParent(scoreIndicatorParent); + scoringEvent.visual.gameObject.SetActive(true); + + RenderedScoringEvents.Add(scoringEvent); + + //Get the score text and color based on HSV config + scoringEvent.textInfo = GetIndicatorInfo(scoringEvent); + if(scoringEvent.noteEventType == NoteEventType.bad || scoringEvent.noteEventType == NoteEventType.bomb) + { + //Use the X icon for this indicator + scoringEvent.visual.SetIconActive(true); + } + else + { + //If the note was missed, use the miss text + //Otherwise, use the formatted string from the config + bool isMiss = scoringEvent.noteEventType == NoteEventType.miss; + string indicatorText = isMiss ? missString : scoringEvent.textInfo.text; + + scoringEvent.visual.SetIconActive(false); + scoringEvent.visual.SetText(indicatorText); + } + } + float timeDifference = TimeManager.CurrentTime - scoringEvent.Time; float t = timeDifference / indicatorLifetime; @@ -328,7 +355,7 @@ private void UpdateScoreIndicator(ScoringEvent scoringEvent) Vector3 endPos = new Vector3(scoringEvent.endX, endY, endZ); Vector3 position = Vector3.Lerp(startPos, endPos, Easings.Quart.Out(t)); - Color color = GetIndicatorColor(scoringEvent); + Color color = scoringEvent.textInfo.color; if(timeDifference < indicatorFadeInTime) { color.a = timeDifference / indicatorFadeInTime; @@ -344,30 +371,8 @@ private void UpdateScoreIndicator(ScoringEvent scoringEvent) } } - if(scoringEvent.visual == null) - { - scoringEvent.visual = scoreIndicatorPool.GetObject(); - scoringEvent.visual.transform.SetParent(scoreIndicatorParent); - scoringEvent.visual.gameObject.SetActive(true); - - RenderedScoringEvents.Add(scoringEvent); - } - - scoringEvent.visual.transform.position = position; - - if(scoringEvent.noteEventType == NoteEventType.bad || scoringEvent.noteEventType == NoteEventType.bomb) - { - scoringEvent.visual.SetIconActive(true); - } - else - { - bool isMiss = scoringEvent.noteEventType == NoteEventType.miss; - string indicatorText = isMiss ? missString : scoringEvent.ScoreGained.ToString(); - - scoringEvent.visual.SetIconActive(false); - scoringEvent.visual.SetText(indicatorText); - } scoringEvent.visual.SetColor(color); + scoringEvent.visual.transform.position = position; } @@ -564,6 +569,7 @@ private void UpdateSettings(string setting) if(ReplayManager.IsReplayMode) { + ClearIndicators(); UpdateBeat(TimeManager.CurrentBeat); } } diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs index 81a4c1c1..aa22257f 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs @@ -41,6 +41,7 @@ public class ScoringEvent : MapElement public int Misses; public ScoreIndicatorHandler visual; + public ScoreTextInfo textInfo; public bool IsBadHit => noteEventType == NoteEventType.bad || noteEventType == NoteEventType.miss From 5b9823120b0247e800c95b821480da6109b7be12 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Tue, 5 Sep 2023 20:38:19 -0600 Subject: [PATCH 12/13] HSV importing --- Assets/Scenes/Previewer.unity | 2514 +++++++++++++++-- Assets/_Prefabs/HUD/ScoreIndicator.prefab | 20 +- Assets/_Prefabs/UI/TextField.prefab | 2 +- Assets/__Scripts/Loading/Replays/HsvConfig.cs | 10 +- Assets/__Scripts/Loading/Replays/HsvLoader.cs | 159 ++ .../Loading/Replays/HsvLoader.cs.meta | 11 + .../MapControl/Replays/ScoreColorSettings.cs | 22 +- .../MapControl/Replays/ScoreManager.cs | 39 +- .../MapControl/Replays/ScoringEvent.cs | 3 +- Assets/__Scripts/Settings/CustomHsvPanel.cs | 42 + .../__Scripts/Settings/CustomHsvPanel.cs.meta | 11 + Assets/__Scripts/UI/Popups/DialogueHandler.cs | 44 +- ProjectSettings/ProjectSettings.asset | 4 +- 13 files changed, 2589 insertions(+), 292 deletions(-) create mode 100644 Assets/__Scripts/Loading/Replays/HsvLoader.cs create mode 100644 Assets/__Scripts/Loading/Replays/HsvLoader.cs.meta create mode 100644 Assets/__Scripts/Settings/CustomHsvPanel.cs create mode 100644 Assets/__Scripts/Settings/CustomHsvPanel.cs.meta diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity index d5d1201b..119994ba 100644 --- a/Assets/Scenes/Previewer.unity +++ b/Assets/Scenes/Previewer.unity @@ -1032,6 +1032,43 @@ MonoBehaviour: m_EditorClassIdentifier: targetTab: 2 settingsMenu: {fileID: 288421083} +--- !u!1 &44118551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 44118552} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &44118552 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44118551} + 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: + - {fileID: 1178704689} + m_Father: {fileID: 1244208926} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &44420181 GameObject: m_ObjectHideFlags: 0 @@ -1871,7 +1908,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 33 + value: 35 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -1931,7 +1968,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -2978 + value: -3088 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2248,7 +2285,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchorMax.x @@ -2308,7 +2345,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchoredPosition.y - value: -1004 + value: -1059 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3184,6 +3221,129 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1001 &97866340 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1060607015} + m_Modifications: + - target: {fileID: 5665982775677310986, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: rule + value: customhsvconfig + objectReference: {fileID: 0} + - target: {fileID: 9087878821805838510, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_text + value: Custom HSV + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_AnchoredPosition.x + value: 165 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_AnchoredPosition.y + value: -1144 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9087878822117837791, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + propertyPath: m_Name + value: CustomHSVToggle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} +--- !u!1 &97866341 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9087878822117837791, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} + m_PrefabInstance: {fileID: 97866340} + m_PrefabAsset: {fileID: 0} +--- !u!114 &97866342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97866341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50a1bb069cc015242a8fd646a471379c, type: 3} + m_Name: + m_EditorClassIdentifier: + Text: Allows you to use a custom imported
Hit Score Visualizer config --- !u!1 &101065086 GameObject: m_ObjectHideFlags: 0 @@ -3898,6 +4058,130 @@ MonoBehaviour: m_Spacing: {x: 25, y: 50} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1 &126118112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126118113} + - component: {fileID: 126118116} + - component: {fileID: 126118115} + - component: {fileID: 126118118} + - component: {fileID: 126118117} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &126118113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126118112} + 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: + - {fileID: 744006543} + - {fileID: 1244208926} + m_Father: {fileID: 1890493000} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 0, y: -50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &126118115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126118112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -429812325, guid: a6a675725f9775246bb4332629dcce11, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &126118116 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126118112} + m_CullTransparentMesh: 1 +--- !u!114 &126118117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126118112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7320bdfed93aa65458ed9d08d2aec15a, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 126118115} + graphicType: 0 +--- !u!114 &126118118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126118112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c9a5fb757fcd98429d6a77ba05328db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 2057674648} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 0 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 50 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1244208928} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &127410424 GameObject: m_ObjectHideFlags: 0 @@ -5590,7 +5874,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_RootOrder - value: 29 + value: 31 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchorMax.x @@ -5650,7 +5934,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchoredPosition.y - value: -2690 + value: -2800 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7134,6 +7418,304 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 262941555} m_CullTransparentMesh: 1 +--- !u!1001 &266755174 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1890493000} + m_Modifications: + - target: {fileID: 4465115620828890657, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Name + value: CloseButton + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Interactable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 266755176} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 0.3773585 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 0.3773585 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 0.3773585 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0.32941177 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0.32941177 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0.32941177 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_ColorMultiplier + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 0.24528301 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 0.24528301 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 0.24528301 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: 6975ee4c1f40caf4da8dd733ee2cfeaf, type: 3} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: 03cefa94d5aa9d74993fb2138af9d607, type: 3} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: 9aa4348290784b2468144a97eb15d8d7, type: 3} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: 9aa4348290784b2468144a97eb15d8d7, type: 3} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 636204015} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 89126678} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890660, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890661, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Type + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890661, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -429812325, guid: a6a675725f9775246bb4332629dcce11, type: 3} + - target: {fileID: 4465115620828890661, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890661, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890661, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890661, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_AnchoredPosition.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1716383666859359801, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} +--- !u!224 &266755175 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4465115620828890662, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + m_PrefabInstance: {fileID: 266755174} + m_PrefabAsset: {fileID: 0} +--- !u!114 &266755176 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4465115620828890661, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} + m_PrefabInstance: {fileID: 266755174} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &269055954 PrefabInstance: m_ObjectHideFlags: 0 @@ -7335,7 +7917,7 @@ MonoBehaviour: indicatorFadeOutTime: 0.3 badEndY: 1.8 badEndZ: 7 - missString: MISS + missString: MISS badColor: {r: 1, g: 0.050980393, b: 0.050980393, a: 1} colorSettings: - formatMode: 1 @@ -7393,18 +7975,14 @@ MonoBehaviour: text: '%s' fade: 0 - color: {r: 1, g: 1, b: 1, a: 1} - scoreThreshold: 113 - text: '%s' - fade: 0 - - color: {r: 0, g: 1, b: 0, a: 1} scoreThreshold: 110 text: '%s' fade: 0 - - color: {r: 1, g: 1, b: 0, a: 1} + - color: {r: 0, g: 1, b: 0, a: 1} scoreThreshold: 105 text: '%s' fade: 0 - - color: {r: 1, g: 0.5019608, b: 0, a: 1} + - color: {r: 1, g: 1, b: 0, a: 1} scoreThreshold: 100 text: '%s' fade: 0 @@ -7425,7 +8003,7 @@ MonoBehaviour: scoreThreshold: 115 text: '%s' fade: 0 - - color: {r: 0.5294118, g: 0.09803922, b: 0.8627451, a: 1} + - color: {r: 0.6, g: 0, b: 1, a: 1} scoreThreshold: 113 text: '%s' fade: 0 @@ -8145,6 +8723,7 @@ GameObject: - component: {fileID: 288421085} - component: {fileID: 288421086} - component: {fileID: 288421084} + - component: {fileID: 288421087} m_Layer: 5 m_Name: Settings m_TagString: Untagged @@ -8165,6 +8744,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1207085339} + - {fileID: 636204016} m_Father: {fileID: 1399682223} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8371,6 +8951,11 @@ MonoBehaviour: ValueWebGL: enabled: 0 value: 0 + - Name: customhsvconfig + Value: 0 + ValueWebGL: + enabled: 0 + value: 0 defaultInts: - Name: hitsound Value: 0 @@ -8711,6 +9296,18 @@ MonoBehaviour: disabledPos: {x: -315, y: -35} transitionTime: 0.1 disableOnHide: 1 +--- !u!114 &288421087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288421080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e410483b659221d47910691e20176361, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &289775834 PrefabInstance: m_ObjectHideFlags: 0 @@ -8736,7 +9333,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 18 + value: 12 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -8796,7 +9393,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -1919 + value: -949 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9999,7 +10596,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_RootOrder - value: 30 + value: 32 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchorMax.x @@ -10059,7 +10656,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchoredPosition.y - value: -2775 + value: -2885 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10977,7 +11574,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_RootOrder - value: 21 + value: 23 objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_AnchorMax.x @@ -11037,7 +11634,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_AnchoredPosition.y - value: -2122 + value: -2232 objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11895,6 +12492,165 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 397411918} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &397690350 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1060607015} + m_Modifications: + - target: {fileID: 1569275759, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_text + value: Import HSV + objectReference: {fileID: 0} + - target: {fileID: 1569275759, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_fontSize + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1569275759, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_fontSizeBase + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624802, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_Name + value: HSVPanelButton + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_AnchoredPosition.x + value: 165 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_AnchoredPosition.y + value: -1214 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 636204015} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8916813011638624807, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} +--- !u!1 &397690351 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8916813011638624802, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} + m_PrefabInstance: {fileID: 397690350} + m_PrefabAsset: {fileID: 0} +--- !u!114 &397690354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397690351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50a1bb069cc015242a8fd646a471379c, type: 3} + m_Name: + m_EditorClassIdentifier: + Text: Opens a panel to import a custom
Hit Score Visualizer config --- !u!1 &398105679 GameObject: m_ObjectHideFlags: 0 @@ -16611,6 +17367,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 545 objectReference: {fileID: 0} + - target: {fileID: 6047339989492884941, guid: f747d439c78fbce4a84b5234f062543e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -129.99994 + objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -16705,11 +17465,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339990065868558, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6047339990065868558, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f747d439c78fbce4a84b5234f062543e, type: 3} @@ -17634,7 +18394,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 623593663} - m_Mesh: {fileID: 1533468636} + m_Mesh: {fileID: 786644786} --- !u!1 &626604732 GameObject: m_ObjectHideFlags: 0 @@ -17768,6 +18528,7 @@ MonoBehaviour: jumpSettingsPanel: {fileID: 868110370} statsPanel: {fileID: 746234558} staticLightsWarningPanel: {fileID: 1115791867} + customHsvPanel: {fileID: 636204015} --- !u!1001 &628506237 PrefabInstance: m_ObjectHideFlags: 0 @@ -17892,6 +18653,61 @@ MonoBehaviour: m_EditorClassIdentifier: timeText: {fileID: 1122314229} beatText: {fileID: 1296040968} +--- !u!1 &636204015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 636204016} + - component: {fileID: 636204017} + m_Layer: 5 + m_Name: CustomHsvPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &636204016 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636204015} + 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: + - {fileID: 1252586046} + - {fileID: 1890493000} + m_Father: {fileID: 288421081} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &636204017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636204015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87eb3a7141a8e42478bf070903eb9f52, type: 3} + m_Name: + m_EditorClassIdentifier: + hsvLoader: {fileID: 288421087} + inputField: {fileID: 699588232} + errorIcon: {fileID: 1009894172} + hsvRepoURL: https://github.com/ErisApps/HitScoreVisualizer/blob/master/README.md --- !u!1001 &641114620 PrefabInstance: m_ObjectHideFlags: 0 @@ -18205,7 +19021,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_RootOrder - value: 26 + value: 28 objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_AnchorMax.x @@ -18265,7 +19081,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_AnchoredPosition.y - value: -2465 + value: -2575 objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -19591,6 +20407,255 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} +--- !u!1001 &699588230 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2057674648} + m_Modifications: + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_text + value: "ueoauoeaueoauoea\u200B" + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_fontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.w + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 39c873c6d1050334ba670ff0737f281e, type: 2} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_fontSizeBase + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 7829808807226803662, guid: 39c873c6d1050334ba670ff0737f281e, type: 2} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_VerticalAlignment + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 6536940767183799557, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_enableWordWrapping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_text + value: Paste HSV Config Here... + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_fontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.w + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_margin.z + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 39c873c6d1050334ba670ff0737f281e, type: 2} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_fontSizeBase + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 7829808807226803662, guid: 39c873c6d1050334ba670ff0737f281e, type: 2} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_VerticalAlignment + value: 256 + objectReference: {fileID: 0} + - target: {fileID: 6536940767407345182, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_enableWordWrapping + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_Text + value: ueoauoeaueoauoea + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 636204017} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetConfig + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: CustomHsvPanel, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351670, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_Name + value: TextField + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_SizeDelta.x + value: 780 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_SizeDelta.y + value: 39.82 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_AnchoredPosition.x + value: 390 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 6536940767801351665, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + - {fileID: 6536940767801351666, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + - {fileID: 8146764821472800232, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + - {fileID: 6536940765714730366, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} +--- !u!224 &699588231 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6536940767801351671, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + m_PrefabInstance: {fileID: 699588230} + m_PrefabAsset: {fileID: 0} +--- !u!114 &699588232 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6536940767801351664, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + m_PrefabInstance: {fileID: 699588230} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748694642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &702005084 GameObject: m_ObjectHideFlags: 0 @@ -20609,6 +21674,58 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} +--- !u!1 &744006542 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744006543} + - component: {fileID: 744006544} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &744006543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744006542} + 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: + - {fileID: 2057674648} + m_Father: {fileID: 126118113} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -2.75} + m_Pivot: {x: 0, y: 1} +--- !u!114 &744006544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744006542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &746234558 GameObject: m_ObjectHideFlags: 0 @@ -20850,6 +21967,25 @@ MonoBehaviour: m_EditorClassIdentifier: graphic: {fileID: 746789548} graphicType: 0 +--- !u!1 &748694642 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6536940767801351670, guid: 0d8d0c02ba6f730439f338a495c13696, type: 3} + m_PrefabInstance: {fileID: 699588230} + m_PrefabAsset: {fileID: 0} +--- !u!114 &748694645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748694642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &756318238 GameObject: m_ObjectHideFlags: 0 @@ -21916,7 +23052,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_RootOrder - value: 14 + value: 17 objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_AnchorMax.x @@ -21976,7 +23112,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_AnchoredPosition.y - value: -1119 + value: -1284 objectReference: {fileID: 0} - target: {fileID: 5241766548580045628, guid: 1917af5300baa7a4a8080f2e09dfc773, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -22047,9 +23183,9 @@ MonoBehaviour: rule: scorecolortype hideInWebGL: 0 requiredSetting: - enabled: 0 + enabled: 1 value: - Name: + Name: customhsvconfig Value: 0 ValueWebGL: enabled: 0 @@ -22123,6 +23259,170 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 1 +--- !u!43 &786644786 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1, y: 1, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020003000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 48 + _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 50000000, y: 50000000, z: 50000000} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &789587981 GameObject: m_ObjectHideFlags: 0 @@ -24634,6 +25934,141 @@ Transform: m_CorrespondingSourceObject: {fileID: 914495321316648540, guid: 46f0cd36b4b4a9b449f7e221ecf8f485, type: 3} m_PrefabInstance: {fileID: 897806917} m_PrefabAsset: {fileID: 0} +--- !u!1 &899480163 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 899480164} + - component: {fileID: 899480166} + - component: {fileID: 899480165} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &899480164 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899480163} + 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: 1890493000} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -100, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &899480165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899480163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Hit Score Visualizer Config + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 78be5821565fc5848a05da897476c0d3, type: 2} + m_sharedMaterial: {fileID: -8419783504037868241, guid: 78be5821565fc5848a05da897476c0d3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 42 + m_fontSizeBase: 42 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 8192 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &899480166 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899480163} + m_CullTransparentMesh: 1 --- !u!1 &900037797 GameObject: m_ObjectHideFlags: 0 @@ -28865,6 +30300,153 @@ Transform: m_CorrespondingSourceObject: {fileID: 914495321316648540, guid: 46f0cd36b4b4a9b449f7e221ecf8f485, type: 3} m_PrefabInstance: {fileID: 1006291408} m_PrefabAsset: {fileID: 0} +--- !u!1 &1009894172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1009894173} + - component: {fileID: 1009894175} + - component: {fileID: 1009894174} + - component: {fileID: 1009894176} + - component: {fileID: 1009894177} + m_Layer: 5 + m_Name: ErrorIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1009894173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009894172} + 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: 1890493000} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 25, y: -25} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1009894174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009894172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d3481cebc47d3b4469f2255d79032e4e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1009894175 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009894172} + m_CullTransparentMesh: 1 +--- !u!114 &1009894176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009894172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50a1bb069cc015242a8fd646a471379c, type: 3} + m_Name: + m_EditorClassIdentifier: + Text: Invalid HSV config!
Click for more info +--- !u!114 &1009894177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009894172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.70980394, g: 0.10980392, b: 0.10980392, a: 1} + m_HighlightedColor: {r: 0.85882354, g: 0.1013412, b: 0.1013412, a: 1} + m_PressedColor: {r: 0.404, g: 0.06544798, b: 0.06544798, a: 1} + m_SelectedColor: {r: 0.85882354, g: 0.101960786, b: 0.101960786, a: 1} + m_DisabledColor: {r: 0.22745098, g: 0.22745098, b: 0.22745098, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1009894174} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 636204017} + m_TargetAssemblyTypeName: CustomHsvPanel, Assembly-CSharp + m_MethodName: OpenInfoURL + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &1017242171 PrefabInstance: m_ObjectHideFlags: 0 @@ -30320,7 +31902,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6047339989492884941, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_SizeDelta.y - value: 3033 + value: 3143 objectReference: {fileID: 0} - target: {fileID: 6047339989714505428, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_Pivot.x @@ -30424,7 +32006,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047339990065868558, guid: f747d439c78fbce4a84b5234f062543e, type: 3} propertyPath: m_AnchorMin.y - value: 0.72634363 + value: 0.73592114 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f747d439c78fbce4a84b5234f062543e, type: 3} @@ -31543,7 +33125,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_RootOrder - value: 27 + value: 29 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchorMax.x @@ -31603,7 +33185,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchoredPosition.y - value: -2520 + value: -2630 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -33329,6 +34911,97 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} +--- !u!1 &1178704688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1178704689} + - component: {fileID: 1178704692} + - component: {fileID: 1178704691} + - component: {fileID: 1178704690} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1178704689 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178704688} + 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: 44118552} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1178704690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178704688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7320bdfed93aa65458ed9d08d2aec15a, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 1178704691} + graphicType: 0 +--- !u!114 &1178704691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178704688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1067061886, guid: a6a675725f9775246bb4332629dcce11, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1178704692 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178704688} + m_CullTransparentMesh: 1 --- !u!1001 &1179619441 PrefabInstance: m_ObjectHideFlags: 0 @@ -34680,6 +36353,239 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1236523864} m_CullTransparentMesh: 1 +--- !u!1 &1244208925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1244208926} + - component: {fileID: 1244208930} + - component: {fileID: 1244208929} + - component: {fileID: 1244208928} + - component: {fileID: 1244208927} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1244208926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244208925} + 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: + - {fileID: 44118552} + m_Father: {fileID: 126118113} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -2.75, y: 0} + m_SizeDelta: {x: 20, y: -5.499999} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1244208927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244208925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7320bdfed93aa65458ed9d08d2aec15a, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 1244208929} + graphicType: 3 +--- !u!114 &1244208928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244208925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.8352941, g: 0.8509804, b: 0.91764706, a: 1} + m_PressedColor: {r: 0.32941177, g: 0.32941177, b: 0.32941177, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} + m_DisabledColor: {r: 0.19607843, g: 0.2, b: 0.20784314, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1178704691} + m_HandleRect: {fileID: 1178704689} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1244208929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244208925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.04435294, g: 0.057199724, b: 0.11372549, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1067061886, guid: a6a675725f9775246bb4332629dcce11, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1244208930 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1244208925} + m_CullTransparentMesh: 1 +--- !u!1 &1252586045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1252586046} + - component: {fileID: 1252586049} + - component: {fileID: 1252586048} + - component: {fileID: 1252586047} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1252586046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1252586045} + 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: 636204016} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1252586047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1252586045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7320bdfed93aa65458ed9d08d2aec15a, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 1252586048} + graphicType: 2 +--- !u!114 &1252586048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1252586045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.007843138, g: 0.03529412, b: 0.05882353, a: 0.78431374} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1067061886, guid: a6a675725f9775246bb4332629dcce11, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1252586049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1252586045} + m_CullTransparentMesh: 1 --- !u!4 &1257540455 stripped Transform: m_CorrespondingSourceObject: {fileID: 1402659133717576742, guid: b517036a68ebe7347a93646830ec348b, type: 3} @@ -35572,7 +37478,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_RootOrder - value: 28 + value: 30 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchorMax.x @@ -35632,7 +37538,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchoredPosition.y - value: -2605 + value: -2715 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -37817,7 +39723,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_RootOrder - value: 19 + value: 21 objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_AnchorMax.x @@ -37877,7 +39783,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_AnchoredPosition.y - value: -1974 + value: -2084 objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -41320,7 +43226,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_RootOrder - value: 16 + value: 19 objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_AnchorMax.x @@ -41380,7 +43286,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_AnchoredPosition.y - value: -1389 + value: -1554 objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -41502,170 +43408,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 51f2b8901d1fdc447b237b9a55307ad2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!43 &1533468636 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 6 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 4 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200020003000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 4 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 48 - _typelessdata: 000080bf000080bf000000000000803f000080bf000000000000803f0000803f00000000000080bf0000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 50000000, y: 50000000, z: 50000000} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1533773245 PrefabInstance: m_ObjectHideFlags: 0 @@ -42751,7 +44493,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_RootOrder - value: 23 + value: 25 objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_AnchorMax.x @@ -42811,7 +44553,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_AnchoredPosition.y - value: -2232 + value: -2342 objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -45414,7 +47156,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -45474,7 +47216,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -949 + value: -1004 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -46190,7 +47932,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 22 + value: 24 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -46250,7 +47992,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -2177 + value: -2287 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -47561,7 +49303,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 32 + value: 34 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -47621,7 +49363,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -2923 + value: -3033 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -51239,6 +52981,101 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Text: Allows you to set your own custom colors +--- !u!1 &1890492999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1890493000} + - component: {fileID: 1890493003} + - component: {fileID: 1890493002} + - component: {fileID: 1890493001} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1890493000 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890492999} + 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: + - {fileID: 899480164} + - {fileID: 1009894173} + - {fileID: 266755175} + - {fileID: 126118113} + m_Father: {fileID: 636204016} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 800, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1890493001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890492999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7320bdfed93aa65458ed9d08d2aec15a, type: 3} + m_Name: + m_EditorClassIdentifier: + graphic: {fileID: 1890493002} + graphicType: 1 +--- !u!114 &1890493002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890492999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -429812325, guid: a6a675725f9775246bb4332629dcce11, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1890493003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1890492999} + m_CullTransparentMesh: 1 --- !u!1001 &1895200222 PrefabInstance: m_ObjectHideFlags: 0 @@ -51657,7 +53494,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 15 + value: 18 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -51717,7 +53554,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -1174 + value: -1339 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -52313,7 +54150,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_RootOrder - value: 17 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_AnchorMax.x @@ -52373,7 +54210,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_AnchoredPosition.y - value: -1734 + value: -1899 objectReference: {fileID: 0} - target: {fileID: 5136436448866786555, guid: 0b8e475dbbe2bc54993fad86c1556db3, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -55219,7 +57056,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 25 + value: 27 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -55279,7 +57116,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -2380 + value: -2490 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -55366,7 +57203,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_RootOrder - value: 24 + value: 26 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchorMax.x @@ -55426,7 +57263,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_AnchoredPosition.y - value: -2295 + value: -2405 objectReference: {fileID: 0} - target: {fileID: 4378467592763974618, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -55489,7 +57326,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_RootOrder - value: 31 + value: 33 objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_AnchorMax.x @@ -55549,7 +57386,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_AnchoredPosition.y - value: -2860 + value: -2970 objectReference: {fileID: 0} - target: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -56735,6 +58572,82 @@ RectTransform: m_AnchoredPosition: {x: 10, y: 10} m_SizeDelta: {x: 300, y: 350} m_Pivot: {x: 0, y: 0} +--- !u!1 &2029084748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2029084749} + - component: {fileID: 2029084751} + - component: {fileID: 2029084750} + m_Layer: 5 + m_Name: RaycastCatcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2029084749 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029084748} + 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: 699588231} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 547} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &2029084750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029084748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2029084751 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029084748} + m_CullTransparentMesh: 1 --- !u!1 &2032384640 GameObject: m_ObjectHideFlags: 0 @@ -57824,6 +59737,85 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fa5f5f0ccfc1087429faf7820e4a30d2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2057674647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057674648} + - component: {fileID: 2057674650} + - component: {fileID: 2057674649} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2057674648 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057674647} + 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: + - {fileID: 699588231} + m_Father: {fileID: 744006543} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 39.82} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2057674649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057674647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &2057674650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057674647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &2065311647 GameObject: m_ObjectHideFlags: 0 @@ -57984,7 +59976,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_RootOrder - value: 20 + value: 22 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchorMax.x @@ -58044,7 +60036,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_AnchoredPosition.y - value: -2037 + value: -2147 objectReference: {fileID: 0} - target: {fileID: 9087878822117837788, guid: a7f0a55a68792b5458628d0091c80d18, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -59855,6 +61847,82 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2139389787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2139389788} + - component: {fileID: 2139389790} + - component: {fileID: 2139389789} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2139389788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139389787} + 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: 266755175} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -1, y: -0.5} + m_SizeDelta: {x: -2, y: -1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2139389789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139389787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9aa4348290784b2468144a97eb15d8d7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2139389790 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139389787} + m_CullTransparentMesh: 1 --- !u!1001 &2143326820 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Prefabs/HUD/ScoreIndicator.prefab b/Assets/_Prefabs/HUD/ScoreIndicator.prefab index 675ef7b5..e75e3461 100644 --- a/Assets/_Prefabs/HUD/ScoreIndicator.prefab +++ b/Assets/_Prefabs/HUD/ScoreIndicator.prefab @@ -26,16 +26,16 @@ RectTransform: m_GameObject: {fileID: 261302884451257289} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4037059583551344264} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 7, y: 7} m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &1782586550414466036 SpriteRenderer: @@ -117,7 +117,7 @@ RectTransform: m_GameObject: {fileID: 4037059583551344267} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.08, y: 0.08, z: 0.08} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5461167299928720766} @@ -127,7 +127,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 5, y: 4} + m_SizeDelta: {x: 0.7, y: 0.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &4037059583551344246 MeshRenderer: @@ -185,7 +185,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -218,8 +218,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 2.2 + m_fontSizeBase: 2.2 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -230,7 +230,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -10 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 diff --git a/Assets/_Prefabs/UI/TextField.prefab b/Assets/_Prefabs/UI/TextField.prefab index cc534b75..a19dfd6c 100644 --- a/Assets/_Prefabs/UI/TextField.prefab +++ b/Assets/_Prefabs/UI/TextField.prefab @@ -414,7 +414,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1536270235, guid: a6a675725f9775246bb4332629dcce11, type: 3} + m_Sprite: {fileID: -429812325, guid: a6a675725f9775246bb4332629dcce11, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/__Scripts/Loading/Replays/HsvConfig.cs b/Assets/__Scripts/Loading/Replays/HsvConfig.cs index 19f41f86..57849fc6 100644 --- a/Assets/__Scripts/Loading/Replays/HsvConfig.cs +++ b/Assets/__Scripts/Loading/Replays/HsvConfig.cs @@ -7,11 +7,11 @@ public class HsvConfig public int timeDependencyDecimalPrecision; public int timeDependencyDecimalOffset; - public HsvJudgement[] judgements; - public HsvJudgementSegment[] beforeCutAngleJudgements; - public HsvJudgementSegment[] accuracyJudgements; - public HsvJudgementSegment[] afterCutAngleJudgements; - public HsvTimeDependencyJudgement[] timeDependencyJudgements; + public HsvJudgement[] judgments; + public HsvJudgementSegment[] beforeCutAngleJudgments; + public HsvJudgementSegment[] accuracyJudgments; + public HsvJudgementSegment[] afterCutAngleJudgments; + public HsvTimeDependencyJudgement[] timeDependencyJudgments; } diff --git a/Assets/__Scripts/Loading/Replays/HsvLoader.cs b/Assets/__Scripts/Loading/Replays/HsvLoader.cs new file mode 100644 index 00000000..d424c697 --- /dev/null +++ b/Assets/__Scripts/Loading/Replays/HsvLoader.cs @@ -0,0 +1,159 @@ +using System; +using System.Collections; +using System.IO; +using System.Threading.Tasks; +using Newtonsoft.Json; +using UnityEngine; + +public class HsvLoader : MonoBehaviour +{ + private static ScoreColorSettings _customHSV; + public static ScoreColorSettings CustomHSV + { + get => _customHSV; + private set + { + _customHSV = value; + OnCustomHSVUpdated?.Invoke(); + } + } + + public static string CustomConfigJson { get; private set; } + public static bool ValidConfig { get; private set; } + + public static event Action OnCustomHSVUpdated; + + private const string HsvFile = "UserHSV.json"; + private string HsvPath => Path.Combine(Application.persistentDataPath, HsvFile); + + private bool savingHSV = false; + private Coroutine saveCoroutine; + + + private void SetHSVFromJson(string configJson) + { + CustomConfigJson = configJson; + + try + { + HsvConfig newConfig = JsonConvert.DeserializeObject(configJson); + if(newConfig != null) + { + ValidConfig = true; + CustomHSV = new ScoreColorSettings(newConfig); + } + else + { + Debug.LogWarning("Null HSV config!"); + ValidConfig = false; + CustomHSV = new ScoreColorSettings(); + } + } + catch(Exception err) + { + Debug.LogWarning($"Failed to parse HSV config with error: {err.Message}"); + ValidConfig = false; + CustomHSV = new ScoreColorSettings(); + } + } + + +//Suppress warnings about a lack of await when building for WebGL +#pragma warning disable 1998 + private async Task SaveHSV(string configJson) + { + try + { +#if !UNITY_WEBGL || UNITY_EDITOR + await File.WriteAllTextAsync(HsvPath, configJson); +#else + PlayerPrefs.SetString("customhsv", configJson); +#endif + } + catch(Exception err) + { + Debug.LogWarning($"Failed to write HSV config with error: {err.Message}, {err.StackTrace}"); + ErrorHandler.Instance.ShowPopup(ErrorType.Error, "Failed to save HSV config to disk!"); + } + } + + + private async Task LoadHSV() + { + try + { +#if !UNITY_WEBGL || UNITY_EDITOR + Debug.Log("Loading custom HSV from file."); + + string path = HsvPath; + if(!File.Exists(path)) + { + //The file doesn't exist, so just set defaults + ValidConfig = false; + CustomHSV = new ScoreColorSettings(); + CustomConfigJson = ""; + return; + } + + string configJson = await File.ReadAllTextAsync(path, System.Text.Encoding.UTF8); +#else + Debug.Log("Loading custom HSV from player prefs."); + string configJson = PlayerPrefs.GetString("customhsv", ""); +#endif + + if(string.IsNullOrEmpty(configJson)) + { + ValidConfig = false; + CustomHSV = new ScoreColorSettings(); + CustomConfigJson = ""; + return; + } + + SetHSVFromJson(configJson); + } + catch(Exception err) + { + Debug.LogWarning($"Failed to read HSV config with error: {err.Message}, {err.StackTrace}"); + ErrorHandler.Instance.ShowPopup(ErrorType.Warning, "Failed to read your HSV config!"); + + ValidConfig = false; + CustomHSV = new ScoreColorSettings(); + CustomConfigJson = ""; + } + } + + + private IEnumerator SetHSVCoroutine(string configJson) + { + savingHSV = true; + + using Task saveTask = SaveHSV(configJson); + SetHSVFromJson(configJson); + + yield return new WaitUntil(() => saveTask.IsCompleted); + + savingHSV = false; + } + + + public void SetHSV(string configJson) + { + if(configJson == null) + { + throw new ArgumentNullException("configJson cannot be null!"); + } + + if(savingHSV) + { + StopCoroutine(saveCoroutine); + } + + saveCoroutine = StartCoroutine(SetHSVCoroutine(configJson)); + } + + + private async void Start() + { + await LoadHSV(); + } +} \ No newline at end of file diff --git a/Assets/__Scripts/Loading/Replays/HsvLoader.cs.meta b/Assets/__Scripts/Loading/Replays/HsvLoader.cs.meta new file mode 100644 index 00000000..50057d37 --- /dev/null +++ b/Assets/__Scripts/Loading/Replays/HsvLoader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e410483b659221d47910691e20176361 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs index 1c450c31..1232a6c7 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs @@ -131,31 +131,31 @@ public ScoreColorSettings(HsvConfig config) timeDependencyDecimals = Mathf.Clamp(config.timeDependencyDecimalPrecision, 0, 99); timeDependencyMult = (int)Mathf.Pow(10, Mathf.Clamp(config.timeDependencyDecimalOffset, 0, 38)); - if(config.judgements != null && config.judgements.Length > 0) + if(config.judgments != null && config.judgments.Length > 0) { scoreJudgements = new List(); - foreach(HsvJudgement judgement in config.judgements) + foreach(HsvJudgement judgement in config.judgments) { scoreJudgements.Add(new ScoreJudgement(judgement)); } + scoreJudgements = scoreJudgements.OrderByDescending(x => x.scoreThreshold).ToList(); } - scoreJudgements = scoreJudgements.OrderByDescending(x => x.scoreThreshold).ToList(); - if(config.beforeCutAngleJudgements != null) + if(config.beforeCutAngleJudgments != null) { - preSwingJudgements.AddRange(config.beforeCutAngleJudgements.OrderByDescending(x => x.threshold)); + preSwingJudgements.AddRange(config.beforeCutAngleJudgments.OrderByDescending(x => x.threshold)); } - if(config.accuracyJudgements != null) + if(config.accuracyJudgments != null) { - accJudgements.AddRange(config.accuracyJudgements.OrderByDescending(x => x.threshold)); + accJudgements.AddRange(config.accuracyJudgments.OrderByDescending(x => x.threshold)); } - if(config.afterCutAngleJudgements != null) + if(config.afterCutAngleJudgments != null) { - postSwingJudgements.AddRange(config.afterCutAngleJudgements.OrderByDescending(x => x.threshold)); + postSwingJudgements.AddRange(config.afterCutAngleJudgments.OrderByDescending(x => x.threshold)); } - if(config.timeDependencyJudgements != null) + if(config.timeDependencyJudgments != null) { - timeDependencyJudgements.AddRange(config.timeDependencyJudgements.OrderByDescending(x => x.threshold)); + timeDependencyJudgements.AddRange(config.timeDependencyJudgments.OrderByDescending(x => x.threshold)); } } diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs index 865214cf..215785b0 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreManager.cs @@ -558,20 +558,42 @@ private void UpdateUIState(UIState newState) } - private void UpdateSettings(string setting) + private void UpdateScoreColorSettings() { - bool allSettings = setting == "all"; - if(colorSettings.Length > 0 && (allSettings || setting == "scorecolortype")) + if(SettingsManager.GetBool("customhsvconfig") && HsvLoader.CustomHSV != null) + { + currentColorSettings = HsvLoader.CustomHSV; + } + else { int colorSettingsIndex = SettingsManager.GetInt("scorecolortype"); colorSettingsIndex = Mathf.Clamp(colorSettingsIndex, 0, colorSettings.Length - 1); currentColorSettings = colorSettings[colorSettingsIndex]; + } - if(ReplayManager.IsReplayMode) - { - ClearIndicators(); - UpdateBeat(TimeManager.CurrentBeat); - } + if(ReplayManager.IsReplayMode) + { + ClearIndicators(); + UpdateBeat(TimeManager.CurrentBeat); + } + } + + + private void UpdateCustomHSV() + { + if(SettingsManager.Loaded && SettingsManager.GetBool("customhsvconfig")) + { + UpdateScoreColorSettings(); + } + } + + + private void UpdateSettings(string setting) + { + bool allSettings = setting == "all"; + if(colorSettings.Length > 0 && (allSettings || setting == "scorecolortype" || setting == "customhsvconfig")) + { + UpdateScoreColorSettings(); } if(allSettings || setting == "fcacc") @@ -587,6 +609,7 @@ private void Start() ReplayManager.OnReplayModeChanged += UpdateReplayMode; UIStateManager.OnUIStateChanged += UpdateUIState; SettingsManager.OnSettingsUpdated += UpdateSettings; + HsvLoader.OnCustomHSVUpdated += UpdateCustomHSV; if(SettingsManager.Loaded) { diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs index aa22257f..35c0542f 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoringEvent.cs @@ -118,7 +118,8 @@ private void CalculateNoteScore() PreSwingScore = Mathf.RoundToInt(Mathf.Clamp01(PreSwingAmount) * ScoreManager.PreSwingValue); PostSwingScore = Mathf.RoundToInt(Mathf.Clamp01(PostSwingAmount) * ScoreManager.PostSwingValue); - ScoreGained = PreSwingScore + PostSwingScore + GetAccScoreFromCenterDistance(Mathf.Abs(SwingCenterDistance)); + AccuracyScore = GetAccScoreFromCenterDistance(Mathf.Abs(SwingCenterDistance)); + ScoreGained = PreSwingScore + PostSwingScore + AccuracyScore; } diff --git a/Assets/__Scripts/Settings/CustomHsvPanel.cs b/Assets/__Scripts/Settings/CustomHsvPanel.cs new file mode 100644 index 00000000..76964a0a --- /dev/null +++ b/Assets/__Scripts/Settings/CustomHsvPanel.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using TMPro; + +public class CustomHsvPanel : MonoBehaviour +{ + [SerializeField] private HsvLoader hsvLoader; + [SerializeField] private TMP_InputField inputField; + [SerializeField] private GameObject errorIcon; + + [Space] + [SerializeField] private string hsvRepoURL; + + + public void SetConfig(string configJson) => hsvLoader.SetHSV(configJson); + + + public void OpenInfoURL() + { + Application.OpenURL(hsvRepoURL); + } + + + private void UpdateErrorIcon() + { + errorIcon.SetActive(!HsvLoader.ValidConfig); + } + + + private void OnEnable() + { + inputField.SetTextWithoutNotify(HsvLoader.CustomConfigJson ?? ""); + UpdateErrorIcon(); + + HsvLoader.OnCustomHSVUpdated += UpdateErrorIcon; + } + + + private void OnDisable() + { + HsvLoader.OnCustomHSVUpdated -= UpdateErrorIcon; + } +} \ No newline at end of file diff --git a/Assets/__Scripts/Settings/CustomHsvPanel.cs.meta b/Assets/__Scripts/Settings/CustomHsvPanel.cs.meta new file mode 100644 index 00000000..3c8d76db --- /dev/null +++ b/Assets/__Scripts/Settings/CustomHsvPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 87eb3a7141a8e42478bf070903eb9f52 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/__Scripts/UI/Popups/DialogueHandler.cs b/Assets/__Scripts/UI/Popups/DialogueHandler.cs index fdafe95f..87bca7cd 100644 --- a/Assets/__Scripts/UI/Popups/DialogueHandler.cs +++ b/Assets/__Scripts/UI/Popups/DialogueHandler.cs @@ -8,7 +8,7 @@ public class DialogueHandler : MonoBehaviour public static List OpenBoxes = new List(); public static bool LogActive => Instance.logCanvas.activeInHierarchy; - public static bool DialogueActive => OpenBoxes.Count > 0 || Instance.infoPanel.activeInHierarchy || Instance.staticLightsWarningPanel.activeInHierarchy || LogActive; + public static bool DialogueActive => OpenBoxes.Count > 0 || Instance.infoPanel.activeInHierarchy || Instance.staticLightsWarningPanel.activeInHierarchy || Instance.customHsvPanel.activeInHierarchy || LogActive; public static bool PopupActive => DialogueActive || Instance.sharePanel.activeInHierarchy || Instance.jumpSettingsPanel.activeInHierarchy || Instance.statsPanel.activeInHierarchy; [SerializeField] private GameObject dialogueBoxPrefab; @@ -20,6 +20,7 @@ public class DialogueHandler : MonoBehaviour public GameObject jumpSettingsPanel; public GameObject statsPanel; public GameObject staticLightsWarningPanel; + public GameObject customHsvPanel; public static void ShowDialogueBox(DialogueBoxType type, string text, Action callback = null) @@ -37,28 +38,13 @@ public static void ShowDialogueBox(DialogueBoxType type, string text, Action infoPanel.SetActive(active); - public void SetSharePanelActive(bool active) - { - sharePanel.SetActive(active); - } + public void SetSharePanelActive(bool active) => sharePanel.SetActive(active); + public void SetJumpSettingsPanelActive(bool active) => jumpSettingsPanel.SetActive(active); - public void SetJumpSettingsPanelActive(bool active) - { - jumpSettingsPanel.SetActive(active); - } - - - public void SetStatsPanelActive(bool active) - { - statsPanel.SetActive(active); - } + public void SetStatsPanelActive(bool active) => statsPanel.SetActive(active); public void ShowLog(Log log) @@ -69,23 +55,13 @@ public void ShowLog(Log log) } - public static void ClearDialogueBoxes() - { - for(int i = OpenBoxes.Count - 1; i >= 0; i--) - { - OpenBoxes[i].Close(); - } - - ClearExtraPopups(); - } - - public static void ClearExtraPopups() { Instance.SetInfoPanelActive(false); Instance.SetSharePanelActive(false); Instance.SetJumpSettingsPanelActive(false); Instance.SetStatsPanelActive(false); + Instance.customHsvPanel.SetActive(false); } @@ -124,6 +100,12 @@ private void DialogueKeybinds() return; } + if(customHsvPanel.activeInHierarchy) + { + customHsvPanel.SetActive(false); + return; + } + if(sharePanel.activeInHierarchy) { SetSharePanelActive(false); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 43278071..966d7d79 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.5.5 + bundleVersion: 0.5.6 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -662,7 +662,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 2 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 From 22d78ca5468b73ad54e20ee41cd196f19e290bae Mon Sep 17 00:00:00 2001 From: AllPoland Date: Tue, 5 Sep 2023 20:49:53 -0600 Subject: [PATCH 13/13] correct time dependency threshold --- .../Previewer/MapControl/Replays/ScoreColorSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs index 1232a6c7..ab1aa9c4 100644 --- a/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs +++ b/Assets/__Scripts/Previewer/MapControl/Replays/ScoreColorSettings.cs @@ -29,7 +29,7 @@ private string GetFormattedScoreText(ScoreJudgement judgement, ScoringEvent scor HsvJudgementSegment accJudgement = accJudgements.FirstOrDefault(x => x.threshold <= scoringEvent.AccuracyScore); HsvJudgementSegment postSwingJudgement = postSwingJudgements.FirstOrDefault(x => x.threshold <= scoringEvent.PostSwingScore); - HsvTimeDependencyJudgement timeDependencyJudgement = timeDependencyJudgements.FirstOrDefault(x => x.threshold <= timeDependency); + HsvTimeDependencyJudgement timeDependencyJudgement = timeDependencyJudgements.FirstOrDefault(x => x.threshold <= scoringEvent.TimeDependency); StringBuilder builder = new StringBuilder(judgement.text); builder.Replace("%b", scoringEvent.PreSwingScore.ToString());