diff --git a/Assets/Resources/Sprites/UI/Common/Opening/Animations/LogoBop2.anim b/Assets/Resources/Sprites/UI/Common/Opening/Animations/LogoBop2.anim index 10c0e2377..c9aef4ec8 100644 --- a/Assets/Resources/Sprites/UI/Common/Opening/Animations/LogoBop2.anim +++ b/Assets/Resources/Sprites/UI/Common/Opening/Animations/LogoBop2.anim @@ -1944,7 +1944,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/UI/Common/Opening/Animations/Star.controller b/Assets/Resources/Sprites/UI/Common/Opening/Animations/Star.controller index f7f90a9b5..5a806550d 100644 --- a/Assets/Resources/Sprites/UI/Common/Opening/Animations/Star.controller +++ b/Assets/Resources/Sprites/UI/Common/Opening/Animations/Star.controller @@ -1,5 +1,20 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!206 &-5682460106301420372 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: [] + m_BlendParameter: Blend + m_BlendParameterY: Blend + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!1107 &-118536590256273627 AnimatorStateMachine: serializedVersion: 6 diff --git a/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarBop.anim b/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarBop.anim index ddd56b557..7be898e28 100644 --- a/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarBop.anim +++ b/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarBop.anim @@ -13,15 +13,13 @@ AnimationClip: m_UseHighQualityCurve: 1 m_RotationCurves: [] m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: + m_EulerCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.70392364, y: 0.70392364, z: 0.70392364} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,17 +27,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.06666667 - value: {x: 0.6365573, y: 0.6365573, z: 0.6365573} - inSlope: {x: -0.32827637, y: -0.32827637, z: -0.32827637} - outSlope: {x: -0.32827637, y: -0.32827637, z: -0.32827637} - 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.18333334 - value: {x: 0.6215113, y: 0.6215113, z: 0.6215113} + time: 0.16666667 + value: {x: 0, y: 0, z: 72} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -49,7 +38,9 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: + path: Holder + m_PositionCurves: [] + m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -60,11 +51,11 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 - attribute: 3 + path: 3506728331 + attribute: 4 script: {fileID: 0} typeID: 4 - customType: 0 + customType: 4 isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: @@ -72,12 +63,12 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.18333334 + m_StopTime: 0.16666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -93,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.70392364 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -101,17 +92,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0.6365573 - inSlope: -0.32827637 - outSlope: -0.32827637 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.6215113 + time: 0.16666667 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,8 +103,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalScale.x - path: + attribute: localEulerAnglesRaw.x + path: Holder classID: 224 script: {fileID: 0} - curve: @@ -130,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.70392364 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -138,17 +120,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0.6365573 - inSlope: -0.32827637 - outSlope: -0.32827637 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.6215113 + time: 0.16666667 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -158,8 +131,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalScale.y - path: + attribute: localEulerAnglesRaw.y + path: Holder classID: 224 script: {fileID: 0} - curve: @@ -167,7 +140,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.70392364 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -175,17 +148,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0.6365573 - inSlope: -0.32827637 - outSlope: -0.32827637 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.6215113 + time: 0.16666667 + value: 72 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -195,11 +159,41 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalScale.z - path: + attribute: localEulerAnglesRaw.z + path: Holder + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Holder + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Holder + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Holder classID: 224 script: {fileID: 0} - m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarIdle.anim b/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarIdle.anim index 9d07ba022..4a36c2b88 100644 --- a/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarIdle.anim +++ b/Assets/Resources/Sprites/UI/Common/Opening/Animations/StarIdle.anim @@ -13,32 +13,7 @@ AnimationClip: m_UseHighQualityCurve: 1 m_RotationCurves: [] m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 237.36264} - 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: 1.5166667 - value: {x: 0, y: 0, z: 360} - inSlope: {x: -0, y: -0, z: 237.36264} - 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} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: + m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] @@ -49,26 +24,19 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 + genericBindings: [] pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.5166667 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -78,122 +46,8 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5166667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: - classID: 224 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5166667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: - classID: 224 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 237.36264 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5166667 - value: 360 - inSlope: 237.36264 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: - classID: 224 - script: {fileID: 0} - m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: - classID: 224 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: - classID: 224 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: - classID: 224 - script: {fileID: 0} - m_HasGenericRootTransform: 1 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Scenes/Title.unity b/Assets/Scenes/Title.unity index 3b86392e9..496b19810 100644 --- a/Assets/Scenes/Title.unity +++ b/Assets/Scenes/Title.unity @@ -147,12 +147,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 112044705} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} - m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -149.99994} + m_LocalScale: {x: 44.15739, y: 44.15739, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1983086177} + m_Father: {fileID: 1809456927} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -236,12 +236,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 332973734} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} - m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -150.00063} + m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157383} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1400026814} + m_Father: {fileID: 637834698} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -447,12 +447,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 394196887} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} - m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -150.00029} + m_LocalScale: {x: 44.15739, y: 44.15739, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1140868081} + m_Father: {fileID: 526126132} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -512,6 +512,82 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &422033007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 422033008} + m_Layer: 0 + m_Name: Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &422033008 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 422033007} + 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: + - {fileID: 943843257} + - {fileID: 699262319} + m_Father: {fileID: 1482915177} + m_RootOrder: 0 + 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!1 &496851851 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 496851852} + m_Layer: 0 + m_Name: Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &496851852 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496851851} + 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: + - {fileID: 1492822652} + - {fileID: 515549784} + m_Father: {fileID: 1865546492} + m_RootOrder: 0 + 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!1 &515549783 GameObject: m_ObjectHideFlags: 0 @@ -536,12 +612,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 515549783} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -149.99998} m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1865546492} + m_Father: {fileID: 496851852} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -601,6 +677,44 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &526126131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 526126132} + m_Layer: 0 + m_Name: Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &526126132 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526126131} + 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: + - {fileID: 394196888} + - {fileID: 2095948298} + m_Father: {fileID: 1140868081} + m_RootOrder: 0 + 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!1 &551511481 GameObject: m_ObjectHideFlags: 0 @@ -713,6 +827,44 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1 &637834697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 637834698} + m_Layer: 0 + m_Name: Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &637834698 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 637834697} + 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: + - {fileID: 332973735} + - {fileID: 1363226269} + m_Father: {fileID: 1400026814} + m_RootOrder: 0 + 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!1 &681648912 GameObject: m_ObjectHideFlags: 0 @@ -897,12 +1049,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 699262318} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -150.00052} m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1482915177} + m_Father: {fileID: 422033008} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1646,12 +1798,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 943843256} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -150.00052} m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1482915177} + m_Father: {fileID: 422033008} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1875,8 +2027,7 @@ RectTransform: m_LocalScale: {x: 0.65393054, y: 0.65393054, z: 0.65393054} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 394196888} - - {fileID: 2095948298} + - {fileID: 526126132} m_Father: {fileID: 551511482} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 28.405} @@ -2142,12 +2293,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363226268} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} - m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -150.00063} + m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157383} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1400026814} + m_Father: {fileID: 637834698} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2236,8 +2387,7 @@ RectTransform: m_LocalScale: {x: 0.37640467, y: 0.37640467, z: 0.37640467} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 332973735} - - {fileID: 1363226269} + - {fileID: 637834698} m_Father: {fileID: 551511482} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 109.833} @@ -2418,8 +2568,7 @@ RectTransform: m_LocalScale: {x: 0.40177596, y: 0.40177596, z: 0.40177596} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 943843257} - - {fileID: 699262319} + - {fileID: 422033008} m_Father: {fileID: 551511482} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -25.01} @@ -2473,12 +2622,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1492822651} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -149.99998} m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1865546492} + m_Father: {fileID: 496851852} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2562,12 +2711,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1605469075} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} - m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -149.99994} + m_LocalScale: {x: 44.15739, y: 44.15739, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1983086177} + m_Father: {fileID: 1809456927} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2838,6 +2987,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1787989625} m_CullTransparentMesh: 1 +--- !u!1 &1809456926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1809456927} + m_Layer: 0 + m_Name: Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1809456927 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1809456926} + 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: + - {fileID: 1605469076} + - {fileID: 112044706} + m_Father: {fileID: 1983086177} + m_RootOrder: 0 + 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!1 &1811344140 GameObject: m_ObjectHideFlags: 0 @@ -2886,6 +3073,12 @@ MonoBehaviour: m_EditorClassIdentifier: createButton: {fileID: 1336149019} logoAnim: {fileID: 869323824} + starAnims: + - {fileID: 1865546493} + - {fileID: 1482915178} + - {fileID: 1140868082} + - {fileID: 1983086178} + - {fileID: 1400026815} bpm: 114 --- !u!82 &1811344143 AudioSource: @@ -3012,8 +3205,7 @@ RectTransform: m_LocalScale: {x: 0.6215113, y: 0.6215113, z: 0.6215113} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1492822652} - - {fileID: 515549784} + - {fileID: 496851852} m_Father: {fileID: 551511482} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3300,8 +3492,7 @@ RectTransform: m_LocalScale: {x: 0.58456814, y: 0.58456814, z: 0.58456814} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1605469076} - - {fileID: 112044706} + - {fileID: 1809456927} m_Father: {fileID: 551511482} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -10.113} @@ -3478,12 +3669,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2095948297} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -150} - m_LocalScale: {x: 44.157387, y: 44.157387, z: 44.157387} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -150.00029} + m_LocalScale: {x: 44.15739, y: 44.15739, z: 44.157387} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1140868081} + m_Father: {fileID: 526126132} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/TitleManager.cs b/Assets/Scripts/TitleManager.cs index 4968cddc1..f5a3f5c9b 100644 --- a/Assets/Scripts/TitleManager.cs +++ b/Assets/Scripts/TitleManager.cs @@ -13,6 +13,8 @@ namespace HeavenStudio [SerializeField] private Animator logoAnim; + [SerializeField] private List starAnims; + [SerializeField] private float bpm = 114f; private AudioSource musicSource; @@ -25,6 +27,9 @@ namespace HeavenStudio private int loops; private double lastAbsTime; + + private bool altBop; + private void Start() { musicSource = GetComponent(); @@ -37,7 +42,7 @@ namespace HeavenStudio if (songPos >= musicSource.clip.length) { time = 0; - targetBopBeat = 0; + targetBopBeat = 1; loops++; } double absTime = Time.realtimeSinceStartup; @@ -63,7 +68,15 @@ namespace HeavenStudio } if (songPosBeat >= targetBopBeat) { - if (targetBopBeat > 4 || loops > 0) logoAnim.Play("LogoBop", 0, 0); + if (targetBopBeat > 4 || loops > 0) + { + logoAnim.Play(altBop ? "LogoBop2" : "LogoBop", 0, 0); + altBop = !altBop; + } + foreach (var star in starAnims) + { + star.Play("StarBop", 0, 0); + } targetBopBeat += 1; } }