From 23d832f17a32d1bdb6729e9e0a83dc2e4407b733 Mon Sep 17 00:00:00 2001 From: yu195 Date: Thu, 13 Apr 2023 21:20:45 +0900 Subject: [PATCH] =?UTF-8?q?#3=20Grade=E8=A1=A8=E7=A4=BA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/SampleScene.unity | 136 ++++++++++++++++++++++++++++++++ Assets/Scripts/GameManager.cs | 41 ++++++++-- 2 files changed, 171 insertions(+), 6 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f3f3eb8..5746dba 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1317,6 +1317,7 @@ RectTransform: m_Children: - {fileID: 1997218002} - {fileID: 1653840521} + - {fileID: 1643848858} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1325,6 +1326,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1643848857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1643848858} + - component: {fileID: 1643848860} + - component: {fileID: 1643848859} + m_Layer: 5 + m_Name: GradeResultText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1643848858 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643848857} + 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: 1540059610} + m_RootOrder: 2 + 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: -75} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1643848859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643848857} + 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: Grade + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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 &1643848860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643848857} + m_CullTransparentMesh: 1 --- !u!1 &1653840520 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index f2fe6f1..8bc2017 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -22,6 +22,9 @@ public class GameManager : MonoBehaviour [SerializeField, InspectorOnly] private TextMeshProUGUI _comboText; + [SerializeField, InspectorOnly] + private TextMeshProUGUI _gradeResultText; + private PlayerInput _playerInput; private NoteObject[] _noteObjects; @@ -36,13 +39,14 @@ private void Start() _playerInput = GetComponent(); LoadNotes(); + _gradeResultText.text = ""; _playerInput.onActionTriggered += OnMainInput; } private void OnDestroy() { _playerInput.onActionTriggered -= OnMainInput; - foreach(var note in _noteObjects) + foreach (var note in _noteObjects) { note.Controller.NoteMiss -= ControllerNoteMiss; } @@ -67,7 +71,9 @@ private void ControllerNoteMiss(int noteId) { ScoreManager.Instance.OnMiss(noteId); UpdateText(); - _noteObjects.First(n => n.NoteId == noteId).Controller.NoteDestroy(); + var controller = _noteObjects.First(n => n.NoteId == noteId).Controller; + controller.NoteMiss -= ControllerNoteMiss; + controller.NoteDestroy(); } private Vector3 CalculateNotePosition(NoteEntity note) @@ -98,6 +104,31 @@ public void UpdateText() _comboText.text = $"{ScoreManager.Instance.CurrentComboCount} Combo"; } + public void UpdateGradeText(Grade grade) + { + switch (grade) + { + case Grade.None: + _gradeResultText.text = ""; + break; + case Grade.Perfect: + _gradeResultText.text = "Perfect"; + break; + case Grade.Great: + _gradeResultText.text = "Great"; + break; + case Grade.Good: + _gradeResultText.text = "Good"; + break; + case Grade.Bad: + _gradeResultText.text = "Bad"; + break; + case Grade.Miss: + _gradeResultText.text = "Miss"; + break; + } + } + public void StartPlay() { @@ -132,13 +163,11 @@ private void OnMainInput(InputAction.CallbackContext context) var (id, grade) = ScoreManager.Instance.OnTap(lanePosition, 1); - var note = _noteObjects.FirstOrDefault(x => x.NoteId == id); - - if (note is null) - return; + var note = _noteObjects.First(x => x.NoteId == id); note.Controller.NoteDestroy(); note.Controller.NoteMiss -= ControllerNoteMiss; + UpdateGradeText(grade); UpdateText(); } }