diff --git a/Assets/Animation/GameOverClip.anim b/Assets/Animation/GameOverClip.anim index 6c025ebf7fbf14a0dc4ef346a7bbacf45a94215b..226ac3a0451999e1a4c7e31b86c52600e36b1b73 100644 --- a/Assets/Animation/GameOverClip.anim +++ b/Assets/Animation/GameOverClip.anim @@ -676,6 +676,366 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.r + path: HighScore + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.g + path: HighScore + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.b + path: HighScore + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.a + path: HighScore + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.r + path: GamesCompleted + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.g + path: GamesCompleted + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.b + path: GamesCompleted + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.a + path: GamesCompleted + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.r + path: OrbsCollected + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.g + path: OrbsCollected + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.b + path: OrbsCollected + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + 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_fontColor.a + path: OrbsCollected + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -801,6 +1161,33 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3542818357 + attribute: 4185109675 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4071261257 + attribute: 4185109675 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3961926287 + attribute: 4185109675 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2599219314 attribute: 2110649717 @@ -882,6 +1269,87 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3542818357 + attribute: 2110649717 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3542818357 + attribute: 269488542 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3542818357 + attribute: 1618666769 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4071261257 + attribute: 2110649717 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4071261257 + attribute: 269488542 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4071261257 + attribute: 1618666769 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3961926287 + attribute: 2110649717 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3961926287 + attribute: 269488542 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3961926287 + attribute: 1618666769 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -911,26 +1379,254 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 3.6000001 - outSlope: 3.6000001 + inSlope: 3.6000001 + outSlope: 3.6000001 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.2 + inSlope: 1.2005992 + outSlope: 1.2005992 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.50016665 + value: 1 + inSlope: -1.1988016 + outSlope: -1.1988016 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: GameOverText + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 3.6000001 + outSlope: 3.6000001 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.2 + inSlope: 1.2005992 + outSlope: 1.2005992 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.50016665 + value: 1 + inSlope: -1.1988016 + outSlope: -1.1988016 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: GameOverText + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 3.6000001 + outSlope: 3.6000001 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1.2 + inSlope: 1.2005992 + outSlope: 1.2005992 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.50016665 + value: 1 + inSlope: -1.1988016 + outSlope: -1.1988016 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: GameOverText + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1.1392428 + outSlope: 1.1392428 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.50016665 + value: 0.5698112 + inSlope: 1.1392428 + outSlope: 1.1392428 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: ScreenFader + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0.5825184 + outSlope: 0.5825184 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.50016665 + value: 0.29135627 + inSlope: 0.5825184 + outSlope: 0.5825184 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: ScreenFader + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0.6181371 + outSlope: 0.6181371 tangentMode: 34 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1.2 - inSlope: 1.2005992 - outSlope: 1.2005992 + time: 0.50016665 + value: 0.3091716 + inSlope: 0.6181371 + outSlope: 0.6181371 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: ScreenFader + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1.9980018 + outSlope: 1.9980018 tangentMode: 34 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.50016665 + value: 0.99933386 + inSlope: 1.9980018 + outSlope: 1.9980018 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: ScreenFader + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 value: 1 - inSlope: -1.1988016 - outSlope: -1.1988016 + inSlope: -0.3998667 + outSlope: -0.3998667 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.50016665 + value: 0.8 + inSlope: -0.3998667 + outSlope: -0.3998667 tangentMode: 34 weightedMode: 0 inWeight: 0.33333334 @@ -939,7 +1635,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalScale.x - path: GameOverText + path: ScoreText classID: 224 script: {fileID: 0} flags: 16 @@ -949,27 +1645,48 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 3.6000001 - outSlope: 3.6000001 + value: 1 + inSlope: -0.39973345 + outSlope: -0.39973345 tangentMode: 34 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 1.2 - inSlope: 1.2005992 - outSlope: 1.2005992 + time: 0.50016665 + value: 0.80006665 + inSlope: -0.39973345 + outSlope: -0.39973345 tangentMode: 34 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: ScoreText + classID: 224 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.50016665 + time: 0 value: 1 - inSlope: -1.1988016 - outSlope: -1.1988016 + inSlope: -0.39973345 + outSlope: -0.39973345 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.50016665 + value: 0.80006665 + inSlope: -0.39973345 + outSlope: -0.39973345 tangentMode: 34 weightedMode: 0 inWeight: 0.33333334 @@ -977,8 +1694,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalScale.y - path: GameOverText + attribute: m_LocalScale.z + path: ScoreText classID: 224 script: {fileID: 0} flags: 16 @@ -988,99 +1705,210 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 3.6000001 - outSlope: 3.6000001 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: 1.2 - inSlope: 1.2005992 - outSlope: 1.2005992 - tangentMode: 34 + value: 0.21960786 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + 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_fontColor.r + path: GameOverText + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.21960786 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + 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_fontColor.g + path: GameOverText + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.21960786 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + 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_fontColor.b + path: GameOverText + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.5 + 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_fontColor.a + path: GameOverText + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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.50016665 + time: 0.5 value: 1 - inSlope: -1.1988016 - outSlope: -1.1988016 - tangentMode: 34 + 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_LocalScale.z - path: GameOverText - classID: 224 - script: {fileID: 0} - flags: 16 + attribute: m_fontColor.r + path: ShotsStats + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 1.1392428 - outSlope: 1.1392428 - tangentMode: 34 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.50016665 - value: 0.5698112 - inSlope: 1.1392428 - outSlope: 1.1392428 - tangentMode: 34 + time: 0.5 + 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: ScreenFader + attribute: m_fontColor.g + path: ShotsStats classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - flags: 16 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0.5825184 - outSlope: 0.5825184 - tangentMode: 34 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.50016665 - value: 0.29135627 - inSlope: 0.5825184 - outSlope: 0.5825184 - tangentMode: 34 + time: 0.5 + 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: ScreenFader + attribute: m_fontColor.b + path: ShotsStats classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - flags: 16 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -1088,59 +1916,59 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0.6181371 - outSlope: 0.6181371 - tangentMode: 34 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.50016665 - value: 0.3091716 - inSlope: 0.6181371 - outSlope: 0.6181371 - tangentMode: 34 + time: 0.5 + 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: ScreenFader + attribute: m_fontColor.a + path: ShotsStats classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - flags: 16 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 1.9980018 - outSlope: 1.9980018 - tangentMode: 34 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.50016665 - value: 0.99933386 - inSlope: 1.9980018 - outSlope: 1.9980018 - tangentMode: 34 + 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: ScreenFader + attribute: m_fontColor.r + path: DistanceStats classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - flags: 16 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -1148,29 +1976,29 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: -0.3998667 - outSlope: -0.3998667 - tangentMode: 34 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.50016665 - value: 0.8 - inSlope: -0.3998667 - outSlope: -0.3998667 - tangentMode: 34 + 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_LocalScale.x - path: ScoreText - classID: 224 - script: {fileID: 0} - flags: 16 + attribute: m_fontColor.g + path: DistanceStats + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -1178,66 +2006,66 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: -0.39973345 - outSlope: -0.39973345 - tangentMode: 34 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.50016665 - value: 0.80006665 - inSlope: -0.39973345 - outSlope: -0.39973345 - tangentMode: 34 + 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_LocalScale.y - path: ScoreText - classID: 224 - script: {fileID: 0} - flags: 16 + attribute: m_fontColor.b + path: DistanceStats + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: -0.39973345 - outSlope: -0.39973345 - tangentMode: 34 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.50016665 - value: 0.80006665 - inSlope: -0.39973345 - outSlope: -0.39973345 - tangentMode: 34 + 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_LocalScale.z - path: ScoreText - classID: 224 - script: {fileID: 0} - flags: 16 + attribute: m_fontColor.a + path: DistanceStats + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.21960786 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1245,7 +2073,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1257,7 +2085,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.r - path: GameOverText + path: TimeStats classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1267,7 +2095,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.21960786 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1275,7 +2103,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1287,7 +2115,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.g - path: GameOverText + path: TimeStats classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1297,7 +2125,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.21960786 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1305,7 +2133,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1317,7 +2145,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.b - path: GameOverText + path: TimeStats classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1335,7 +2163,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1347,7 +2175,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.a - path: GameOverText + path: TimeStats classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1365,7 +2193,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1377,7 +2205,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.r - path: ShotsStats + path: HighScore classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1395,7 +2223,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1407,7 +2235,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.g - path: ShotsStats + path: HighScore classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1425,7 +2253,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1437,7 +2265,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.b - path: ShotsStats + path: HighScore classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1455,7 +2283,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 + time: 0.50016665 value: 1 inSlope: 0 outSlope: 0 @@ -1467,7 +2295,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.a - path: ShotsStats + path: HighScore classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1497,7 +2325,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.r - path: DistanceStats + path: GamesCompleted classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1527,7 +2355,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.g - path: DistanceStats + path: GamesCompleted classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1557,7 +2385,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.b - path: DistanceStats + path: GamesCompleted classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1587,7 +2415,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.a - path: DistanceStats + path: GamesCompleted classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1617,7 +2445,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.r - path: TimeStats + path: OrbsCollected classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1647,7 +2475,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.g - path: TimeStats + path: OrbsCollected classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1677,7 +2505,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.b - path: TimeStats + path: OrbsCollected classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 @@ -1707,7 +2535,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.a - path: TimeStats + path: OrbsCollected classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} flags: 0 diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index 274f697666ec76b3a2f89138663b51b16ecedf62..a54d6fbf50e8b7714bfa9735ea0534cd8e6f2d7c 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -157,7 +157,7 @@ RectTransform: 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: 264, y: 10} + m_AnchoredPosition: {x: 264, y: 60} m_SizeDelta: {x: 199.25, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1202986 @@ -291,7 +291,7 @@ RectTransform: 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: -1, y: 10} + m_AnchoredPosition: {x: -1, y: 60} m_SizeDelta: {x: 250, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4488739 @@ -618,7 +618,7 @@ RectTransform: 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: -160} + m_AnchoredPosition: {x: 0, y: -220} m_SizeDelta: {x: 250, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &19443781 @@ -1558,6 +1558,9 @@ MonoBehaviour: shotsText: {fileID: 2138422232} distanceText: {fileID: 4488739} timeText: {fileID: 1202986} + scoreText: {fileID: 1255493753} + gamesText: {fileID: 2105470358} + orbsText: {fileID: 239079281} --- !u!114 &109216541 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2175,6 +2178,140 @@ CapsuleCollider: m_Height: 4.17 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &239079279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 239079280} + - component: {fileID: 239079282} + - component: {fileID: 239079281} + m_Layer: 5 + m_Name: OrbsCollected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &239079280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239079279} + 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: 264136413} + 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: 370, y: -50} + m_SizeDelta: {x: 350, y: 49} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &239079281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239079279} + 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: 'Orbs: 0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 16777215 + m_fontColor: {r: 1, g: 1, b: 1, a: 0} + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &239079282 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239079279} + m_CullTransparentMesh: 1 --- !u!1 &264136408 GameObject: m_ObjectHideFlags: 0 @@ -2297,6 +2434,9 @@ RectTransform: - {fileID: 2138422231} - {fileID: 4488738} - {fileID: 1202985} + - {fileID: 1255493752} + - {fileID: 2105470357} + - {fileID: 239079280} - {fileID: 591423029} - {fileID: 604773450} - {fileID: 19443780} @@ -8449,7 +8589,7 @@ RectTransform: 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: 100} + m_AnchoredPosition: {x: 0, y: 170} m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &537051244 @@ -9231,7 +9371,7 @@ RectTransform: 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: -90} + m_AnchoredPosition: {x: 0, y: -150} m_SizeDelta: {x: 250, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &604773451 @@ -11997,6 +12137,140 @@ SkinnedMeshRenderer: m_Center: {x: -0.21740456, y: -0.00000009685755, z: 0.10632968} m_Extent: {x: 0.7098157, y: 0.04438655, z: 0.32349676} m_DirtyAABB: 0 +--- !u!1 &1255493751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1255493752} + - component: {fileID: 1255493754} + - component: {fileID: 1255493753} + m_Layer: 5 + m_Name: HighScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1255493752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255493751} + 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: 264136413} + 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: -350, y: -50} + m_SizeDelta: {x: 250, y: 49} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1255493753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255493751} + 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: 'High Score: 0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 16777215 + m_fontColor: {r: 1, g: 1, b: 1, a: 0} + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1255493754 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255493751} + m_CullTransparentMesh: 1 --- !u!1 &1265858856 GameObject: m_ObjectHideFlags: 0 @@ -12084,7 +12358,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -642.6587, y: -300} m_SizeDelta: {x: 75, y: 60} m_Pivot: {x: 0, y: 0} --- !u!1 &1297588071 @@ -15562,6 +15836,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b4f43bf66218c874d871d02802b6a2db, type: 3} m_Name: m_EditorClassIdentifier: + stats: {fileID: 109216539} --- !u!114 &1883097035 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16387,6 +16662,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2064269621} m_CullTransparentMesh: 1 +--- !u!1 &2105470356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2105470357} + - component: {fileID: 2105470359} + - component: {fileID: 2105470358} + m_Layer: 5 + m_Name: GamesCompleted + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2105470357 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105470356} + 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: 264136413} + 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: -50} + m_SizeDelta: {x: 370, y: 49} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2105470358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105470356} + 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: 'Completed: 0' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 16777215 + m_fontColor: {r: 1, g: 1, b: 1, a: 0} + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &2105470359 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105470356} + m_CullTransparentMesh: 1 --- !u!4 &2112317438 Transform: m_ObjectHideFlags: 0 @@ -16512,7 +16921,7 @@ RectTransform: 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: -266, y: 10} + m_AnchoredPosition: {x: -266, y: 60} m_SizeDelta: {x: 199.25, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2138422232 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 69e0e245f3bf4b6485cbe8d143ae39805986481e..d851837b91f7da3b0d4f179e89b34e84ac8c041a 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -157,7 +157,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 445, y: -214} + m_AnchoredPosition: {x: 375, y: -214} m_SizeDelta: {x: 250, y: 32.0357} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5435174 @@ -207,8 +207,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -339,7 +339,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 2052799352} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: OpenSettings m_Mode: 6 @@ -401,7 +401,7 @@ GameObject: - component: {fileID: 76495210} - component: {fileID: 76495209} m_Layer: 5 - m_Name: Accuracy + m_Name: Playtime m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -473,8 +473,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -639,6 +639,70 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 700, y: 328} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &149073813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 149073814} + - component: {fileID: 149073815} + m_Layer: 5 + m_Name: GamesCompleted + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &149073814 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149073813} + 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: 1178235827} + - {fileID: 1825204726} + m_Father: {fileID: 1261534168} + 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: -50} + m_SizeDelta: {x: 350, y: 428} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &149073815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149073813} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &167408041 GameObject: m_ObjectHideFlags: 0 @@ -867,6 +931,70 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 169564553} m_CullTransparentMesh: 1 +--- !u!1 &185390129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 185390130} + - component: {fileID: 185390131} + m_Layer: 5 + m_Name: OrbsCollected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &185390130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185390129} + 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: 1887949347} + - {fileID: 410404228} + m_Father: {fileID: 1261534168} + 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: -90} + m_SizeDelta: {x: 350, y: 428} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &185390131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185390129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &186602336 GameObject: m_ObjectHideFlags: 0 @@ -1151,6 +1279,8 @@ MonoBehaviour: - Level01 - Cutscene07 - Cutscene08 + currentIndex: 0 + currentQuest: 0 announcementText: {fileID: 0} enemyManager: [] questText: {fileID: 0} @@ -1163,6 +1293,8 @@ MonoBehaviour: isShopKeeper: 0 shopTimeRemaining: 0 shopKeeper: {fileID: 0} + timerCanvas: {fileID: 0} + stats: {fileID: 0} --- !u!4 &309830954 Transform: m_ObjectHideFlags: 0 @@ -1481,7 +1613,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} + - m_Target: {fileID: 2052799352} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: OpenSettings m_Mode: 6 @@ -1531,6 +1663,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 385603386} m_CullTransparentMesh: 0 +--- !u!1 &410404227 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 410404228} + - component: {fileID: 410404230} + - component: {fileID: 410404229} + m_Layer: 5 + m_Name: OrbsCollectedValue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &410404228 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410404227} + 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: 185390130} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 375, y: -214} + m_SizeDelta: {x: 250, y: 32.0357} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &410404229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410404227} + 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: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &410404230 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410404227} + m_CullTransparentMesh: 1 --- !u!1 &443545947 GameObject: m_ObjectHideFlags: 0 @@ -1747,7 +2013,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 2052799352} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: OpenStats m_Mode: 6 @@ -3233,8 +3499,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3784,7 +4050,7 @@ RectTransform: 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: 90} + m_AnchoredPosition: {x: 0, y: 110} m_SizeDelta: {x: 350, y: 428} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &961904885 @@ -3847,7 +4113,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 445, y: -214} + m_AnchoredPosition: {x: 375, y: -214} m_SizeDelta: {x: 250, y: 32.0357} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &994761032 @@ -3897,8 +4163,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4576,7 +4842,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &1182548624 +--- !u!1 &1178235826 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4584,8 +4850,142 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1182548625} - - component: {fileID: 1182548626} + - component: {fileID: 1178235827} + - component: {fileID: 1178235829} + - component: {fileID: 1178235828} + m_Layer: 5 + m_Name: GamesCompleted + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1178235827 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178235826} + 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: 149073814} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 125, y: -214} + m_SizeDelta: {x: 250, y: 32.0357} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1178235828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178235826} + 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: Games Completed + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1178235829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178235826} + m_CullTransparentMesh: 1 +--- !u!1 &1182548624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1182548625} + - component: {fileID: 1182548626} m_Layer: 5 m_Name: PlayerNameSettings m_TagString: Untagged @@ -4752,6 +5152,9 @@ RectTransform: - {fileID: 961904884} - {fileID: 1364163117} - {fileID: 1613358725} + - {fileID: 1328175207} + - {fileID: 149073814} + - {fileID: 185390130} - {fileID: 1657958132} m_Father: {fileID: 2052799348} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4929,6 +5332,70 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1314586895} m_CullTransparentMesh: 0 +--- !u!1 &1328175206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1328175207} + - component: {fileID: 1328175208} + m_Layer: 5 + m_Name: HighScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1328175207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328175206} + 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: 1511528309} + - {fileID: 1696747493} + m_Father: {fileID: 1261534168} + 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: -10} + m_SizeDelta: {x: 350, y: 428} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1328175208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328175206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1355971045 GameObject: m_ObjectHideFlags: 0 @@ -5098,7 +5565,7 @@ RectTransform: 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: 35} + m_AnchoredPosition: {x: 0, y: 70} m_SizeDelta: {x: 350, y: 428} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1364163118 @@ -5473,6 +5940,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495964236} m_CullTransparentMesh: 0 +--- !u!1 &1511528308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1511528309} + - component: {fileID: 1511528311} + - component: {fileID: 1511528310} + m_Layer: 5 + m_Name: HighScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1511528309 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511528308} + 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: 1328175207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 125, y: -214} + m_SizeDelta: {x: 250, y: 32.0357} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1511528310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511528308} + 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: High Score + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1511528311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511528308} + m_CullTransparentMesh: 1 --- !u!1 &1514419196 GameObject: m_ObjectHideFlags: 0 @@ -5686,7 +6287,7 @@ RectTransform: 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: -20} + m_AnchoredPosition: {x: 0, y: 30} m_SizeDelta: {x: 350, y: 428} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1613358726 @@ -6193,6 +6794,140 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1696747492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1696747493} + - component: {fileID: 1696747495} + - component: {fileID: 1696747494} + m_Layer: 5 + m_Name: HighScoreValue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1696747493 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696747492} + 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: 1328175207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 375, y: -214} + m_SizeDelta: {x: 250, y: 32.0357} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1696747494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696747492} + 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: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1696747495 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696747492} + m_CullTransparentMesh: 1 --- !u!1 &1730925587 GameObject: m_ObjectHideFlags: 0 @@ -6700,8 +7435,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6750,6 +7485,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1809041544} m_CullTransparentMesh: 1 +--- !u!1 &1825204725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1825204726} + - component: {fileID: 1825204728} + - component: {fileID: 1825204727} + m_Layer: 5 + m_Name: GamesCompletedValue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1825204726 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825204725} + 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: 149073814} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 375, y: -214} + m_SizeDelta: {x: 250, y: 32.0357} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1825204727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825204725} + 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: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1825204728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1825204725} + m_CullTransparentMesh: 1 --- !u!1 &1850157860 GameObject: m_ObjectHideFlags: 0 @@ -6886,6 +7755,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1850157860} m_CullTransparentMesh: 1 +--- !u!1 &1887949346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1887949347} + - component: {fileID: 1887949349} + - component: {fileID: 1887949348} + m_Layer: 5 + m_Name: OrbsCollected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1887949347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887949346} + 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: 185390130} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 125, y: -214} + m_SizeDelta: {x: 250, y: 32.0357} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1887949348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887949346} + 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: Orbs Collected + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dc36b3fdc14f47ebb36fd484a67e268a, type: 2} + m_sharedMaterial: {fileID: 2140032, guid: dc36b3fdc14f47ebb36fd484a67e268a, 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1887949349 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887949346} + m_CullTransparentMesh: 1 --- !u!1 &1927707793 GameObject: m_ObjectHideFlags: 0 @@ -7323,6 +8326,9 @@ MonoBehaviour: shotsText: {fileID: 2122165065} distanceText: {fileID: 994761032} timeText: {fileID: 5435174} + scoreText: {fileID: 1696747494} + gamesText: {fileID: 1825204727} + orbsText: {fileID: 410404229} --- !u!114 &2052799352 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7421,7 +8427,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 2052799352} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: OpenStats m_Mode: 6 @@ -7819,7 +8825,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 445, y: -214} + m_AnchoredPosition: {x: 375, y: -214} m_SizeDelta: {x: 250, y: 32.0357} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2122165065 @@ -7869,8 +8875,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Scripts/Global/Statistics.cs b/Assets/Scripts/Global/Statistics.cs index ef405cdeec1d39b55da4d10ca8664259801df66e..3d6eb706cb0024df0e23013e5c16f26072a6e93b 100644 --- a/Assets/Scripts/Global/Statistics.cs +++ b/Assets/Scripts/Global/Statistics.cs @@ -6,20 +6,32 @@ public class Statistics : MonoBehaviour private int shotsHit; private float distanceTraveled; private float playtime; + private int highScore; + private int gamesCompleted; + private int orbsCollected; private const string SHOTS_HIT_KEY = "ShotsHit"; private const string DISTANCE_TRAVELED_KEY = "DistanceTraveled"; private const string PLAYTIME_KEY = "Playtime"; + private const string HIGHSCORE_KEY = "HighScore"; + private const string GAMES_COMPLETED_KEY = "GamesCompleted"; + private const string ORBS_COLLECTED_KEY = "OrbsCollected"; public TMPro.TextMeshProUGUI shotsText; public TMPro.TextMeshProUGUI distanceText; public TMPro.TextMeshProUGUI timeText; + public TMPro.TextMeshProUGUI scoreText; + public TMPro.TextMeshProUGUI gamesText; + public TMPro.TextMeshProUGUI orbsText; void Start() { shotsHit = PlayerPrefs.GetInt(SHOTS_HIT_KEY, 0); distanceTraveled = PlayerPrefs.GetFloat(DISTANCE_TRAVELED_KEY, 0f); playtime = PlayerPrefs.GetFloat(PLAYTIME_KEY, 0f); + highScore = PlayerPrefs.GetInt(HIGHSCORE_KEY, 0); + gamesCompleted = PlayerPrefs.GetInt(GAMES_COMPLETED_KEY, 0); + orbsCollected = PlayerPrefs.GetInt(ORBS_COLLECTED_KEY, 0); shotsText.text = shotsHit.ToString(); distanceText.text = distanceTraveled + " m"; @@ -31,5 +43,14 @@ public class Statistics : MonoBehaviour // Update timeText to display playtime in H:M:S format timeText.text = hours.ToString("00") + ":" + minutes.ToString("00") + ":" + seconds.ToString("00"); + + // Update high score text + scoreText.text = highScore.ToString(); + + // Update games completed text + gamesText.text = gamesCompleted + " games"; + + // Update orbs collected text + orbsText.text = orbsCollected + " orbs"; } } diff --git a/Assets/Scripts/Managers/LevelManager.cs b/Assets/Scripts/Managers/LevelManager.cs index 3e670308d1c5da73648316bcb8fb118f1dd8816a..2c7e05744be58034657cb07c47f8fe8ed6481b77 100644 --- a/Assets/Scripts/Managers/LevelManager.cs +++ b/Assets/Scripts/Managers/LevelManager.cs @@ -1,4 +1,5 @@ using System; +using Unity.VisualScripting.Antlr3.Runtime.Misc; using UnityEngine; using UnityEngine.SceneManagement; @@ -41,6 +42,7 @@ namespace Nightmare public float shopTimeRemaining = 0f; public GameObject shopKeeper; public GameObject timerCanvas; + public StatsManager stats; public static LevelManager Instance; private void Awake() @@ -328,7 +330,7 @@ namespace Nightmare } } - timeRemaining = 5f + announcementDuration; + timeRemaining = 60f + announcementDuration; } else if (currentQuest == 2) { @@ -517,6 +519,9 @@ namespace Nightmare } else { + GameObject player = GameObject.FindGameObjectWithTag("Player"); + if(player) stats = player.GetComponent<StatsManager>(); + if(stats) stats.addGamesCompleted(); Exit(); } } diff --git a/Assets/Scripts/Managers/ScoreManager.cs b/Assets/Scripts/Managers/ScoreManager.cs index 9c9593c6923ac80a542aa155ddc1cbbaa928b082..93bdbe2caa0b932cdc990d1052377c3793591122 100644 --- a/Assets/Scripts/Managers/ScoreManager.cs +++ b/Assets/Scripts/Managers/ScoreManager.cs @@ -9,6 +9,7 @@ namespace Nightmare public static int score; private int levelThreshhold; const int LEVEL_INCREASE = 300; + public StatsManager stats; TMPro.TextMeshProUGUI sText; @@ -34,16 +35,7 @@ namespace Nightmare void Update () { sText.text = "Score:" + score; - //if (score >= levelThreshhold) - //{ - // AdvanceLevel(); - //} - } - - private void AdvanceLevel() - { - levelThreshhold = score + LEVEL_INCREASE; - LevelManager lm = FindObjectOfType<LevelManager>(); + stats.findHighScore(score); } } } \ No newline at end of file diff --git a/Assets/Scripts/Managers/StatsManager.cs b/Assets/Scripts/Managers/StatsManager.cs index e21a8041d6235d1be343434eb01b30aa083f12c5..c81dd248ca897389fac227f07dee676ebe0c85f0 100644 --- a/Assets/Scripts/Managers/StatsManager.cs +++ b/Assets/Scripts/Managers/StatsManager.cs @@ -6,15 +6,24 @@ public class StatsManager : MonoBehaviour private int shotsHit; private float distanceTraveled; private float playtime; + private int highScore; + private int gamesCompleted; + private int orbsCollected; private PlayerHealth playerHealth; private const string SHOTS_HIT_KEY = "ShotsHit"; private const string DISTANCE_TRAVELED_KEY = "DistanceTraveled"; private const string PLAYTIME_KEY = "Playtime"; + private const string HIGHSCORE_KEY = "HighScore"; + private const string GAMES_COMPLETED_KEY = "GamesCompleted"; + private const string ORBS_COLLECTED_KEY = "OrbsCollected"; public TMPro.TextMeshProUGUI shotsText; public TMPro.TextMeshProUGUI distanceText; public TMPro.TextMeshProUGUI timeText; + public TMPro.TextMeshProUGUI scoreText; + public TMPro.TextMeshProUGUI gamesText; + public TMPro.TextMeshProUGUI orbsText; void Start() { @@ -22,6 +31,9 @@ public class StatsManager : MonoBehaviour shotsHit = PlayerPrefs.GetInt(SHOTS_HIT_KEY, 0); distanceTraveled = PlayerPrefs.GetFloat(DISTANCE_TRAVELED_KEY, 0f); playtime = PlayerPrefs.GetFloat(PLAYTIME_KEY, 0f); + highScore = PlayerPrefs.GetInt(HIGHSCORE_KEY, 0); + gamesCompleted = PlayerPrefs.GetInt(GAMES_COMPLETED_KEY, 0); + orbsCollected = PlayerPrefs.GetInt(ORBS_COLLECTED_KEY, 0); } void Update() @@ -38,6 +50,15 @@ public class StatsManager : MonoBehaviour playtime += Time.deltaTime; PlayerPrefs.SetFloat(PLAYTIME_KEY, playtime); + // Highscore + PlayerPrefs.SetInt(HIGHSCORE_KEY, highScore); + + // Games Completed + PlayerPrefs.SetInt(GAMES_COMPLETED_KEY, gamesCompleted); + + // Orbs Collected + PlayerPrefs.SetInt(ORBS_COLLECTED_KEY, orbsCollected); + // Save Data PlayerPrefs.Save(); @@ -51,6 +72,15 @@ public class StatsManager : MonoBehaviour // Update timeText to display playtime in H:M:S format timeText.text = "Time: " + hours.ToString("00") + ":" + minutes.ToString("00") + ":" + seconds.ToString("00"); + + // Update high score text + scoreText.text = "High Score:\n" + highScore; + + // Update games completed text + gamesText.text = "Games Completed:\n" + gamesCompleted; + + // Update orbs collected text + orbsText.text = "Orbs Collected:\n" + orbsCollected; } } @@ -59,6 +89,9 @@ public class StatsManager : MonoBehaviour PlayerPrefs.SetInt(SHOTS_HIT_KEY, shotsHit); PlayerPrefs.SetFloat(DISTANCE_TRAVELED_KEY, distanceTraveled); PlayerPrefs.SetFloat(PLAYTIME_KEY, playtime); + PlayerPrefs.SetInt(HIGHSCORE_KEY, highScore); + PlayerPrefs.SetInt(GAMES_COMPLETED_KEY, gamesCompleted); + PlayerPrefs.SetInt(ORBS_COLLECTED_KEY, orbsCollected); PlayerPrefs.Save(); } @@ -72,6 +105,24 @@ public class StatsManager : MonoBehaviour distanceTraveled += distance; } + public void findHighScore(int score) + { + if(score > highScore) + { + highScore = score; + } + } + + public void addGamesCompleted() + { + gamesCompleted += 1; + } + + public void addOrbsCollected() + { + orbsCollected += 1; + } + void OnApplicationQuit() { // Save statistics when the application quits diff --git a/Assets/Scripts/Orbs/DamageOrb.cs b/Assets/Scripts/Orbs/DamageOrb.cs index 207f838b11f0e6c55d43392d4afacef87fb156e2..d2aa64f7be66042ba2f6da24153a4280efee3099 100644 --- a/Assets/Scripts/Orbs/DamageOrb.cs +++ b/Assets/Scripts/Orbs/DamageOrb.cs @@ -1,10 +1,12 @@ using UnityEngine; using Nightmare; +using Unity.VisualScripting.Antlr3.Runtime.Misc; public class PowerUpOrb : MonoBehaviour { public WeaponManager weaponManager; public GameObject tag; + public StatsManager stats; bool playerInRange; private void Awake() @@ -34,6 +36,9 @@ public class PowerUpOrb : MonoBehaviour public void PowerUp() { + GameObject player = GameObject.FindGameObjectWithTag("Player"); + if (player) stats = player.GetComponent<StatsManager>(); + if (stats) stats.addOrbsCollected(); weaponManager.PowerUp(); Destroy(gameObject); } diff --git a/Assets/Scripts/Orbs/HealOrb.cs b/Assets/Scripts/Orbs/HealOrb.cs index abe7de81ea0daa75eb25d28c34cf5c66bfbd5a39..347f2265fd04f2a1150f1564a7d971d978a2e884 100644 --- a/Assets/Scripts/Orbs/HealOrb.cs +++ b/Assets/Scripts/Orbs/HealOrb.cs @@ -7,6 +7,7 @@ public class HealOrb : MonoBehaviour { public PlayerHealth playerHealth; public GameObject player; + public StatsManager stats; bool playerInRange; private void Awake() @@ -40,6 +41,10 @@ public class HealOrb : MonoBehaviour public void Heal() { + GameObject player = GameObject.FindGameObjectWithTag("Player"); + if (player) stats = player.GetComponent<StatsManager>(); + if (stats) stats.addOrbsCollected(); + int healAmount = (int) (0.2 * playerHealth.startingHealth); playerHealth.HealHealth(healAmount); diff --git a/Assets/Scripts/Orbs/SpeedOrb.cs b/Assets/Scripts/Orbs/SpeedOrb.cs index 45223e0171b7eab68481cbddd08a5a7abfdd2940..dd479b8094c0085ad9e8851844e7f7cade64d793 100644 --- a/Assets/Scripts/Orbs/SpeedOrb.cs +++ b/Assets/Scripts/Orbs/SpeedOrb.cs @@ -7,6 +7,7 @@ public class SpeedOrb : MonoBehaviour { public PlayerMovement playerMovement; public GameObject player; + public StatsManager stats; bool playerInRange; private void Awake() @@ -36,6 +37,10 @@ public class SpeedOrb : MonoBehaviour public void Speed() { + GameObject player = GameObject.FindGameObjectWithTag("Player"); + if (player) stats = player.GetComponent<StatsManager>(); + if (stats) stats.addOrbsCollected(); + playerMovement.SpeedBoost(); Destroy(gameObject); }