From 8b43853450355b775a33b078c2746b80e3bfa245 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sat, 20 Jan 2024 00:24:23 -0500 Subject: [PATCH] fix operation order issue with judgement --- .../UI/Timeline/JudgementOpen.playable | 17 -- Assets/Scenes/Judgement.unity | 230 +++++++++--------- Assets/Scripts/JudgementManager.cs | 6 +- ...Generator.Editor.ProjectSettingsData.asset | 1 + 4 files changed, 121 insertions(+), 133 deletions(-) diff --git a/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable index 6af5efa75..46a5ed1b3 100644 --- a/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable +++ b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable @@ -143,7 +143,6 @@ MonoBehaviour: - {fileID: 4005577975902647507} - {fileID: 2251119349716289747} - {fileID: 3019407148365585604} - - {fileID: 8445470951399354961} - {fileID: -5180983858531340552} --- !u!114 &-5180983858531340552 MonoBehaviour: @@ -464,19 +463,3 @@ MonoBehaviour: m_Retroactive: 0 m_EmitOnce: 0 m_Asset: {fileID: 11400000, guid: f5bc62bc9f451ed4a9ed997842113201, type: 2} ---- !u!114 &8445470951399354961 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} - m_Name: Signal Emitter - m_EditorClassIdentifier: - m_Time: 0 - m_Retroactive: 0 - m_EmitOnce: 0 - m_Asset: {fileID: 11400000, guid: b84f5e43721bc2e408bc902a4e02988d, type: 2} diff --git a/Assets/Scenes/Judgement.unity b/Assets/Scenes/Judgement.unity index cd8e130ab..dfaeb3d4b 100644 --- a/Assets/Scenes/Judgement.unity +++ b/Assets/Scenes/Judgement.unity @@ -10265,7 +10265,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272774269} m_CullTransparentMesh: 1 ---- !u!21 &353272174 +--- !u!21 &372391762 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -10301,6 +10301,42 @@ Material: m_Colors: - _WidthHeightRadius: {r: 652, g: 112, b: 96, a: 0} m_BuildTextureStacks: [] +--- !u!21 &449422902 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 632, g: 92, b: 84, a: 0} + m_BuildTextureStacks: [] --- !u!1 &513457786 GameObject: m_ObjectHideFlags: 0 @@ -10483,7 +10519,7 @@ PlayableDirector: m_Enabled: 1 serializedVersion: 3 m_PlayableAsset: {fileID: 11400000, guid: 1cface0e48180cc43954bd1d6d1c6168, type: 2} - m_InitialState: 1 + m_InitialState: 0 m_WrapMode: 0 m_DirectorUpdateMode: 1 m_InitialTime: 0 @@ -11405,7 +11441,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1805959308} + m_Material: {fileID: 2014912716} m_Color: {r: 0.14901961, g: 0.14901961, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -11465,7 +11501,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.247, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -11558,7 +11594,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 353272174} + m_Material: {fileID: 372391762} m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -12012,6 +12048,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1238570285} m_CullTransparentMesh: 1 +--- !u!21 &1284898014 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 648, g: 74, b: 80, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1432705147 GameObject: m_ObjectHideFlags: 0 @@ -12063,7 +12135,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2127234886} + m_Material: {fileID: 1284898014} m_Color: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -12661,7 +12733,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1918595244} + m_Material: {fileID: 449422902} m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -13011,78 +13083,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1702256960} m_CullTransparentMesh: 1 ---- !u!21 &1805959308 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 632, g: 34.3, b: 80, a: 0} - m_BuildTextureStacks: [] ---- !u!21 &1918595244 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 632, g: 92, b: 84, a: 0} - m_BuildTextureStacks: [] --- !u!1 &1932988790 GameObject: m_ObjectHideFlags: 0 @@ -13334,6 +13334,42 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0.5, y: 0.5} +--- !u!21 &2014912716 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 632, g: 34.3, b: 80, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2040008466 GameObject: m_ObjectHideFlags: 0 @@ -13506,39 +13542,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086822065} m_CullTransparentMesh: 1 ---- !u!21 &2127234886 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 648, g: 74, b: 80, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Scripts/JudgementManager.cs b/Assets/Scripts/JudgementManager.cs index bf93c4b96..21122e566 100644 --- a/Assets/Scripts/JudgementManager.cs +++ b/Assets/Scripts/JudgementManager.cs @@ -13,7 +13,7 @@ using HeavenStudio.InputSystem; namespace HeavenStudio { - [RequireComponent(typeof(PlayableDirector), typeof(AudioSource))] + [RequireComponent(typeof(PlayableDirector), typeof(AudioSource), typeof(PlayableDirector))] public class JudgementManager : MonoBehaviour { enum Rank @@ -113,6 +113,7 @@ namespace HeavenStudio [SerializeField] Animator canvasAnim; AudioSource audioSource; + PlayableDirector director; List usedCategories; float[] categoryInputs; double[] categoryScores; @@ -521,6 +522,9 @@ namespace HeavenStudio private void Start() { audioSource = GetComponent(); + director = GetComponent(); + PrepareJudgement(); + director.Play(); } private IEnumerator WaitAndRank() diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 4390d9565..7ef2a3505 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -29,5 +29,6 @@ MonoBehaviour: - Assets/Scripts/Games/FirstContact/FirstContact.cs - Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs - Assets/Scripts/InputSystem/PlayerInput.cs + - Assets/Scripts/JudgementManager.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []