From c48d9138af596fb3106ce6778d5fa0df80189007 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Fri, 28 Feb 2025 22:05:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=82=AC=EC=9A=B4=EB=93=9C=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=99=94=EB=A9=B4=20=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Gameton/Resources/TestBgm.mp3 | 3 + .../Assets/Gameton/Resources/TestBgm.mp3.meta | 23 +++ .../Assets/Gameton/Resources/TestSound.mp3 | 3 + .../Gameton/Resources/TestSound.mp3.meta | 23 +++ .../Resources/UI/Prefabs/UI.LobbyUI.prefab | 147 +++++++++++++++++- .../UI/Prefabs/UI.SkillSettingUI.prefab | 2 +- .../Resources/UI/Prefabs/UI.TitleUI.prefab | 145 +++++++++++++++++ Gameton-06/Assets/Gameton/Scenes/Title.unity | 2 +- 8 files changed, 345 insertions(+), 3 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Resources/TestBgm.mp3 create mode 100644 Gameton-06/Assets/Gameton/Resources/TestBgm.mp3.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/TestSound.mp3 create mode 100644 Gameton-06/Assets/Gameton/Resources/TestSound.mp3.meta diff --git a/Gameton-06/Assets/Gameton/Resources/TestBgm.mp3 b/Gameton-06/Assets/Gameton/Resources/TestBgm.mp3 new file mode 100644 index 00000000..c664e2e6 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/TestBgm.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe74adac56e404a573c7d3d4ef7d49853b1d53bb1b467ef578352d3318dc1641 +size 4166018 diff --git a/Gameton-06/Assets/Gameton/Resources/TestBgm.mp3.meta b/Gameton-06/Assets/Gameton/Resources/TestBgm.mp3.meta new file mode 100644 index 00000000..5482915b --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/TestBgm.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f618821a0ceb608499bd7a176e6622a3 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/TestSound.mp3 b/Gameton-06/Assets/Gameton/Resources/TestSound.mp3 new file mode 100644 index 00000000..8222420f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/TestSound.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c108a5e07af378e2cc9811aa13bcd1755e51ab5713f300b6b36c523951a1e39a +size 9403 diff --git a/Gameton-06/Assets/Gameton/Resources/TestSound.mp3.meta b/Gameton-06/Assets/Gameton/Resources/TestSound.mp3.meta new file mode 100644 index 00000000..75d3bb28 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/TestSound.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 289d4e594986798498d5c331b821fbd4 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab index cf3d3819..73cbf212 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab @@ -75,6 +75,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4704085106301035772} + - {fileID: 4746103566376610781} m_Father: {fileID: 3280644615170995712} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} @@ -4693,7 +4694,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7333434866958364904} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 3792216005111688921} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 289d4e594986798498d5c331b821fbd4, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &7110652749158827392 GameObject: m_ObjectHideFlags: 0 @@ -5374,6 +5387,138 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8425877636870102903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4746103566376610781} + - component: {fileID: 3792216005111688921} + m_Layer: 5 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4746103566376610781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8425877636870102903} + 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: 8006700817135627474} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!82 &3792216005111688921 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8425877636870102903} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &8455097121421154728 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab index 5712991f..3e23855e 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab @@ -623,7 +623,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 127 + m_Bits: 63 --- !u!222 &7717542720819395202 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab index 6ca1fe66..602b99c3 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab @@ -191,6 +191,138 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: charaterSelectUI: {fileID: 4108690129144757636, guid: 60a165f7709a3934093a4d7df75bad04, type: 3} +--- !u!1 &3203624332564501931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2486503543037853382} + - component: {fileID: 6848335913990854717} + m_Layer: 5 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2486503543037853382 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3203624332564501931} + 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: 7114312418154409345} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!82 &6848335913990854717 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3203624332564501931} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 289d4e594986798498d5c331b821fbd4, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &3340510248360602876 GameObject: m_ObjectHideFlags: 0 @@ -354,6 +486,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2486503543037853382} - {fileID: 6147450528475637372} - {fileID: 3757522227616513290} m_Father: {fileID: 291657315787126367} @@ -506,6 +639,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 6848335913990854717} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 289d4e594986798498d5c331b821fbd4, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &8457603573555983225 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scenes/Title.unity b/Gameton-06/Assets/Gameton/Scenes/Title.unity index 9339118b..5724a246 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Title.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Title.unity @@ -135,7 +135,7 @@ GameObject: - component: {fileID: 1728598201} m_Layer: 0 m_Name: Main Camera - m_TagString: Untagged + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 From 95491ff226e7bcbb4d4d208f862dcbca7e381240 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Fri, 28 Feb 2025 23:34:17 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=201?= =?UTF-8?q?=EC=B4=88=20=EB=94=9C=EB=A0=88=EC=9D=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefabs/UI.TitleUI.prefab | 36 +++++++++---------- .../Assets/Gameton/Scripts/UI/TitleUI.cs | 18 ++++++++-- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab index 602b99c3..3764e3ca 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab @@ -219,7 +219,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3757522227616513290} m_Father: {fileID: 7114312418154409345} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -237,7 +238,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 289d4e594986798498d5c331b821fbd4, type: 3} + m_audioClip: {fileID: 0} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -486,9 +487,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2486503543037853382} - {fileID: 6147450528475637372} - - {fileID: 3757522227616513290} + - {fileID: 2486503543037853382} m_Father: {fileID: 291657315787126367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -530,7 +530,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6371053127936218335} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -538,7 +538,7 @@ RectTransform: - {fileID: 2066853826154585915} - {fileID: 2289668262598961504} - {fileID: 360608318618800707} - m_Father: {fileID: 7114312418154409345} + m_Father: {fileID: 2486503543037853382} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -627,18 +627,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1005971612728675762} - m_TargetAssemblyTypeName: TON.TitleUI, Assembly-CSharp - m_MethodName: OnClickStartButton - 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 - m_Target: {fileID: 6848335913990854717} m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine m_MethodName: PlayOneShot @@ -651,6 +639,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1005971612728675762} + m_TargetAssemblyTypeName: TON.TitleUI, Assembly-CSharp + m_MethodName: OnClickStartButton + 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!1 &8457603573555983225 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs index 02d38532..c5ebce59 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/TitleUI.cs @@ -7,9 +7,24 @@ namespace TON public class TitleUI : UIBase { public CharaterSelectUI charaterSelectUI; - + + AudioSource _buttonAudio; + + private void Start() + { + _buttonAudio = gameObject.AddComponent(); + DontDestroyOnLoad(this.transform.parent.gameObject); + } + public void OnClickStartButton() { + StartCoroutine(StartButtonDelay()); + } + + IEnumerator StartButtonDelay() + { + yield return new WaitForSeconds(1f); // 1초 대기 + // Main.Singleton?.ChangeScene(SceneType.Ingame); UIManager.Hide(UIList.TitleUI); @@ -34,7 +49,6 @@ namespace TON } } - public void OnClickExitButton() { Main.Singleton?.SystemQuit();