diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index be48e40..ed9d45d 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -21,9 +21,9 @@ GameObject: - component: {fileID: 4056561897088050} - component: {fileID: 212864900431362760} - component: {fileID: 50337207293964320} - - component: {fileID: 61036691294505782} - component: {fileID: 114327601929205558} - component: {fileID: 114122030605112200} + - component: {fileID: 60574383325537906} m_Layer: 9 m_Name: Enemy m_TagString: Untagged @@ -55,7 +55,7 @@ Transform: m_GameObject: {fileID: 1195403025493360} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -82.64991, y: -29.3563, z: 0.40207273} - m_LocalScale: {x: 2.648, y: 0.903, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4114672742814982} m_Father: {fileID: 0} @@ -68,8 +68,8 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1437013688705742} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.379, y: 0.552, z: 0} - m_LocalScale: {x: 0.18882175, y: 0.11074196, z: 1} + m_LocalPosition: {x: 0.379, y: 0.058, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4056561897088050} m_RootOrder: 0 @@ -84,8 +84,8 @@ Rigidbody2D: m_BodyType: 0 m_Simulated: 1 m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 2.391144 + m_UseAutoMass: 0 + m_Mass: 1.5 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 @@ -94,8 +94,8 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!61 &61036691294505782 -BoxCollider2D: +--- !u!60 &60574383325537906 +PolygonCollider2D: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} @@ -110,15 +110,28 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 2.28, y: 0.82} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 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} --- !u!114 &114122030605112200 MonoBehaviour: m_ObjectHideFlags: 1 @@ -132,8 +145,16 @@ MonoBehaviour: m_EditorClassIdentifier: fishCaught: 0 fishPileSprites: - - {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} - fishPileStages: + - {fileID: 0} + - {fileID: 21300000, guid: 1ca1321049c586e4f86c43b461c53210, type: 3} + - {fileID: 21300000, guid: 5357d76bfe87f37489c252197d6548f3, type: 3} + - {fileID: 21300000, guid: 72d0711964923ee469e38d13424858f8, type: 3} + - {fileID: 21300000, guid: 082fbe21a6557cd4a866620a4586293b, type: 3} + - {fileID: 21300000, guid: 69cfde8a6e90b4e4f875f925ecdf4ead, type: 3} + - {fileID: 21300000, guid: ab4f5ce491a45fa4ba43f2e031b26bd1, type: 3} + - {fileID: 21300000, guid: 2749b8097b8dea44b91b5119d5cfd775, type: 3} + fishPileStages: 01000000020000000300000004000000050000000600000007000000 + fishPile: {fileID: 1437013688705742} --- !u!114 &114327601929205558 MonoBehaviour: m_ObjectHideFlags: 1 @@ -148,11 +169,11 @@ MonoBehaviour: maximumDistanceFromFish: 1 timeBeforeChangingTarget: 10 horizontalSpeed: 5 - verticalSpeed: 30 + verticalSpeed: 17 shootForce: 5 harpoon: {fileID: 1737609814504882, guid: 288f16ae5eaa16440b89da431723b1c2, type: 2} harpoonAvailable: 1 - maxJetFuel: 1 + maxJetFuel: 2 jetFuelRechargeSpeed: 0.1 --- !u!212 &212723113996758088 SpriteRenderer: @@ -189,15 +210,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} - m_Color: {r: 0, g: 0.98189926, b: 1, a: 1} + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!212 &212864900431362760 @@ -235,8 +256,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Sprite: {fileID: 21300000, guid: 1476fb3dc3082c948a8faa6f3b18bef9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/Prefabs/Harpoon.prefab b/Assets/Prefabs/Harpoon.prefab index 455d342..e896883 100644 --- a/Assets/Prefabs/Harpoon.prefab +++ b/Assets/Prefabs/Harpoon.prefab @@ -143,7 +143,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ccf0966283c66ef4e83d7d3c12e61e9a, type: 3} m_Name: m_EditorClassIdentifier: - returnSpeed: 5 + returnSpeed: 20 --- !u!120 &120926356996093036 LineRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Ship.prefab b/Assets/Prefabs/Ship.prefab index 597162a..317ff80 100644 --- a/Assets/Prefabs/Ship.prefab +++ b/Assets/Prefabs/Ship.prefab @@ -48,7 +48,7 @@ GameObject: m_IsActive: 1 --- !u!1 &1707044546218068 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 @@ -90,7 +90,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4419769467158982} - - {fileID: 4811992088834386} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -104,6 +103,7 @@ Transform: m_LocalPosition: {x: 0.245, y: -0.382, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4811992088834386} - {fileID: 4881997913105036} m_Father: {fileID: 4279439219186522} m_RootOrder: 0 @@ -114,12 +114,12 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1707044546218068} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.6742, y: 0.0142, z: 0} - m_LocalScale: {x: 0.5, y: 0.1, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.91920006, y: 0.3961983, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4279439219186522} - m_RootOrder: 1 + m_Father: {fileID: 4419769467158982} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4881997913105036 Transform: @@ -132,7 +132,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4419769467158982} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &50107883579770240 Rigidbody2D: @@ -195,8 +195,15 @@ MonoBehaviour: m_EditorClassIdentifier: fishCaught: 0 fishPileSprites: - - {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} - fishPileStages: + - {fileID: 0} + - {fileID: 21300000, guid: 1ca1321049c586e4f86c43b461c53210, type: 3} + - {fileID: 21300000, guid: 5357d76bfe87f37489c252197d6548f3, type: 3} + - {fileID: 21300000, guid: 72d0711964923ee469e38d13424858f8, type: 3} + - {fileID: 21300000, guid: 082fbe21a6557cd4a866620a4586293b, type: 3} + - {fileID: 21300000, guid: 69cfde8a6e90b4e4f875f925ecdf4ead, type: 3} + - {fileID: 21300000, guid: ab4f5ce491a45fa4ba43f2e031b26bd1, type: 3} + - {fileID: 21300000, guid: 2749b8097b8dea44b91b5119d5cfd775, type: 3} + fishPileStages: 01000000020000000300000004000000050000000600000007000000 fishPile: {fileID: 1707044546218068} --- !u!114 &114893472868460232 MonoBehaviour: @@ -312,15 +319,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} - m_Color: {r: 0, g: 0.98189926, b: 1, a: 1} + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!212 &212928515413584804 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 8bbc9d5..ea71d0a 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -164,6 +164,47 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 +--- !u!1 &155609377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 155609379} + - component: {fileID: 155609378} + m_Layer: 0 + m_Name: Crosshair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &155609378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 155609377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87af86a0319173742b6d97583a796ca8, type: 3} + m_Name: + m_EditorClassIdentifier: + crosshair: {fileID: 2800000, guid: ca8179fb7cd0e2740858e904b954a35e, type: 3} +--- !u!4 &155609379 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 155609377} + 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: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &162431714 stripped Transform: m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, @@ -563,6 +604,52 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &744010482 +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: 3.83 + objectReference: {fileID: 0} + - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} + propertyPath: m_LocalPosition.y + value: 37.79 + 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 + objectReference: {fileID: 0} + - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + 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 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2} + m_IsPrefabAsset: 0 --- !u!1001 &754549122 Prefab: m_ObjectHideFlags: 0 @@ -1494,53 +1581,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_PrefabInternal: {fileID: 1597600653} ---- !u!1001 &1406564692 -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: 4.27 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalPosition.y - value: 42.06 - 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 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2} - m_IsPrefabAsset: 0 --- !u!1 &1410052124 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, type: 2} - m_PrefabInternal: {fileID: 1406564692} + m_PrefabInternal: {fileID: 744010482} --- !u!1001 &1415523105 Prefab: m_ObjectHideFlags: 0 @@ -1747,6 +1792,11 @@ 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 @@ -1779,6 +1829,156 @@ 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 diff --git a/Assets/Scripts/EnemyShipAi.cs b/Assets/Scripts/EnemyShipAi.cs index 60cdeb0..a3cae9d 100644 --- a/Assets/Scripts/EnemyShipAi.cs +++ b/Assets/Scripts/EnemyShipAi.cs @@ -24,11 +24,11 @@ public class EnemyShipAi : MonoBehaviour { void Start () { rb = GetComponent(); spriteRenderer = GetComponent(); - jetFuel = maxJetFuel; + jetFuel = 0f; } void Update () { - timeBeforeChangingTarget += Time.deltaTime; + timeSinceLastTarget += Time.deltaTime; //Find a target fish if(target == null || timeSinceLastTarget > timeBeforeChangingTarget) { @@ -72,7 +72,7 @@ public class EnemyShipAi : MonoBehaviour { harpoonInstance.transform.position = transform.position + direction; harpoonInstance.transform.rotation = transform.rotation; harpoonInstance.GetComponent().AddForce(direction * shootForce); - harpoonInstance.GetComponent().flipX = spriteRenderer.flipX; + harpoonInstance.GetComponent().flipX = transform.localScale.x < 0; harpoonInstance.layer = 9; Linker linker = harpoonInstance.GetComponentInChildren(); linker.firstObject = gameObject; @@ -86,13 +86,14 @@ public class EnemyShipAi : MonoBehaviour { if (transform.position.x - target.transform.position.x < 0f) { rb.AddForce(Vector2.right * horizontalSpeed * power); - spriteRenderer.flipX = true; + transform.localScale = new Vector3(-1f, 1f, 1f); } //Left else { rb.AddForce(Vector2.right * -horizontalSpeed * power); spriteRenderer.flipX = false; + transform.localScale = new Vector3(-1f, 1f, 1f); } //Enable the jetpack if(jetFuel == maxJetFuel) diff --git a/Assets/Scripts/FishAi.cs b/Assets/Scripts/FishAi.cs index d151f09..11c6a8c 100644 --- a/Assets/Scripts/FishAi.cs +++ b/Assets/Scripts/FishAi.cs @@ -19,7 +19,7 @@ public class FishAi : MonoBehaviour { void ChangeDirection() { - direction = new Vector3(Random.Range(-1f, 1f), Random.Range(-1f, 1f)); + direction = new Vector3(Random.Range(-1f, 1f), Random.Range(-1f, 0.4f)); } void Update () { diff --git a/Assets/Scripts/FishCatcher.cs b/Assets/Scripts/FishCatcher.cs index 8a74ee2..07e4e85 100644 --- a/Assets/Scripts/FishCatcher.cs +++ b/Assets/Scripts/FishCatcher.cs @@ -7,17 +7,18 @@ public class FishCatcher : MonoBehaviour { public int fishCaught = 0; public Sprite[] fishPileSprites; public int[] fishPileStages; + public GameObject fishPile; private SpriteRenderer fishPileRenderer; private void Start() { - fishPileRenderer = GetComponent(); + fishPileRenderer = fishPile.GetComponent(); } private void OnCollisionEnter2D(Collision2D collision) { - if(collision.gameObject.tag == "Fish") + if (collision.gameObject.tag == "Fish" && collision.gameObject.GetComponent().hook != null) { fishCaught++; Destroy(collision.gameObject); diff --git a/Assets/Scripts/Harpoon.cs b/Assets/Scripts/Harpoon.cs index 3bf969a..c347321 100644 --- a/Assets/Scripts/Harpoon.cs +++ b/Assets/Scripts/Harpoon.cs @@ -33,20 +33,25 @@ public class Harpoon : MonoBehaviour { { rb.MoveRotation(-Vector2.Angle(transform.position - linker.firstObject.transform.position, Vector2.right) - 90f); } - rb.MovePosition(Vector3.MoveTowards(transform.position, linker.firstObject.transform.position, returnSpeed * Time.deltaTime)); - if(Vector3.Distance(transform.position, linker.firstObject.transform.position) < 0.2f) + Cannon cannon = linker.firstObject.GetComponent(); + if(cannon != null) { - Cannon cannon = linker.firstObject.GetComponent(); - if(cannon != null) + 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); } - else + } + else + { + 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); } - Destroy(gameObject); } } } diff --git a/Assets/Scripts/InitCrosshair.cs b/Assets/Scripts/InitCrosshair.cs new file mode 100644 index 0000000..19e341a --- /dev/null +++ b/Assets/Scripts/InitCrosshair.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class InitCrosshair : MonoBehaviour { + + public Texture2D crosshair; + + void Start () { + Cursor.SetCursor(crosshair, new Vector2(15, 14), CursorMode.Auto); + } +} diff --git a/Assets/Scripts/InitCrosshair.cs.meta b/Assets/Scripts/InitCrosshair.cs.meta new file mode 100644 index 0000000..d0699b1 --- /dev/null +++ b/Assets/Scripts/InitCrosshair.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 87af86a0319173742b6d97583a796ca8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/enemyboat.png b/Assets/Sprites/enemyboat.png index 46d8f15..c169a33 100644 --- a/Assets/Sprites/enemyboat.png +++ b/Assets/Sprites/enemyboat.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffc514fb79c9e564d5d89295804338f0bcc258f805664f018c29b47fa6c9dcaa -size 25783 +oid sha256:7ff440bd6ce80c8dd892889fafd8fbe0a7c71d1e4a6b09087c326398daa98c7a +size 19085 diff --git a/Assets/Sprites/enemyboat.png.meta b/Assets/Sprites/enemyboat.png.meta new file mode 100644 index 0000000..625cb63 --- /dev/null +++ b/Assets/Sprites/enemyboat.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 1476fb3dc3082c948a8faa6f3b18bef9 +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: 40 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: 2c193dac11faa9c45ba3fad49c175d39 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fishpile1.png b/Assets/Sprites/fishpile1.png index dbd4c6b..66b1aa3 100644 --- a/Assets/Sprites/fishpile1.png +++ b/Assets/Sprites/fishpile1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:878ca93c7b767bb3c1f2ab276cca17e9e1c12260b47516eaa0238915611089d6 -size 19010 +oid sha256:ff889aa4b9e204fa574d3fc71027815bd68cc009837cfff0482d452d146d13f0 +size 10329 diff --git a/Assets/Sprites/fishpile1.png.meta b/Assets/Sprites/fishpile1.png.meta new file mode 100644 index 0000000..5dc7a07 --- /dev/null +++ b/Assets/Sprites/fishpile1.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 1ca1321049c586e4f86c43b461c53210 +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: f8850b3e86e519140b7179fb86d7c0d7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fishpile2.png b/Assets/Sprites/fishpile2.png index a50691d..713c374 100644 --- a/Assets/Sprites/fishpile2.png +++ b/Assets/Sprites/fishpile2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98874896d63caf941797062a09e3c3b12a8b2d613bd79c15ab556464072cfd05 -size 19295 +oid sha256:4ff09d030905b9b590a35b7fb81a4313a0db9372280fed6807c6b2193e8d20c8 +size 7914 diff --git a/Assets/Sprites/fishpile2.png.meta b/Assets/Sprites/fishpile2.png.meta new file mode 100644 index 0000000..98f848b --- /dev/null +++ b/Assets/Sprites/fishpile2.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 5357d76bfe87f37489c252197d6548f3 +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: 85759698524d69242bb3e10acfed8b29 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fishpile3.png b/Assets/Sprites/fishpile3.png index 09d82d5..9aced6d 100644 --- a/Assets/Sprites/fishpile3.png +++ b/Assets/Sprites/fishpile3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2553987dcd8da48069e90f304833c03162ae311eca0bd0bc9926bb5cc1718e2 -size 19470 +oid sha256:31f1cd8522619f35465673eaccee9fd06c7220aeee71f3e767adb8d7531e6d64 +size 13597 diff --git a/Assets/Sprites/fishpile3.png.meta b/Assets/Sprites/fishpile3.png.meta new file mode 100644 index 0000000..8a89793 --- /dev/null +++ b/Assets/Sprites/fishpile3.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 72d0711964923ee469e38d13424858f8 +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: 9a7fa2aa7064fdd429fff0c3d948ddfd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fishpile4.png b/Assets/Sprites/fishpile4.png index 1a3fe39..dac60e7 100644 --- a/Assets/Sprites/fishpile4.png +++ b/Assets/Sprites/fishpile4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6846814d18fc2323ae22c3e54077d478cfcd721aca7f41edaf1c652d7720abcf -size 19733 +oid sha256:b4017032997b1d4f3432d7074fc62c224b24f72f89971604f6154a1b3d8df95f +size 15646 diff --git a/Assets/Sprites/fishpile4.png.meta b/Assets/Sprites/fishpile4.png.meta new file mode 100644 index 0000000..21fab28 --- /dev/null +++ b/Assets/Sprites/fishpile4.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 082fbe21a6557cd4a866620a4586293b +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: 98a6cb6f163cd7a4d90402630db31ea6 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fishpile5.png b/Assets/Sprites/fishpile5.png index 21e18d8..68c6b0c 100644 --- a/Assets/Sprites/fishpile5.png +++ b/Assets/Sprites/fishpile5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e6aaffe0cbc860907ccbee96eaa76e5054aa89dada9951ac40b92faf33a1ef1 -size 20043 +oid sha256:c716ded3656d629956e41451c65706729a2aad2b66dfc1ec799c4e007c7fc1aa +size 17807 diff --git a/Assets/Sprites/fishpile5.png.meta b/Assets/Sprites/fishpile5.png.meta new file mode 100644 index 0000000..95bb381 --- /dev/null +++ b/Assets/Sprites/fishpile5.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 69cfde8a6e90b4e4f875f925ecdf4ead +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: f2e37cae776b0054caaa44f3a45865eb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fishpile6.png b/Assets/Sprites/fishpile6.png index 3022f49..e1ce3c1 100644 --- a/Assets/Sprites/fishpile6.png +++ b/Assets/Sprites/fishpile6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89cfc3fbb06651bbeae7fc6fe0b2c54403719121ccdd333d1102eee8f0e6dc6c -size 20503 +oid sha256:458fa7ba2dd0efe1910105993871f82c18e6a804efd7b5074bc073d5c1ed2cd4 +size 20528 diff --git a/Assets/Sprites/fishpile6.png.meta b/Assets/Sprites/fishpile6.png.meta new file mode 100644 index 0000000..cbd6d6a --- /dev/null +++ b/Assets/Sprites/fishpile6.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: ab4f5ce491a45fa4ba43f2e031b26bd1 +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: 0fa23d5b48afcef4d9b4bc44e9f364e3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/fishpile7.png b/Assets/Sprites/fishpile7.png index fea5e1a..5f4f863 100644 --- a/Assets/Sprites/fishpile7.png +++ b/Assets/Sprites/fishpile7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3399e178e911dad9d1e70b11f867eef2c1f7df27e38e067af2638e99da02dd6 -size 21239 +oid sha256:b30dda62d04dcc9f4395ab09b11f0f155d8c332e88504c5d3bafdeb912360137 +size 22439 diff --git a/Assets/Sprites/fishpile7.png.meta b/Assets/Sprites/fishpile7.png.meta new file mode 100644 index 0000000..e91cc28 --- /dev/null +++ b/Assets/Sprites/fishpile7.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 2749b8097b8dea44b91b5119d5cfd775 +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + 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 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + 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: 89ea07eaabb616e47ae9c1f5c6ecfe71 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/mirino.png b/Assets/Sprites/mirino.png index 3ece3bf..4bb5004 100644 --- a/Assets/Sprites/mirino.png +++ b/Assets/Sprites/mirino.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25018917a75991b9a340baf7c82e39b12b5a97a41df4d4834a057e715f10f328 -size 21124 +oid sha256:6fb2030718de630bf1247faf0604d7de6d88aa8316662b8c827428f7d872df3f +size 10356 diff --git a/Assets/Sprites/mirino.png.meta b/Assets/Sprites/mirino.png.meta index 29d9d7e..2fa9662 100644 --- a/Assets/Sprites/mirino.png.meta +++ b/Assets/Sprites/mirino.png.meta @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 @@ -32,7 +32,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: -1 - aniso: -1 + aniso: 1 mipBias: -100 wrapU: 1 wrapV: 1 @@ -51,7 +51,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 8 + textureType: 7 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -69,6 +69,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: []