Cutsceeens

This commit is contained in:
Bruno Rybársky 2021-07-24 12:38:43 +02:00
parent 1c5be0cda2
commit d739b54515
82 changed files with 36952 additions and 64 deletions

18343
Assets/Scenes/Intro.unity Normal file

File diff suppressed because it is too large Load Diff

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5cbd3a8b8a4a6a54ab389a053f302e37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -6766,7 +6766,7 @@ MonoBehaviour:
bottom: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
controller: {fileID: 685738186}
sfx: {fileID: 1823422550}
runspeed: 40
runspeed: 12
--- !u!212 &685738188
SpriteRenderer:
m_ObjectHideFlags: 0

@ -1015,7 +1015,7 @@ MonoBehaviour:
bottom: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
controller: {fileID: 685738186}
sfx: {fileID: 1823422550}
runspeed: 60
runspeed: 12
--- !u!212 &685738188
SpriteRenderer:
m_ObjectHideFlags: 0

@ -1271,7 +1271,7 @@ MonoBehaviour:
bottom: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
controller: {fileID: 685738186}
sfx: {fileID: 1823422550}
runspeed: 60
runspeed: 12
--- !u!212 &685738188
SpriteRenderer:
m_ObjectHideFlags: 0

@ -6834,7 +6834,7 @@ MonoBehaviour:
bottom: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
controller: {fileID: 685738186}
sfx: {fileID: 1823422550}
runspeed: 60
runspeed: 12
--- !u!212 &685738188
SpriteRenderer:
m_ObjectHideFlags: 0

@ -71194,7 +71194,7 @@ MonoBehaviour:
bottom: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
controller: {fileID: 685738186}
sfx: {fileID: 1823422550}
runspeed: 60
runspeed: 12
--- !u!212 &685738188
SpriteRenderer:
m_ObjectHideFlags: 0
@ -177665,7 +177665,7 @@ MonoBehaviour:
target: {fileID: 8300000, guid: a2756462c48e9164db32d5b1cd8d4d56, type: 3}
sfx: {fileID: 1823422550}
circ: {fileID: 1750757247}
nextScene: Finish
nextScene: Outro
--- !u!212 &1750757250
SpriteRenderer:
m_ObjectHideFlags: 0

17658
Assets/Scenes/Outro.unity Normal file

File diff suppressed because it is too large Load Diff

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 88fa1555ffa01c34f958334cce8ef6fe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -296,7 +296,7 @@ MonoBehaviour:
bottom: {fileID: 6200000, guid: 2c0538ecede9d3b43867ca45f72ba04b, type: 2}
controller: {fileID: 4766648}
sfx: {fileID: 517709047}
runspeed: 60
runspeed: 12
--- !u!212 &4766650
SpriteRenderer:
m_ObjectHideFlags: 0
@ -30739,7 +30739,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: -44.6, y: -10.98}
m_AnchoredPosition: {x: -47.37, y: -12.64}
m_SizeDelta: {x: 20, y: 4.4791}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &381871073
@ -30762,7 +30762,10 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: You play as this UFO which is trying to get to his house.
m_text: 'You play as this UFO which is trying to get to a repair center.
Only
half of his backup engines are working...'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: ef325a480290fa14fba489996636a572, type: 2}
m_sharedMaterial: {fileID: -8345311776861960751, guid: ef325a480290fa14fba489996636a572, type: 2}
@ -30825,7 +30828,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: -5.263632, y: 0, z: -1.4657669, w: -0.66926813}
m_margin: {x: -8.30945, y: 0, z: -8.595764, w: 0.71519756}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
@ -37048,7 +37051,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: -43.5, y: -1.26}
m_AnchoredPosition: {x: -43.2, y: 1.86}
m_SizeDelta: {x: 20, y: 4.4791}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &742189227

@ -0,0 +1,49 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class Intro_player : MonoBehaviour
{
public Animator animator;
public AudioSource sfx;
public AudioSource EngineSfx;
public ParticleSystem explosion;
public ParticleSystem engine;
public Rigidbody2D rb;
public bool crashed;
private void OnCollisionEnter2D (Collision2D collisionInfo)
{
if (collisionInfo.collider.name == "Planet") {
animator.SetBool("crashed", true);
crashed = true;
explosion.Play();
sfx.Play();
engine.Stop();
EngineSfx.Stop();
}
}
// Update is called once per frame
void Update()
{
Vector3 targetVelocity = rb.velocity;
if(!crashed){
targetVelocity[0] = 12f;
targetVelocity[1] = 0f;
}
else{
targetVelocity[0] = 0f;
targetVelocity[1] = 0f;
StartCoroutine(Example());
}
rb.velocity = targetVelocity;
}
IEnumerator Example()
{
yield return new WaitForSecondsRealtime(2);
SceneManager.LoadScene("Tutorial");
}
}

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b6c1bdac27d30ce469e733fba929f79a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -23,7 +23,7 @@ public class MenuPlay : MonoBehaviour
if(Physics2D.CircleCast(mouse.pos, 1f, Vector2.zero, 0f, contactFilter)){
if (Input.GetMouseButtonDown(0)){
sfx.Play();
SceneManager.LoadScene("Tutorial");
SceneManager.LoadScene("Intro");
}
previous_hover = hover;

@ -0,0 +1,57 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class Outro_Player : MonoBehaviour
{
public AudioSource enginesfx;
public ParticleSystem engine;
public Rigidbody2D rb;
public bool running = false;
// Start is called before the first frame update
void Start()
{
StartCoroutine(starting());
}
// Update is called once per frame
void Update()
{
Vector3 targetVelocity = rb.velocity;
if(running){
targetVelocity[0] = 0f;
targetVelocity[1] = 12f;
}
else{
targetVelocity[0] = 0f;
targetVelocity[1] = 0f;
}
rb.velocity = targetVelocity;
}
IEnumerator starting()
{
yield return new WaitForSecondsRealtime(3f);
engine.Play();
enginesfx.Play();
yield return new WaitForSecondsRealtime(1f);
engine.Stop();
enginesfx.Stop();
yield return new WaitForSecondsRealtime(3f);
engine.Play();
enginesfx.Play();
yield return new WaitForSecondsRealtime(2f);
engine.Stop();
enginesfx.Stop();
yield return new WaitForSecondsRealtime(3f);
engine.Play();
running = true;
enginesfx.Play();
yield return new WaitForSecondsRealtime(5f);
SceneManager.LoadScene("Finish");
}
}

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ec2edaeb6f39a1941815b5026576c858
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -69,7 +69,7 @@ public class PlayerControls : MonoBehaviour
}
void FixedUpdate(){
controller.Move(horizonatalaxis * runspeed * 10f * Time.fixedDeltaTime, jumping);
controller.Move(horizonatalaxis * runspeed, jumping);
}
}

BIN
Assets/Sounds/Music/Outro.mp3 (Stored with Git LFS) Normal file

Binary file not shown.

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 56095047d4a46a34e9f7a89925a96297
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sounds/Music/intro.mp3 (Stored with Git LFS) Normal file

Binary file not shown.

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: d0d2e9d82a74e5149811fee2d27e5bd4
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sounds/SFX/engine.wav (Stored with Git LFS) Normal file

Binary file not shown.

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: e8da8d1a678ae1d4aafc408300731172
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sounds/SFX/explosion.wav (Stored with Git LFS) Normal file

Binary file not shown.

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: e588f2dc71a797e4e9f717b9aaa9e83c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sprites/Background/star.png (Stored with Git LFS) Normal file

Binary file not shown.

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: 98857c0b16f5beb4cb459274fed54004
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 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: 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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a9705f5705c947348a26142b3442b9f9
guid: 517cabe74d04a9f47a8a284f431878be
folderAsset: yes
DefaultImporter:
externalObjects: {}

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 579710de231dcf84482936748be2bb56
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sprites/Level/Intro/planet.png (Stored with Git LFS) Normal file

Binary file not shown.

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: c8b02497c7004c24584a38c63eaa7c97
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 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: 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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,185 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-8931488373452117918
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7392692093133997801}
m_Position: {x: 370, y: -100, z: 0}
- serializedVersion: 1
m_State: {fileID: 8372169896440642067}
m_Position: {x: 260, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -4552532101016508153}
m_Position: {x: 610, y: -100, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8372169896440642067}
--- !u!1102 &-4552532101016508153
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: aftxplsion
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6582df791da789445901d07fa3387a5e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-3763167526240408798
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4552532101016508153}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.28571433
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerI
serializedVersion: 5
m_AnimatorParameters:
- m_Name: crashed
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -8931488373452117918}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &7392692093133997801
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: xplosion
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3763167526240408798}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: dcd89dd498d29fa42a39d65985cf7125, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &7638605992584346620
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: crashed
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7392692093133997801}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.5833334
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8372169896440642067
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: right
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7638605992584346620}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: db1bb8e7ff2b516419c85be380bd5396, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 315a6347dbf66684eac4b4c7bb476d84
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-4390536315944769961
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2822201223567042610}
m_Position: {x: 380, y: 30, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -2822201223567042610}
--- !u!1102 &-2822201223567042610
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c18944e0c1eb9114694bc2621556a9e1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlayerO
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -4390536315944769961}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1b25e7b3856b7da41b062011e4b542e6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 12906c617e352dd47aa4d0554b16d966
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: aftxplsion
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6582df791da789445901d07fa3387a5e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,86 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: xplosion
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 1ec3af065737c60458c0ed60325e29c3, type: 3}
- time: 0.05
value: {fileID: 21300000, guid: 5697a7c269a378046baa62a88ba82a7a, type: 3}
- time: 0.1
value: {fileID: 21300000, guid: ac425c9cfc8f3654a860c81416c78738, type: 3}
- time: 0.15
value: {fileID: 21300000, guid: 7c1f11346f5e5f146816a76f42869279, type: 3}
- time: 0.2
value: {fileID: 21300000, guid: 91ebb94f12ca3a34ebd076ea1db0e7db, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: dafbdfec60072ec4695b2a7543ced910, type: 3}
- time: 0.3
value: {fileID: 21300000, guid: ac67f2be9b0934c45a592005fd479b77, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 20
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 1ec3af065737c60458c0ed60325e29c3, type: 3}
- {fileID: 21300000, guid: 5697a7c269a378046baa62a88ba82a7a, type: 3}
- {fileID: 21300000, guid: ac425c9cfc8f3654a860c81416c78738, type: 3}
- {fileID: 21300000, guid: 7c1f11346f5e5f146816a76f42869279, type: 3}
- {fileID: 21300000, guid: 91ebb94f12ca3a34ebd076ea1db0e7db, type: 3}
- {fileID: 21300000, guid: dafbdfec60072ec4695b2a7543ced910, type: 3}
- {fileID: 21300000, guid: ac67f2be9b0934c45a592005fd479b77, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.35000002
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dcd89dd498d29fa42a39d65985cf7125
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

@ -26,7 +26,7 @@ AnimationClip:
- time: 0.2
value: {fileID: 21300000, guid: 7c1f11346f5e5f146816a76f42869279, type: 3}
- time: 0.3
value: {fileID: 21300000, guid: dafbdfec60072ec4695b2a7543ced910, type: 3}
value: {fileID: 21300000, guid: 5697a7c269a378046baa62a88ba82a7a, type: 3}
- time: 0.4
value: {fileID: 21300000, guid: ac425c9cfc8f3654a860c81416c78738, type: 3}
- time: 0.5
@ -53,7 +53,7 @@ AnimationClip:
- {fileID: 21300000, guid: 5697a7c269a378046baa62a88ba82a7a, type: 3}
- {fileID: 21300000, guid: e44ed79d4aba10d41873c12c86e77a60, type: 3}
- {fileID: 21300000, guid: 7c1f11346f5e5f146816a76f42869279, type: 3}
- {fileID: 21300000, guid: dafbdfec60072ec4695b2a7543ced910, type: 3}
- {fileID: 21300000, guid: 5697a7c269a378046baa62a88ba82a7a, type: 3}
- {fileID: 21300000, guid: ac425c9cfc8f3654a860c81416c78738, type: 3}
- {fileID: 21300000, guid: 91ebb94f12ca3a34ebd076ea1db0e7db, type: 3}
m_AnimationClipSettings:

@ -8,6 +8,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Menu.unity
guid: 95c395cb7cc37b44ba088a26824e05d4
- enabled: 1
path: Assets/Scenes/Intro.unity
guid: 5cbd3a8b8a4a6a54ab389a053f302e37
- enabled: 1
path: Assets/Scenes/Tutorial.unity
guid: 32640dac989b482479f83e6642cc0f21
@ -29,6 +32,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Level6.unity
guid: 6294a52e7a5bf7644a9a2a4ffe5f463c
- enabled: 1
path: Assets/Scenes/Outro.unity
guid: 88fa1555ffa01c34f958334cce8ef6fe
- enabled: 1
path: Assets/Scenes/Finish.unity
guid: ebcc423186b359f4d801704ac9ea3cfb

@ -12,7 +12,7 @@ TagManager:
- Water
- UI
- Player
-
- Background
-
-
-

@ -6,58 +6,31 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-1:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c731500121478623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c731500121479623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c73150012147f623d28393930
=======
value: 22424703114646680e0b0227036c73150012147b623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c731500121478623d28393930
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-5:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c7919181e0b22623d28393930
=======
value: 22424703114646680e0b0227036c731500121479623d28393930
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
flags: 0
RecentlyUsedScenePath-7:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c73150012147b623d28393930
=======
value: 22424703114646680e0b0227036c7919181e0b22623d28393930
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c73150012147e623d28393930
flags: 0
RecentlyUsedScenePath-9:
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c731500121479623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c731500121478623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c73150012147b623d28393930
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c72151802563f22213229
flags: 0
UnityRemoteCompression:
value: 337f73
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c761e0205176439262f2434
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c70050205176439262f2434
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650

@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 1