diff --git a/.idea/.idea.ReplayPuzzleGame/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.ReplayPuzzleGame/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..f8fb1ee --- /dev/null +++ b/.idea/.idea.ReplayPuzzleGame/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/Assets/Resources/Animation/Button/ExitButton.controller b/Assets/Resources/Animation/Button/ExitButton.controller index 8ede4b8..bac26fb 100644 --- a/Assets/Resources/Animation/Button/ExitButton.controller +++ b/Assets/Resources/Animation/Button/ExitButton.controller @@ -33,7 +33,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Selected - m_Speed: 1 + m_Speed: 0.2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -119,7 +119,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.075 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -299,7 +299,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.075 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -405,16 +405,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.8, y: 0.8, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.16666667 - value: {x: 0.85, y: 0.85, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -433,19 +424,61 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: Image - classID: 1 - script: {fileID: 0} + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 m_PPtrCurves: [] m_SampleRate: 60 @@ -465,10 +498,28 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 83635035 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 + path: 0 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 customType: 0 isPPtrCurve: 0 isIntCurve: 0 @@ -479,7 +530,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.16666667 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -501,16 +552,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.85 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -531,16 +573,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.85 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -568,15 +601,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -592,19 +616,61 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: Image - classID: 1 - script: {fileID: 0} + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 @@ -672,7 +738,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 2673494831448960601} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 370, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: -3400500641746794722} m_Position: {x: 235, y: 65, z: 0} diff --git a/Assets/Resources/Animation/Button/StartButton.controller b/Assets/Resources/Animation/Button/StartButton.controller index d8046c5..1ec6a32 100644 --- a/Assets/Resources/Animation/Button/StartButton.controller +++ b/Assets/Resources/Animation/Button/StartButton.controller @@ -88,16 +88,16 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 3821167387455904132} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 360, y: -50, z: 0} - serializedVersion: 1 m_State: {fileID: 6862069327150605683} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 240, y: 70, z: 0} - serializedVersion: 1 m_State: {fileID: 17717696096183445} m_Position: {x: 270, y: 130, z: 0} - serializedVersion: 1 m_State: {fileID: -3694095715869377086} - m_Position: {x: 305, y: 195, z: 0} + m_Position: {x: 310, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -7580251949265437115} m_Position: {x: 340, y: 260, z: 0} @@ -137,16 +137,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.8, y: 0.8, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.16666667 - value: {x: 0.85, y: 0.85, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -165,19 +156,61 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: Image - classID: 1 - script: {fileID: 0} + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 m_PPtrCurves: [] m_SampleRate: 60 @@ -197,10 +230,28 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 83635035 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 + path: 0 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 customType: 0 isPPtrCurve: 0 isIntCurve: 0 @@ -211,7 +262,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.16666667 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -233,16 +284,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.85 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -263,16 +305,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.85 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -300,15 +333,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -324,19 +348,61 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: Image - classID: 1 - script: {fileID: 0} + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 @@ -350,7 +416,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Selected - m_Speed: 1 + m_Speed: 0.2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -692,7 +758,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.075 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -742,7 +808,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.075 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Resources/LevelData/2.asset b/Assets/Resources/LevelData/2.asset index 8903360..9d2466a 100644 --- a/Assets/Resources/LevelData/2.asset +++ b/Assets/Resources/LevelData/2.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: 2 m_EditorClassIdentifier: Assembly-CSharp::LevelData levelID: 2 - timeLimit: 1000 - maxReplyCount: 100 + timeLimit: 30 + maxReplyCount: 1 nextLevelData: {fileID: 11400000, guid: 1277e94fea55582409d5b9ebed074313, type: 2} diff --git a/Assets/Resources/Prefabs/LevelSelection/LevelButton.prefab b/Assets/Resources/Prefabs/LevelSelection/LevelButton.prefab index f3624f8..6cc56f9 100644 --- a/Assets/Resources/Prefabs/LevelSelection/LevelButton.prefab +++ b/Assets/Resources/Prefabs/LevelSelection/LevelButton.prefab @@ -167,6 +167,7 @@ GameObject: - component: {fileID: 932858263788394230} - component: {fileID: 7451157250173494354} - component: {fileID: 1992964018908465426} + - component: {fileID: 675990582765400667} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -276,6 +277,23 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &675990582765400667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3424401853676871554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13fa946357d6235429d21155c656ffd0, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonSelectedEffect + selectedStateName: Selected + buttonSelectedAudioClip: {fileID: 8300000, guid: 3d2d9ce8b1aee194496aef3a91b2c834, type: 3} + minPitchRange: 0.6 + maxPitchRange: 1.4 + indicatorObject: {fileID: 0} --- !u!1 &3566787042337807238 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/LevelUI.prefab b/Assets/Resources/Prefabs/UI/LevelUI.prefab index 288080b..0e97bca 100644 --- a/Assets/Resources/Prefabs/UI/LevelUI.prefab +++ b/Assets/Resources/Prefabs/UI/LevelUI.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 4653677641626993281} - component: {fileID: 9154027782447411362} - component: {fileID: 8453292232745728670} + - component: {fileID: 447061651683248933} m_Layer: 5 m_Name: Exit m_TagString: Untagged @@ -133,6 +134,23 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &447061651683248933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 581921403393022697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13fa946357d6235429d21155c656ffd0, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonSelectedEffect + selectedStateName: Selected + buttonSelectedAudioClip: {fileID: 8300000, guid: 3d2d9ce8b1aee194496aef3a91b2c834, type: 3} + minPitchRange: 0.4 + maxPitchRange: 0.8 + indicatorObject: {fileID: 0} --- !u!1 &1239584724105336888 GameObject: m_ObjectHideFlags: 0 @@ -299,6 +317,7 @@ GameObject: - component: {fileID: 289032216194717987} - component: {fileID: 4675379547845901913} - component: {fileID: 7034905793721281437} + - component: {fileID: 754062764737720033} m_Layer: 5 m_Name: Resume m_TagString: Untagged @@ -377,7 +396,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button m_Navigation: - m_Mode: 3 + m_Mode: 1 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -420,6 +439,23 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &754062764737720033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2373335286361345569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13fa946357d6235429d21155c656ffd0, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonSelectedEffect + selectedStateName: Selected + buttonSelectedAudioClip: {fileID: 8300000, guid: 3d2d9ce8b1aee194496aef3a91b2c834, type: 3} + minPitchRange: 0.4 + maxPitchRange: 0.8 + indicatorObject: {fileID: 0} --- !u!1 &3274030838748859313 GameObject: m_ObjectHideFlags: 0 @@ -1150,6 +1186,7 @@ GameObject: - component: {fileID: 952143658998337882} - component: {fileID: 8545628987191718553} - component: {fileID: 4311362312104474959} + - component: {fileID: 2327365756812851549} m_Layer: 5 m_Name: Retry m_TagString: Untagged @@ -1271,3 +1308,20 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &2327365756812851549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9177732386304534335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13fa946357d6235429d21155c656ffd0, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonSelectedEffect + selectedStateName: Selected + buttonSelectedAudioClip: {fileID: 8300000, guid: 3d2d9ce8b1aee194496aef3a91b2c834, type: 3} + minPitchRange: 0.4 + maxPitchRange: 0.8 + indicatorObject: {fileID: 0} diff --git a/Assets/Resources/Scenes/GameScene/Title.unity b/Assets/Resources/Scenes/GameScene/Title.unity index a921779..12a5cc1 100644 --- a/Assets/Resources/Scenes/GameScene/Title.unity +++ b/Assets/Resources/Scenes/GameScene/Title.unity @@ -119,6 +119,156 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &190100901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 190100902} + - component: {fileID: 190100904} + - component: {fileID: 190100903} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &190100902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190100901} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 333519957} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -486.00003, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &190100903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190100901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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: 778368247, guid: e994df514718d2242828c449672f005f, 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 &190100904 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190100901} + m_CullTransparentMesh: 1 +--- !u!1 &194052869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 194052870} + - component: {fileID: 194052872} + - component: {fileID: 194052871} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &194052870 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 194052869} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1115642157} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -486, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &194052871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 194052869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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: 778368247, guid: e994df514718d2242828c449672f005f, 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 &194052872 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 194052869} + m_CullTransparentMesh: 1 --- !u!1 &333519956 GameObject: m_ObjectHideFlags: 0 @@ -132,6 +282,7 @@ GameObject: - component: {fileID: 333519959} - component: {fileID: 333519958} - component: {fileID: 333519961} + - component: {fileID: 333519962} m_Layer: 5 m_Name: Start m_TagString: Untagged @@ -152,7 +303,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 855480167} - - {fileID: 1832182728} + - {fileID: 190100902} m_Father: {fileID: 1604020941} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -217,7 +368,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -264,6 +415,23 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &333519962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 333519956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13fa946357d6235429d21155c656ffd0, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonSelectedEffect + selectedStateName: Selected + buttonSelectedAudioClip: {fileID: 8300000, guid: 3d2d9ce8b1aee194496aef3a91b2c834, type: 3} + minPitchRange: 0.9 + maxPitchRange: 1.1 + indicatorObject: {fileID: 190100901} --- !u!1 &521421727 GameObject: m_ObjectHideFlags: 0 @@ -297,81 +465,6 @@ Transform: - {fileID: 1691069464} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &580814344 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 580814345} - - component: {fileID: 580814347} - - component: {fileID: 580814346} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &580814345 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 580814344} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1115642157} - 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: -460, y: 20} - m_SizeDelta: {x: 112.5, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &580814346 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 580814344} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - 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: -7867266084347359734, guid: fd20f70460f6fc844a90aaff081454bb, 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 &580814347 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 580814344} - m_CullTransparentMesh: 1 --- !u!1 &769922957 GameObject: m_ObjectHideFlags: 0 @@ -1511,6 +1604,7 @@ GameObject: - component: {fileID: 1115642159} - component: {fileID: 1115642158} - component: {fileID: 1115642161} + - component: {fileID: 1115642162} m_Layer: 5 m_Name: Exit m_TagString: Untagged @@ -1531,7 +1625,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1787979742} - - {fileID: 580814345} + - {fileID: 194052870} m_Father: {fileID: 1604020941} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1596,7 +1690,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1643,6 +1737,23 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1115642162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115642156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13fa946357d6235429d21155c656ffd0, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonSelectedEffect + selectedStateName: Selected + buttonSelectedAudioClip: {fileID: 8300000, guid: 3d2d9ce8b1aee194496aef3a91b2c834, type: 3} + minPitchRange: 0.9 + maxPitchRange: 1.1 + indicatorObject: {fileID: 194052869} --- !u!1 &1148076516 GameObject: m_ObjectHideFlags: 0 @@ -2161,81 +2272,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1787979741} m_CullTransparentMesh: 1 ---- !u!1 &1832182727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1832182728} - - component: {fileID: 1832182730} - - component: {fileID: 1832182729} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1832182728 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1832182727} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 333519957} - 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: -460, y: 20} - m_SizeDelta: {x: 112.5, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1832182729 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1832182727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - 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: -7867266084347359734, guid: fd20f70460f6fc844a90aaff081454bb, 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 &1832182730 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1832182727} - m_CullTransparentMesh: 1 --- !u!1 &1837674009 GameObject: m_ObjectHideFlags: 0 @@ -2478,10 +2514,66 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 1198.4016 + objectReference: {fileID: 0} + - target: {fileID: 605171125080917740, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 244.90833 + objectReference: {fileID: 0} + - target: {fileID: 1320285034244313337, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 5123145293459312921, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.x + value: 721.65497 + objectReference: {fileID: 0} + - target: {fileID: 5424197064635361057, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} - target: {fileID: 6452561418906399231, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} propertyPath: m_Name value: UIManager objectReference: {fileID: 0} + - target: {fileID: 7521780356471096617, guid: 021b91bfee59ac546b2a0d5ca2b87683, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Resources/Scripts/Manager/GameManager.cs b/Assets/Resources/Scripts/Manager/GameManager.cs index ba4377a..b968b61 100644 --- a/Assets/Resources/Scripts/Manager/GameManager.cs +++ b/Assets/Resources/Scripts/Manager/GameManager.cs @@ -100,10 +100,12 @@ public class GameManager : MonoBehaviour public void EnterLevel(LevelData levelData) { - gameState = GameState.Preview; Debug.Log("Level_" + levelData.levelID); SceneManager.sceneLoaded += OnLevelLoaded; SceneManager.LoadScene("Level_"+levelData.levelID); + + Time.timeScale = 1f; + gameState = GameState.Preview; currentLevelData = levelData; currentTimer = levelData.timeLimit; @@ -185,6 +187,7 @@ public class GameManager : MonoBehaviour if(currentReplayCount > 0) { currentReplayCount--; + OnReplayCountChanged?.Invoke(currentReplayCount); SpawnManager.instance.StopRecordingAndReStart(); } } @@ -192,7 +195,7 @@ public class GameManager : MonoBehaviour public void TogglePause() { - if (gameState == GameState.Playing || gameState == GameState.Preview) + if (gameState == GameState.Playing) { gameState = GameState.Pause; Time.timeScale = 0; diff --git a/Assets/Resources/Scripts/Manager/SoundManager.cs b/Assets/Resources/Scripts/Manager/SoundManager.cs index 776399d..fbb2cbf 100644 --- a/Assets/Resources/Scripts/Manager/SoundManager.cs +++ b/Assets/Resources/Scripts/Manager/SoundManager.cs @@ -101,6 +101,13 @@ public class SoundManager : MonoBehaviour Debug.Log($"인스펙터 창에서 사운드 클립 넣어주기 --> {type}"); } } + + public void PlaySFX(AudioClip audioClip, float minPitch, float maxPitch) + { + sfxSource.pitch = Random.Range(minPitch, maxPitch); + sfxSource.volume = 1f; + sfxSource.PlayOneShot(audioClip); + } } [System.Serializable] diff --git a/Assets/Resources/Scripts/Manager/SpawnManager.cs b/Assets/Resources/Scripts/Manager/SpawnManager.cs index 421bb81..7834fbe 100644 --- a/Assets/Resources/Scripts/Manager/SpawnManager.cs +++ b/Assets/Resources/Scripts/Manager/SpawnManager.cs @@ -91,7 +91,7 @@ public class SpawnManager : MonoBehaviour cameraEffect.SetTarget(currentPlayer.transform); currentReplayIndex = 0; SoundManager.instance.PlaySFX(SfxType.Replay); - for(int i = 0; i < 100; i++) + for(int i = 0; i < 1; i++) { foreach (var record in allRecordedFrames) { diff --git a/Assets/Resources/Scripts/Scene/LevelSelectScene.cs b/Assets/Resources/Scripts/Scene/LevelSelectScene.cs index 1799b7c..45486c1 100644 --- a/Assets/Resources/Scripts/Scene/LevelSelectScene.cs +++ b/Assets/Resources/Scripts/Scene/LevelSelectScene.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; using UnityEngine.UI; diff --git a/Assets/Resources/Scripts/Utility/ButtonSelectedEffect.cs b/Assets/Resources/Scripts/Utility/ButtonSelectedEffect.cs new file mode 100644 index 0000000..fa9de8b --- /dev/null +++ b/Assets/Resources/Scripts/Utility/ButtonSelectedEffect.cs @@ -0,0 +1,78 @@ +using Unity.VisualScripting; +using UnityEngine; +using UnityEngine.EventSystems; + +public class ButtonSelectedEffect : MonoBehaviour, ISelectHandler, IDeselectHandler +{ + private Animator _animator; + + [SerializeField] private string selectedStateName = "Selected"; + + [SerializeField] private AudioClip buttonSelectedAudioClip; + + [SerializeField] private float minPitchRange = 0.9f; + [SerializeField] private float maxPitchRange = 1.1f; + + [SerializeField] private GameObject indicatorObject; + + private bool isFirstSelected = false; + + public void Awake() + { + if (GetComponent() != null) + { + _animator = GetComponent(); + } + } + + public void OnEnable() + { + if (EventSystem.current.firstSelectedGameObject.Equals(gameObject)) + { + isFirstSelected = true; + } + + if (indicatorObject != null) + { + indicatorObject.SetActive(false); + } + } + + public void FirstSelctedButton() + { + isFirstSelected = true; + } + + public void OnSelect(BaseEventData eventData) + { + if (isFirstSelected) + { + if (_animator != null) + { + _animator.Play(selectedStateName, 0, 1f); + _animator.Update(0); + } + isFirstSelected = false; + } + else + { + if (buttonSelectedAudioClip != null) + { + SoundManager.instance.PlaySFX(buttonSelectedAudioClip, minPitchRange, maxPitchRange); + } + } + + if (indicatorObject != null) + { + indicatorObject.SetActive(true); + } + } + + public void OnDeselect(BaseEventData eventData) + { + if (indicatorObject != null) + { + indicatorObject.SetActive(false); + } + } +} diff --git a/Assets/Resources/Scripts/Utility/ButtonSelectedEffect.cs.meta b/Assets/Resources/Scripts/Utility/ButtonSelectedEffect.cs.meta new file mode 100644 index 0000000..4e90c4a --- /dev/null +++ b/Assets/Resources/Scripts/Utility/ButtonSelectedEffect.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 13fa946357d6235429d21155c656ffd0 \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6787703..630eabd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -393,6 +393,9 @@ PlayerSettings: - m_BuildTarget: Standalone m_StaticBatching: 1 m_DynamicBatching: 0 + - m_BuildTarget: WebGL + m_StaticBatching: 0 + m_DynamicBatching: 0 m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobMode: [] diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 7a17e8f..029ad8b 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 1 + m_Enabled: 0 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events