diff --git a/Assets/Enemy/crow/BossAppeare.playable b/Assets/Enemy/crow/BossAppeare.playable index e90c425..3293cb2 100644 --- a/Assets/Enemy/crow/BossAppeare.playable +++ b/Assets/Enemy/crow/BossAppeare.playable @@ -13122,6 +13122,7 @@ MonoBehaviour: - {fileID: 2071551457135041266} - {fileID: -8021664221193793846} - {fileID: -2451502508535460984} + - {fileID: 5577503254438046790} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -13169,6 +13170,22 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &1584845256456350972 +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: b608a15fd09b1dc46a315b6fb479da36, type: 2} --- !u!114 &2071551457135041266 MonoBehaviour: m_ObjectHideFlags: 1 @@ -13401,6 +13418,30 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &5577503254438046790 +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: b46e36075dd1c124a8422c228e75e1fb, type: 3} + m_Name: Signal Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: + - {fileID: 1584845256456350972} --- !u!74 &7476065184256242031 AnimationClip: m_ObjectHideFlags: 0 diff --git a/Assets/FadeOut.cs b/Assets/FadeOut.cs new file mode 100644 index 0000000..1ea548c --- /dev/null +++ b/Assets/FadeOut.cs @@ -0,0 +1,25 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.UI; + +public class FadeOut : MonoBehaviour +{ + private Image image; + private void Start() + { + image = GetComponent(); + StartCoroutine(FadeOutFlow()); + } + + private IEnumerator FadeOutFlow() + { + var time = 0f; + while (time < 1.5f) + { + time += Time.deltaTime; + image.color = new Color(0, 0, 0, Mathf.Lerp(1f, 0f, time / 1.5f)); + yield return null; + } + gameObject.SetActive(false); + } +} diff --git a/Assets/FadeOut.cs.meta b/Assets/FadeOut.cs.meta new file mode 100644 index 0000000..ba5f948 --- /dev/null +++ b/Assets/FadeOut.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 77c4c26a3e3c7894cb057e38169e892a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NextText1.cs b/Assets/NextText1.cs index f9a3a1f..b17b3d2 100644 --- a/Assets/NextText1.cs +++ b/Assets/NextText1.cs @@ -46,6 +46,6 @@ public void NextTag() public void ChangeBackgroundMusic() { - AudioManager.SetAsBackgroundMusicInstance("Audio/MAIN_THEME", true); + AudioManager.SetAsBackgroundMusicInstance("Audio/The_Moonless_Forest", true); } } diff --git a/Assets/Resources/2DGraphic/Radience Intro.mp4 b/Assets/Resources/2DGraphic/Radience Intro.mp4 new file mode 100644 index 0000000..d99dec0 Binary files /dev/null and b/Assets/Resources/2DGraphic/Radience Intro.mp4 differ diff --git a/Assets/Resources/2DGraphic/game_intro.mp4.meta b/Assets/Resources/2DGraphic/Radience Intro.mp4.meta similarity index 88% rename from Assets/Resources/2DGraphic/game_intro.mp4.meta rename to Assets/Resources/2DGraphic/Radience Intro.mp4.meta index 02eb015..ad49c97 100644 --- a/Assets/Resources/2DGraphic/game_intro.mp4.meta +++ b/Assets/Resources/2DGraphic/Radience Intro.mp4.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55204dc76692f624897a96324703bd24 +guid: d559bf958a94aeb468b699c4d176e495 VideoClipImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Resources/2DGraphic/Radience.png b/Assets/Resources/2DGraphic/Radience.png index a4a7144..997a3cd 100644 Binary files a/Assets/Resources/2DGraphic/Radience.png and b/Assets/Resources/2DGraphic/Radience.png differ diff --git a/Assets/Resources/2DGraphic/game_intro.mp4 b/Assets/Resources/2DGraphic/game_intro.mp4 deleted file mode 100644 index dbb1723..0000000 Binary files a/Assets/Resources/2DGraphic/game_intro.mp4 and /dev/null differ diff --git a/Assets/Resources/Audio/MAIN_THEME.wav b/Assets/Resources/Audio/MAIN_THEME.wav index e4a6de8..cb1f048 100644 Binary files a/Assets/Resources/Audio/MAIN_THEME.wav and b/Assets/Resources/Audio/MAIN_THEME.wav differ diff --git a/Assets/Resources/Audio/Radience.mp3 b/Assets/Resources/Audio/Radience.mp3 new file mode 100644 index 0000000..3eb2e8f Binary files /dev/null and b/Assets/Resources/Audio/Radience.mp3 differ diff --git a/Assets/Resources/Audio/Radience.mp3.meta b/Assets/Resources/Audio/Radience.mp3.meta new file mode 100644 index 0000000..7e8cd2b --- /dev/null +++ b/Assets/Resources/Audio/Radience.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 348b15abb391a0c46910fe1d00f37914 +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/Assets/Resources/Audio/The_Moonless_Forest.wav b/Assets/Resources/Audio/The_Moonless_Forest.wav new file mode 100644 index 0000000..f75f551 Binary files /dev/null and b/Assets/Resources/Audio/The_Moonless_Forest.wav differ diff --git a/Assets/Resources/Audio/The_Moonless_Forest.wav.meta b/Assets/Resources/Audio/The_Moonless_Forest.wav.meta new file mode 100644 index 0000000..81ab122 --- /dev/null +++ b/Assets/Resources/Audio/The_Moonless_Forest.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 157eb8407962c1547bba01202cf3eefa +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/Assets/SaveAndLoad/SaveData.cs b/Assets/SaveAndLoad/SaveData.cs index 2a6ce68..25bddc6 100644 --- a/Assets/SaveAndLoad/SaveData.cs +++ b/Assets/SaveAndLoad/SaveData.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using Managers; using Unity.VisualScripting; using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/Scenes/FinalScene.unity b/Assets/Scenes/FinalScene.unity index f93f6c2..8cd5b1b 100644 --- a/Assets/Scenes/FinalScene.unity +++ b/Assets/Scenes/FinalScene.unity @@ -3819,7 +3819,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "-\uC0B0\uB098\uBC29 \uD074\uB9AC\uC5B4-" + m_text: "-\uB798\uB514\uC5B8\uC2A4 \uD074\uB9AC\uC5B4-" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 139440ff7fcbe2f40aae85a4f16adc13, type: 2} m_sharedMaterial: {fileID: -1033877242123928219, guid: 139440ff7fcbe2f40aae85a4f16adc13, type: 2} diff --git a/Assets/Scenes/IntroScene.unity b/Assets/Scenes/IntroScene.unity index 958490a..6be65db 100644 --- a/Assets/Scenes/IntroScene.unity +++ b/Assets/Scenes/IntroScene.unity @@ -149,7 +149,7 @@ VideoPlayer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 929644301} m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: 55204dc76692f624897a96324703bd24, type: 3} + m_VideoClip: {fileID: 32900000, guid: d559bf958a94aeb468b699c4d176e495, type: 3} m_TargetCameraAlpha: 1 m_TargetCamera3DLayout: 0 m_TargetCamera: {fileID: 1135844104} @@ -341,9 +341,79 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!1001 &1773297707 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7271465512265952315, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_Name + value: AudioManager + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalPosition.x + value: -10.214267 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalPosition.y + value: 7.618173 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalPosition.z + value: -2.7666085 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7959082137206510154, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: Loop + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: 09f555e4ac92a074ebc84a676cd30525, type: 3} + - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} + propertyPath: m_PlayOnAwake + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1135844105} - {fileID: 929644303} + - {fileID: 1773297707} diff --git a/Assets/Scenes/LastScene.unity b/Assets/Scenes/LastScene.unity index 910a010..c31b0ce 100644 --- a/Assets/Scenes/LastScene.unity +++ b/Assets/Scenes/LastScene.unity @@ -695,6 +695,81 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &977234788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 977234791} + - component: {fileID: 977234789} + - component: {fileID: 977234792} + m_Layer: 0 + m_Name: NextText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &977234789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977234788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f4f4dd4b5a5dcd4797afc9063eb8db8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &977234791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977234788} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.091181636, y: 3.204327, z: -10.027191} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &977234792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977234788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: b608a15fd09b1dc46a315b6fb479da36, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 977234789} + m_TargetAssemblyTypeName: NextText, Assembly-CSharp + m_MethodName: ChangeBackgroundMusic + 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 &1071664161 GameObject: m_ObjectHideFlags: 0 @@ -757,8 +832,11 @@ PlayableDirector: value: {fileID: 1563876558} - key: {fileID: -2451502508535460984, guid: e42680a6d1b779941becd836ea4eafb3, type: 2} value: {fileID: 0} + - key: {fileID: 5577503254438046790, guid: e42680a6d1b779941becd836ea4eafb3, type: 2} + value: {fileID: 977234792} m_ExposedReferences: - m_References: [] + m_References: + - f417d12ebd055fe4e919fdd17a5f22bb: {fileID: 977234788} --- !u!4 &1071664163 Transform: m_ObjectHideFlags: 0 @@ -1251,7 +1329,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 + rgba: 16777215 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -1952,3 +2030,4 @@ SceneRoots: - {fileID: 712230542} - {fileID: 1941279377} - {fileID: 1563876560} + - {fileID: 977234791} diff --git a/Assets/Scenes/Stage1-1.unity b/Assets/Scenes/Stage1-1.unity index 00eeb96..1952470 100644 --- a/Assets/Scenes/Stage1-1.unity +++ b/Assets/Scenes/Stage1-1.unity @@ -105271,7 +105271,7 @@ Camera: far clip plane: 1000 field of view: 64 orthographic: 0 - orthographic size: 11 + orthographic size: 0.9 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -111043,7 +111043,7 @@ PrefabInstance: - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_audioClip value: - objectReference: {fileID: 8300000, guid: 653c7d13630d5da498c5f01ddc5e0383, type: 3} + objectReference: {fileID: 8300000, guid: 157eb8407962c1547bba01202cf3eefa, type: 3} - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_PlayOnAwake value: 1 diff --git a/Assets/Scenes/Stage1.unity b/Assets/Scenes/Stage1.unity index e783972..a4d4c19 100644 --- a/Assets/Scenes/Stage1.unity +++ b/Assets/Scenes/Stage1.unity @@ -50610,7 +50610,7 @@ Camera: far clip plane: 1000 field of view: 64 orthographic: 0 - orthographic size: 11 + orthographic size: 0.9 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -56783,7 +56783,7 @@ PrefabInstance: - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_audioClip value: - objectReference: {fileID: 8300000, guid: 653c7d13630d5da498c5f01ddc5e0383, type: 3} + objectReference: {fileID: 8300000, guid: 157eb8407962c1547bba01202cf3eefa, type: 3} - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_PlayOnAwake value: 1 diff --git a/Assets/Scenes/Stage2_Rework.unity b/Assets/Scenes/Stage2_Rework.unity index 64cea52..fc7e074 100644 --- a/Assets/Scenes/Stage2_Rework.unity +++ b/Assets/Scenes/Stage2_Rework.unity @@ -1047,7 +1047,7 @@ PrefabInstance: - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_audioClip value: - objectReference: {fileID: 8300000, guid: 653c7d13630d5da498c5f01ddc5e0383, type: 3} + objectReference: {fileID: 8300000, guid: 157eb8407962c1547bba01202cf3eefa, type: 3} - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_PlayOnAwake value: 1 diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index 3d210ae..4d48c0d 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -761,7 +761,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 413.67, y: 0} + m_AnchoredPosition: {x: 399.43, y: 0} m_SizeDelta: {x: 0, y: 105.20001} m_Pivot: {x: 1, y: 0.5} --- !u!114 &355016085 @@ -6955,6 +6955,7 @@ RectTransform: - {fileID: 1902826322} - {fileID: 1124837680} - {fileID: 783741228} + - {fileID: 1034772647} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -7035,7 +7036,7 @@ PrefabInstance: - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_audioClip value: - objectReference: {fileID: 8300000, guid: 653c7d13630d5da498c5f01ddc5e0383, type: 3} + objectReference: {fileID: 8300000, guid: 09f555e4ac92a074ebc84a676cd30525, type: 3} - target: {fileID: 9140698619840300227, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} propertyPath: m_PlayOnAwake value: 1 @@ -7045,6 +7046,94 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5c2d1b431516d174b85fb4c77453f471, type: 3} +--- !u!1 &1034772646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1034772647} + - component: {fileID: 1034772649} + - component: {fileID: 1034772648} + - component: {fileID: 1034772650} + m_Layer: 5 + m_Name: FadeOut + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1034772647 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034772646} + 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: 985564000} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1034772648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034772646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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: 0} + 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 &1034772649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034772646} + m_CullTransparentMesh: 1 +--- !u!114 &1034772650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034772646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77c4c26a3e3c7894cb057e38169e892a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1085496921 GameObject: m_ObjectHideFlags: 0 @@ -7803,7 +7892,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 413.67, y: 0} + m_AnchoredPosition: {x: 399.43, y: 0} m_SizeDelta: {x: 0, y: 105.20001} m_Pivot: {x: 1, y: 0} --- !u!114 &1257483569 @@ -8060,7 +8149,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 413.67, y: 0} + m_AnchoredPosition: {x: 399.43, y: 0} m_SizeDelta: {x: 0, y: 105.20001} m_Pivot: {x: 1, y: 1} --- !u!114 &1310898470 @@ -9274,8 +9363,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -150} - m_SizeDelta: {x: 650, y: 175} + m_AnchoredPosition: {x: -100, y: -250} + m_SizeDelta: {x: 635.9629, y: 147.6342} m_Pivot: {x: 1, y: 1} --- !u!114 &1902826323 MonoBehaviour: diff --git a/Assets/StageManager/CrowDDamBBang.cs b/Assets/StageManager/CrowDDamBBang.cs index d244603..038931c 100644 --- a/Assets/StageManager/CrowDDamBBang.cs +++ b/Assets/StageManager/CrowDDamBBang.cs @@ -1,3 +1,4 @@ +using Managers; using UnityEngine; using UnityEngine.SceneManagement; @@ -7,6 +8,7 @@ public class CrowDDamBBang : MonoBehaviour { private void Start() { + AudioManager.SetAsBackgroundMusicInstance("Audio/Radience", true); SceneManager.LoadScene("CrowChacing"); } } diff --git a/Assets/TimelinePerStage/title/NextSceneTitle.cs b/Assets/TimelinePerStage/title/NextSceneTitle.cs index 449a04a..1a0e56c 100644 --- a/Assets/TimelinePerStage/title/NextSceneTitle.cs +++ b/Assets/TimelinePerStage/title/NextSceneTitle.cs @@ -1,3 +1,4 @@ +using Managers; using UnityEngine; using UnityEngine.SceneManagement; @@ -7,6 +8,7 @@ public class NextSceneTitle : MonoBehaviour { private void Start() { + AudioManager.SetAsBackgroundMusicInstance("Audio/The_Moonless_Forest", true); SceneManager.LoadScene("Stage1"); } } diff --git a/Assets/TimelinePerStage/title/TitleTimeline.cs b/Assets/TimelinePerStage/title/TitleTimeline.cs index 7b0226f..4639d94 100644 --- a/Assets/TimelinePerStage/title/TitleTimeline.cs +++ b/Assets/TimelinePerStage/title/TitleTimeline.cs @@ -30,6 +30,7 @@ public void TimeLineStart() public void Load() { + AudioManager.SetAsBackgroundMusicInstance("Audio/The_Moonless_Forest", true); SaveData.LoadScene(); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index b70b768..64d9416 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -29,9 +29,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/ExcuterEnd.unity guid: 7273a1350b736e6488a8dbdd1afef027 - - enabled: 0 - path: Assets/Scenes/Stage3.unity - guid: b548dff3d89c53a46be9e845ede6d0e8 - enabled: 1 path: Assets/Scenes/LastScene.unity guid: eca491b36490320419568bb49d353cc6