diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 998a7b8..d842db0 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -1438,6 +1438,154 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 556217749} m_CullTransparentMesh: 1 +--- !u!1 &559869167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 559869168} + - component: {fileID: 559869170} + - component: {fileID: 559869171} + - component: {fileID: 559869169} + m_Layer: 5 + m_Name: Version + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &559869168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559869167} + 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: 1941756047} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -46, y: 15} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 1, y: 0} +--- !u!114 &559869169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559869167} + 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: 'Version: 0.1.0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: caf4b111a8083cc4493a45bd8be92246, type: 2} + m_sharedMaterial: {fileID: -916883817245365249, guid: caf4b111a8083cc4493a45bd8be92246, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 4 + 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: -260.10144, 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 &559869170 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559869167} + m_CullTransparentMesh: 1 +--- !u!114 &559869171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 559869167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49568c48c44cb364e9702ea6d5f43956, type: 3} + m_Name: + m_EditorClassIdentifier: + _version: {fileID: 559869169} --- !u!1 &621429386 GameObject: m_ObjectHideFlags: 0 @@ -3908,6 +4056,7 @@ RectTransform: m_Children: - {fileID: 479878303} - {fileID: 1645624618} + - {fileID: 559869168} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Scripts/Ingame/UIManager.cs b/Assets/Scripts/Ingame/UIManager.cs index 38273c7..36addf7 100644 --- a/Assets/Scripts/Ingame/UIManager.cs +++ b/Assets/Scripts/Ingame/UIManager.cs @@ -57,7 +57,7 @@ private IEnumerator GameStartCoroutine() for (int i = 0; i < 3; i++) { _countText.text = (3 - i).ToString(); - + yield return new WaitForSeconds(1f); } @@ -69,9 +69,10 @@ private IEnumerator GameStartCoroutine() _canSelectAction = true; } - private IEnumerator BgmCouroutine() + private IEnumerator BgmCoroutine() { SoundManager.Instance.PlayBGM(SoundType.FirstBGM); + yield return null; } private IEnumerator TurnStartCoroutine() { diff --git a/Assets/Scripts/Title/VersionUI.cs b/Assets/Scripts/Title/VersionUI.cs new file mode 100644 index 0000000..2ab5448 --- /dev/null +++ b/Assets/Scripts/Title/VersionUI.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +public class VersionUI : MonoBehaviour +{ + [SerializeField] + private TextMeshProUGUI _version; + + /// + /// Awake is called when the script instance is being loaded. + /// + private void Awake() + { + _version.text = $"Version: {Application.version}"; + } +} diff --git a/Assets/Scripts/Title/VersionUI.cs.meta b/Assets/Scripts/Title/VersionUI.cs.meta new file mode 100644 index 0000000..5c694ed --- /dev/null +++ b/Assets/Scripts/Title/VersionUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 49568c48c44cb364e9702ea6d5f43956 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: