diff --git a/Assets/Animations/MenuIntroAnim.anim b/Assets/Animations/MenuIntroAnim.anim index 5b91783..93f5a98 100644 --- a/Assets/Animations/MenuIntroAnim.anim +++ b/Assets/Animations/MenuIntroAnim.anim @@ -23,7 +23,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -400 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -31,47 +31,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 180 + time: 0.75 + value: 0 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_AnchoredPosition.x - path: ButtonsUI/PlayButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -400 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -250 - inSlope: 580 - outSlope: 580 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 180 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -81,88 +51,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_AnchoredPosition.x - path: ButtonsUI/QuitButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -400 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -250 - inSlope: 696 - outSlope: 696 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: 180 - 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_AnchoredPosition.x - path: ButtonsUI/OptionsButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -400 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -250 - inSlope: 870 - outSlope: 870 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 180 - 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_AnchoredPosition.x + attribute: m_Color.a path: ButtonsUI/EndlessButton - classID: 224 - script: {fileID: 0} + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 - serializedVersion: 2 curve: @@ -170,7 +62,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 500 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -178,8 +70,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 500 + time: 1.25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -187,8 +79,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 - value: -500 + time: 1.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -198,10 +90,127 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_AnchoredPosition.x + attribute: m_Color.a + path: ButtonsUI/QuitButton + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + 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.a + path: ButtonsUI/OptionsButton + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + 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.a + path: ButtonsUI/PlayButton + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + 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.a path: Title Text - classID: 224 - script: {fileID: 0} + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 m_PPtrCurves: [] m_SampleRate: 60 @@ -212,47 +221,47 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 2879541571 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 + path: 3661551353 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 4130452514 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1057435606 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 3661551353 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 + path: 2879541571 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3837568584 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 @@ -262,7 +271,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.75 + m_StopTime: 1.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -284,7 +293,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -400 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -292,47 +301,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 180 + time: 0.75 + value: 0 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_AnchoredPosition.x - path: ButtonsUI/PlayButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -400 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -250 - inSlope: 580 - outSlope: 580 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 180 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -342,88 +321,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_AnchoredPosition.x - path: ButtonsUI/QuitButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -400 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -250 - inSlope: 696 - outSlope: 696 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: 180 - 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_AnchoredPosition.x - path: ButtonsUI/OptionsButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -400 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: -250 - inSlope: 870 - outSlope: 870 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 180 - 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_AnchoredPosition.x + attribute: m_Color.a path: ButtonsUI/EndlessButton - classID: 224 - script: {fileID: 0} + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 - serializedVersion: 2 curve: @@ -431,7 +332,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 500 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -439,8 +340,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 - value: 500 + time: 1.25 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -448,8 +349,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.75 - value: -500 + time: 1.5 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -459,10 +360,127 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_AnchoredPosition.x + attribute: m_Color.a + path: ButtonsUI/QuitButton + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + 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.a + path: ButtonsUI/OptionsButton + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + 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.a + path: ButtonsUI/PlayButton + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + 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.a path: Title Text - classID: 224 - script: {fileID: 0} + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 diff --git a/Assets/Animations/OpenUIAnim.anim b/Assets/Animations/OpenUIAnim.anim index 1d82b0c..72e9582 100644 --- a/Assets/Animations/OpenUIAnim.anim +++ b/Assets/Animations/OpenUIAnim.anim @@ -17,222 +17,6 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.41666666 - value: 300 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -300 - 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_AnchoredPosition.x - path: ButtonsUI/PlayButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/QuitButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.16666667 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/OptionsButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.33333334 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/LeaderboardButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.43333334 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/EndlessButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -500 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 500 - 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_AnchoredPosition.x - path: Title Text - classID: 224 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -302,6 +86,516 @@ AnimationClip: classID: 224 script: {fileID: 0} 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: Title Text + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -310,60 +604,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 2879541571 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 4130452514 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 1057435606 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 41272802 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 3661551353 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 3837568584 - attribute: 1460864421 - script: {fileID: 0} - typeID: 224 - customType: 28 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1262681926 attribute: 538195251 @@ -373,6 +613,51 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3661551353 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130452514 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1057435606 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2879541571 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3837568584 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1262681926 attribute: 1460864421 @@ -382,6 +667,114 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3661551353 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3661551353 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3661551353 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130452514 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130452514 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130452514 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1057435606 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1057435606 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1057435606 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2879541571 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2879541571 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2879541571 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -404,222 +797,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.41666666 - value: 300 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -300 - 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_AnchoredPosition.x - path: ButtonsUI/PlayButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/QuitButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.16666667 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/OptionsButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.33333334 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/LeaderboardButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.43333334 - value: 250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8333333 - value: -250 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -250 - 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_AnchoredPosition.x - path: ButtonsUI/EndlessButton - classID: 224 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -500 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 500 - 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_AnchoredPosition.x - path: Title Text - classID: 224 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -689,6 +866,516 @@ AnimationClip: classID: 224 script: {fileID: 0} 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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.r + path: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + 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: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/EndlessButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/QuitButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/OptionsButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: ButtonsUI/PlayButton + 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 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + 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.a + path: Title Text + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/OrinAnimator.controller b/Assets/Animations/OrinAnimator.controller index 6d97596..4a5dac4 100644 --- a/Assets/Animations/OrinAnimator.controller +++ b/Assets/Animations/OrinAnimator.controller @@ -46,7 +46,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -131,7 +131,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -147,10 +147,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -6929421917455097161} - m_Position: {x: 200, y: 190, z: 0} + m_Position: {x: 230, y: 190, z: 0} - serializedVersion: 1 m_State: {fileID: -2893911691035677289} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 240, y: 70, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -3810283269045731517} diff --git a/Assets/Audio/SFX/heal.wav b/Assets/Audio/SFX/heal.wav new file mode 100644 index 0000000..5d6a686 Binary files /dev/null and b/Assets/Audio/SFX/heal.wav differ diff --git a/Assets/Audio/SFX/heal.wav.meta b/Assets/Audio/SFX/heal.wav.meta new file mode 100644 index 0000000..a735833 --- /dev/null +++ b/Assets/Audio/SFX/heal.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d7776ab90551a81da8c0fa765e7b2e73 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + 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/Dialogue/Intro Cutscene.asset b/Assets/Dialogue/Intro Cutscene.asset index 53f235c..39c73d1 100644 --- a/Assets/Dialogue/Intro Cutscene.asset +++ b/Assets/Dialogue/Intro Cutscene.asset @@ -13,6 +13,11 @@ MonoBehaviour: m_Name: Intro Cutscene m_EditorClassIdentifier: dialogueList: + - character: {fileID: 0} + text: 'CONTROLS: Left Click: Shoot. Left Click (held down): Charged Shot.\nRight + Click: Deflect. Right Click (held down): Ranged Deflection.\nEsc: Pause/Skip + Dialogue/Skip Cutscene.\n CLICK TO CONTINUE.' + cutsceneImage: {fileID: 0} - character: {fileID: 0} text: The Netherworld. cutsceneImage: {fileID: 0} @@ -65,3 +70,6 @@ MonoBehaviour: are they gonna kiss at the end? Only time will tell\u2026" cutsceneImage: {fileID: 0} nextScene: 1 + dialogueLoop: {fileID: 0} + musicToPlay: {fileID: 0} + volume: 0 diff --git a/Assets/Prefabs/Blue Wheel Ghost.prefab b/Assets/Prefabs/Blue Wheel Ghost.prefab index 3eba302..b644dd2 100644 --- a/Assets/Prefabs/Blue Wheel Ghost.prefab +++ b/Assets/Prefabs/Blue Wheel Ghost.prefab @@ -103,8 +103,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 10 - maxHealth: 10 + health: 20 + maxHealth: 20 isStalled: 0 invulnerable: 0 abilities: @@ -120,6 +120,7 @@ MonoBehaviour: hasStartedDialogue: 0 attackCooldown: 0.5 thisBossDialogue: {fileID: 0} + animator: {fileID: 0} --- !u!50 &3364470107593543731 Rigidbody2D: serializedVersion: 5 diff --git a/Assets/Prefabs/ChargedProjectile.prefab b/Assets/Prefabs/ChargedProjectile.prefab index 05eb168..51dd751 100644 --- a/Assets/Prefabs/ChargedProjectile.prefab +++ b/Assets/Prefabs/ChargedProjectile.prefab @@ -328,7 +328,7 @@ MonoBehaviour: isPiercing: 0 playerBullet: 0 projectileHealth: 2 - damage: 3 + damage: 10 speed: 12 lifetime: 10 direction: {x: 0, y: 0} @@ -336,8 +336,10 @@ MonoBehaviour: volume: 0.2 rb: {fileID: 491664178497510395} sprite: {fileID: 8682302247623402918} + willUnparent: 0 + unparentTime: 0 explosionEffect: {fileID: 6745324559653537241, guid: 33ecc1f33ed493eb0935c09a5807debc, type: 3} - blastRadius: 4 + blastRadius: 5 enemyLayer: serializedVersion: 2 m_Bits: 64 diff --git a/Assets/Prefabs/Cirno.prefab b/Assets/Prefabs/Cirno.prefab index d106b9f..5992c14 100644 --- a/Assets/Prefabs/Cirno.prefab +++ b/Assets/Prefabs/Cirno.prefab @@ -166,8 +166,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 50 - maxHealth: 50 + health: 100 + maxHealth: 100 isStalled: 0 invulnerable: 0 abilities: diff --git a/Assets/Prefabs/Fairy.prefab b/Assets/Prefabs/Fairy.prefab index ecaa149..f020f03 100644 --- a/Assets/Prefabs/Fairy.prefab +++ b/Assets/Prefabs/Fairy.prefab @@ -108,8 +108,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 2 - maxHealth: 2 + health: 10 + maxHealth: 10 isStalled: 0 invulnerable: 0 abilities: @@ -130,6 +130,7 @@ MonoBehaviour: hasStartedDialogue: 0 attackCooldown: 4 thisBossDialogue: {fileID: 0} + animator: {fileID: 0} --- !u!50 &3364470107593543731 Rigidbody2D: serializedVersion: 5 diff --git a/Assets/Prefabs/GhostFairy.prefab b/Assets/Prefabs/GhostFairy.prefab index 81e8aa3..9232ad1 100644 --- a/Assets/Prefabs/GhostFairy.prefab +++ b/Assets/Prefabs/GhostFairy.prefab @@ -103,8 +103,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 2 - maxHealth: 2 + health: 6 + maxHealth: 6 isStalled: 0 invulnerable: 0 abilities: diff --git a/Assets/Prefabs/Green Wheel Ghost.prefab b/Assets/Prefabs/Green Wheel Ghost.prefab index e585a01..2bddb92 100644 --- a/Assets/Prefabs/Green Wheel Ghost.prefab +++ b/Assets/Prefabs/Green Wheel Ghost.prefab @@ -104,8 +104,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 10 - maxHealth: 10 + health: 12 + maxHealth: 12 isStalled: 0 invulnerable: 0 abilities: @@ -122,6 +122,7 @@ MonoBehaviour: hasStartedDialogue: 0 attackCooldown: 2 thisBossDialogue: {fileID: 0} + animator: {fileID: 0} --- !u!50 &3364470107593543731 Rigidbody2D: serializedVersion: 5 diff --git a/Assets/Prefabs/Merlin.prefab b/Assets/Prefabs/Merlin.prefab index e14afbd..dc43481 100644 --- a/Assets/Prefabs/Merlin.prefab +++ b/Assets/Prefabs/Merlin.prefab @@ -93,7 +93,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4.5, y: 4.5, z: 1} + m_LocalScale: {x: 5, y: 5, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9204654692879442726} diff --git a/Assets/Prefabs/Orin.prefab b/Assets/Prefabs/Orin.prefab index 5be5a12..0a3117a 100644 --- a/Assets/Prefabs/Orin.prefab +++ b/Assets/Prefabs/Orin.prefab @@ -149,7 +149,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 3, z: 1} + m_LocalScale: {x: 5.8, y: 5.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9204654692879442726} @@ -225,8 +225,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 50 - maxHealth: 50 + health: 150 + maxHealth: 150 isStalled: 0 invulnerable: 0 abilities: diff --git a/Assets/Prefabs/Purple Wheel Ghost.prefab b/Assets/Prefabs/Purple Wheel Ghost.prefab index 4708d6d..b51bbd3 100644 --- a/Assets/Prefabs/Purple Wheel Ghost.prefab +++ b/Assets/Prefabs/Purple Wheel Ghost.prefab @@ -103,8 +103,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 10 - maxHealth: 10 + health: 16 + maxHealth: 16 isStalled: 0 invulnerable: 0 abilities: diff --git a/Assets/Prefabs/Red Wheel Ghost.prefab b/Assets/Prefabs/Red Wheel Ghost.prefab index ddc32e5..e5df990 100644 --- a/Assets/Prefabs/Red Wheel Ghost.prefab +++ b/Assets/Prefabs/Red Wheel Ghost.prefab @@ -103,8 +103,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 10 - maxHealth: 10 + health: 14 + maxHealth: 14 isStalled: 0 invulnerable: 0 abilities: @@ -120,6 +120,7 @@ MonoBehaviour: hasStartedDialogue: 0 attackCooldown: 0.5 thisBossDialogue: {fileID: 0} + animator: {fileID: 0} --- !u!50 &3364470107593543731 Rigidbody2D: serializedVersion: 5 diff --git a/Assets/Prefabs/ReisenProjectile.prefab b/Assets/Prefabs/ReisenProjectile.prefab index 259c79a..9adc5b8 100644 --- a/Assets/Prefabs/ReisenProjectile.prefab +++ b/Assets/Prefabs/ReisenProjectile.prefab @@ -255,7 +255,7 @@ MonoBehaviour: isPiercing: 0 playerBullet: 0 projectileHealth: 2 - damage: 0 + damage: 2 speed: 12 lifetime: 8 direction: {x: 0, y: 0} @@ -263,6 +263,8 @@ MonoBehaviour: volume: 0.2 rb: {fileID: 491664178497510395} sprite: {fileID: 8682302247623402918} + willUnparent: 0 + unparentTime: 0 --- !u!61 &6245364729484703978 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Vengeful Spirit.prefab b/Assets/Prefabs/Vengeful Spirit.prefab index d9e07fc..546d29c 100644 --- a/Assets/Prefabs/Vengeful Spirit.prefab +++ b/Assets/Prefabs/Vengeful Spirit.prefab @@ -165,8 +165,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3585d9ceba9f440838b5b13d75bef210, type: 3} m_Name: m_EditorClassIdentifier: - health: 8 - maxHealth: 8 + health: 18 + maxHealth: 18 isStalled: 0 invulnerable: 0 abilities: diff --git a/Assets/Prefabs/Zombie Fairy.prefab b/Assets/Prefabs/Zombie Fairy.prefab index e6d55d8..201becf 100644 --- a/Assets/Prefabs/Zombie Fairy.prefab +++ b/Assets/Prefabs/Zombie Fairy.prefab @@ -177,8 +177,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2a09223bdc8572ce868c17f69e123d9, type: 3} m_Name: m_EditorClassIdentifier: - health: 3 - maxHealth: 3 + health: 16 + maxHealth: 16 isStalled: 0 invulnerable: 0 abilities: @@ -195,9 +195,12 @@ MonoBehaviour: hasStartedDialogue: 0 attackCooldown: 4 thisBossDialogue: {fileID: 0} + animator: {fileID: 0} deathAbility: {fileID: 9001769450310889851} hasDiedOnce: 0 disappearanceTime: 2 + disappearanceColor: {r: 1, g: 1, b: 1, a: 0.3137255} + boxCollider: {fileID: 8471022324025238609} --- !u!1001 &5674839477773287016 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..137d86f --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 584f8d2a489e295f49a720937ab9c37d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json new file mode 100644 index 0000000..db8d617 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json @@ -0,0 +1 @@ +{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","GpuSkinning":false,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"WebGL","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.42f1","Branch":"6000.0/staging","Changeset":"feb9a7235030","Date":1741186687},"Dependencies":["com.unity.cinemachine@3.1.7","com.unity.collab-proxy@2.12.4","com.unity.feature.2d@2.0.1","com.unity.ide.rider@3.0.31","com.unity.ide.visualstudio@2.0.22","com.unity.inputsystem@1.13.1","com.unity.multiplayer.center@1.0.0","com.unity.render-pipelines.universal@17.0.4","com.unity.test-framework@1.4.6","com.unity.timeline@1.8.7","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.5","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.0.4","com.unity.shadergraph@17.0.4","com.unity.render-pipelines.universal-config@17.0.3","com.unity.2d.animation@10.1.4","com.unity.2d.pixel-perfect@5.0.3","com.unity.2d.psdimporter@9.0.3","com.unity.2d.sprite@1.0.0","com.unity.2d.spriteshape@10.0.7","com.unity.2d.tilemap@1.0.0","com.unity.2d.tilemap.extras@4.1.0","com.unity.2d.aseprite@1.1.8","com.unity.splines@2.7.2","com.unity.searcher@4.9.3","com.unity.burst@1.8.19","com.unity.mathematics@1.3.2","com.unity.collections@2.5.1","com.unity.rendering.light-transport@1.0.1","com.unity.2d.common@9.0.7","com.unity.settings-manager@2.0.1","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.0.3"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta new file mode 100644 index 0000000..9634679 --- /dev/null +++ b/Assets/Resources/PerformanceTestRunInfo.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 094f65056b3fbbe8180e2e148301b424 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json new file mode 100644 index 0000000..49438ae --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json @@ -0,0 +1 @@ +{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta new file mode 100644 index 0000000..1dc629d --- /dev/null +++ b/Assets/Resources/PerformanceTestRunSettings.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59e9e55abcfe924f7a9ff92ac57ff48b +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Cutscene.unity b/Assets/Scenes/Cutscene.unity index 15dd8c0..84f6fde 100644 --- a/Assets/Scenes/Cutscene.unity +++ b/Assets/Scenes/Cutscene.unity @@ -222,7 +222,7 @@ AudioSource: m_GameObject: {fileID: 340660165} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} + OutputAudioMixerGroup: {fileID: -7933749356697498971, guid: 5b91c65afbbc56666978cabb52c900d7, type: 2} m_audioClip: {fileID: 0} m_Resource: {fileID: 0} m_PlayOnAwake: 1 diff --git a/Assets/Scenes/EndStats.unity b/Assets/Scenes/EndStats.unity index 7da0ae5..611fcb6 100644 --- a/Assets/Scenes/EndStats.unity +++ b/Assets/Scenes/EndStats.unity @@ -213,7 +213,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2036628542} + - {fileID: 1782430604} + - {fileID: 1280651981} - {fileID: 438061503} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2344,6 +2345,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1275635031} m_CullTransparentMesh: 1 +--- !u!1 &1280651980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1280651981} + - component: {fileID: 1280651983} + - component: {fileID: 1280651982} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1280651981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1280651980} + 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: 2036628542} + m_Father: {fileID: 205987961} + 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: 1600, y: 900} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1280651982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1280651980} + 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.16037738, g: 0.16037738, b: 0.16037738, a: 0.9411765} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1280651983 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1280651980} + m_CullTransparentMesh: 1 --- !u!1 &1592883823 GameObject: m_ObjectHideFlags: 0 @@ -3027,6 +3104,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773281054} m_CullTransparentMesh: 1 +--- !u!1 &1782430603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1782430604} + - component: {fileID: 1782430606} + - component: {fileID: 1782430605} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1782430604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1782430603} + 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: 205987961} + 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 &1782430605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1782430603} + 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: 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: 21300000, guid: c34ae5a5c99d08fb2b3051e66d716cd3, 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 &1782430606 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1782430603} + m_CullTransparentMesh: 1 --- !u!1 &1787376669 GameObject: m_ObjectHideFlags: 0 @@ -3116,12 +3268,12 @@ RectTransform: - {fileID: 1592883824} - {fileID: 1710755045} - {fileID: 294775542} - m_Father: {fileID: 205987961} + m_Father: {fileID: 1280651981} 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_SizeDelta: {x: 320, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 61fe659..926c607 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -528,7 +528,6 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1525764241} - {fileID: 1508708869} m_Father: {fileID: 792189078} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -719,8 +718,8 @@ MonoBehaviour: m_Calls: [] m_text: GAME PAUSED m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 31681b6317b97a75d9630d5a9447ec59, type: 2} + m_sharedMaterial: {fileID: -4320267033492842854, guid: 31681b6317b97a75d9630d5a9447ec59, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -744,8 +743,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 90 + m_fontSizeBase: 90 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1339,22 +1338,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1848761515} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: SetPauseMenu + - m_Target: {fileID: 207858223} + m_TargetAssemblyTypeName: WaveManager, Assembly-CSharp + m_MethodName: CallPauseMenu 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: 1848761515} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: SetPause - m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -1430,6 +1417,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7efbe47d2619e84c5a8c30f4f0a622d4, type: 3} m_Name: m_EditorClassIdentifier: + pauseMenu: {fileID: 1018994379} player: {fileID: 792189080} tlPoint: {fileID: 1833387033} brPoint: {fileID: 1607467118} @@ -1439,29 +1427,49 @@ MonoBehaviour: wave: 1 waveList: - enemies: - - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} - - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} bossWave: 0 bossEnemy: {fileID: 0} bossName: {fileID: 0} - enemies: - - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} - - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} - - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} - - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} bossWave: 0 bossEnemy: {fileID: 0} bossName: {fileID: 0} - enemies: - - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} bossWave: 0 bossEnemy: {fileID: 0} bossName: {fileID: 0} @@ -1472,27 +1480,55 @@ MonoBehaviour: bossEnemy: {fileID: 1399007133090255655, guid: 94372a92d26e339c18ab01f38964651c, type: 3} bossName: {fileID: 2800000, guid: 295e845b7e07e74dc97a35aac9b281eb, type: 3} - enemies: - - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} - - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} - - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} bossWave: 0 bossEnemy: {fileID: 0} bossName: {fileID: 0} - enemies: - - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} bossWave: 0 bossEnemy: {fileID: 0} bossName: {fileID: 0} - enemies: - - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} - - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} bossWave: 0 bossEnemy: {fileID: 0} bossName: {fileID: 0} @@ -1500,6 +1536,62 @@ MonoBehaviour: bossWave: 1 bossEnemy: {fileID: 1399007133090255655, guid: bd42ccff0fb43e3909113b491cd04bde, type: 3} bossName: {fileID: 2800000, guid: a615d07865b835b2b9bba376fba5fe4e, type: 3} + - enemies: + - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} + - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} + - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} + - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} + - enemies: + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} + bossWave: 0 + bossEnemy: {fileID: 0} + bossName: {fileID: 0} - enemies: [] bossWave: 0 bossEnemy: {fileID: 0} @@ -1507,15 +1599,15 @@ MonoBehaviour: bossInstance: {fileID: 0} bossUI: {fileID: 1575776379} bossNameUI: {fileID: 604345225} - bossHPBar: {fileID: 1736235475} + bossHPBar: {fileID: 1736235476} lunasa: {fileID: 8204255019896046086, guid: 89ae362896c542484a2f9a24137ff79f, type: 3} merlin: {fileID: 7990710719955313840, guid: 6536c2fab6ea3afd0b49a6a27168dbac, type: 3} lyrica: {fileID: 4312946653448804466, guid: 8a5ee4d483e2b001581f2900f3073e3a, type: 3} lunasaInstance: {fileID: 0} merlinInstance: {fileID: 0} lyricaInstance: {fileID: 0} - prismMaxHP: 400 - prismHP: 400 + prismMaxHP: 600 + prismHP: 600 prismriverDialogue: {fileID: 11400000, guid: d7c68d978c359b23f8ce78341a3742a4, type: 2} enemyFolder: {fileID: 1869055951} enemiesInPlay: [] @@ -1523,17 +1615,34 @@ MonoBehaviour: enemyLayer: serializedVersion: 2 m_Bits: 64 + healInterval: 4 bossDialogueLoop: {fileID: 8300000, guid: 752af8540297d58e98cf0378761bcd56, type: 3} bossMusic: {fileID: 8300000, guid: 19a397d576cdeee5787ba3e5ea26deed, type: 3} bossVolume: 0.2 finalDialogueLoop: {fileID: 8300000, guid: 042e279354e2654f8aad89c2ce74d2cf, type: 3} finalMusic: {fileID: 8300000, guid: bcad3e254d2f2871695272df93f03ab6, type: 3} - finalVolume: 0.2 audioSource: {fileID: 519420033} musicSource: {fileID: 1253359894} musicIntro: {fileID: 8300000, guid: f24ebbf8b9e8d2e38a5b05d559226ae4, type: 3} - musicLoop: {fileID: 8300000, guid: f24ebbf8b9e8d2e38a5b05d559226ae4, type: 3} - musicVolume: 0.2 + musicLoop: {fileID: 8300000, guid: 2fd2c6e12f1276c43a62444947c098be, type: 3} + loseUI: {fileID: 737360384} + statsUI: {fileID: 2145483545} + enemyList: + - {fileID: 1399007133090255655, guid: 2b83aa798873a7d7483649412adf1900, type: 3} + - {fileID: 1399007133090255655, guid: 97a36728917fcf2a48cd9cc6c872d667, type: 3} + - {fileID: 5489426242025890397, guid: cdd094012fe85e64189fe63126c61f74, type: 3} + - {fileID: 1399007133090255655, guid: fa8cdfd4e5a54de54adc166651e4e2d2, type: 3} + - {fileID: 1399007133090255655, guid: 5256ecd19fc50f9d28f4a5040ea4e583, type: 3} + - {fileID: 1399007133090255655, guid: 27d196be45d54c904a466f384211140a, type: 3} + - {fileID: 1399007133090255655, guid: b4747bd34605d4ea9be92d46420beb51, type: 3} + - {fileID: 1399007133090255655, guid: 5561a9722201a7023938de37a08d1d5a, type: 3} + bossList: + - {fileID: 1399007133090255655, guid: 94372a92d26e339c18ab01f38964651c, type: 3} + - {fileID: 1399007133090255655, guid: bd42ccff0fb43e3909113b491cd04bde, type: 3} + bossWaveInterval: 10 + baseSpawnAmount: 2 + exponentIncrease: 1.01 + exponentHealthIncrease: 1.01 --- !u!4 &207858224 Transform: m_ObjectHideFlags: 0 @@ -1763,81 +1872,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &260785838 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 260785839} - - component: {fileID: 260785841} - - component: {fileID: 260785840} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &260785839 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 260785838} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1427374388} - 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, y: 0.5} ---- !u!114 &260785840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 260785838} - 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: 1, g: 0.97192276, b: 0.41037738, 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: 1 - 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 &260785841 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 260785838} - m_CullTransparentMesh: 1 --- !u!1 &281948449 GameObject: m_ObjectHideFlags: 0 @@ -2341,9 +2375,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1848761515} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: RestartGame + - m_Target: {fileID: 207858223} + m_TargetAssemblyTypeName: WaveManager, Assembly-CSharp + m_MethodName: CallRestartGame m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2496,14 +2530,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 902904345} + m_Children: [] m_Father: {fileID: 1018994380} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 600, y: 100} - m_SizeDelta: {x: 300, y: 80} + m_SizeDelta: {x: 360, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &456641445 MonoBehaviour: @@ -2524,7 +2557,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -2534,9 +2567,9 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: 787abbfa1549d54a99edb92305239157, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 787abbfa1549d54a99edb92305239157, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 787abbfa1549d54a99edb92305239157, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal @@ -2549,10 +2582,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1848761515} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: SetPause - m_Mode: 6 + m_MethodName: SetPauseMenu + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -2581,8 +2614,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 24f57860aeb923f9d86606595f78af39, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4850,9 +4883,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1492123111} - - {fileID: 737360387} - {fileID: 1557698509} - {fileID: 1018994380} + - {fileID: 737360387} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5352,10 +5385,12 @@ MonoBehaviour: - {fileID: 111481029} heart: {fileID: 21300000, guid: 8bd2e8c4685905b67b6be0c512235332, type: 3} depletedHeart: {fileID: 21300000, guid: ec7ca25158827f72a868859b3780f09d, type: 3} - hurtSound: {fileID: 8300000, guid: 31ceec34062edf012b9c9b29e9e3c583, type: 3} + hurtSound: {fileID: 8300000, guid: d06e6b882c8868ed29eb9472930f9237, type: 3} hurtVolume: 1 gameOverSound: {fileID: 8300000, guid: d2ca4d560c918a61b93cc2f9cfe93c84, type: 3} gameOverVolume: 1 + healSound: {fileID: 8300000, guid: d7776ab90551a81da8c0fa765e7b2e73, type: 3} + healVolume: 1 --- !u!1 &809625456 GameObject: m_ObjectHideFlags: 0 @@ -5805,144 +5840,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 877534642} m_CullTransparentMesh: 1 ---- !u!1 &902904344 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 902904345} - - component: {fileID: 902904347} - - component: {fileID: 902904346} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &902904345 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 902904344} - 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: 456641444} - 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 &902904346 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 902904344} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Resume - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &902904347 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 902904344} - m_CullTransparentMesh: 1 --- !u!1 &914120605 GameObject: m_ObjectHideFlags: 0 @@ -6283,9 +6180,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1848761515} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: ExitGame + - m_Target: {fileID: 207858223} + m_TargetAssemblyTypeName: WaveManager, Assembly-CSharp + m_MethodName: CallExitGame m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -6436,81 +6333,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1059673196 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1059673197} - - component: {fileID: 1059673199} - - component: {fileID: 1059673198} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1059673197 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059673196} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1525764241} - 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, y: 0.5} ---- !u!114 &1059673198 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059673196} - 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: 1, g: 0.97192276, b: 0.41037738, 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: 1 - 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 &1059673199 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1059673196} - m_CullTransparentMesh: 1 --- !u!1 &1080910579 GameObject: m_ObjectHideFlags: 0 @@ -7324,14 +7146,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1514749176} + m_Children: [] m_Father: {fileID: 1018994380} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -600, y: 100} - m_SizeDelta: {x: 300, y: 80} + m_SizeDelta: {x: 360, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1375732607 MonoBehaviour: @@ -7352,7 +7173,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -7362,9 +7183,9 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: f589517e6cc37f2b680a697c74488eec, type: 3} + m_PressedSprite: {fileID: 21300000, guid: f589517e6cc37f2b680a697c74488eec, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: f589517e6cc37f2b680a697c74488eec, type: 3} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal @@ -7377,9 +7198,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1848761515} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: ExitGame + - m_Target: {fileID: 207858223} + m_TargetAssemblyTypeName: WaveManager, Assembly-CSharp + m_MethodName: CallExitGame m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -7409,8 +7230,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: f754a88c47facc0308e92e1683b8e2d7, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7640,108 +7461,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377150954} m_CullTransparentMesh: 1 ---- !u!1 &1427374387 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1427374388} - - component: {fileID: 1427374391} - - component: {fileID: 1427374390} - - component: {fileID: 1427374389} - m_Layer: 5 - m_Name: ChargeMeter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1427374388 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1427374387} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.22222224, y: 0.22222224, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 260785839} - m_Father: {fileID: 2118842023} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.1475715, y: -0.39827132} - m_SizeDelta: {x: 2, y: 0.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1427374389 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1427374387} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1427374390 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1427374387} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &1427374391 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1427374387} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 519420031} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &1427609519 GameObject: m_ObjectHideFlags: 0 @@ -8116,244 +7835,6 @@ Transform: m_Children: [] m_Father: {fileID: 89136269} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1514749175 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1514749176} - - component: {fileID: 1514749178} - - component: {fileID: 1514749177} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1514749176 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1514749175} - 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: 1375732606} - 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 &1514749177 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1514749175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Exit - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1514749178 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1514749175} - m_CullTransparentMesh: 1 ---- !u!1 &1525764237 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1525764241} - - component: {fileID: 1525764240} - - component: {fileID: 1525764239} - - component: {fileID: 1525764238} - m_Layer: 5 - m_Name: ChargeMeter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1525764238 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1525764237} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1525764239 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1525764237} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &1525764240 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1525764237} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 519420031} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 ---- !u!224 &1525764241 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1525764237} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.24999997, y: 0.24999997, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1059673197} - m_Father: {fileID: 89136269} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.24966002, y: -0.55279875} - m_SizeDelta: {x: 2, y: 0.2} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1525954652 GameObject: m_ObjectHideFlags: 0 @@ -8617,6 +8098,8 @@ RectTransform: - {fileID: 187521851} - {fileID: 732145676} - {fileID: 1575776380} + - {fileID: 1888522253} + - {fileID: 1945398293} m_Father: {fileID: 744158569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8699,7 +8182,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1575776380 RectTransform: m_ObjectHideFlags: 0 @@ -9079,8 +8562,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: currentCooldown: 0 - cooldown: 0.6 - power: 1 + cooldown: 0.4 + power: 2 origin: {fileID: 1508708869} direction: {x: 0, y: 0, z: 0} abilitySound: {fileID: 8300000, guid: fd6f09c4717aab6acb62b6cc03faff0f, type: 3} @@ -9091,9 +8574,9 @@ MonoBehaviour: chargedProjectile: {fileID: -6529745966989534246, guid: 3a54ec8191c702d0aa76c672ff2042ca, type: 3} cam: {fileID: 519420031} mouseHoldTime: 1 - maxChargeTime: 3 - chargeCooldown: 10 - chargeMeter: {fileID: 1059673197} + maxChargeTime: 2 + chargeCooldown: 4 + chargeMeter: {fileID: 1888522253} --- !u!1 &1660524067 GameObject: m_ObjectHideFlags: 0 @@ -9139,8 +8622,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0fd254066289aba4a8779f6678e0c515, type: 3} m_Name: m_EditorClassIdentifier: - currentCooldown: 0.6 - cooldown: 0.6 + currentCooldown: 0.4 + cooldown: 0.4 power: 2 origin: {fileID: 2118842023} direction: {x: 0, y: 0, z: 0} @@ -9160,11 +8643,11 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 64 mouseHoldTime: 1 - maxChargeTime: 3 - chargeCooldown: 10 + maxChargeTime: 2 + chargeCooldown: 4 chargeSlashSFX: {fileID: 8300000, guid: 6c88eed4d3f820103bc93c441b0ecb35, type: 3} chargeVolume: 1 - chargeMeter: {fileID: 260785839} + chargeMeter: {fileID: 1945398293} deflectionParticles: {fileID: 4159152011618467134, guid: 9ce0c058e110ae6d985bc4afd29247a4, type: 3} chargeSweepEffect: {fileID: 0} noHitSlashSFX: {fileID: 8300000, guid: bce81df760dde7f29956856baf2b03f7, type: 3} @@ -9203,7 +8686,7 @@ BoxCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: -1, y: -1.5} + m_Offset: {x: -1, y: -3.5} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -9213,7 +8696,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 10, y: 5.5} + m_Size: {x: 10, y: 10} m_EdgeRadius: 0 --- !u!1 &1680258749 GameObject: @@ -9379,15 +8862,15 @@ RectTransform: m_GameObject: {fileID: 1736235474} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1530553327} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: -40, y: -20} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1736235476 MonoBehaviour: @@ -9402,21 +8885,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + 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: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: bf07ae890f6aa8c599dcc23f9f3d5ef1, type: 3} + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 + m_FillMethod: 0 + m_FillAmount: 0 m_FillClockwise: 1 - m_FillOrigin: 0 + m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 --- !u!222 &1736235477 @@ -9625,62 +9108,6 @@ Transform: m_Children: [] m_Father: {fileID: 792189078} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1848761514 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1848761516} - - component: {fileID: 1848761515} - m_Layer: 0 - m_Name: GameManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1848761515 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848761514} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 49f68bad15f506ff394c93aee2ec0583, type: 3} - m_Name: - m_EditorClassIdentifier: - continues: 0 - time: - wave: 0 - deflections: 0 - projectilesShot: 0 - projectilesHit: 0 - accuracy: - livesLost: 0 - pauseMenu: {fileID: 1018994379} - winCutscene: {fileID: 11400000, guid: 17cff24cc31a8f4e393b778eaa27fc63, type: 2} - loseUI: {fileID: 737360384} - statsUI: {fileID: 2145483545} ---- !u!4 &1848761516 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848761514} - serializedVersion: 2 - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1855180238 GameObject: m_ObjectHideFlags: 0 @@ -9894,6 +9321,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1887939057} m_CullTransparentMesh: 1 +--- !u!1 &1888522252 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1888522253} + - component: {fileID: 1888522255} + - component: {fileID: 1888522254} + m_Layer: 5 + m_Name: ReisenChargeMeter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1888522253 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888522252} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 0, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1557698509} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -110, y: 10} + m_SizeDelta: {x: 20, y: 70} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1888522254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888522252} + 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.882714, g: 0.6556604, 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: 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 &1888522255 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888522252} + m_CullTransparentMesh: 1 --- !u!1 &1914413598 GameObject: m_ObjectHideFlags: 0 @@ -10030,6 +9532,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1945398292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1945398293} + - component: {fileID: 1945398295} + - component: {fileID: 1945398294} + m_Layer: 5 + m_Name: YoumuChargeMeter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1945398293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945398292} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 0, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1557698509} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -80, y: 10} + m_SizeDelta: {x: 20, y: 70} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1945398294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945398292} + 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.80395204, g: 1, b: 0.654902, 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 &1945398295 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1945398292} + m_CullTransparentMesh: 1 --- !u!1 &1971400054 GameObject: m_ObjectHideFlags: 0 @@ -10714,8 +10291,7 @@ Transform: m_LocalPosition: {x: 1.5063004, y: -2.4488897, z: 0} m_LocalScale: {x: 5, y: 5, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1427374388} + m_Children: [] m_Father: {fileID: 792189078} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2118842024 @@ -10823,9 +10399,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1848761515} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: ContinueGame + - m_Target: {fileID: 207858223} + m_TargetAssemblyTypeName: WaveManager, Assembly-CSharp + m_MethodName: CallContinue m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -10941,6 +10517,5 @@ SceneRoots: - {fileID: 1824360583} - {fileID: 110796960} - {fileID: 1586737003} - - {fileID: 1848761516} - {fileID: 2145483546} - {fileID: 809625460} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 9cc81ae..51607e0 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -226,7 +226,7 @@ AudioSource: m_audioClip: {fileID: 8300000, guid: 81f8fddeddd9bb7b1a908663b5a5c773, type: 3} m_Resource: {fileID: 8300000, guid: 81f8fddeddd9bb7b1a908663b5a5c773, type: 3} m_PlayOnAwake: 1 - m_Volume: 0.107 + m_Volume: 1 m_Pitch: 1 Loop: 1 Mute: 0 @@ -628,6 +628,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 181032013} m_CullTransparentMesh: 1 +--- !u!1 &191373953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 191373954} + - component: {fileID: 191373956} + - component: {fileID: 191373955} + m_Layer: 5 + m_Name: Resources Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &191373954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 191373953} + 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: 1452192252} + 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: 75} + m_SizeDelta: {x: 0, y: -150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &191373955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 191373953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Resources + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &191373956 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 191373953} + m_CullTransparentMesh: 1 --- !u!1 &261972285 GameObject: m_ObjectHideFlags: 0 @@ -799,6 +935,7 @@ RectTransform: - {fileID: 925982717} - {fileID: 961482113} - {fileID: 1605031377} + - {fileID: 1452192252} m_Father: {fileID: 1283282904} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -880,8 +1017,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -25, y: 0} - m_SizeDelta: {x: -350, y: -500} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &336106319 GameObject: @@ -951,9 +1088,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 319830414} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 180.5, y: -217.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -200, y: -155} m_SizeDelta: {x: 361, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &349726889 @@ -999,7 +1136,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 349726890} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1283282906} + m_TargetAssemblyTypeName: MainMenuHandler, Assembly-CSharp + m_MethodName: StartEndless + 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!114 &349726890 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1905,6 +2054,146 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 987511400} m_CullTransparentMesh: 1 +--- !u!1 &997164115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 997164116} + - component: {fileID: 997164118} + - component: {fileID: 997164117} + m_Layer: 5 + m_Name: FontLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &997164116 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997164115} + 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: 1452192252} + 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: -20} + m_SizeDelta: {x: -20, y: -60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &997164117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997164115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Mona Font (https://monadabxy.com/fonts/mona/) + + Daydream Font (https://doublegum.gumroad.com/l/daydream) + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 81077e73d3a1f59879d0ff81b7e31a38, type: 2} + m_sharedMaterial: {fileID: -7786892333198751292, guid: 81077e73d3a1f59879d0ff81b7e31a38, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &997164118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 997164115} + m_CullTransparentMesh: 1 --- !u!1 &1283282900 GameObject: m_ObjectHideFlags: 0 @@ -2228,6 +2517,83 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1452192251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1452192252} + - component: {fileID: 1452192254} + - component: {fileID: 1452192253} + m_Layer: 5 + m_Name: Resources Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1452192252 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452192251} + 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: 191373954} + - {fileID: 997164116} + m_Father: {fileID: 317104979} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 710, y: 122.5} + m_SizeDelta: {x: 450, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1452192253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452192251} + 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.2924528, g: 0.2924528, b: 0.2924528, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1452192254 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452192251} + m_CullTransparentMesh: 1 --- !u!1 &1453077515 GameObject: m_ObjectHideFlags: 0 @@ -2297,9 +2663,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 319830414} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 180, y: -507.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -200, y: -325} m_SizeDelta: {x: 360, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1462526546 @@ -2504,9 +2870,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 319830414} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 180, y: -362.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -600, y: -325} m_SizeDelta: {x: 360, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1530617248 @@ -2635,10 +3001,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1283282904} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -500, y: 0} - m_SizeDelta: {x: 825, y: 510} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 825, y: 510} + m_SizeDelta: {x: 1650, y: 1020} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1599139653 CanvasRenderer: @@ -2662,7 +3028,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2714,8 +3080,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 320, y: 145} - m_SizeDelta: {x: 600, y: 245} + m_AnchoredPosition: {x: 250, y: 145} + m_SizeDelta: {x: 450, y: 245} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1605031378 MonoBehaviour: @@ -3008,6 +3374,62 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1857881617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857881619} + - component: {fileID: 1857881618} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1857881618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857881617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49f68bad15f506ff394c93aee2ec0583, type: 3} + m_Name: + m_EditorClassIdentifier: + continues: 0 + time: + wave: 0 + deflections: 0 + projectilesShot: 0 + projectilesHit: 0 + accuracy: + livesLost: 0 + canPause: 1 + isEndless: 0 + winCutscene: {fileID: 11400000, guid: 17cff24cc31a8f4e393b778eaa27fc63, type: 2} + gameOver: 0 +--- !u!4 &1857881619 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857881617} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1858954779 GameObject: m_ObjectHideFlags: 0 @@ -3293,9 +3715,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 319830414} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 180, y: -72.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -600, y: -155} m_SizeDelta: {x: 360, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1987706977 @@ -3400,3 +3822,4 @@ SceneRoots: - {fileID: 1283282904} - {fileID: 1429204728} - {fileID: 1840294810} + - {fileID: 1857881619} diff --git a/Assets/Scripts/Abilities/ReisenShoot.cs b/Assets/Scripts/Abilities/ReisenShoot.cs index 9e4a167..5b86053 100644 --- a/Assets/Scripts/Abilities/ReisenShoot.cs +++ b/Assets/Scripts/Abilities/ReisenShoot.cs @@ -45,7 +45,7 @@ public class ReisenShoot : Ability protected override void Update() { base.Update(); - if (currentMouseHoldTime >= 0) + if (currentMouseHoldTime > 0) { currentMouseHoldTime -= Time.deltaTime; if (currentMouseHoldTime <= 0 && Input.GetMouseButton(0) && currentChargeTime <= 0) @@ -55,13 +55,15 @@ public class ReisenShoot : Ability } else if (Input.GetMouseButtonUp(0)) { + currentMouseHoldTime = 0; + isCharging = false; ShootBullet(projectile, power); } } if (isCharging && Input.GetMouseButton(0)) //this code REEKS { currentChargeTime += Time.deltaTime; - chargeMeter.localScale = new Vector3(Math.Clamp(currentChargeTime, 0, maxChargeTime)/maxChargeTime, 1f, 1f); + chargeMeter.localScale = new Vector3(1f, Math.Clamp(currentChargeTime, 0, maxChargeTime)/maxChargeTime, 1f); } else if (currentChargeTime > 0 && isCharging && Input.GetMouseButtonUp(0)) { diff --git a/Assets/Scripts/Abilities/YoumuDeflect.cs b/Assets/Scripts/Abilities/YoumuDeflect.cs index 211a2f4..8f0b9f9 100644 --- a/Assets/Scripts/Abilities/YoumuDeflect.cs +++ b/Assets/Scripts/Abilities/YoumuDeflect.cs @@ -129,7 +129,7 @@ public class YoumuDeflect : Ability { base.Update(); - if (currentMouseHoldTime >= 0) + if (currentMouseHoldTime > 0) { currentMouseHoldTime -= Time.deltaTime; if (currentMouseHoldTime <= 0 && Input.GetMouseButton(1) && currentChargeTime <= 0) @@ -140,12 +140,14 @@ public class YoumuDeflect : Ability else if (Input.GetMouseButtonUp(1)) { RegularDeflection(); + currentMouseHoldTime = 0; + isCharging = false; } } if (isCharging && Input.GetMouseButton(1)) //this code REEKS { currentChargeTime += Time.deltaTime; - chargeMeter.localScale = new Vector3(Math.Clamp(currentChargeTime, 0, maxChargeTime)/maxChargeTime, 1f, 1f); + chargeMeter.localScale = new Vector3(1f, Math.Clamp(currentChargeTime, 0, maxChargeTime)/maxChargeTime, 1f); } else if (isCharging && Input.GetMouseButtonUp(1)) { diff --git a/Assets/Scripts/Dialogue/DialogueManager.cs b/Assets/Scripts/Dialogue/DialogueManager.cs index 4949d5b..e5ff6ee 100644 --- a/Assets/Scripts/Dialogue/DialogueManager.cs +++ b/Assets/Scripts/Dialogue/DialogueManager.cs @@ -53,18 +53,19 @@ public class DialogueManager : MonoBehaviour public void StartDialogue(DialogueScript newDialogue) { + GameManager.instance.canPause = false; dialogueUI.SetActive(true); WaveManager.instance.bossUI.SetActive(false); dialogueActive = true; currentText = 0; scriptToShow = newDialogue; + WaveManager.instance.player.invulnerable = true; battleUIAnimator.SetTrigger(dialogueStartTrigger); DialogueScript.Dialogue currentDialogue = scriptToShow.dialogueList[currentText]; if (WaveManager.instance.bossInstance) { bossSpeechBubble.position = WaveManager.instance.bossInstance.transform.position + offset; WaveManager.instance.musicSource.clip = WaveManager.instance.bossDialogueLoop; - WaveManager.instance.musicSource.volume = WaveManager.instance.bossVolume; WaveManager.instance.musicSource.Play(); } if (WaveManager.instance.lyricaInstance) @@ -74,7 +75,6 @@ public class DialogueManager : MonoBehaviour merlinSpeechBubble.transform.position = WaveManager.instance.merlinInstance.transform.position + offset; lyricaSpeechBubble.transform.position = WaveManager.instance.lyricaInstance.transform.position + offset; WaveManager.instance.musicSource.clip = WaveManager.instance.finalDialogueLoop; - WaveManager.instance.musicSource.volume = WaveManager.instance.finalVolume; WaveManager.instance.musicSource.Play(); } SetDialogue(currentDialogue); @@ -101,6 +101,7 @@ public class DialogueManager : MonoBehaviour dialogueUI.SetActive(false); WaveManager.instance.player.isStalled = false; WaveManager.instance.player.invulnerable = false; + GameManager.instance.canPause = true; battleUIAnimator.SetTrigger(dialogueEndTrigger); if (WaveManager.instance.bossInstance) { diff --git a/Assets/Scripts/Entities/Enemy.cs b/Assets/Scripts/Entities/Enemy.cs index ad5c10e..79f0eb5 100644 --- a/Assets/Scripts/Entities/Enemy.cs +++ b/Assets/Scripts/Entities/Enemy.cs @@ -104,7 +104,6 @@ public class Enemy : Entity { DialogueManager.instance.battleUIAnimator.SetTrigger(DialogueManager.instance.nobossTrigger); WaveManager.instance.musicSource.clip = WaveManager.instance.musicLoop; - WaveManager.instance.musicSource.volume = WaveManager.instance.musicVolume; WaveManager.instance.musicSource.Play(); } } @@ -134,7 +133,7 @@ public class Enemy : Entity if (isBossEnemy && !hasStartedDialogue) { hasStartedDialogue = true; - if (thisBossDialogue) + if (thisBossDialogue && !GameManager.instance.isEndless) { DialogueManager.instance.StartDialogue(thisBossDialogue); //the worst code ever } diff --git a/Assets/Scripts/Entities/Entity.cs b/Assets/Scripts/Entities/Entity.cs index 035ba9b..4621f7e 100644 --- a/Assets/Scripts/Entities/Entity.cs +++ b/Assets/Scripts/Entities/Entity.cs @@ -26,7 +26,7 @@ public class Entity : MonoBehaviour } } - public void Heal(int healing) + public virtual void Heal(int healing) { health += healing; health = Math.Clamp(health, 0, maxHealth); diff --git a/Assets/Scripts/Entities/Player.cs b/Assets/Scripts/Entities/Player.cs index e91000b..d169998 100644 --- a/Assets/Scripts/Entities/Player.cs +++ b/Assets/Scripts/Entities/Player.cs @@ -22,6 +22,8 @@ public class Player : Entity [SerializeField] private float hurtVolume = 1f; [SerializeField] private AudioClip gameOverSound; [SerializeField] private float gameOverVolume = 1f; + [SerializeField] private AudioClip healSound; + [SerializeField] private float healVolume = 1f; private void Update() { if (!isStalled) @@ -62,6 +64,13 @@ public class Player : Entity } } + public override void Heal(int healing) + { + base.Heal(healing); + UpdateLivesUI(); + WaveManager.instance.audioSource.PlayOneShot(healSound, healVolume); + } + public override void TakeDamage(int damage) { base.TakeDamage(damage); diff --git a/Assets/Scripts/Entities/ZombieFairy.cs b/Assets/Scripts/Entities/ZombieFairy.cs index 14562c4..1aa8bc8 100644 --- a/Assets/Scripts/Entities/ZombieFairy.cs +++ b/Assets/Scripts/Entities/ZombieFairy.cs @@ -5,17 +5,20 @@ public class ZombieFairy : Enemy [SerializeField] private Ability deathAbility; [SerializeField] private bool hasDiedOnce; [SerializeField] private float disappearanceTime; + [SerializeField] private Color disappearanceColor; + [SerializeField] private BoxCollider2D boxCollider; private float currentDisappearanceTime; protected override void OnDeath() { if (!hasDiedOnce) { - hasDiedOnce = true; health = maxHealth; invulnerable = true; isStalled = true; + hasDiedOnce = true; + boxCollider.enabled = false; currentDisappearanceTime = disappearanceTime; - sprite.color = Color.black; + sprite.color = disappearanceColor; } else { @@ -34,6 +37,7 @@ public class ZombieFairy : Enemy currentDisappearanceTime -= Time.deltaTime; if (currentDisappearanceTime <= 0) { + boxCollider.enabled = true; invulnerable = false; isStalled = false; sprite.color = Color.white; diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 1c2e2a9..d7408b1 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -31,27 +31,27 @@ public class GameManager : MonoBehaviour public string accuracy; public int livesLost; [Header("Pause UI")] - [SerializeField] private GameObject pauseMenu; - + public bool canPause = true; + public bool isEndless = false; [Header("Game Over")] [SerializeField] private DialogueScript winCutscene; - [SerializeField] private GameObject loseUI; - [SerializeField] private StatsUI statsUI; - private bool gameOver; + public bool gameOver; public void EndGame() { SetPause(true); gameOver = true; + canPause = false; time = TimeSpan.FromSeconds(Time.timeSinceLevelLoad).ToString(@"mm\:ss"); wave = WaveManager.instance.wave-1; + WaveManager.instance.musicSource.Stop(); accuracy = ((float)projectilesHit / projectilesShot).ToString(@"P"); } public void LoseGame() { - loseUI.SetActive(true); + WaveManager.instance.loseUI.SetActive(true); EndGame(); - statsUI.SetUI(); + WaveManager.instance.statsUI.SetUI(); } public void WinGame() @@ -65,23 +65,41 @@ public class GameManager : MonoBehaviour { LevelSwitcher.instance.SwitchLevel(0); SetPause(false); + canPause = true; + ClearStats(); } public void RestartGame() { LevelSwitcher.instance.SwitchLevel(1); + canPause = true; SetPause(false); + ClearStats(); } public void ContinueGame() { gameOver = false; - loseUI.SetActive(false); + canPause = true; + WaveManager.instance.loseUI.SetActive(false); SetPause(false); + WaveManager.instance.musicSource.Play(); WaveManager.instance.player.health = WaveManager.instance.player.maxHealth; continues++; } + private void ClearStats() + { + continues = 0; + wave = 0; + projectilesHit = 0; + projectilesShot = 0; + accuracy = ""; + deflections = 0; + livesLost = 0; + time = ""; + } + public void SetPause(bool state) { if (state) @@ -96,16 +114,16 @@ public class GameManager : MonoBehaviour public void SetPauseMenu() { - if (!gameOver && !DialogueManager.instance.dialogueActive) + if (!gameOver && canPause && WaveManager.instance) { - if (!pauseMenu.activeSelf) + if (!WaveManager.instance.pauseMenu.activeSelf) { - pauseMenu.SetActive(true); + WaveManager.instance.pauseMenu.SetActive(true); SetPause(true); } else { - pauseMenu.SetActive(false); + WaveManager.instance.pauseMenu.SetActive(false); SetPause(false); } } diff --git a/Assets/Scripts/MainMenuHandler.cs b/Assets/Scripts/MainMenuHandler.cs index 37ebba9..f1def6c 100644 --- a/Assets/Scripts/MainMenuHandler.cs +++ b/Assets/Scripts/MainMenuHandler.cs @@ -28,11 +28,19 @@ public class MainMenuHandler : MonoBehaviour screenFade.gameObject.SetActive(true); screenFade.color = Color.clear; StartCoroutine(FadeScreen(2, startingScript)); + GameManager.instance.gameOver = false; + GameManager.instance.canPause = true; + GameManager.instance.isEndless = false; } public void StartEndless() { - + screenFade.gameObject.SetActive(true); + screenFade.color = Color.clear; + StartCoroutine(FadeScreen(1, startingScript)); + GameManager.instance.gameOver = false; + GameManager.instance.canPause = true; + GameManager.instance.isEndless = true; } public void QuitGame() diff --git a/Assets/Scripts/SettingsMenu.cs b/Assets/Scripts/SettingsMenu.cs index ed6d621..1b4287d 100644 --- a/Assets/Scripts/SettingsMenu.cs +++ b/Assets/Scripts/SettingsMenu.cs @@ -30,12 +30,20 @@ public class SettingsMenu : MonoBehaviour { sfxLabel.text = $"SFX ({(sfxSlider.value * 100).ToString("F1")}%);"; mainMixer.SetFloat("SFXVolume", Mathf.Log10(sfxSlider.value) * 20); + if (sfxSlider.value <= 0f) + { + mainMixer.SetFloat("SFXVolume", Mathf.Log10(0.01f) * 20); + } PlayerPrefs.SetFloat("SFXVolume", sfxSlider.value); } public void UpdateMusic() { musicLabel.text = $"Music ({(musicSlider.value * 100).ToString("F1")}%);"; mainMixer.SetFloat("MusicVolume", Mathf.Log10(musicSlider.value) * 20); + if (musicSlider.value <= 0f) + { + mainMixer.SetFloat("MusicVolume", Mathf.Log10(0.01f) * 20); + } PlayerPrefs.SetFloat("MusicVolume", musicSlider.value); } } diff --git a/Assets/Scripts/WaveManager.cs b/Assets/Scripts/WaveManager.cs index f3eb7cf..6927073 100644 --- a/Assets/Scripts/WaveManager.cs +++ b/Assets/Scripts/WaveManager.cs @@ -35,7 +35,7 @@ public class WaveManager : MonoBehaviour public Texture bossName; //public DialogueScript bossDialogue; } - + public GameObject pauseMenu; [Header("Player Point")] public Player player; //only for continues lol [SerializeField] private Transform tlPoint; @@ -52,7 +52,7 @@ public class WaveManager : MonoBehaviour public Enemy bossInstance; public GameObject bossUI; [SerializeField] private RawImage bossNameUI; - [SerializeField] private Transform bossHPBar; + [SerializeField] private Image bossHPBar; [Header("Final Boss")] [SerializeField] private Prismriver lunasa; @@ -69,25 +69,41 @@ public class WaveManager : MonoBehaviour public List enemiesInPlay = new(); [SerializeField] private float enemyCheckRadius; [SerializeField] private LayerMask enemyLayer; + public int healInterval; [Header("Audio")] public AudioClip bossDialogueLoop; public AudioClip bossMusic; public float bossVolume; public AudioClip finalDialogueLoop; public AudioClip finalMusic; - public float finalVolume; public AudioSource audioSource; public AudioSource musicSource; [SerializeField] private AudioClip musicIntro; public AudioClip musicLoop; - public float musicVolume; + [Header("UI")] + public GameObject loseUI; + public StatsUI statsUI; + [Header("Endless")] + [SerializeField] private Enemy[] enemyList; + [SerializeField] private Enemy[] bossList; + [SerializeField] private int bossWaveInterval; + [Header("Enemy Count Calculations")] + [SerializeField] private float baseSpawnAmount; + [SerializeField] private float exponentIncrease; + public float exponentHealthIncrease; private void Start() { - SpawnWave(); + if (GameManager.instance.isEndless) + { + SpawnEndlessWave(); + } + else + { + SpawnWave(); + } //SpawnFinalBoss(); - musicSource.volume = musicVolume; - musicSource.PlayOneShot(musicIntro, musicVolume); + musicSource.PlayOneShot(musicIntro); StartCoroutine(WaitForLoop()); } @@ -115,6 +131,25 @@ public class WaveManager : MonoBehaviour return randomPoint; } + public void CallPauseMenu() + { + GameManager.instance.SetPauseMenu(); + } + public void CallExitGame() + { + GameManager.instance.ExitGame(); + } + + public void CallRestartGame() + { + GameManager.instance.RestartGame(); + } + + public void CallContinue() + { + GameManager.instance.ContinueGame(); + } + private bool CheckEnemyOverlap(Vector3 areaToCheck) { if (Physics2D.OverlapCircle(areaToCheck, enemyCheckRadius, enemyLayer)) @@ -142,6 +177,20 @@ public class WaveManager : MonoBehaviour } wave++; } + private void SpawnEndlessWave() + { + //waveUI.text = $"Wave: {wave}"; + int amountToSpawn = Mathf.FloorToInt(baseSpawnAmount * Mathf.Pow(wave, exponentIncrease)); + for (int i = 0; i < amountToSpawn; i++) + { + SpawnEnemy(enemyList[Random.Range(0, enemyList.Length)]); + } + if (wave % bossWaveInterval == 0) + { + SpawnBoss(bossList[Random.Range(0, bossList.Length)]); + } + wave++; + } protected void SpawnBoss(Enemy boss) { @@ -150,8 +199,16 @@ public class WaveManager : MonoBehaviour bossNameUI.texture = waveList[wave - 1].bossName; bossNameUI.SetNativeSize(); UpdateBossUI(); - player.isStalled = true; //wait for boss to enter then start dialogue - player.invulnerable = true; + if (!GameManager.instance.isEndless) + { + player.isStalled = true; //wait for boss to enter then start dialogue + player.invulnerable = true; + } + else + { + newBoss.maxHealth = Mathf.FloorToInt(newBoss.maxHealth * Mathf.Pow(wave, exponentHealthIncrease)); + newBoss.health = newBoss.maxHealth; + } } private void SpawnFinalBoss() { @@ -171,6 +228,11 @@ public class WaveManager : MonoBehaviour { Enemy newEnemy = Instantiate(enemy, enemyFolder); Vector3 movepos = GetRandomEnemyPoint(); + if (GameManager.instance.isEndless) + { + newEnemy.maxHealth = Mathf.FloorToInt(newEnemy.maxHealth * Mathf.Pow(wave, exponentHealthIncrease)); + newEnemy.health = newEnemy.maxHealth; + } newEnemy.currentMovementRoutine = newEnemy.StartCoroutine(newEnemy.MoveToPosition(enemySpawnPoint.position,movepos, newEnemy.moveSpeed)); newEnemy.originalPosition = movepos; enemiesInPlay.Add(newEnemy); @@ -195,18 +257,26 @@ public class WaveManager : MonoBehaviour { if (lyricaInstance) { - bossHPBar.localScale = new Vector3(1 - (float)prismHP / prismMaxHP, 1f, 1f); + bossHPBar.fillAmount = 1 - (float)prismHP / prismMaxHP; return; } - bossHPBar.localScale = new Vector3(1 - (float)bossInstance.health / bossInstance.maxHealth, 1f, 1f); + bossHPBar.fillAmount = 1 - (float)bossInstance.health / bossInstance.maxHealth; } public virtual void UpdateKills() { if (enemiesInPlay.Count == 0) { - if (waveList[wave - 1].bossEnemy) + Debug.Log("interval: " + ((wave+1) % healInterval)); + if ((wave + 1) % healInterval == 0) { + Debug.Log("here"); + player.Heal(1); + } + if (GameManager.instance.isEndless) + { + SpawnEndlessWave(); + return; } SpawnWave(); } diff --git a/Assets/Settings/UniversalRP.asset b/Assets/Settings/UniversalRP.asset index fccfdda..e88db67 100644 --- a/Assets/Settings/UniversalRP.asset +++ b/Assets/Settings/UniversalRP.asset @@ -78,6 +78,7 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 0 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 @@ -98,34 +99,35 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeMainLightShadows: 4 m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Assets/Sprites/BG.png b/Assets/Sprites/BG.png new file mode 100644 index 0000000..1866eb9 Binary files /dev/null and b/Assets/Sprites/BG.png differ diff --git a/Assets/Sprites/BG.png.meta b/Assets/Sprites/BG.png.meta new file mode 100644 index 0000000..4d29630 --- /dev/null +++ b/Assets/Sprites/BG.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c34ae5a5c99d08fb2b3051e66d716cd3 +TextureImporter: + internalIDToNameTable: + - first: + 213: -6695950386315148514 + second: BG_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: BG_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e13cb0ea9943313a0800000000000000 + internalID: -6695950386315148514 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + BG_0: -6695950386315148514 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/JamCover.png b/Assets/Sprites/JamCover.png new file mode 100644 index 0000000..3fd374b Binary files /dev/null and b/Assets/Sprites/JamCover.png differ diff --git a/Assets/Sprites/JamCover.png.meta b/Assets/Sprites/JamCover.png.meta new file mode 100644 index 0000000..0024a8d --- /dev/null +++ b/Assets/Sprites/JamCover.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: eb9c4f03a8840870d91aa7276f7edd43 +TextureImporter: + internalIDToNameTable: + - first: + 213: 1831344991726452067 + second: JamCover_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: JamCover_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 36dbb0d219e3a6910800000000000000 + internalID: 1831344991726452067 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + JamCover_0: 1831344991726452067 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/JamCoverScale.png b/Assets/Sprites/JamCoverScale.png new file mode 100644 index 0000000..466093d Binary files /dev/null and b/Assets/Sprites/JamCoverScale.png differ diff --git a/Assets/Sprites/JamCoverScale.png.meta b/Assets/Sprites/JamCoverScale.png.meta new file mode 100644 index 0000000..4cc62df --- /dev/null +++ b/Assets/Sprites/JamCoverScale.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: ae162f2a629a337a49686e009233fdbd +TextureImporter: + internalIDToNameTable: + - first: + 213: -3906241657935648322 + second: JamCoverScale_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: JamCoverScale_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1680 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: eb9a9e388ed3ac9c0800000000000000 + internalID: -3906241657935648322 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + JamCoverScale_0: -3906241657935648322 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/button2.meta b/Assets/Sprites/button2.meta new file mode 100644 index 0000000..eac70d6 --- /dev/null +++ b/Assets/Sprites/button2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0622ee03059840d8fad559be42c1c17c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/button2/restart.png b/Assets/Sprites/button2/restart.png new file mode 100644 index 0000000..8d2148c Binary files /dev/null and b/Assets/Sprites/button2/restart.png differ diff --git a/Assets/Sprites/button2/restart.png.meta b/Assets/Sprites/button2/restart.png.meta new file mode 100644 index 0000000..968e35d --- /dev/null +++ b/Assets/Sprites/button2/restart.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 58bd0a6880c874f2aa0da7e6d3c10a94 +TextureImporter: + internalIDToNameTable: + - first: + 213: -3026058171327407114 + second: restart_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: restart_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 360 + height: 130 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6fb9c5c30284106d0800000000000000 + internalID: -3026058171327407114 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + restart_0: -3026058171327407114 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/button2/restartpressed.png b/Assets/Sprites/button2/restartpressed.png new file mode 100644 index 0000000..ebc99cb Binary files /dev/null and b/Assets/Sprites/button2/restartpressed.png differ diff --git a/Assets/Sprites/button2/restartpressed.png.meta b/Assets/Sprites/button2/restartpressed.png.meta new file mode 100644 index 0000000..04bfdb1 --- /dev/null +++ b/Assets/Sprites/button2/restartpressed.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: f7a9c59c098686ad7be0d226b37b52b2 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7408628544949234822 + second: restartpressed_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: restartpressed_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 360 + height: 111 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a735b7947934f2990800000000000000 + internalID: -7408628544949234822 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + restartpressed_0: -7408628544949234822 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/button2/resume.png b/Assets/Sprites/button2/resume.png new file mode 100644 index 0000000..f69b9ae Binary files /dev/null and b/Assets/Sprites/button2/resume.png differ diff --git a/Assets/Sprites/button2/resume.png.meta b/Assets/Sprites/button2/resume.png.meta new file mode 100644 index 0000000..199914d --- /dev/null +++ b/Assets/Sprites/button2/resume.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 24f57860aeb923f9d86606595f78af39 +TextureImporter: + internalIDToNameTable: + - first: + 213: -6450244300066960991 + second: resume_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: resume_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 360 + height: 130 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1a94504ebf02c76a0800000000000000 + internalID: -6450244300066960991 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + resume_0: -6450244300066960991 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/button2/resumepressed.png b/Assets/Sprites/button2/resumepressed.png new file mode 100644 index 0000000..e9982ec Binary files /dev/null and b/Assets/Sprites/button2/resumepressed.png differ diff --git a/Assets/Sprites/button2/resumepressed.png.meta b/Assets/Sprites/button2/resumepressed.png.meta new file mode 100644 index 0000000..2230cf5 --- /dev/null +++ b/Assets/Sprites/button2/resumepressed.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 787abbfa1549d54a99edb92305239157 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8554155897808983002 + second: resumepressed_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: resumepressed_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 360 + height: 111 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ad3973a977776b670800000000000000 + internalID: 8554155897808983002 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + resumepressed_0: 8554155897808983002 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/icon.png b/Assets/Sprites/icon.png new file mode 100644 index 0000000..60e036e Binary files /dev/null and b/Assets/Sprites/icon.png differ diff --git a/Assets/Sprites/icon.png.meta b/Assets/Sprites/icon.png.meta new file mode 100644 index 0000000..5b789b0 --- /dev/null +++ b/Assets/Sprites/icon.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: d5f20cdaa1567ccbb9fdf04e8f878563 +TextureImporter: + internalIDToNameTable: + - first: + 213: 6934086728263231946 + second: icon_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: icon_0 + rect: + serializedVersion: 2 + x: 84 + y: 0 + width: 312 + height: 480 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ac961e71423da3060800000000000000 + internalID: 6934086728263231946 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + icon_0: 6934086728263231946 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index e526cd7..69fa093 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -56,7 +56,17 @@ MonoBehaviour: - rid: 7752762179098771476 - rid: 3114554863623077888 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 7752762179098771456 + - rid: 7752762179098771457 + - rid: 7752762179098771459 + - rid: 7752762179098771461 + - rid: 7752762179098771462 + - rid: 7752762179098771464 + - rid: 7752762179098771466 + - rid: 7752762179098771468 + - rid: 7752762179098771472 + - rid: 7752762179098771476 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 50321e4..db6d92c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany + companyName: Sylver Systems productName: ReisenYoumuOuting defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -45,7 +45,7 @@ PlayerSettings: defaultScreenWidth: 1920 defaultScreenHeight: 1080 defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenHeightWeb: 540 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 @@ -94,7 +94,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 @@ -106,7 +106,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -141,7 +141,8 @@ PlayerSettings: visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 bundleVersion: 1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -286,7 +287,14 @@ PlayerSettings: AndroidAppBundleSizeToValidate: 150 AndroidReportGooglePlayAppDependencies: 1 androidSymbolsSizeThreshold: 800 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: d5f20cdaa1567ccbb9fdf04e8f878563, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] @@ -308,7 +316,10 @@ PlayerSettings: m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: WebGL + m_Formats: 05000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1