From 751ba762156adfdc43278648c155f7575448d1f0 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 13 Aug 2018 13:08:34 +0200 Subject: [PATCH] temp --- Assets/Prefabs/Enemy.prefab | 85 ++- Assets/Prefabs/Lighthouse.prefab | 4 +- Assets/Prefabs/Quit with Esc.prefab | 53 ++ Assets/Prefabs/Quit with Esc.prefab.meta | 8 + Assets/Prefabs/Sea.prefab | 2 +- Assets/Prefabs/Ship.prefab | 59 +- Assets/Prefabs/Terrain.prefab | 2 +- Assets/Scenes/Game.unity | 924 ++++++++++++++++++----- Assets/Scenes/MainMenu.unity | 45 ++ Assets/Scripts/Cannon.cs | 2 - Assets/Scripts/Countdown.cs | 31 + Assets/Scripts/Countdown.cs.meta | 11 + Assets/Scripts/EnemyShipAi.cs | 39 +- Assets/Scripts/ExitWithEsc.cs | 20 + Assets/Scripts/ExitWithEsc.cs.meta | 11 + Assets/Scripts/FishCatcher.cs | 34 + Assets/Scripts/Harpoon.cs | 4 + Assets/Scripts/Harpoon.cs.meta | 2 +- Assets/Scripts/Tide.cs | 2 +- 19 files changed, 1131 insertions(+), 207 deletions(-) create mode 100644 Assets/Prefabs/Quit with Esc.prefab create mode 100644 Assets/Prefabs/Quit with Esc.prefab.meta create mode 100644 Assets/Scripts/Countdown.cs create mode 100644 Assets/Scripts/Countdown.cs.meta create mode 100644 Assets/Scripts/ExitWithEsc.cs create mode 100644 Assets/Scripts/ExitWithEsc.cs.meta diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index acb4233..be48e40 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -31,19 +31,49 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1437013688705742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4114672742814982} + - component: {fileID: 212723113996758088} + m_Layer: 9 + m_Name: Fish Pile + m_TagString: Fish + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &4056561897088050 Transform: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1195403025493360} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 21.96, y: 36.57, z: 0} + 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_Children: [] + m_Children: + - {fileID: 4114672742814982} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4114672742814982 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + 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_Children: [] + m_Father: {fileID: 4056561897088050} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &50337207293964320 Rigidbody2D: serializedVersion: 4 @@ -101,6 +131,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fishCaught: 0 + fishPileSprites: + - {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} + fishPileStages: --- !u!114 &114327601929205558 MonoBehaviour: m_ObjectHideFlags: 1 @@ -121,6 +154,52 @@ MonoBehaviour: harpoonAvailable: 1 maxJetFuel: 1 jetFuelRechargeSpeed: 0.1 +--- !u!212 &212723113996758088 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1437013688705742} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} + m_Color: {r: 0, g: 0.98189926, 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_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!212 &212864900431362760 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Lighthouse.prefab b/Assets/Prefabs/Lighthouse.prefab index 6e0d3cb..b0bd317 100644 --- a/Assets/Prefabs/Lighthouse.prefab +++ b/Assets/Prefabs/Lighthouse.prefab @@ -25,7 +25,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &4978811670595372 Transform: @@ -74,7 +74,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -3 + m_SortingOrder: -2 m_Sprite: {fileID: 21300000, guid: aa55a5c6b0f009a428147c305780d1de, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/Quit with Esc.prefab b/Assets/Prefabs/Quit with Esc.prefab new file mode 100644 index 0000000..e77ed48 --- /dev/null +++ b/Assets/Prefabs/Quit with Esc.prefab @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1083141539684426} + m_IsPrefabAsset: 1 +--- !u!1 &1083141539684426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4722408669233146} + - component: {fileID: 114342689784495420} + m_Layer: 0 + m_Name: Quit with Esc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4722408669233146 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1083141539684426} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114342689784495420 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1083141539684426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c5fa8e61b016ab40a3e18ba5ecae525, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Quit with Esc.prefab.meta b/Assets/Prefabs/Quit with Esc.prefab.meta new file mode 100644 index 0000000..d672eca --- /dev/null +++ b/Assets/Prefabs/Quit with Esc.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5ddb823086133341948764b93db7721 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sea.prefab b/Assets/Prefabs/Sea.prefab index 2a2b0d9..b329578 100644 --- a/Assets/Prefabs/Sea.prefab +++ b/Assets/Prefabs/Sea.prefab @@ -1786,7 +1786,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: seaTextures: {fileID: 1259758189242624} - speed: 0.002 + speed: 0.004166667 --- !u!212 &212022742042672606 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Ship.prefab b/Assets/Prefabs/Ship.prefab index 27a0a88..597162a 100644 --- a/Assets/Prefabs/Ship.prefab +++ b/Assets/Prefabs/Ship.prefab @@ -54,9 +54,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4811992088834386} + - component: {fileID: 212513540302985290} m_Layer: 8 m_Name: Fish Pile - m_TagString: Untagged + m_TagString: Fish m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -85,7 +86,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: 40.291958, z: 0} + m_LocalPosition: {x: 4.27, y: 42.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4419769467158982} @@ -114,8 +115,8 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1707044546218068} 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_LocalPosition: {x: -0.6742, y: 0.0142, z: 0} + m_LocalScale: {x: 0.5, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 4279439219186522} m_RootOrder: 1 @@ -193,6 +194,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fishCaught: 0 + fishPileSprites: + - {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} + fishPileStages: + fishPile: {fileID: 1707044546218068} --- !u!114 &114893472868460232 MonoBehaviour: m_ObjectHideFlags: 1 @@ -272,6 +277,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!212 &212513540302985290 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1707044546218068} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: be5eaf9abd3481b489d582a8f1a41508, type: 3} + m_Color: {r: 0, g: 0.98189926, 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_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!212 &212928515413584804 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Terrain.prefab b/Assets/Prefabs/Terrain.prefab index a995e9c..89f2c75 100644 --- a/Assets/Prefabs/Terrain.prefab +++ b/Assets/Prefabs/Terrain.prefab @@ -26,7 +26,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &4023639078503100 Transform: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 13be52b..8bbc9d5 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -118,7 +118,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -134,15 +134,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -150,26 +150,119 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 12 + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_Name + value: Fish Spawner (4) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: sea value: objectReference: {fileID: 2008841353} - - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: m_Name - value: Fish Spawner (4) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &162431714 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1076540941} +--- !u!1 &189120855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 189120856} + - component: {fileID: 189120859} + - component: {fileID: 189120858} + - component: {fileID: 189120857} + m_Layer: 5 + m_Name: Time left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &189120856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 189120855} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_Children: [] + m_Father: {fileID: 671121545} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -5} + m_SizeDelta: {x: 1377.9, y: 372.7} + m_Pivot: {x: 0, y: 1} +--- !u!114 &189120857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 189120855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f6e912b74c1744d83aedb0e365fa93, type: 3} + m_Name: + m_EditorClassIdentifier: + startingTime: 240 +--- !u!114 &189120858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 189120855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 300 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 300 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: X:XX +--- !u!222 &189120859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 189120855} + m_CullTransparentMesh: 0 --- !u!1001 &217240171 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -185,15 +278,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -201,27 +294,17 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 8 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (1) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: randomFactor - value: 30 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 @@ -262,41 +345,46 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4978811670595372, guid: 633eed510cb97614896a65613c2eb772, type: 2} propertyPath: m_RootOrder - value: 6 + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 633eed510cb97614896a65613c2eb772, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &281630673 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1063221186} --- !u!1001 &317854633 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1571656221} m_Modifications: - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.x - value: 21.96 + value: -28.969913 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.y - value: 36.57 + value: -29.8863 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 0.40207273 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.w @@ -304,7 +392,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1195403025493360, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_Name @@ -313,6 +401,11 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &382755411 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 2089851341} --- !u!1001 &391017218 Prefab: m_ObjectHideFlags: 0 @@ -350,7 +443,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2} propertyPath: m_RootOrder - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27, type: 2} @@ -360,6 +453,21 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb6270a21e7fa744878210a4df90d27, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &449207487 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, + type: 2} + m_PrefabInternal: {fileID: 1105789933} +--- !u!4 &551501946 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 754549122} +--- !u!4 &618464446 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1032809216} --- !u!1 &671121541 GameObject: m_ObjectHideFlags: 0 @@ -423,8 +531,8 @@ Canvas: m_GameObject: {fileID: 671121541} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} + m_RenderMode: 1 + m_Camera: {fileID: 1687883081} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -443,23 +551,24 @@ RectTransform: m_GameObject: {fileID: 671121541} 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_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 949267804} + - {fileID: 189120856} m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 300} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1001 &754549122 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -475,15 +584,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -491,27 +600,17 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 14 + value: 6 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (7) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: randomFactor - value: 10 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 @@ -552,11 +651,16 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4023639078503100, guid: 0514a38f22bae454d821a12517a141c4, type: 2} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0514a38f22bae454d821a12517a141c4, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &889744602 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1415523105} --- !u!1 &949267803 GameObject: m_ObjectHideFlags: 0 @@ -645,6 +749,11 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 949267803} m_CullTransparentMesh: 0 +--- !u!4 &960595254 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1240811157} --- !u!1001 &994904156 Prefab: m_ObjectHideFlags: 0 @@ -684,15 +793,341 @@ Prefab: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 212905935617951042, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212956196077882010, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212351940099845282, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212991208024605472, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212908312157428282, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212615740644260420, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212958655812975138, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212077785262748234, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212596352138466270, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212438709598232376, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212706271189958462, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212743599512948026, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212835593336442562, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212387760563178558, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212827644986399214, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212583161621006292, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212923190663581758, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212220977463381004, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212624572427802740, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212288506279396184, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212571237110603728, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212323086000436106, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212907414085975740, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212279592476195862, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212833199628362132, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212180851788349558, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212985630553638740, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212204569046025558, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212237968126033720, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212637533125222678, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212659358151512422, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212304169802630230, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212828523393898174, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212585745694724586, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212744024839157390, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212608466257708106, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212189340223201570, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212892974992884802, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212878907014968314, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212022742042672606, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212411922187133280, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212429577464670142, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212769389565826172, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212467762716140544, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212086788301428422, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212756982268078232, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212645392905211924, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212025957235915962, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212824268843083134, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212122226970924638, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212919054189349052, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212781675239961156, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212810257641209612, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 212487609344418062, guid: 4dc0408b236da9847b1c799161bbd70a, + type: 2} + propertyPath: m_SortingOrder + value: -1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &1007771029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1097226914} +--- !u!1001 &1032809216 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2003875048} + m_Modifications: + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_LocalPosition.x + value: 4.82 + objectReference: {fileID: 0} + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_LocalPosition.y + value: 25.8 + objectReference: {fileID: 0} + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_Name + value: Fish Spawner (12) + objectReference: {fileID: 0} + - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} + m_IsPrefabAsset: 0 --- !u!1001 &1063221186 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -708,15 +1143,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -724,22 +1159,17 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 16 + value: 8 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (9) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 15 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 @@ -748,7 +1178,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -764,15 +1194,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -780,23 +1210,13 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: sea value: objectReference: {fileID: 2008841353} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: spawnTime - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: randomFactor - value: 30 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 @@ -805,7 +1225,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -821,15 +1241,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -837,22 +1257,17 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 18 + value: 10 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (11) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 60 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 @@ -861,31 +1276,31 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1571656221} m_Modifications: - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.x - value: 39.292458 + value: -11.637455 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.y - value: 36.612633 + value: -29.843666 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 0.40207273 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.w @@ -893,7 +1308,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1195403025493360, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_Name @@ -962,15 +1377,69 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1240811157 +--- !u!1001 &1196286370 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalPosition.y + value: 33.22 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalPosition.z + value: 99 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalScale.x + value: 3.219731 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalScale.y + value: 3.219731 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalScale.z + value: 3.219731 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c5ddb823086133341948764b93db7721, type: 2} + m_IsPrefabAsset: 0 +--- !u!1001 &1240811157 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2003875048} + m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x value: -27.97 @@ -985,15 +1454,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -1001,20 +1470,30 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 10 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} + propertyPath: m_Name + value: Fish Spawner (2) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: sea value: objectReference: {fileID: 2008841353} - - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: m_Name - value: Fish Spawner (2) - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &1331249258 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 217240171} +--- !u!4 &1334340815 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1597600653} --- !u!1001 &1406564692 Prefab: m_ObjectHideFlags: 0 @@ -1052,12 +1531,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 212928515413584804, guid: 1cf703958a669d942a42326499701367, - type: 2} - propertyPath: m_FlipX - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2} @@ -1072,7 +1546,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -1088,15 +1562,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -1104,31 +1578,57 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 13 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (6) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 35 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 +--- !u!1 &1571656220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1571656221} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1571656221 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1571656220} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 50.929913, y: 66.4563, z: -0.40207273} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1721412594} + - {fileID: 2058116047} + - {fileID: 449207487} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1597600653 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -1144,15 +1644,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -1160,31 +1660,36 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 15 + value: 7 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (8) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 40 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &1665648038 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 1692303116} +--- !u!20 &1687883081 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 20610604938940038, guid: acb6270a21e7fa744878210a4df90d27, + type: 2} + m_PrefabInternal: {fileID: 391017218} --- !u!1001 &1692303116 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -1200,15 +1705,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -1216,55 +1721,55 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 11 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (3) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 20 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &1721412594 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, + type: 2} + m_PrefabInternal: {fileID: 1861714896} --- !u!1001 &1861714896 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1571656221} m_Modifications: - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.x - value: -31.72 + value: -82.64991 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.y - value: 37.1 + value: -29.3563 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 0.40207273 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_LocalRotation.w @@ -1272,22 +1777,72 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} propertyPath: m_RootOrder - value: 19 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} m_IsPrefabAsset: 0 +--- !u!4 &1873097371 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, + type: 2} + m_PrefabInternal: {fileID: 80419718} +--- !u!1 &2003875047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2003875048} + m_Layer: 0 + m_Name: Fish Spawners + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2003875048 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2003875047} + 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: + - {fileID: 162431714} + - {fileID: 1331249258} + - {fileID: 960595254} + - {fileID: 1665648038} + - {fileID: 1873097371} + - {fileID: 889744602} + - {fileID: 551501946} + - {fileID: 1334340815} + - {fileID: 281630673} + - {fileID: 382755411} + - {fileID: 1007771029} + - {fileID: 618464446} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2008841353 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1259758189242624, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2} m_PrefabInternal: {fileID: 994904156} +--- !u!4 &2058116047 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, + type: 2} + m_PrefabInternal: {fileID: 317854633} --- !u!1001 &2089851341 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2003875048} m_Modifications: - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalPosition.x @@ -1303,15 +1858,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_LocalRotation.w @@ -1319,22 +1874,17 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_RootOrder - value: 17 + value: 9 objectReference: {fileID: 0} - - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, - type: 2} - propertyPath: sea - value: - objectReference: {fileID: 2008841353} - target: {fileID: 1634593922401586, guid: 343a89599f7365845937eb14b4669b20, type: 2} propertyPath: m_Name value: Fish Spawner (10) objectReference: {fileID: 0} - target: {fileID: 114324088513504716, guid: 343a89599f7365845937eb14b4669b20, type: 2} - propertyPath: spawnTime - value: 15 - objectReference: {fileID: 0} + propertyPath: sea + value: + objectReference: {fileID: 2008841353} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 0bb823b..a846693 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -145,6 +145,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fishCaught: 0 + fishPileSprites: [] + fishPileStages: + fishPile: {fileID: 0} --- !u!114 &215901070 MonoBehaviour: m_ObjectHideFlags: 0 @@ -199,6 +202,48 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.727} +--- !u!1001 &303581856 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c5ddb823086133341948764b93db7721, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &366541447 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Cannon.cs b/Assets/Scripts/Cannon.cs index 33be0d4..33fd5bf 100644 --- a/Assets/Scripts/Cannon.cs +++ b/Assets/Scripts/Cannon.cs @@ -12,12 +12,10 @@ public class Cannon : MonoBehaviour { public float startingForce = 1f; private float force = 1f; - private SpriteRenderer hullSpriteRenderer; private SpriteRenderer spriteRenderer; private void Start() { - hullSpriteRenderer = hull.GetComponent(); spriteRenderer = GetComponent(); //Disable enemy and player collisions Physics2D.IgnoreLayerCollision(8, 8); diff --git a/Assets/Scripts/Countdown.cs b/Assets/Scripts/Countdown.cs new file mode 100644 index 0000000..3eaac72 --- /dev/null +++ b/Assets/Scripts/Countdown.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Countdown : MonoBehaviour { + + public float startingTime = 500f; + + private float currentTime = 500f; + private Text timerText; + + void Start () { + currentTime = startingTime; + timerText = GetComponent(); + } + + void Update () { + currentTime -= Time.deltaTime; + timerText.text = string.Format("{0}:{1:00}", (int)currentTime / 60, (int)currentTime % 60); + if(currentTime <= 0f) + { + TheEnd(); + } + } + + void TheEnd() + { + //Do something + } +} diff --git a/Assets/Scripts/Countdown.cs.meta b/Assets/Scripts/Countdown.cs.meta new file mode 100644 index 0000000..ffb304e --- /dev/null +++ b/Assets/Scripts/Countdown.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 80f6e912b74c1744d83aedb0e365fa93 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/EnemyShipAi.cs b/Assets/Scripts/EnemyShipAi.cs index d666195..60cdeb0 100644 --- a/Assets/Scripts/EnemyShipAi.cs +++ b/Assets/Scripts/EnemyShipAi.cs @@ -32,14 +32,22 @@ public class EnemyShipAi : MonoBehaviour { //Find a target fish if(target == null || timeSinceLastTarget > timeBeforeChangingTarget) { - if(target != null) + if (target != null) { - target.GetComponent().targetedBy = null; + FishAi fishAi = target.GetComponent(); + if (fishAi != null) + { + fishAi.targetedBy = null; + } } target = FindClosestFish(GameObject.FindGameObjectsWithTag("Fish")); if (target != null) { - target.GetComponent().targetedBy = gameObject; + FishAi fishAi = target.GetComponent(); + if (fishAi != null) + { + fishAi.targetedBy = gameObject; + } } timeBeforeChangingTarget = 0f; } @@ -112,11 +120,32 @@ public class EnemyShipAi : MonoBehaviour { GameObject FindClosestFish(GameObject[] fish) { GameObject result = null; + float distance; float minimumDistance = Mathf.Infinity; foreach (GameObject fishInstance in fish) { - if (fishInstance.GetComponent().targetedBy != null) continue; - float distance = Vector3.Distance(fishInstance.transform.position, transform.position); + if(fishInstance == null) + { + break; + } + FishCatcher fishCatcher = fishInstance.GetComponentInParent(); + if (fishCatcher != null && fishCatcher.fishCaught > 0) + { + if (fishCatcher.gameObject.layer == 9) + { + distance = Mathf.Infinity; + } + else + { + distance = Vector3.Distance(fishInstance.transform.position, transform.position) + 1f; + } + } + else + { + FishAi fishAi = fishInstance.GetComponent(); + if (fishAi != null && fishAi.targetedBy != null) continue; + distance = Vector3.Distance(fishInstance.transform.position, transform.position); + } if (distance < minimumDistance) { minimumDistance = distance; diff --git a/Assets/Scripts/ExitWithEsc.cs b/Assets/Scripts/ExitWithEsc.cs new file mode 100644 index 0000000..af4cfd3 --- /dev/null +++ b/Assets/Scripts/ExitWithEsc.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExitWithEsc : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + if(Input.GetKeyDown(KeyCode.Escape)) + { + Debug.LogWarning("Application.Quit() is not available in the Unity Editor."); + Application.Quit(); + } + } +} diff --git a/Assets/Scripts/ExitWithEsc.cs.meta b/Assets/Scripts/ExitWithEsc.cs.meta new file mode 100644 index 0000000..2a9f756 --- /dev/null +++ b/Assets/Scripts/ExitWithEsc.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0c5fa8e61b016ab40a3e18ba5ecae525 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FishCatcher.cs b/Assets/Scripts/FishCatcher.cs index 8b22abc..8a74ee2 100644 --- a/Assets/Scripts/FishCatcher.cs +++ b/Assets/Scripts/FishCatcher.cs @@ -5,6 +5,15 @@ using UnityEngine; public class FishCatcher : MonoBehaviour { public int fishCaught = 0; + public Sprite[] fishPileSprites; + public int[] fishPileStages; + + private SpriteRenderer fishPileRenderer; + + private void Start() + { + fishPileRenderer = GetComponent(); + } private void OnCollisionEnter2D(Collision2D collision) { @@ -12,6 +21,31 @@ public class FishCatcher : MonoBehaviour { { fishCaught++; Destroy(collision.gameObject); + CheckStages(); } } + + public void LoseFish() + { + fishCaught--; + CheckStages(); + } + + private void CheckStages() + { + int currentStage = 0; + while(true) + { + if (currentStage == fishPileStages.Length) + { + break; + } + if (fishCaught > fishPileStages[currentStage]) + { + currentStage++; + } + else break; + } + fishPileRenderer.sprite = fishPileSprites[currentStage]; + } } diff --git a/Assets/Scripts/Harpoon.cs b/Assets/Scripts/Harpoon.cs index 17ce830..3bf969a 100644 --- a/Assets/Scripts/Harpoon.cs +++ b/Assets/Scripts/Harpoon.cs @@ -56,6 +56,10 @@ public class Harpoon : MonoBehaviour { if (going) { going = false; + if(rb == null) + { + rb = GetComponent(); + } rb.bodyType = RigidbodyType2D.Kinematic; } if (collision.gameObject.tag == "Fish") diff --git a/Assets/Scripts/Harpoon.cs.meta b/Assets/Scripts/Harpoon.cs.meta index 95ea086..31c0ef4 100644 --- a/Assets/Scripts/Harpoon.cs.meta +++ b/Assets/Scripts/Harpoon.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 100 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Tide.cs b/Assets/Scripts/Tide.cs index 3b91358..c4559ee 100644 --- a/Assets/Scripts/Tide.cs +++ b/Assets/Scripts/Tide.cs @@ -19,7 +19,7 @@ public class Tide : MonoBehaviour if (buoyancyEffector2D.surfaceLevel > 0) { buoyancyEffector2D.surfaceLevel = buoyancyEffector2D.surfaceLevel - (Time.deltaTime * speed); - seaTextures.transform.Translate(Vector3.down * Time.deltaTime * speed * 40); } + seaTextures.transform.Translate(Vector3.down * Time.deltaTime * speed * 40); } } \ No newline at end of file