ld42/bleach-beach
ld42/bleach-beach
1
Fork 0
mirror of https://github.com/Steffo99/bleach-beach.git synced 2024-12-04 19:04:19 +00:00
Code Activity

Fix animation

Browse source
This commit is contained in:
Steffo 2018-08-12 16:53:14 +02:00
parent cd5be643ef
commit 094fb7b1b0
11 changed files with 402 additions and 507 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Assets/Animations/Fish.anim
View file

@ -16,21 +16,39 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 13b9b471ab4f9bf4b9fbf69db9962f28, type: 3}
- time: 0.083333336
value: {fileID: 21300000, guid: 5196555e6d71c154a926591247bbc9ae, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: []
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 13b9b471ab4f9bf4b9fbf69db9962f28, type: 3}
- {fileID: 21300000, guid: 5196555e6d71c154a926591247bbc9ae, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 0.16666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0

60
Assets/Animations/Fish.controller
View file

@ -8,4 +8,62 @@ AnimatorController:
m_Name: Fish
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107005836622274080}
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 &1102423236165572208
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Fish
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: e205bc343f188294b9b6d0b3237935f4, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107005836622274080
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102423236165572208}
m_Position: {x: 252, y: 120, 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: 1102423236165572208}

206
Assets/Animations/Image.controller
View file

@ -1,206 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Image
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Fade
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: 1107632156456390720}
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!1101 &1101297225407363970
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101333426504373366
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Fade
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102621835447936306}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101337476910680204
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102132594972050264}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101491124873253358
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102132594972050264
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: FadeOut
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101333426504373366}
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: 11e951955754b0743a4f2725e76a077f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102621835447936306
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: FadeIn
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101297225407363970}
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: 7d359f62ed877f14ca19beac28f46c3f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107632156456390720
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102132594972050264}
m_Position: {x: 252, y: 12, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102621835447936306}
m_Position: {x: 372, y: 108, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions:
- {fileID: 1109416943451025996}
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 48, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102132594972050264}
--- !u!1109 &1109416943451025996
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102132594972050264}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1

8
Assets/Animations/Image.controller.meta generated
View file

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

13
Assets/Prefabs/Ship.prefab generated
View file

@ -38,6 +38,7 @@ GameObject:
- component: {fileID: 4279439219186522}
- component: {fileID: 50107883579770240}
- component: {fileID: 114893472868460232}
- component: {fileID: 114815898204907146}
m_Layer: 8
m_Name: Ship
m_TagString: Player
@ -180,6 +181,18 @@ PolygonCollider2D:
- {x: 0.78310096, y: -0.51465136}
- {x: 1.3078427, y: 0.32390344}
- {x: -1.2722943, y: 0.3283955}
--- !u!114 &114815898204907146
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1506768218425990}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e1de68aef1b6a89419a36f3455e25bf3, type: 3}
m_Name:
m_EditorClassIdentifier:
fishCaught: 0
--- !u!114 &114893472868460232
MonoBehaviour:
m_ObjectHideFlags: 1

125
Assets/Scenes/Game.unity generated
View file

@ -209,11 +209,6 @@ Prefab:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.size
value: 265
objectReference: {fileID: 0}
- target: {fileID: 4023639078503100, guid: 0514a38f22bae454d821a12517a141c4, type: 2}
propertyPath: m_LocalPosition.x
value: 0
@ -246,106 +241,6 @@ Prefab:
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[258].y
value: -23.321346
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[258].x
value: -49.972443
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[255].y
value: 55.055428
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[255].x
value: 50.008274
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[256].x
value: 50.191864
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[256].y
value: 55.6062
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[257].x
value: 50.683697
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[257].y
value: -24.33369
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[259].x
value: -52.564972
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[259].y
value: 58.340706
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[260].x
value: 50.177364
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[260].y
value: 55.705566
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[261].x
value: 51.006096
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[261].y
value: 56.45051
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[262].x
value: 49.914623
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[262].y
value: 57.248528
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[263].x
value: -50.21778
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[263].y
value: 56.741875
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[264].x
value: -49.91083
objectReference: {fileID: 0}
- target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4,
type: 2}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[264].y
value: 20.208763
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0514a38f22bae454d821a12517a141c4, type: 2}
m_IsPrefabAsset: 0
@ -388,10 +283,6 @@ Prefab:
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
propertyPath: m_LocalPosition.y
value: -0.02
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
m_IsPrefabAsset: 0
@ -436,14 +327,9 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20,
type: 2}
propertyPath: spawnTime
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20,
type: 2}
propertyPath: randomFactor
value: 0.2
objectReference: {fileID: 0}
propertyPath: sea
value:
objectReference: {fileID: 2008841353}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2}
m_IsPrefabAsset: 0
@ -494,3 +380,8 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 1406564692}
--- !u!1 &2008841353 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1259758189242624, guid: 4dc0408b236da9847b1c799161bbd70a,
type: 2}
m_PrefabInternal: {fileID: 994904156}

418
Assets/Scenes/MainMenu.unity generated
View file

@ -113,6 +113,92 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &215901068
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 215901072}
- component: {fileID: 215901071}
- component: {fileID: 215901070}
- component: {fileID: 215901069}
m_Layer: 8
m_Name: Ship
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &215901069
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 114815898204907146, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 215901068}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e1de68aef1b6a89419a36f3455e25bf3, type: 3}
m_Name:
m_EditorClassIdentifier:
fishCaught: 0
--- !u!114 &215901070
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 114893472868460232, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 215901068}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 91d88e1722c056f47a710df9123b44a9, type: 3}
m_Name:
m_EditorClassIdentifier:
hull: {fileID: 757881493}
horizontalShipSpeed: 5
verticalShipSpeed: 30
maxJetFuel: 2
jetFuelRechargeSpeed: 0.1
--- !u!50 &215901071
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 50107883579770240, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 215901068}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 2
m_LinearDrag: 1
m_AngularDrag: 1
m_GravityScale: 1
m_Material: {fileID: 6200000, guid: 704f912fbe8bba74ebedd5a5f7bff08f, type: 2}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!4 &215901072
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 215901068}
m_LocalRotation: {x: -0, y: -0, z: 0.049957126, w: -0.99875134}
m_LocalPosition: {x: -14.61, y: 9.41, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 757881496}
- {fileID: 891569523}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.727}
--- !u!1 &366541447
GameObject:
m_ObjectHideFlags: 0
@ -176,7 +262,7 @@ Canvas:
m_GameObject: {fileID: 366541447}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
@ -185,7 +271,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingLayerID: 785011415
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &366541451
@ -196,17 +282,17 @@ RectTransform:
m_GameObject: {fileID: 366541447}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2033480560}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
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_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &650713241
GameObject:
m_ObjectHideFlags: 0
@ -259,7 +345,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &670477758
GameObject:
@ -290,7 +376,7 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -9.650415, y: -0.44705772}
m_Offset: {x: 13.7, y: -0.44705772}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@ -301,7 +387,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 19.925472, y: 40.10512}
m_Size: {x: 8.27, y: 69.63}
m_EdgeRadius: 0
--- !u!4 &670477760
Transform:
@ -310,11 +396,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 670477758}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 29.7, y: 0.4, z: -50.34375}
m_LocalPosition: {x: 11.6, y: 0.4, z: -50.34375}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &670477761
MonoBehaviour:
@ -328,7 +414,145 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
image: {fileID: 2033480561}
animator: {fileID: 2033480563}
fade: {fileID: 2033480559}
--- !u!1 &757881493
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 1396569450907664, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 757881496}
- component: {fileID: 757881495}
- component: {fileID: 757881494}
m_Layer: 8
m_Name: Hull
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!60 &757881494
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 60759684842668732, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 757881493}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 2.68, y: 1.3}
newSize: {x: 1.34, y: 0.65}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: -1.2726313, y: -0.5143094}
- {x: 0.78310096, y: -0.51465136}
- {x: 1.3078427, y: 0.32390344}
- {x: -1.2722943, y: 0.3283955}
--- !u!212 &757881495
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 212928515413584804, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 757881493}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 1f841006c9147454d8eca3d3cae86c0f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.34, y: 0.65}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &757881496
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 4419769467158982, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 757881493}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.245, y: -0.382, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 215901072}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &891569522
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 1707044546218068, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 891569523}
m_Layer: 8
m_Name: Fish Pile
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &891569523
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 4811992088834386, guid: 1cf703958a669d942a42326499701367,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 891569522}
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_Children: []
m_Father: {fileID: 215901072}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &922617565
GameObject:
m_ObjectHideFlags: 0
@ -381,7 +605,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &984464199
GameObject:
@ -450,7 +674,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2}
propertyPath: m_LocalPosition.y
value: 0.66
value: -10.91
objectReference: {fileID: 0}
- target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2}
propertyPath: m_LocalPosition.z
@ -481,6 +705,26 @@ Prefab:
propertyPath: target
value:
objectReference: {fileID: 0}
- target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27,
type: 2}
propertyPath: limitFirstCorner.x
value: -1000
objectReference: {fileID: 0}
- target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27,
type: 2}
propertyPath: limitFirstCorner.y
value: -1000
objectReference: {fileID: 0}
- target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27,
type: 2}
propertyPath: limitSecondCorner.x
value: 1000
objectReference: {fileID: 0}
- target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27,
type: 2}
propertyPath: limitSecondCorner.y
value: 1000
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: acb6270a21e7fa744878210a4df90d27, type: 2}
m_IsPrefabAsset: 0
@ -527,154 +771,14 @@ Prefab:
propertyPath: m_Name
value: Sea
objectReference: {fileID: 0}
- target: {fileID: 4769752010558754, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
propertyPath: m_LocalScale.x
value: 0.5828812
objectReference: {fileID: 0}
- target: {fileID: 114441698435220922, guid: 4dc0408b236da9847b1c799161bbd70a,
type: 2}
propertyPath: speed
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4769752010558754, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
propertyPath: m_LocalScale.y
value: 1.3323
objectReference: {fileID: 0}
- target: {fileID: 4769752010558754, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
propertyPath: m_LocalScale.z
value: 1.3323
objectReference: {fileID: 0}
- target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
propertyPath: m_LocalPosition.x
value: -3.3248
objectReference: {fileID: 0}
- target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
propertyPath: m_LocalScale.x
value: 1.975
objectReference: {fileID: 0}
- target: {fileID: 4108515592884750, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
propertyPath: m_LocalPosition.y
value: -0.37
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &1375928277
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalPosition.x
value: -14.61
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalPosition.y
value: 9.41
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalRotation.z
value: 0.049957126
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalRotation.w
value: -0.99875134
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_LocalEulerAnglesHint.z
value: -5.727
objectReference: {fileID: 0}
- target: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, type: 2}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &1377091584
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1377091586}
- component: {fileID: 1377091585}
m_Layer: 0
m_Name: RightCollider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!61 &1377091585
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1377091584}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 8.281294}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 54.11301}
m_EdgeRadius: 0
--- !u!4 &1377091586
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1377091584}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 30.54, y: -1.3, z: -50.34375}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2033480559
GameObject:
m_ObjectHideFlags: 0
@ -708,8 +812,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -2, y: -32}
m_SizeDelta: {x: -1340, y: -538}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2033480561
MonoBehaviour:
@ -823,5 +927,5 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

4
Assets/Scripts/Cannon.cs
View file

@ -20,13 +20,13 @@ public class Cannon : MonoBehaviour {
}
private void Update ()
{
if (harpoonAvailable)
{
Vector2 screenPosition = Camera.main.WorldToScreenPoint(transform.position);
Vector2 direction = (Vector2)Input.mousePosition - screenPosition;
transform.rotation = Quaternion.LookRotation(Vector3.forward, direction);
spriteRenderer.flipX = direction.x < 0;
if (harpoonAvailable)
{
if (Input.GetMouseButton(0))
{
force = Mathf.Clamp(force + forceBuildingSpeed * Time.deltaTime, 0, maxForce);

3
Assets/Scripts/FollowGameObject.cs
View file

@ -9,6 +9,8 @@ public class FollowGameObject : MonoBehaviour {
public Vector2 limitSecondCorner;
void Update () {
if (target != null)
{
transform.position = new Vector3(
Mathf.Clamp(target.transform.position.x, limitFirstCorner.x, limitSecondCorner.x),
Mathf.Clamp(target.transform.position.y, limitFirstCorner.y, limitSecondCorner.y),
@ -16,3 +18,4 @@ public class FollowGameObject : MonoBehaviour {
);
}
}
}

21
Assets/Scripts/GameStarter.cs
View file

@ -2,14 +2,29 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class GameStarter : MonoBehaviour {
public Image image;
public Animator animator;
public GameObject fade;
private Animator animator;
private void Start()
{
animator = fade.GetComponent<Animator>();
}
private void Update()
{
if (animator.GetBool("Finished"))
{
SceneManager.LoadScene("Game");
}
}
void OnTriggerEnter2D(Collider2D GameStart)
{
animator.SetBool("Fade", false);
Application.LoadLevel(1);
animator.SetBool("Fade", true);
}
}

9
ProjectSettings/TagManager.asset generated
View file

@ -3,7 +3,8 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
tags: []
tags:
- Fish
layers:
- Default
- TransparentFX
@ -38,6 +39,9 @@ TagManager:
-
-
m_SortingLayers:
- name: Particles
uniqueID: 3614082125
locked: 0
- name: Default
uniqueID: 0
locked: 0
@ -47,3 +51,6 @@ TagManager:
- name: Cannon
uniqueID: 2724917297
locked: 0
- name: Fade
uniqueID: 785011415
locked: 0