From 97e7944ebb97b001731509961b19548c9dfb4236 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 13 Aug 2018 16:53:11 +0200 Subject: [PATCH] Add fish stealing --- Assets/Animations/Bass.anim | 71 ++++++ Assets/Animations/Bass.anim.meta | 8 + Assets/Animations/bass1.controller | 69 ++++++ Assets/Animations/bass1.controller.meta | 8 + Assets/Prefabs/Camera.prefab | 4 +- Assets/Prefabs/Enemy.prefab | 80 +++--- Assets/Prefabs/Fish.prefab | 6 +- Assets/Prefabs/Ship.prefab | 32 ++- Assets/Prefabs/Terrain.prefab | 21 ++ Assets/Scenes/Game.unity | 229 +++++------------- Assets/Scripts/EnemyShipAi.cs | 2 +- Assets/Scripts/FishAi.cs | 4 + Assets/Scripts/FishCatcher.cs | 2 +- Assets/Scripts/FishSpawner.cs | 2 +- Assets/Scripts/Harpoon.cs | 43 +++- ...{copertina big FADED .png => CoverBig.png} | 0 Assets/Sprites/CoverBig.png.meta | 88 +++++++ ...pertina small FADED.png => CoverSmall.png} | 0 Assets/Sprites/CoverSmall.png.meta | 88 +++++++ Assets/Sprites/Fish1.png.meta | 2 +- Assets/Sprites/Fish2.png.meta | 2 +- Assets/Sprites/bolla1.png.meta | 88 +++++++ Assets/Sprites/bolla2.png.meta | 88 +++++++ Assets/Sprites/fiammetta12.png.meta | 88 +++++++ ProjectSettings/EditorBuildSettings.asset | 3 + ProjectSettings/TagManager.asset | 1 + 26 files changed, 815 insertions(+), 214 deletions(-) create mode 100644 Assets/Animations/Bass.anim create mode 100644 Assets/Animations/Bass.anim.meta create mode 100644 Assets/Animations/bass1.controller create mode 100644 Assets/Animations/bass1.controller.meta rename Assets/Sprites/{copertina big FADED .png => CoverBig.png} (100%) create mode 100644 Assets/Sprites/CoverBig.png.meta rename Assets/Sprites/{Copertina small FADED.png => CoverSmall.png} (100%) create mode 100644 Assets/Sprites/CoverSmall.png.meta create mode 100644 Assets/Sprites/bolla1.png.meta create mode 100644 Assets/Sprites/bolla2.png.meta create mode 100644 Assets/Sprites/fiammetta12.png.meta diff --git a/Assets/Animations/Bass.anim b/Assets/Animations/Bass.anim new file mode 100644 index 0000000..6e9a247 --- /dev/null +++ b/Assets/Animations/Bass.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Bass + 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: fd538832d6439684c859c2f6e0dcb3e9, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 8a08060f2b223f843ba2b5993c7730f9, 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: fd538832d6439684c859c2f6e0dcb3e9, type: 3} + - {fileID: 21300000, guid: 8a08060f2b223f843ba2b5993c7730f9, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + 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_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Bass.anim.meta b/Assets/Animations/Bass.anim.meta new file mode 100644 index 0000000..afcc84f --- /dev/null +++ b/Assets/Animations/Bass.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3339d808b025cf3409ff2e6a58b13a0e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/bass1.controller b/Assets/Animations/bass1.controller new file mode 100644 index 0000000..a199718 --- /dev/null +++ b/Assets/Animations/bass1.controller @@ -0,0 +1,69 @@ +%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: bass1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107344191363111560} + 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 &1102242371471254512 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Bass + 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: 3339d808b025cf3409ff2e6a58b13a0e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107344191363111560 +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: 1102242371471254512} + m_Position: {x: 200, y: 0, 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: 1102242371471254512} diff --git a/Assets/Animations/bass1.controller.meta b/Assets/Animations/bass1.controller.meta new file mode 100644 index 0000000..abebd0d --- /dev/null +++ b/Assets/Animations/bass1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a041259541bef6848b7842078800464f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Camera.prefab b/Assets/Prefabs/Camera.prefab index 8faaa9b..b03fc87 100644 --- a/Assets/Prefabs/Camera.prefab +++ b/Assets/Prefabs/Camera.prefab @@ -51,7 +51,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} + m_BackGroundColor: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 0} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} @@ -100,6 +100,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fd512583b04cd7946b3a98cb56ce031c, type: 3} m_Name: m_EditorClassIdentifier: - target: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, type: 2} + target: {fileID: 0} limitFirstCorner: {x: -29.5, y: 7} limitSecondCorner: {x: 30, y: 50} diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index ed9d45d..e1b9e32 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -31,15 +31,16 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1437013688705742 +--- !u!1 &1916503929201496 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: - - component: {fileID: 4114672742814982} - - component: {fileID: 212723113996758088} + - component: {fileID: 4636126680252624} + - component: {fileID: 212334857738858528} + - component: {fileID: 61935106545931236} m_Layer: 9 m_Name: Fish Pile m_TagString: Fish @@ -57,18 +58,18 @@ Transform: m_LocalPosition: {x: -82.64991, y: -29.3563, z: 0.40207273} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4114672742814982} + - {fileID: 4636126680252624} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4114672742814982 +--- !u!4 &4636126680252624 Transform: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1437013688705742} + m_GameObject: {fileID: 1916503929201496} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.379, y: 0.058, z: 0} + m_LocalPosition: {x: 0.491, y: 0.029, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4056561897088050} @@ -110,7 +111,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 2.28, y: 0.82} + oldSize: {x: 2.85, y: 1.025} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -118,20 +119,45 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 1.0215378, y: 0.2429924} - - {x: 0.7562485, y: 0.2443695} - - {x: 0.6318512, y: 0.04626465} - - {x: 0.21186829, y: 0.050930023} - - {x: -0.035362244, y: 0.39256287} - - {x: -0.6863022, y: 0.3929062} - - {x: -0.855896, y: 0.247612} - - {x: -1.1314468, y: 0.06403732} - - {x: -0.9704056, y: -0.14984131} - - {x: -0.69023895, y: -0.3472557} - - {x: 0.49145508, y: -0.3515396} - - {x: 0.70632935, y: -0.09444809} - - {x: 1.1383896, y: 0.024600983} - - {x: 1.1399994, y: 0.14811325} + - - {x: 1.2900238, y: 0.31887054} + - {x: 0.9722061, y: 0.32024765} + - {x: 0.7836075, y: 0.057937622} + - {x: 0.24105072, y: 0.05676651} + - {x: -0.044273376, y: 0.49213028} + - {x: -0.8617325, y: 0.4927559} + - {x: -1.3989182, y: 0.06415939} + - {x: -1.1805267, y: -0.21988297} + - {x: -0.8536606, y: -0.45231628} + - {x: -0.35486603, y: -0.44492722} + - {x: 0.62461853, y: -0.43881226} + - {x: 0.910759, y: -0.10964584} + - {x: 1.414444, y: 0.04896164} + - {x: 1.4201584, y: 0.18896866} +--- !u!61 &61935106545931236 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1916503929201496} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.25} + 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: 0.61, y: 0.46} + m_EdgeRadius: 0 --- !u!114 &114122030605112200 MonoBehaviour: m_ObjectHideFlags: 1 @@ -153,8 +179,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 69cfde8a6e90b4e4f875f925ecdf4ead, type: 3} - {fileID: 21300000, guid: ab4f5ce491a45fa4ba43f2e031b26bd1, type: 3} - {fileID: 21300000, guid: 2749b8097b8dea44b91b5119d5cfd775, type: 3} - fishPileStages: 01000000020000000300000004000000050000000600000007000000 - fishPile: {fileID: 1437013688705742} + fishPileStages: 010000000200000003000000040000000a0000001100000019000000 + fishPile: {fileID: 1916503929201496} --- !u!114 &114327601929205558 MonoBehaviour: m_ObjectHideFlags: 1 @@ -167,7 +193,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maximumDistanceFromFish: 1 - timeBeforeChangingTarget: 10 + timeBeforeChangingTarget: 5 horizontalSpeed: 5 verticalSpeed: 17 shootForce: 5 @@ -175,12 +201,12 @@ MonoBehaviour: harpoonAvailable: 1 maxJetFuel: 2 jetFuelRechargeSpeed: 0.1 ---- !u!212 &212723113996758088 +--- !u!212 &212334857738858528 SpriteRenderer: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1437013688705742} + m_GameObject: {fileID: 1916503929201496} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 diff --git a/Assets/Prefabs/Fish.prefab b/Assets/Prefabs/Fish.prefab index 233e15a..9f3b2b1 100644 --- a/Assets/Prefabs/Fish.prefab +++ b/Assets/Prefabs/Fish.prefab @@ -38,7 +38,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1615301965237016} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.22, y: 28.15, z: 0} + m_LocalPosition: {x: -20.15, y: 3.76, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -80,7 +80,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.24, y: 0.76} + oldSize: {x: 0.62, y: 0.38} newSize: {x: 0.62, y: 0.38} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -121,6 +121,8 @@ MonoBehaviour: timeBetweenDirectionChanges: 2 speed: 1 hook: {fileID: 0} + sea: {fileID: 0} + targetedBy: {fileID: 0} --- !u!212 &212894136892818758 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Ship.prefab b/Assets/Prefabs/Ship.prefab index 317ff80..36a3b02 100644 --- a/Assets/Prefabs/Ship.prefab +++ b/Assets/Prefabs/Ship.prefab @@ -55,6 +55,7 @@ GameObject: m_Component: - component: {fileID: 4811992088834386} - component: {fileID: 212513540302985290} + - component: {fileID: 61023326388071292} m_Layer: 8 m_Name: Fish Pile m_TagString: Fish @@ -86,7 +87,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1506768218425990} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.27, y: 42.06, z: 0} + m_LocalPosition: {x: 3.83, y: 37.79, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4419769467158982} @@ -115,7 +116,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1707044546218068} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.91920006, y: 0.3961983, z: 0} + m_LocalPosition: {x: -0.91920006, y: 0.332, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4419769467158982} @@ -182,6 +183,31 @@ PolygonCollider2D: - {x: 0.78310096, y: -0.51465136} - {x: 1.3078427, y: 0.32390344} - {x: -1.2722943, y: 0.3283955} +--- !u!61 &61023326388071292 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1707044546218068} + 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.25} + 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: 0.61, y: 0.46} + m_EdgeRadius: 0 --- !u!114 &114815898204907146 MonoBehaviour: m_ObjectHideFlags: 1 @@ -203,7 +229,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 69cfde8a6e90b4e4f875f925ecdf4ead, type: 3} - {fileID: 21300000, guid: ab4f5ce491a45fa4ba43f2e031b26bd1, type: 3} - {fileID: 21300000, guid: 2749b8097b8dea44b91b5119d5cfd775, type: 3} - fishPileStages: 01000000020000000300000004000000050000000600000007000000 + fishPileStages: 010000000200000003000000040000000a0000001100000019000000 fishPile: {fileID: 1707044546218068} --- !u!114 &114893472868460232 MonoBehaviour: diff --git a/Assets/Prefabs/Terrain.prefab b/Assets/Prefabs/Terrain.prefab index 89f2c75..4e8b241 100644 --- a/Assets/Prefabs/Terrain.prefab +++ b/Assets/Prefabs/Terrain.prefab @@ -21,6 +21,7 @@ GameObject: - component: {fileID: 4023639078503100} - component: {fileID: 212998951973022566} - component: {fileID: 60970885189888988} + - component: {fileID: 50624838385847748} m_Layer: 0 m_Name: Terrain m_TagString: Untagged @@ -41,6 +42,26 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &50624838385847748 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1451878951753834} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 6200000, guid: ff5412443ab09e34591cb119b17ec799, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!60 &60970885189888988 PolygonCollider2D: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 50f53ee..11221e4 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -203,7 +203,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &162431714 stripped Transform: @@ -259,6 +259,9 @@ MonoBehaviour: m_EditorClassIdentifier: startingTime: 240 script: {fileID: 1410052124} + nave1: {fileID: 0} + nave2: {fileID: 0} + nave3: {fileID: 0} --- !u!114 &189120858 MonoBehaviour: m_ObjectHideFlags: 0 @@ -387,7 +390,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4978811670595372, guid: 633eed510cb97614896a65613c2eb772, type: 2} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 633eed510cb97614896a65613c2eb772, type: 2} @@ -485,7 +488,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27, type: 2} @@ -598,7 +601,7 @@ RectTransform: - {fileID: 949267804} - {fileID: 189120856} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -642,11 +645,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4811992088834386, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalPosition.y - value: 0.332 + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2} @@ -739,11 +738,58 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4023639078503100, guid: 0514a38f22bae454d821a12517a141c4, type: 2} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0514a38f22bae454d821a12517a141c4, type: 2} m_IsPrefabAsset: 0 +--- !u!1001 &876330348 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_LocalPosition.x + value: -20.21 + objectReference: {fileID: 0} + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_LocalPosition.y + value: 3.91 + objectReference: {fileID: 0} + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4139569998151354, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114516106445027332, guid: 3b07c51a898a8e342b3d0236ca47bf8c, + type: 2} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3b07c51a898a8e342b3d0236ca47bf8c, type: 2} + m_IsPrefabAsset: 0 --- !u!4 &889744602 stripped Transform: m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, @@ -1465,7 +1511,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1196286370 Prefab: @@ -1504,7 +1550,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} propertyPath: m_LocalScale.x @@ -1667,7 +1713,7 @@ Transform: - {fileID: 2058116047} - {fileID: 449207487} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1597600653 Prefab: @@ -1793,11 +1839,6 @@ Prefab: m_Modification: m_TransformParent: {fileID: 1571656221} m_Modifications: - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.size - value: 14 - objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.x value: -82.64991 @@ -1830,156 +1871,6 @@ Prefab: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[7].x - value: -1.1805267 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[7].y - value: -0.21988297 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[9].x - value: -0.35486603 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[9].y - value: -0.44492722 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[10].x - value: 0.62461853 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[10].y - value: -0.43881226 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[11].x - value: 0.910759 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[11].y - value: -0.10964584 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[12].x - value: 1.414444 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[12].y - value: 0.04896164 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[13].x - value: 1.4201584 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[13].y - value: 0.18896866 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[14].x - value: 1.1399994 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[14].y - value: 0.14811325 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[8].x - value: -0.8536606 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[8].y - value: -0.45231628 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[6].y - value: 0.06415939 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[6].x - value: -1.3989182 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[5].x - value: -0.8617325 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[5].y - value: 0.4927559 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[4].x - value: -0.044273376 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[4].y - value: 0.49213028 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].x - value: 0.24105072 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].y - value: 0.05676651 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].x - value: 0.9722061 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].y - value: 0.32024765 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].y - value: 0.057937622 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].x - value: 0.7836075 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].x - value: 1.2900238 - objectReference: {fileID: 0} - - target: {fileID: 60574383325537906, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].y - value: 0.31887054 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} m_IsPrefabAsset: 0 @@ -2026,7 +1917,7 @@ Transform: - {fileID: 1007771029} - {fileID: 618464446} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2008841353 stripped GameObject: diff --git a/Assets/Scripts/EnemyShipAi.cs b/Assets/Scripts/EnemyShipAi.cs index a3cae9d..c2c16af 100644 --- a/Assets/Scripts/EnemyShipAi.cs +++ b/Assets/Scripts/EnemyShipAi.cs @@ -49,7 +49,7 @@ public class EnemyShipAi : MonoBehaviour { fishAi.targetedBy = gameObject; } } - timeBeforeChangingTarget = 0f; + timeSinceLastTarget = 0f; } } diff --git a/Assets/Scripts/FishAi.cs b/Assets/Scripts/FishAi.cs index 11c6a8c..4df0de2 100644 --- a/Assets/Scripts/FishAi.cs +++ b/Assets/Scripts/FishAi.cs @@ -35,6 +35,10 @@ public class FishAi : MonoBehaviour { { rb.MovePosition(hook.transform.position); } + if(Physics2D.OverlapPoint(transform.position) != GetComponent()) + { + ChangeDirection(); + } } void OnCollisionEnter2D(Collision2D collision) diff --git a/Assets/Scripts/FishCatcher.cs b/Assets/Scripts/FishCatcher.cs index 07e4e85..8c2b985 100644 --- a/Assets/Scripts/FishCatcher.cs +++ b/Assets/Scripts/FishCatcher.cs @@ -41,7 +41,7 @@ public class FishCatcher : MonoBehaviour { { break; } - if (fishCaught > fishPileStages[currentStage]) + if (fishCaught >= fishPileStages[currentStage]) { currentStage++; } diff --git a/Assets/Scripts/FishSpawner.cs b/Assets/Scripts/FishSpawner.cs index 2823d03..3a201d3 100644 --- a/Assets/Scripts/FishSpawner.cs +++ b/Assets/Scripts/FishSpawner.cs @@ -21,7 +21,7 @@ public class FishSpawner : MonoBehaviour { GameObject newFish = Instantiate(fish); newFish.transform.position = transform.position; newFish.GetComponent().sea = sea; - timeToSpawn = Random.Range(spawnTime - randomFactor, spawnTime + randomFactor); + timeToSpawn = Random.Range(spawnTime, spawnTime + randomFactor); } if(transform.position.y > sea.transform.position.y) { diff --git a/Assets/Scripts/Harpoon.cs b/Assets/Scripts/Harpoon.cs index c347321..934bde1 100644 --- a/Assets/Scripts/Harpoon.cs +++ b/Assets/Scripts/Harpoon.cs @@ -5,6 +5,7 @@ using UnityEngine; public class Harpoon : MonoBehaviour { public float returnSpeed = 5f; + public GameObject fish; private Rigidbody2D rb; private bool going = true; @@ -39,8 +40,7 @@ public class Harpoon : MonoBehaviour { rb.MovePosition(Vector3.MoveTowards(transform.position, linker.firstObject.transform.parent.position, returnSpeed * Time.deltaTime)); if(Physics2D.OverlapPoint(transform.position) == linker.firstObject.transform.parent.GetComponent()) { - cannon.harpoonAvailable = true; - Destroy(gameObject); + Invoke("SelfDestruct", 0.1f); } } else @@ -48,9 +48,7 @@ public class Harpoon : MonoBehaviour { rb.MovePosition(Vector3.MoveTowards(transform.position, linker.firstObject.transform.position, returnSpeed * Time.deltaTime)); if(Physics2D.OverlapPoint(transform.position) == linker.firstObject.transform.GetComponent()) { - EnemyShipAi enemyShipAi = linker.firstObject.GetComponent(); - enemyShipAi.harpoonAvailable = true; - Destroy(gameObject); + Invoke("SelfDestruct", 0.1f); } } } @@ -69,8 +67,41 @@ public class Harpoon : MonoBehaviour { } if (collision.gameObject.tag == "Fish") { - collision.gameObject.GetComponent().hook = gameObject; + FishAi fishAi = collision.gameObject.GetComponent(); + fishAi.hook = gameObject; } + } + void OnTriggerEnter2D(Collider2D other) + { + FishCatcher fc = other.gameObject.GetComponentInParent(); + if (fc != null && fc.fishCaught > 0 && other.gameObject.layer != gameObject.layer) + { + fc.LoseFish(); + Invoke("SpawnCaughtFish", 0.1f); + } + } + + void SelfDestruct() + { + Cannon cannon = linker.firstObject.GetComponent(); + if(cannon != null) + { + cannon.harpoonAvailable = true; + } + else + { + EnemyShipAi enemyShipAi = linker.firstObject.GetComponent(); + enemyShipAi.harpoonAvailable = true; + } + Destroy(gameObject); + } + + void SpawnCaughtFish() + { + GameObject newFish = Instantiate(fish); + newFish.transform.position = transform.position; + newFish.GetComponent().sea = GameObject.FindGameObjectWithTag("SeaTextures"); + newFish.GetComponent().hook = gameObject; } } diff --git a/Assets/Sprites/copertina big FADED .png b/Assets/Sprites/CoverBig.png similarity index 100% rename from Assets/Sprites/copertina big FADED .png rename to Assets/Sprites/CoverBig.png diff --git a/Assets/Sprites/CoverBig.png.meta b/Assets/Sprites/CoverBig.png.meta new file mode 100644 index 0000000..0d104b7 --- /dev/null +++ b/Assets/Sprites/CoverBig.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 07c0841a1cd5f3748ad0ac2271ea38d4 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d3c995ba2d0485f45a1292328d08b26a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Copertina small FADED.png b/Assets/Sprites/CoverSmall.png similarity index 100% rename from Assets/Sprites/Copertina small FADED.png rename to Assets/Sprites/CoverSmall.png diff --git a/Assets/Sprites/CoverSmall.png.meta b/Assets/Sprites/CoverSmall.png.meta new file mode 100644 index 0000000..8290c24 --- /dev/null +++ b/Assets/Sprites/CoverSmall.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 0b1df44707049b841b21a113c8a61948 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2bcd052f4896a7b4f8947e01caa2b75f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Fish1.png.meta b/Assets/Sprites/Fish1.png.meta index 536911c..b0aeda1 100644 --- a/Assets/Sprites/Fish1.png.meta +++ b/Assets/Sprites/Fish1.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 32 + spritePixelsToUnits: 50 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/Fish2.png.meta b/Assets/Sprites/Fish2.png.meta index 93863f7..5efff85 100644 --- a/Assets/Sprites/Fish2.png.meta +++ b/Assets/Sprites/Fish2.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 32 + spritePixelsToUnits: 50 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/bolla1.png.meta b/Assets/Sprites/bolla1.png.meta new file mode 100644 index 0000000..76b0bfc --- /dev/null +++ b/Assets/Sprites/bolla1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5459c66f383719c4d861b8356b9669e1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 709c711a051dfe842a89809ff259129a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/bolla2.png.meta b/Assets/Sprites/bolla2.png.meta new file mode 100644 index 0000000..ca69185 --- /dev/null +++ b/Assets/Sprites/bolla2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 0a9e1ec8b9ab52242a9331f76a871d69 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dcf7b2b5afa8d6749a38e11014dbe0ed + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fiammetta12.png.meta b/Assets/Sprites/fiammetta12.png.meta new file mode 100644 index 0000000..2c01ad0 --- /dev/null +++ b/Assets/Sprites/fiammetta12.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 914ea1c05029f0740b48c99e7469e822 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1d54f533d75c3d64f935787059fbe209 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 9d4e2eb..ec4db9a 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,4 +11,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Game.unity guid: 0045a14fab245e64a8cb4a8f1ff53902 + - enabled: 1 + path: Assets/Scenes/Results.unity + guid: 14eaa48c4049adc49a31ec5ab5921898 m_configObjects: {} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 0954d02..6d50bcf 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - Fish + - SeaTextures layers: - Default - TransparentFX