From ef50643e2da42648bf3b1667a9123f7cb9bcca4a Mon Sep 17 00:00:00 2001 From: Blake Podger Date: Mon, 1 Nov 2021 16:00:38 +0000 Subject: [PATCH 01/23] changed most assets to use the ones developed --- .../{LaserBeam.prefab => CannonBall.prefab} | 236 +++-- ...eam.prefab.meta => CannonBall.prefab.meta} | 0 .../Assets/Examples/Defender/Defender.unity | 987 ++---------------- .../{Meteor.prefab => Enemy Ship.prefab} | 309 +++--- ...eor.prefab.meta => Enemy Ship.prefab.meta} | 0 Unity-Files/Assets/Images/Asteroids/Pasty.png | 3 + .../Assets/Images/Asteroids/Pasty.png.meta | 96 ++ Unity-Files/Assets/Images/Asteroids/Ship.png | 3 + .../Assets/Images/Asteroids/Ship.png.meta | 96 ++ .../Images/Backgrounds/Sea tile frame 2.png | 3 + .../Backgrounds/Sea tile frame 2.png.meta | 96 ++ .../Assets/Images/Backgrounds/Sea tile.png | 3 + .../Images/Backgrounds/Sea tile.png.meta | 96 ++ .../Assets/Images/Blocks/Castle tower.png | 3 + .../Images/Blocks/Castle tower.png.meta | 96 ++ Unity-Files/Assets/Images/Cannon.meta | 8 + .../Images/Cannon/Canon ball with trail.png | 3 + .../Cannon/Canon ball with trail.png.meta | 96 ++ .../Assets/Images/Cannon/Canon ball.png | 3 + .../Assets/Images/Cannon/Canon ball.png.meta | 96 ++ .../Images/Cannon/Canon, facing away.png | 3 + .../Images/Cannon/Canon, facing away.png.meta | 96 ++ .../Scripts/Gameplay/ObjectCreatorArea.cs | 2 +- .../UserSettings/EditorUserSettings.asset | 17 +- 24 files changed, 1203 insertions(+), 1148 deletions(-) rename Unity-Files/Assets/Examples/Defender/{LaserBeam.prefab => CannonBall.prefab} (60%) rename Unity-Files/Assets/Examples/Defender/{LaserBeam.prefab.meta => CannonBall.prefab.meta} (100%) rename Unity-Files/Assets/Examples/Defender/{Meteor.prefab => Enemy Ship.prefab} (55%) rename Unity-Files/Assets/Examples/Defender/{Meteor.prefab.meta => Enemy Ship.prefab.meta} (100%) create mode 100644 Unity-Files/Assets/Images/Asteroids/Pasty.png create mode 100644 Unity-Files/Assets/Images/Asteroids/Pasty.png.meta create mode 100644 Unity-Files/Assets/Images/Asteroids/Ship.png create mode 100644 Unity-Files/Assets/Images/Asteroids/Ship.png.meta create mode 100644 Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png create mode 100644 Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png.meta create mode 100644 Unity-Files/Assets/Images/Backgrounds/Sea tile.png create mode 100644 Unity-Files/Assets/Images/Backgrounds/Sea tile.png.meta create mode 100644 Unity-Files/Assets/Images/Blocks/Castle tower.png create mode 100644 Unity-Files/Assets/Images/Blocks/Castle tower.png.meta create mode 100644 Unity-Files/Assets/Images/Cannon.meta create mode 100644 Unity-Files/Assets/Images/Cannon/Canon ball with trail.png create mode 100644 Unity-Files/Assets/Images/Cannon/Canon ball with trail.png.meta create mode 100644 Unity-Files/Assets/Images/Cannon/Canon ball.png create mode 100644 Unity-Files/Assets/Images/Cannon/Canon ball.png.meta create mode 100644 Unity-Files/Assets/Images/Cannon/Canon, facing away.png create mode 100644 Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta diff --git a/Unity-Files/Assets/Examples/Defender/LaserBeam.prefab b/Unity-Files/Assets/Examples/Defender/CannonBall.prefab similarity index 60% rename from Unity-Files/Assets/Examples/Defender/LaserBeam.prefab rename to Unity-Files/Assets/Examples/Defender/CannonBall.prefab index af805d5..a0efc28 100644 --- a/Unity-Files/Assets/Examples/Defender/LaserBeam.prefab +++ b/Unity-Files/Assets/Examples/Defender/CannonBall.prefab @@ -3,9 +3,10 @@ --- !u!1 &196000 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 454194} - component: {fileID: 21278666} @@ -14,9 +15,10 @@ GameObject: - component: {fileID: 11477670} - component: {fileID: 114000014027203158} - component: {fileID: 114000014282508134} - - component: {fileID: 114000014129692958} + - component: {fileID: 5794854728891031477} + - component: {fileID: 3047173133866021815} m_Layer: 0 - m_Name: LaserBeam + m_Name: CannonBall m_TagString: Bullet m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -24,79 +26,24 @@ GameObject: m_IsActive: 1 --- !u!4 &454194 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196000} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.8, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalPosition: {x: 0.001, y: -1.878, z: 0} + m_LocalScale: {x: 1.1025387, y: 1.0101537, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &5075258 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 196000} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 1 - m_LinearDrag: 0.2 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!61 &6151316 -BoxCollider2D: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 196000} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.67, y: 1.14} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.13, y: 0.37} - m_EdgeRadius: 0 ---- !u!114 &11477670 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 196000} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8862ea7b10c84421c9485c36f04335a1, type: 3} - m_Name: - m_EditorClassIdentifier: - timeToDestruction: 2 --- !u!212 &21278666 SpriteRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196000} m_Enabled: 1 m_CastShadows: 0 @@ -105,6 +52,10 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -114,6 +65,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -126,7 +78,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: 275518d00a0ca9b4587899941cd75594, type: 3} + m_Sprite: {fileID: 21300000, guid: 732f24ff08ff2ac4d858c3327cf901c5, type: 3} m_Color: {r: 0.85294116, g: 0.86004055, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -136,22 +88,73 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 + m_SpriteSortPoint: 0 +--- !u!61 &6151316 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196000} + m_Enabled: 0 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.32, y: 0.32} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 196000} - m_IsPrefabParent: 1 + m_Size: {x: 0.13, y: 0.37} + m_EdgeRadius: 0 +--- !u!50 &5075258 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196000} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 1 + m_Mass: 0.114046305 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &11477670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8862ea7b10c84421c9485c36f04335a1, type: 3} + m_Name: + m_EditorClassIdentifier: + timeToDestruction: 2 --- !u!114 &114000014027203158 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196000} m_Enabled: 1 m_EditorHideFlags: 0 @@ -159,25 +162,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerId: 0 ---- !u!114 &114000014129692958 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 196000} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: be840ffee03ed4abe9b3dc9b48f9cae7, type: 3} - m_Name: - m_EditorClassIdentifier: - target: 1 - deathEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, - type: 2} --- !u!114 &114000014282508134 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196000} m_Enabled: 1 m_EditorHideFlags: 0 @@ -185,15 +175,53 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: actions: - - {fileID: 114000014129692958} + - {fileID: 3047173133866021815} useCustomActions: 0 customActions: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null happenOnlyOnce: 0 filterByTag: 1 filterTag: Enemy frequency: 1 eventType: 0 +--- !u!61 &5794854728891031477 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196000} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.32, y: 0.32} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.32, y: 0.32} + m_EdgeRadius: 0 +--- !u!114 &3047173133866021815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 196000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be840ffee03ed4abe9b3dc9b48f9cae7, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 0 + deathEffect: {fileID: 0} diff --git a/Unity-Files/Assets/Examples/Defender/LaserBeam.prefab.meta b/Unity-Files/Assets/Examples/Defender/CannonBall.prefab.meta similarity index 100% rename from Unity-Files/Assets/Examples/Defender/LaserBeam.prefab.meta rename to Unity-Files/Assets/Examples/Defender/CannonBall.prefab.meta diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 69c02dd..08b2fc7 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -334,12 +334,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: 1279aeb81883ac94eb98c6ebbed30ab6, type: 3} + m_Sprite: {fileID: 21300000, guid: 70d7e196908077943883f5850c9577c3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 1 - m_Size: {x: 1.1255195, y: 3.4558845} + m_Size: {x: 2.6641407, y: 3.0007997} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -353,176 +353,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 213808745} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.2971, z: 0} + m_LocalPosition: {x: 0.02, y: -0.24, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 267901558} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &226735570 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 226735571} - - component: {fileID: 226735572} - m_Layer: 0 - m_Name: Box - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &226735571 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 226735570} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.10821557, z: 0} - m_LocalScale: {x: 1.3158758, y: 1.5104994, z: 1} - m_Children: [] - m_Father: {fileID: 267901558} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &226735572 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 226735570} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - 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_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 1279aeb81883ac94eb98c6ebbed30ab6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.19, y: 1.06} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &228618996 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 228618997} - - component: {fileID: 228618998} - m_Layer: 0 - m_Name: Crane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &228618997 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 228618996} - m_LocalRotation: {x: -0, y: -0, z: -0.35611475, w: -0.9344423} - m_LocalPosition: {x: -1.32, y: 0.49, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.15529999} - m_Children: [] - m_Father: {fileID: 965912684} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 41.724003} ---- !u!212 &228618998 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 228618996} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - 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_ReceiveGI: 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: 5acd8ed30dcaa0841a47459b03197c38, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 2 - m_Size: {x: 4.4145184, y: 0.9756489} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &267901556 GameObject: m_ObjectHideFlags: 0 @@ -565,10 +401,8 @@ Transform: m_LocalPosition: {x: 0, y: -3.84, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 226735571} - {fileID: 213808747} - {fileID: 565676025} - - {fileID: 633269072} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -625,170 +459,6 @@ MonoBehaviour: typeOfControl: 1 speed: 5 constrainedDistance: 5 ---- !u!1001 &277389902 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 467411917} - m_Modifications: - - target: {fileID: 1877504394966820, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_Name - value: P_Flame (2) - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.x - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.y - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.z - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.x - value: 3.744 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.y - value: -1.025 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.z - value: -0.17146212 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9987885 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.z - value: 0.04920925 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 5.6410003 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: randomSeed - value: 1519064299 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: ShapeModule.radius.value - value: 0.88340753 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: EmissionModule.rateOverTime.scalar - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} ---- !u!4 &277389903 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - m_PrefabInstance: {fileID: 277389902} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &320000907 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 467411917} - m_Modifications: - - target: {fileID: 1877504394966820, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_Name - value: P_Flame (4) - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.x - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.y - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.z - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.x - value: -6.056 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.y - value: -1.016 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.z - value: -0.17146212 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9987885 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.z - value: 0.04920925 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 5.6410003 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: randomSeed - value: 235549934 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: ShapeModule.radius.value - value: 0.88340753 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: EmissionModule.rateOverTime.scalar - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} ---- !u!4 &320000908 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - m_PrefabInstance: {fileID: 320000907} - m_PrefabAsset: {fileID: 0} --- !u!1 &396721111 GameObject: m_ObjectHideFlags: 0 @@ -894,13 +564,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 5, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.5} - m_Children: - - {fileID: 715410611} - - {fileID: 1457891797} - - {fileID: 277389903} - - {fileID: 2137795899} - - {fileID: 320000908} - - {fileID: 1431242090} + m_Children: [] m_Father: {fileID: 965912684} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -929,11 +593,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 565676024} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.49, z: 0} + m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 267901558} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &565676026 MonoBehaviour: @@ -950,91 +614,9 @@ MonoBehaviour: prefabToSpawn: {fileID: 196000, guid: c9ddfe9d025db4b058cfab0c1466019c, type: 3} keyToPress: 32 creationRate: 0.4 - shootSpeed: 10 + shootSpeed: 4 shootDirection: {x: 0, y: 1} relativeToRotation: 1 ---- !u!1 &633269071 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 633269072} - - component: {fileID: 633269073} - m_Layer: 0 - m_Name: BarrellTop - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &633269072 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 633269071} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.9417, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} - m_Children: [] - m_Father: {fileID: 267901558} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &633269073 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 633269071} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - 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_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 1279aeb81883ac94eb98c6ebbed30ab6, type: 3} - m_Color: {r: 0.8161765, g: 0.8161765, b: 0.8161765, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 1 - m_Size: {x: 1.3327243, y: 0.8773303} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &668653126 GameObject: m_ObjectHideFlags: 0 @@ -1092,7 +674,7 @@ SpriteRenderer: m_SortingLayerID: 145232093 m_SortingLayer: -1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 3e791915aa3004c4baed949356148ea1, type: 3} + m_Sprite: {fileID: 21300000, guid: 7264172ff9419654ab152dc81614330d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1111,74 +693,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 668653126} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.79, y: 5.22, z: 0} + m_LocalPosition: {x: -0.79, y: 5, z: 0} m_LocalScale: {x: 1.0063003, y: 1.0063004, z: 0.5031502} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &715410610 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 467411917} - m_Modifications: - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.x - value: -5.47 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.y - value: -4.5 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.z - value: -0.17146212 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: randomSeed - value: 1902963030 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: ShapeModule.radius.value - value: 2.9 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: EmissionModule.rateOverTime.scalar - value: 10 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} ---- !u!4 &715410611 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - m_PrefabInstance: {fileID: 715410610} - m_PrefabAsset: {fileID: 0} --- !u!1 &883890379 GameObject: m_ObjectHideFlags: 0 @@ -1208,7 +728,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 5 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &883890381 SpriteRenderer: @@ -1286,11 +806,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 950081911} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.15560007, z: 0} + m_LocalPosition: {x: 0.02, y: 0.61, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &950081913 SpriteRenderer: @@ -1331,7 +851,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 00ae0125fcaab6942979154f6275ae0b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1371,9 +891,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 2} m_Children: - {fileID: 467411917} - - {fileID: 1377767125} - - {fileID: 228618997} - - {fileID: 1071988532} - {fileID: 668653128} - {fileID: 883890380} - {fileID: 950081912} @@ -1496,6 +1013,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabToSpawn: {fileID: 105984, guid: 8177d22e11d634712aa2c506186fc6bc, type: 3} + ItemOne: {fileID: 0} spawnInterval: 2 --- !u!61 &1011785962 BoxCollider2D: @@ -1676,7 +1194,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1066252771} m_CullTransparentMesh: 1 ---- !u!1 &1071988530 +--- !u!1 &1444297364 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1684,24 +1202,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1071988532} - - component: {fileID: 1071988531} - - component: {fileID: 1071988534} - - component: {fileID: 1071988533} + - component: {fileID: 1444297366} + - component: {fileID: 1444297365} m_Layer: 0 - m_Name: Robot + m_Name: Castle tower m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &1071988531 +--- !u!212 &1444297365 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1071988530} + m_GameObject: {fileID: 1444297364} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1726,7 +1242,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1734,307 +1250,32 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 9 - m_Sprite: {fileID: 21300000, guid: 4f510331afd51bf40906b990dbdc0c9f, type: 3} + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: 5bbd65bcc12cf9742b81837dd19b9827, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 2.7099998, y: 2.6399999} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1071988532 +--- !u!4 &1444297366 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1071988530} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.46, y: 0.79, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.5} + m_GameObject: {fileID: 1444297364} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.13, y: -3.55, z: 0} + m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 1} m_Children: [] - m_Father: {fileID: 965912684} - m_RootOrder: 3 + m_Father: {fileID: 0} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1071988533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1071988530} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 66eec6aefb56e4015b605a5088d6e109, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidbody2D: {fileID: 0} - speed: 2 - directionChangeInterval: 3 - orientToDirection: 0 - lookAxis: 0 - waypoints: - - {x: 0.48011672, y: -4.2207212} ---- !u!50 &1071988534 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1071988530} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 5 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!1 &1377767124 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1377767125} - - component: {fileID: 1377767126} - m_Layer: 0 - m_Name: Crane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1377767125 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1377767124} - m_LocalRotation: {x: 0, y: 0, z: 0.3917264, w: -0.92008173} - m_LocalPosition: {x: 1.3569999, y: 0.45499998, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.1553021} - m_Children: [] - m_Father: {fileID: 965912684} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -46.124} ---- !u!212 &1377767126 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1377767124} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - 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_ReceiveGI: 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: 5acd8ed30dcaa0841a47459b03197c38, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 2 - m_Size: {x: 4.4145184, y: 0.9756489} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1001 &1431242089 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 467411917} - m_Modifications: - - target: {fileID: 1877504394966820, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_Name - value: P_Flame (5) - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.x - value: -0.109 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.y - value: -4.503 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.z - value: -0.17146212 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: randomSeed - value: 1965940070 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: ShapeModule.radius.value - value: 1.39 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: EmissionModule.rateOverTime.scalar - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 199133694170664540, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: m_SortingOrder - value: -10 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} ---- !u!4 &1431242090 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - m_PrefabInstance: {fileID: 1431242089} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1457891796 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 467411917} - m_Modifications: - - target: {fileID: 1877504394966820, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_Name - value: P_Flame (1) - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.x - value: 5.34 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.y - value: -4.5 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.z - value: -0.17146212 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: randomSeed - value: 1902963030 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: ShapeModule.radius.value - value: 2.9 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: EmissionModule.rateOverTime.scalar - value: 10 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} ---- !u!4 &1457891797 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - m_PrefabInstance: {fileID: 1457891796} - m_PrefabAsset: {fileID: 0} --- !u!1 &1659683273 GameObject: m_ObjectHideFlags: 0 @@ -2101,6 +1342,88 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!1 &1744543747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1744543749} + - component: {fileID: 1744543748} + m_Layer: 0 + m_Name: Castle tower (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1744543748 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744543747} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 5 + m_Sprite: {fileID: 21300000, guid: 5bbd65bcc12cf9742b81837dd19b9827, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1744543749 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744543747} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.15, y: -3.55, z: 0} + m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1780207595 GameObject: m_ObjectHideFlags: 0 @@ -3212,88 +2535,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1891276009} m_CullTransparentMesh: 1 ---- !u!1001 &2137795898 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 467411917} - m_Modifications: - - target: {fileID: 1877504394966820, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_Name - value: P_Flame (3) - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.x - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.y - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalScale.z - value: 0.43711984 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.x - value: -1.06 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.y - value: -0.564 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalPosition.z - value: -0.17146212 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9987885 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalRotation.z - value: 0.04920925 - objectReference: {fileID: 0} - - target: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 5.6410003 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: randomSeed - value: 1519064299 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: ShapeModule.radius.value - value: 0.88340753 - objectReference: {fileID: 0} - - target: {fileID: 198284934849911346, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - propertyPath: EmissionModule.rateOverTime.scalar - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf6d7a525a8804494a7a6c45483273ba, type: 3} ---- !u!4 &2137795899 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4746607902619854, guid: cf6d7a525a8804494a7a6c45483273ba, - type: 3} - m_PrefabInstance: {fileID: 2137795898} - m_PrefabAsset: {fileID: 0} --- !u!1 &1000012006557035 GameObject: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Examples/Defender/Meteor.prefab b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab similarity index 55% rename from Unity-Files/Assets/Examples/Defender/Meteor.prefab rename to Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab index 877b1ed..23992bb 100644 --- a/Unity-Files/Assets/Examples/Defender/Meteor.prefab +++ b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab @@ -3,21 +3,22 @@ --- !u!1 &105984 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 416926} - component: {fileID: 21256868} - - component: {fileID: 6049366} - component: {fileID: 5058630} - component: {fileID: 11424868} - component: {fileID: 114000011533140650} - component: {fileID: 114000012881949288} - component: {fileID: 11441764} - component: {fileID: 114000012184921828} + - component: {fileID: 4441117583140911826} m_Layer: 0 - m_Name: Meteor + m_Name: Enemy Ship m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -25,139 +26,24 @@ GameObject: m_IsActive: 1 --- !u!4 &416926 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105984} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.547273, y: 9.535884, z: 2} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalPosition: {x: 9.6538, y: 9.7741, z: 2} + m_LocalScale: {x: 1.2735804, y: 1.3039601, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &5058630 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 105984} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 1.0022 - m_LinearDrag: 4 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!60 &6049366 -PolygonCollider2D: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 2.44, y: 2.29} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 0.44, y: -1.015} - - {x: 0.51, y: -0.955} - - {x: 0.63, y: -0.78499997} - - {x: 0.72999996, y: -0.73499995} - - {x: 0.96999997, y: -0.505} - - {x: 1.0799999, y: -0.49499997} - - {x: 1.16, y: -0.405} - - {x: 1.22, y: -0.295} - - {x: 1.22, y: -0.21499999} - - {x: 1.15, y: -0.145} - - {x: 1.16, y: -0.085} - - {x: 1.12, y: 0.225} - - {x: 1.01, y: 0.505} - - {x: 0.96999997, y: 0.59499997} - - {x: 1.01, y: 0.675} - - {x: 0.82, y: 0.865} - - {x: 0.72999996, y: 0.835} - - {x: 0.53, y: 0.965} - - {x: 0.5, y: 1.0849999} - - {x: 0.44, y: 1.125} - - {x: 0.32999998, y: 1.145} - - {x: 0.14999999, y: 1.145} - - {x: 0.06, y: 1.0849999} - - {x: -0.08, y: 1.0749999} - - {x: -0.28, y: 1.055} - - {x: -0.52, y: 1.005} - - {x: -0.59999996, y: 0.995} - - {x: -0.76, y: 0.865} - - {x: -0.84999996, y: 0.79499996} - - {x: -0.83, y: 0.715} - - {x: -0.96, y: 0.59499997} - - {x: -1.1, y: 0.345} - - {x: -1.1899999, y: 0.295} - - {x: -1.22, y: 0.265} - - {x: -1.22, y: -0.16499999} - - {x: -1.1, y: -0.21499999} - - {x: -1.05, y: -0.345} - - {x: -0.90999997, y: -0.545} - - {x: -0.68, y: -0.835} - - {x: -0.69, y: -0.98499995} - - {x: -0.61, y: -1.055} - - {x: -0.48, y: -1.135} - - {x: -0.44, y: -1.145} - - {x: -0.32999998, y: -1.145} - - {x: -0.19999999, y: -1.035} - - {x: 0.06, y: -1.025} - - {x: 0.19, y: -1.0749999} ---- !u!114 &11424868 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c62d65bd264a4e088b75b7511b9467a, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidbody2D: {fileID: 0} - rotationSpeed: 5 ---- !u!114 &11441764 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0fa3c260db47248a18ecb8112019040d, type: 3} - m_Name: - m_EditorClassIdentifier: - destroyWhenActivated: 0 - healthChange: -1 --- !u!212 &21256868 SpriteRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105984} m_Enabled: 1 m_CastShadows: 0 @@ -166,6 +52,10 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -175,6 +65,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -187,7 +78,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c7e7ab03a14ec3e41af63158afe42530, type: 3} + m_Sprite: {fileID: 21300000, guid: d3e5ee0eb24b6d84ea3c1965e4cbefdb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -197,22 +88,48 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 105984} - m_IsPrefabParent: 1 + m_SpriteSortPoint: 0 +--- !u!50 &5058630 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 1 + m_Mass: 1.0318747 + m_LinearDrag: 4 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &11424868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c62d65bd264a4e088b75b7511b9467a, type: 3} + m_Name: + m_EditorClassIdentifier: + rigidbody2D: {fileID: 0} + rotationSpeed: 5 --- !u!114 &114000011533140650 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -225,28 +142,15 @@ MonoBehaviour: customActions: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null happenOnlyOnce: 1 filterByTag: 0 filterTag: Player ---- !u!114 &114000012184921828 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b9c4adaf25c56477b836b81ad48e3bdb, type: 3} - m_Name: - m_EditorClassIdentifier: - pointsWorth: 1 --- !u!114 &114000012881949288 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -255,4 +159,83 @@ MonoBehaviour: m_EditorClassIdentifier: target: 0 deathEffect: {fileID: 1496494696399852, guid: 61bb6781d7b9444e89d1fd6eef729832, - type: 2} + type: 3} +--- !u!114 &11441764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fa3c260db47248a18ecb8112019040d, type: 3} + m_Name: + m_EditorClassIdentifier: + destroyWhenActivated: 0 + healthChange: -1 +--- !u!114 &114000012184921828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9c4adaf25c56477b836b81ad48e3bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + pointsWorth: 1 +--- !u!60 &4441117583140911826 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.73, y: 1.17} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.36499998, y: 0.295} + - {x: 0.355, y: 0.325} + - {x: 0.275, y: 0.36499998} + - {x: 0.195, y: 0.375} + - {x: 0.125, y: 0.515} + - {x: 0.024999999, y: 0.585} + - {x: -0.044999998, y: 0.585} + - {x: -0.065, y: 0.515} + - {x: -0.24499999, y: 0.355} + - {x: -0.195, y: 0.16499999} + - {x: -0.345, y: 0.16499999} + - {x: -0.36499998, y: 0.13499999} + - {x: -0.36499998, y: 0.085} + - {x: -0.325, y: 0.044999998} + - {x: -0.325, y: -0.055} + - {x: -0.355, y: -0.13499999} + - {x: -0.255, y: -0.21499999} + - {x: -0.205, y: -0.435} + - {x: -0.095, y: -0.585} + - {x: 0.265, y: -0.585} + - {x: 0.305, y: -0.49499997} + - {x: 0.295, y: -0.325} + - {x: 0.36499998, y: -0.185} + - - {x: -0.044999998, y: 0.385} + - {x: -0.044999998, y: 0.42499998} + - {x: -0.065, y: 0.375} + - {x: -0.055, y: 0.375} diff --git a/Unity-Files/Assets/Examples/Defender/Meteor.prefab.meta b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab.meta similarity index 100% rename from Unity-Files/Assets/Examples/Defender/Meteor.prefab.meta rename to Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab.meta diff --git a/Unity-Files/Assets/Images/Asteroids/Pasty.png b/Unity-Files/Assets/Images/Asteroids/Pasty.png new file mode 100644 index 0000000..958c3f6 --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Pasty.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1481e68a6a399c64fcddd98b72e7b449aff5c5baf4d71239cfc836ebd8fcbca +size 1279 diff --git a/Unity-Files/Assets/Images/Asteroids/Pasty.png.meta b/Unity-Files/Assets/Images/Asteroids/Pasty.png.meta new file mode 100644 index 0000000..d705cb9 --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Pasty.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: f52713aa35a19c64a9178e89c2c317fc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Asteroids/Ship.png b/Unity-Files/Assets/Images/Asteroids/Ship.png new file mode 100644 index 0000000..63209b4 --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Ship.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0514ca505cec5739a426f07ab1c2070e0e152e90c4b2bfb1bc6f37943edd9cd4 +size 10929 diff --git a/Unity-Files/Assets/Images/Asteroids/Ship.png.meta b/Unity-Files/Assets/Images/Asteroids/Ship.png.meta new file mode 100644 index 0000000..cd58acd --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Ship.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: d3e5ee0eb24b6d84ea3c1965e4cbefdb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png b/Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png new file mode 100644 index 0000000..077192b --- /dev/null +++ b/Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e77132f078010e6affc8f3dbccda6a10b67c8e57cbcf32abc0006cec8f5a7e1 +size 2807 diff --git a/Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png.meta b/Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png.meta new file mode 100644 index 0000000..2459d3f --- /dev/null +++ b/Unity-Files/Assets/Images/Backgrounds/Sea tile frame 2.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 4719caf1b94ed624fb97281c488369b9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Backgrounds/Sea tile.png b/Unity-Files/Assets/Images/Backgrounds/Sea tile.png new file mode 100644 index 0000000..00768ae --- /dev/null +++ b/Unity-Files/Assets/Images/Backgrounds/Sea tile.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c10d6da846c266882947ea115bd17c6d219cf8dd85fbb6c18098b37907c54520 +size 2940 diff --git a/Unity-Files/Assets/Images/Backgrounds/Sea tile.png.meta b/Unity-Files/Assets/Images/Backgrounds/Sea tile.png.meta new file mode 100644 index 0000000..3f8253f --- /dev/null +++ b/Unity-Files/Assets/Images/Backgrounds/Sea tile.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 7264172ff9419654ab152dc81614330d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Blocks/Castle tower.png b/Unity-Files/Assets/Images/Blocks/Castle tower.png new file mode 100644 index 0000000..3742ea0 --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/Castle tower.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bf7b4093de89f4c53fbcb7ae7535af2de149d0895ef3227373cadfe654f27c0 +size 5216 diff --git a/Unity-Files/Assets/Images/Blocks/Castle tower.png.meta b/Unity-Files/Assets/Images/Blocks/Castle tower.png.meta new file mode 100644 index 0000000..7f03a97 --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/Castle tower.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 5bbd65bcc12cf9742b81837dd19b9827 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Cannon.meta b/Unity-Files/Assets/Images/Cannon.meta new file mode 100644 index 0000000..27518dc --- /dev/null +++ b/Unity-Files/Assets/Images/Cannon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3101d52f3b707c44b977e5b502d2640 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Cannon/Canon ball with trail.png b/Unity-Files/Assets/Images/Cannon/Canon ball with trail.png new file mode 100644 index 0000000..dcdfd5d --- /dev/null +++ b/Unity-Files/Assets/Images/Cannon/Canon ball with trail.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b65c49a2d6a079f9e9e58f014ef02b1d2a0a55389f46c01f9e8ec632797a61c +size 1333 diff --git a/Unity-Files/Assets/Images/Cannon/Canon ball with trail.png.meta b/Unity-Files/Assets/Images/Cannon/Canon ball with trail.png.meta new file mode 100644 index 0000000..207adc3 --- /dev/null +++ b/Unity-Files/Assets/Images/Cannon/Canon ball with trail.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 732f24ff08ff2ac4d858c3327cf901c5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Cannon/Canon ball.png b/Unity-Files/Assets/Images/Cannon/Canon ball.png new file mode 100644 index 0000000..4be28d5 --- /dev/null +++ b/Unity-Files/Assets/Images/Cannon/Canon ball.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2a7ce216f6c60b1a783bc648acd8d9e12d3ae92abb4100210efd35bc62a40f1 +size 1180 diff --git a/Unity-Files/Assets/Images/Cannon/Canon ball.png.meta b/Unity-Files/Assets/Images/Cannon/Canon ball.png.meta new file mode 100644 index 0000000..865aaf5 --- /dev/null +++ b/Unity-Files/Assets/Images/Cannon/Canon ball.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: d6a1f9acdcdbc70408ad1ddb559a7db3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Cannon/Canon, facing away.png b/Unity-Files/Assets/Images/Cannon/Canon, facing away.png new file mode 100644 index 0000000..6efcb6e --- /dev/null +++ b/Unity-Files/Assets/Images/Cannon/Canon, facing away.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1b678dbe9f1335a20ee0f60c3a50d61e1a656c3eac53755f981d12cdab99fc7 +size 6418 diff --git a/Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta b/Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta new file mode 100644 index 0000000..f1edb7c --- /dev/null +++ b/Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 70d7e196908077943883f5850c9577c3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Scripts/Gameplay/ObjectCreatorArea.cs b/Unity-Files/Assets/Scripts/Gameplay/ObjectCreatorArea.cs index 52bd927..2f21a34 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/ObjectCreatorArea.cs +++ b/Unity-Files/Assets/Scripts/Gameplay/ObjectCreatorArea.cs @@ -10,7 +10,7 @@ public class ObjectCreatorArea : MonoBehaviour // The object to spawn // WARNING: take if from the Project panel, NOT the Scene/Hierarchy! public GameObject prefabToSpawn; - + public GameObject ItemOne; [Header("Other options")] // Configure the spawning pattern diff --git a/Unity-Files/UserSettings/EditorUserSettings.asset b/Unity-Files/UserSettings/EditorUserSettings.asset index 04fa21d..cfc8ffa 100644 --- a/Unity-Files/UserSettings/EditorUserSettings.asset +++ b/Unity-Files/UserSettings/EditorUserSettings.asset @@ -6,24 +6,27 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d - flags: 0 - RecentlyUsedScenePath-1: value: 224247031146467e150f01321c264c5f24181f3f29242f3b28662f3ce5f53134ebec33a7f234362820 flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 224247031146467e150f01321c264c5f37130e2f223c332228663c37f4e53a2cf7f533a7f234362820 flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 224247031146467e150f01321c264c5f3018173e2e292a3c620f123cf6e23534eea923e7ee2e26 flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-3: value: 224247031146467e150f01321c264c5f3a16162e293a691c2c271936f0ae2136ebf32f flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-4: value: 224247031146467e150f01321c264c5f3b16022f6305272a28051825e7ec6476f7e93ffdfe flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + flags: 0 RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c6c3338282b2b21382a35633c133af6f9 + flags: 0 + RecentlyUsedScenePath-7: value: 224247031146467e150f01321c264c5f32121e2f222c2322620d1835e7ee303df0a923e7ee2e26 flags: 0 vcSharedLogLevel: From 215e1793bea84b268341017b890677da92a8848c Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 16:13:53 +0000 Subject: [PATCH 02/23] Update Changed Pivot Point of Cannon --- .../Assets/Examples/Defender/Defender.unity | 4 ++-- .../Images/Cannon/Canon, facing away.png.meta | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 08b2fc7..c55c5c5 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -398,7 +398,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 267901556} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -3.84, z: 0} + m_LocalPosition: {x: 0, y: -4.49, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 213808747} @@ -593,7 +593,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 565676024} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalPosition: {x: 0, y: 1.19, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 267901558} diff --git a/Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta b/Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta index f1edb7c..6763fee 100644 --- a/Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta +++ b/Unity-Files/Assets/Images/Cannon/Canon, facing away.png.meta @@ -44,7 +44,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 + alignment: 7 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -75,6 +75,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] From b5912c09536e5bc3a1c471b11234fdf9de7ce58f Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 16:16:00 +0000 Subject: [PATCH 03/23] Update Re-aligned Collision Bounds --- .../Assets/Examples/Defender/Defender.unity | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index c55c5c5..871fbf3 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -566,7 +566,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &565676024 GameObject: @@ -697,7 +697,7 @@ Transform: m_LocalScale: {x: 1.0063003, y: 1.0063004, z: 0.5031502} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &883890379 GameObject: @@ -728,7 +728,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &883890381 SpriteRenderer: @@ -810,7 +810,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &950081913 SpriteRenderer: @@ -890,6 +890,8 @@ Transform: m_LocalPosition: {x: 0, y: -5, z: 0} m_LocalScale: {x: 1, y: 1, z: 2} m_Children: + - {fileID: 1744543749} + - {fileID: 1444297366} - {fileID: 467411917} - {fileID: 668653128} - {fileID: 883890380} @@ -962,7 +964,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 990867867} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -5.1556, z: 0} + m_LocalPosition: {x: 0, y: -4.39, z: 0} m_LocalScale: {x: 1, y: 1, z: 2} m_Children: [] m_Father: {fileID: 0} @@ -980,7 +982,7 @@ GameObject: - component: {fileID: 1011785961} - component: {fileID: 1011785962} m_Layer: 0 - m_Name: AsteroidSpawner + m_Name: EnemySpawner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1269,12 +1271,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1444297364} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.13, y: -3.55, z: 0} - m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8.13, y: 1.45, z: 0} + m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 0.5} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 + m_Father: {fileID: 965912684} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1659683273 GameObject: @@ -1417,12 +1419,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1744543747} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8.15, y: -3.55, z: 0} - m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.15, y: 1.45, z: 0} + m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 0.5} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 965912684} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1780207595 GameObject: From 883d531a23e4b55b99f69b8ab1dd05f92d55044b Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 16:21:11 +0000 Subject: [PATCH 04/23] Bug Fix Trigger Between CannonBall & Enemy Ship --- .../Examples/Defender/CannonBall.prefab | 31 ++----------------- .../Examples/Defender/Enemy Ship.prefab | 15 --------- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/CannonBall.prefab b/Unity-Files/Assets/Examples/Defender/CannonBall.prefab index a0efc28..bf18cbd 100644 --- a/Unity-Files/Assets/Examples/Defender/CannonBall.prefab +++ b/Unity-Files/Assets/Examples/Defender/CannonBall.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 454194} - component: {fileID: 21278666} - - component: {fileID: 6151316} - component: {fileID: 5075258} - component: {fileID: 11477670} - component: {fileID: 114000014027203158} @@ -89,32 +88,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!61 &6151316 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 196000} - m_Enabled: 0 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.32, y: 0.32} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.13, y: 0.37} - m_EdgeRadius: 0 --- !u!50 &5075258 Rigidbody2D: serializedVersion: 4 @@ -127,7 +100,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 1 - m_Mass: 0.114046305 + m_Mass: 1 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 0 @@ -195,7 +168,7 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} diff --git a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab index 23992bb..af10556 100644 --- a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab +++ b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 416926} - component: {fileID: 21256868} - component: {fileID: 5058630} - - component: {fileID: 11424868} - component: {fileID: 114000011533140650} - component: {fileID: 114000012881949288} - component: {fileID: 11441764} @@ -110,20 +109,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &11424868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 105984} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c62d65bd264a4e088b75b7511b9467a, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidbody2D: {fileID: 0} - rotationSpeed: 5 --- !u!114 &114000011533140650 MonoBehaviour: m_ObjectHideFlags: 0 From 803df9dd94fd1b859b47befbfd596ff9bd3c9921 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 17:10:05 +0000 Subject: [PATCH 05/23] Added Enemy Return Script (WIP) --- .../Assets/Scripts/Movement/EnemyReturn.cs | 19 +++++++++++++++++++ .../Scripts/Movement/EnemyReturn.cs.meta | 11 +++++++++++ 2 files changed, 30 insertions(+) create mode 100644 Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs create mode 100644 Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs.meta diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs new file mode 100644 index 0000000..eec94df --- /dev/null +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Rigidbody2D))] +public class EnemyReturn : Physics2DObject +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs.meta b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs.meta new file mode 100644 index 0000000..97e0f7a --- /dev/null +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1cf824a8218b19a4f843a9fa0642f548 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 5349e532ac7aeb9ade305011051194e37ab9addb Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 17:35:46 +0000 Subject: [PATCH 06/23] Update Edited Sorting Order For UI --- .../Assets/Examples/Defender/Defender.unity | 36 +++++++++++++++++++ .../Examples/Defender/Enemy Ship.prefab | 12 +++++++ 2 files changed, 48 insertions(+) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 7f78233..0081517 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -2028,6 +2028,7 @@ GameObject: - component: {fileID: 1911483931} - component: {fileID: 1880482685} - component: {fileID: 1891200086} + - component: {fileID: 1891200088} - component: {fileID: 1880477035} - component: {fileID: 114000009163615921} - component: {fileID: 1891200087} @@ -2067,6 +2068,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a8504d71b5f7e374bb0450375fe3e6d3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!210 &1891200088 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891200085} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1891202903 GameObject: m_ObjectHideFlags: 0 @@ -2171,6 +2183,7 @@ GameObject: m_Component: - component: {fileID: 1911386533} - component: {fileID: 1911052147} + - component: {fileID: 1891273396} m_Layer: 5 m_Name: GameOverPanel m_TagString: Untagged @@ -2178,6 +2191,17 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 +--- !u!210 &1891273396 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891273395} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1891273445 GameObject: m_ObjectHideFlags: 0 @@ -2206,6 +2230,7 @@ GameObject: m_Component: - component: {fileID: 1911392657} - component: {fileID: 1911520267} + - component: {fileID: 1891276010} m_Layer: 5 m_Name: WinPanel m_TagString: Untagged @@ -2213,6 +2238,17 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 +--- !u!210 &1891276010 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1891276009} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!222 &1911052147 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab index af10556..3cdaac4 100644 --- a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab +++ b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 11441764} - component: {fileID: 114000012184921828} - component: {fileID: 4441117583140911826} + - component: {fileID: -7020474658778450613} m_Layer: 0 m_Name: Enemy Ship m_TagString: Enemy @@ -224,3 +225,14 @@ PolygonCollider2D: - {x: -0.044999998, y: 0.42499998} - {x: -0.065, y: 0.375} - {x: -0.055, y: 0.375} +--- !u!210 &-7020474658778450613 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -5 From 5394ae8f79664a58f4821927db22ff22c4bf6b02 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 17:44:11 +0000 Subject: [PATCH 07/23] Updated UI Constraints --- Unity-Files/Assets/Examples/Defender/Defender.unity | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 0081517..0048dca 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -2507,10 +2507,10 @@ RectTransform: m_Father: {fileID: 1911403295} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 464.755} - m_SizeDelta: {x: 0, y: -931.51} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -75.244995} + m_SizeDelta: {x: 1920, y: 148.48999} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &1911483931 Canvas: From 914070f0f347aa718097111a21836c6c603c4cd4 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 19:32:04 +0000 Subject: [PATCH 08/23] Added Enemy Return Script Functionality --- .../Examples/Defender/Enemy Ship.prefab | 127 ++++++++---------- .../Assets/Scripts/Movement/EnemyReturn.cs | 41 +++++- 2 files changed, 95 insertions(+), 73 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab index 3cdaac4..d1c0190 100644 --- a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab +++ b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab @@ -11,11 +11,10 @@ GameObject: - component: {fileID: 416926} - component: {fileID: 21256868} - component: {fileID: 5058630} - - component: {fileID: 114000011533140650} - - component: {fileID: 114000012881949288} - - component: {fileID: 11441764} - - component: {fileID: 114000012184921828} - component: {fileID: 4441117583140911826} + - component: {fileID: -2225950841401146330} + - component: {fileID: 114000011533140650} + - component: {fileID: 114000012184921828} - component: {fileID: -7020474658778450613} m_Layer: 0 m_Name: Enemy Ship @@ -81,7 +80,7 @@ SpriteRenderer: m_Sprite: {fileID: 21300000, guid: d3e5ee0eb24b6d84ea3c1965e4cbefdb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 - m_FlipY: 0 + m_FlipY: 1 m_DrawMode: 0 m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 @@ -101,78 +100,15 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 1 - m_Mass: 1.0318747 + m_Mass: 1 m_LinearDrag: 4 m_AngularDrag: 0.05 - m_GravityScale: 1 + m_GravityScale: 0 m_Material: {fileID: 0} m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &114000011533140650 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bdab9334f9a2a4efe8c019b5d37595cd, type: 3} - m_Name: - m_EditorClassIdentifier: - actions: - - {fileID: 114000012881949288} - useCustomActions: 0 - customActions: - m_PersistentCalls: - m_Calls: [] - happenOnlyOnce: 1 - filterByTag: 0 - filterTag: Player ---- !u!114 &114000012881949288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: be840ffee03ed4abe9b3dc9b48f9cae7, type: 3} - m_Name: - m_EditorClassIdentifier: - target: 0 - deathEffect: {fileID: 1496494696399852, guid: 61bb6781d7b9444e89d1fd6eef729832, - type: 3} ---- !u!114 &11441764 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0fa3c260db47248a18ecb8112019040d, type: 3} - m_Name: - m_EditorClassIdentifier: - destroyWhenActivated: 0 - healthChange: -1 ---- !u!114 &114000012184921828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 105984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b9c4adaf25c56477b836b81ad48e3bdb, type: 3} - m_Name: - m_EditorClassIdentifier: - pointsWorth: 1 --- !u!60 &4441117583140911826 PolygonCollider2D: m_ObjectHideFlags: 0 @@ -183,7 +119,7 @@ PolygonCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -225,6 +161,55 @@ PolygonCollider2D: - {x: -0.044999998, y: 0.42499998} - {x: -0.065, y: 0.375} - {x: -0.055, y: 0.375} +--- !u!114 &-2225950841401146330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1cf824a8218b19a4f843a9fa0642f548, type: 3} + m_Name: + m_EditorClassIdentifier: + rigidbody2D: {fileID: 0} + normalSpeed: 5 + returnSpeed: 5 +--- !u!114 &114000011533140650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bdab9334f9a2a4efe8c019b5d37595cd, type: 3} + m_Name: + m_EditorClassIdentifier: + actions: + - {fileID: 0} + useCustomActions: 0 + customActions: + m_PersistentCalls: + m_Calls: [] + happenOnlyOnce: 1 + filterByTag: 0 + filterTag: Player +--- !u!114 &114000012184921828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9c4adaf25c56477b836b81ad48e3bdb, type: 3} + m_Name: + m_EditorClassIdentifier: + pointsWorth: 1 --- !u!210 &-7020474658778450613 SortingGroup: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index eec94df..6b4e1d4 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -5,15 +5,52 @@ using UnityEngine; [RequireComponent(typeof(Rigidbody2D))] public class EnemyReturn : Physics2DObject { + [Header("Movement Speed")] + [Tooltip("The amount of speed in which the boat moves towards the castle")] + public float normalSpeed = 5f; + [Tooltip("The amount of speed in which the boat moves away from the castle")] + public float returnSpeed = 5f; + + private bool isReturning = false; + private Vector2 movement = new Vector2(0f, 0f); + // Start is called before the first frame update void Start() { - + } // Update is called once per frame void Update() { - + if (isReturning) + { + movement = new Vector2(0f, returnSpeed); + } + else + { + movement = new Vector2(0f, -normalSpeed); + } + } + + //FixedUpdate is called every frame when the physics are calculated + void FixedUpdate() + { + rigidbody2D.AddForce(movement); + } + void OnTriggerEnter2D(Collider2D otherCollider) + { + string playerTag = otherCollider.gameObject.tag; + if (playerTag == "Player" || playerTag == "Player2") + { + HealthSystemAttribute healthScript = otherCollider.gameObject.GetComponent(); + if (healthScript != null) + { + // subtract health from the player + healthScript.ModifyHealth(-1); + } + this.GetComponent().flipY = false; + isReturning = true; + } } } From ad095108d13d60855e2b58a910532940b5958ec7 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 19:32:34 +0000 Subject: [PATCH 09/23] Added Pastie Prefab, Self Destruct Script --- .../Assets/Examples/Defender/Pastie.prefab | 219 ++++++++++++++++++ .../Examples/Defender/Pastie.prefab.meta | 7 + .../Gameplay/TimedSelfDestructWithTimer.cs | 29 +++ 3 files changed, 255 insertions(+) create mode 100644 Unity-Files/Assets/Examples/Defender/Pastie.prefab create mode 100644 Unity-Files/Assets/Examples/Defender/Pastie.prefab.meta create mode 100644 Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs diff --git a/Unity-Files/Assets/Examples/Defender/Pastie.prefab b/Unity-Files/Assets/Examples/Defender/Pastie.prefab new file mode 100644 index 0000000..4c37ca9 --- /dev/null +++ b/Unity-Files/Assets/Examples/Defender/Pastie.prefab @@ -0,0 +1,219 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2252406525984333962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3590677777586087654} + - component: {fileID: 1762312007996219834} + - component: {fileID: 9035969042858155278} + - component: {fileID: 885697997895152444} + m_Layer: 0 + m_Name: Pastie + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3590677777586087654 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2252406525984333962} + 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: 4878835270198494247} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1762312007996219834 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2252406525984333962} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: f52713aa35a19c64a9178e89c2c317fc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &9035969042858155278 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2252406525984333962} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.32, y: 0.32} + newSize: {x: 0.32, y: 0.32} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.29, y: 0.14} + m_EdgeRadius: 0 +--- !u!210 &885697997895152444 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2252406525984333962} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &8759752071964469198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4878835270198494247} + - component: {fileID: 3971930330748749842} + - component: {fileID: 6171167674268838333} + m_Layer: 0 + m_Name: TimerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4878835270198494247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8759752071964469198} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.02, y: 0.02, z: -2.668017} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3590677777586087654} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &3971930330748749842 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8759752071964469198} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!102 &6171167674268838333 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8759752071964469198} + m_Text: 5 + m_OffsetZ: 0 + m_CharacterSize: 0.05 + m_LineSpacing: 1 + m_Anchor: 4 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 0 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3} + m_Color: + serializedVersion: 2 + rgba: 4294967295 diff --git a/Unity-Files/Assets/Examples/Defender/Pastie.prefab.meta b/Unity-Files/Assets/Examples/Defender/Pastie.prefab.meta new file mode 100644 index 0000000..7bcf525 --- /dev/null +++ b/Unity-Files/Assets/Examples/Defender/Pastie.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a445f9af9bec11a4e89494c4031e6162 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs new file mode 100644 index 0000000..4f22f12 --- /dev/null +++ b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using System.Collections; + +public class TimedSelfDestruct : MonoBehaviour +{ + + // After this time, the object will be destroyed + public float timeToDestruction; + + + void Start () + { + Invoke("DestroyMe", timeToDestruction); + } + + // Update is called every frame, if the MonoBehaviour is enabled. + void Update() + { + + } + + // This function will destroy this object :( + void DestroyMe() + { + Destroy(gameObject); + + // Bye bye! + } +} From 05311b5b2dd925c96c4c249f33846d03c6791c44 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 20:09:52 +0000 Subject: [PATCH 10/23] Update Self Destruct Script --- .../Gameplay/TimedSelfDestructWithTimer.cs | 36 +++++++++++-------- .../TimedSelfDestructWithTimer.cs.meta | 11 ++++++ 2 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs.meta diff --git a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs index 4f22f12..3a06f03 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs +++ b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs @@ -1,29 +1,37 @@ using UnityEngine; using System.Collections; -public class TimedSelfDestruct : MonoBehaviour +public class TimedSelfDestructWithTimer : MonoBehaviour { - // After this time, the object will be destroyed - public float timeToDestruction; + // After this time, the object will be destroyed + public float timeToDestruction; - void Start () - { - Invoke("DestroyMe", timeToDestruction); - } + void Start() + { + //Invoke("DestroyMe", timeToDestruction); + } // Update is called every frame, if the MonoBehaviour is enabled. void Update() { - + if (timeToDestruction > 0) + { + timeToDestruction -= Time.deltaTime; + GetComponentInChildren().text = Mathf.Abs(timeToDestruction).ToString(); + } + else + { + DestroyMe(); + } } - // This function will destroy this object :( - void DestroyMe() - { - Destroy(gameObject); + // This function will destroy this object :( + void DestroyMe() + { + Destroy(gameObject); - // Bye bye! - } + // Bye bye! + } } diff --git a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs.meta b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs.meta new file mode 100644 index 0000000..fb6e91b --- /dev/null +++ b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7fb007fc909a54d4e9f2700296b8898d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 6688ec3137db504f36b642225d788f6d1064fc79 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 20:11:45 +0000 Subject: [PATCH 11/23] Update Rename Self Destruct Script --- ...ithTimer.cs => TimedSelfDestructWithTimerOrShootToReturn.cs} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Unity-Files/Assets/Scripts/Gameplay/{TimedSelfDestructWithTimer.cs => TimedSelfDestructWithTimerOrShootToReturn.cs} (90%) diff --git a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs similarity index 90% rename from Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs rename to Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs index 3a06f03..f962066 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs +++ b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -public class TimedSelfDestructWithTimer : MonoBehaviour +public class TimedSelfDestructWithTimerOrShootToReturn : MonoBehaviour { // After this time, the object will be destroyed From eea58ac4472f70c8c0005046745c9a0b74be54e4 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 20:18:50 +0000 Subject: [PATCH 12/23] Update Enemy Return Func & Pastie Spawning --- .../Examples/Defender/Enemy Ship.prefab | 4 +++ .../Assets/Examples/Defender/Pastie.prefab | 20 +++++++++++-- ...fDestructWithTimerOrShootToReturn.cs.meta} | 2 +- .../Assets/Scripts/Movement/EnemyReturn.cs | 30 +++++++++++++++---- 4 files changed, 46 insertions(+), 10 deletions(-) rename Unity-Files/Assets/Scripts/Gameplay/{TimedSelfDestructWithTimer.cs.meta => TimedSelfDestructWithTimerOrShootToReturn.cs.meta} (83%) diff --git a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab index d1c0190..f675037 100644 --- a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab +++ b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab @@ -176,6 +176,10 @@ MonoBehaviour: rigidbody2D: {fileID: 0} normalSpeed: 5 returnSpeed: 5 + droppedObject: {fileID: 2252406525984333962, guid: a445f9af9bec11a4e89494c4031e6162, + type: 3} + deathEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, + type: 3} --- !u!114 &114000011533140650 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Examples/Defender/Pastie.prefab b/Unity-Files/Assets/Examples/Defender/Pastie.prefab index 4c37ca9..aba68b0 100644 --- a/Unity-Files/Assets/Examples/Defender/Pastie.prefab +++ b/Unity-Files/Assets/Examples/Defender/Pastie.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3590677777586087654} - component: {fileID: 1762312007996219834} - component: {fileID: 9035969042858155278} + - component: {fileID: 2612555762601387375} - component: {fileID: 885697997895152444} m_Layer: 0 m_Name: Pastie @@ -28,7 +29,7 @@ Transform: m_GameObject: {fileID: 2252406525984333962} 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: 2, y: 2, z: 1} m_Children: - {fileID: 4878835270198494247} m_Father: {fileID: 0} @@ -111,6 +112,19 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.29, y: 0.14} m_EdgeRadius: 0 +--- !u!114 &2612555762601387375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2252406525984333962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d5bb11f68e548f4b8699da51f5e5982, type: 3} + m_Name: + m_EditorClassIdentifier: + timeToDestruction: 10 --- !u!210 &885697997895152444 SortingGroup: m_ObjectHideFlags: 0 @@ -121,7 +135,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -6 --- !u!1 &8759752071964469198 GameObject: m_ObjectHideFlags: 0 @@ -203,7 +217,7 @@ TextMesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8759752071964469198} - m_Text: 5 + m_Text: m_OffsetZ: 0 m_CharacterSize: 0.05 m_LineSpacing: 1 diff --git a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs.meta b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs.meta similarity index 83% rename from Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs.meta rename to Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs.meta index fb6e91b..7ff6e44 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimer.cs.meta +++ b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7fb007fc909a54d4e9f2700296b8898d +guid: 2d5bb11f68e548f4b8699da51f5e5982 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index 6b4e1d4..d813cd1 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -10,6 +10,10 @@ public class EnemyReturn : Physics2DObject public float normalSpeed = 5f; [Tooltip("The amount of speed in which the boat moves away from the castle")] public float returnSpeed = 5f; + [Header("Dropped Object")] + public GameObject droppedObject; + [Header("Death Effect When Shot")] + public GameObject deathEffect; private bool isReturning = false; private Vector2 movement = new Vector2(0f, 0f); @@ -43,14 +47,28 @@ public class EnemyReturn : Physics2DObject string playerTag = otherCollider.gameObject.tag; if (playerTag == "Player" || playerTag == "Player2") { - HealthSystemAttribute healthScript = otherCollider.gameObject.GetComponent(); - if (healthScript != null) - { - // subtract health from the player - healthScript.ModifyHealth(-1); - } + // HealthSystemAttribute healthScript = otherCollider.gameObject.GetComponent(); + // if (healthScript != null) + // { + // // subtract health from the player + // healthScript.ModifyHealth(-1); + // } this.GetComponent().flipY = false; isReturning = true; } + else if (playerTag == "Bullet") + { + if (deathEffect != null) + { + GameObject newDeathEffect = Instantiate(deathEffect); + newDeathEffect.transform.position = this.transform.position; + } + float randomX = Random.Range(0, 1); + float randomY = Random.Range(0, 1); + GameObject newDroppedObject = Instantiate(droppedObject); + newDroppedObject.transform.position = new Vector2(randomX + this.transform.position.x, randomY + this.transform.position.y); + + Destroy(gameObject); + } } } From 24b04cb2085c9b8bbf1585ca9221bccc5204def1 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 21:04:16 +0000 Subject: [PATCH 13/23] Added ItemStash Script for Enemy Pickup --- .../Assets/Scripts/Gameplay/ItemStash.cs | 29 +++++++++++++++++++ .../Assets/Scripts/Gameplay/ItemStash.cs.meta | 11 +++++++ ...medSelfDestructWithTimerOrShootToReturn.cs | 19 +++++++++++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs create mode 100644 Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs.meta diff --git a/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs new file mode 100644 index 0000000..63e7281 --- /dev/null +++ b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ItemStash : MonoBehaviour +{ + [Header("Dropped Item Amount")] + public int droppedItemAmount = 3; + + private void OnTriggerEnter2D(Collider2D other) + { + string objectTag = other.gameObject.tag; + if (objectTag == "Enemy" && droppedItemAmount > 0) + { + droppedItemAmount -= 1; + other.gameObject.GetComponent().hasDroppableObject = true; + } + } + + public void AddDroppedItemAmountByOne() + { + droppedItemAmount += 1; + } + + private void Update() + { + + } +} diff --git a/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs.meta b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs.meta new file mode 100644 index 0000000..ef2074a --- /dev/null +++ b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bba26da02d9d0b540be9dee579836806 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs index f962066..a2dbfa2 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs +++ b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs @@ -19,7 +19,7 @@ public class TimedSelfDestructWithTimerOrShootToReturn : MonoBehaviour if (timeToDestruction > 0) { timeToDestruction -= Time.deltaTime; - GetComponentInChildren().text = Mathf.Abs(timeToDestruction).ToString(); + GetComponentInChildren().text = timeToDestruction.ToString().Split('.')[0]; } else { @@ -30,8 +30,25 @@ public class TimedSelfDestructWithTimerOrShootToReturn : MonoBehaviour // This function will destroy this object :( void DestroyMe() { + HealthSystemAttribute healthScript = GameObject.Find("CollisionDetector").gameObject.GetComponent(); + if (healthScript != null) + { + // subtract health from the player + healthScript.ModifyHealth(-1); + } Destroy(gameObject); // Bye bye! } + + private void OnTriggerEnter2D(Collider2D other) + { + string objectTag = other.gameObject.tag; + if (objectTag == "Bullet") + { + GameObject.Find("CollisionDetector").GetComponent().AddDroppedItemAmountByOne(); + Destroy(other); + Destroy(gameObject); + } + } } From aeae818f80a02f01b0f29ec450797e13d8efb79d Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 21:05:07 +0000 Subject: [PATCH 14/23] Updated EnemyReturn Script To Handle Dropping Item --- .../Assets/Examples/Defender/Defender.unity | 77 ++++++++++++++++++- .../Assets/Scripts/Movement/EnemyReturn.cs | 32 +++++--- 2 files changed, 95 insertions(+), 14 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 0048dca..12d344c 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -404,7 +404,7 @@ Transform: - {fileID: 213808747} - {fileID: 565676025} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &267901559 MonoBehaviour: @@ -897,7 +897,7 @@ Transform: - {fileID: 883890380} - {fileID: 950081912} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &990867867 GameObject: @@ -910,6 +910,7 @@ GameObject: - component: {fileID: 990867870} - component: {fileID: 990867869} - component: {fileID: 990867868} + - component: {fileID: 990867871} m_Layer: 0 m_Name: CollisionDetector m_TagString: Player @@ -928,7 +929,7 @@ BoxCollider2D: m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_UsedByEffector: 0 + m_UsedByEffector: 1 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: @@ -970,6 +971,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &990867871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 990867867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bba26da02d9d0b540be9dee579836806, type: 3} + m_Name: + m_EditorClassIdentifier: + droppedItemAmount: 3 --- !u!1 &1011785959 GameObject: m_ObjectHideFlags: 0 @@ -1043,6 +1057,63 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 12, y: 2} m_EdgeRadius: 0 +--- !u!1 &1019999843 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1019999845} + - component: {fileID: 1019999844} + m_Layer: 0 + m_Name: CollisionDetectorReturn + m_TagString: Finish + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1019999844 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019999843} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0.19999999, y: 0.22, z: 0.19999999, w: 0.24} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.28, y: 1.28} + newSize: {x: 17.75735, y: 1.2300253} + adaptiveTilingThreshold: 0.5 + drawMode: 2 + adaptiveTiling: 0 + m_AutoTiling: 1 + serializedVersion: 2 + m_Size: {x: 1.28, y: 1.28} + m_EdgeRadius: 0 +--- !u!4 &1019999845 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1019999843} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 6.48, z: 0} + m_LocalScale: {x: 1, y: 1, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1066252771 GameObject: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index d813cd1..10515ca 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -14,6 +14,8 @@ public class EnemyReturn : Physics2DObject public GameObject droppedObject; [Header("Death Effect When Shot")] public GameObject deathEffect; + [Header("Has Droppable Object")] + public bool hasDroppableObject = false; private bool isReturning = false; private Vector2 movement = new Vector2(0f, 0f); @@ -47,12 +49,6 @@ public class EnemyReturn : Physics2DObject string playerTag = otherCollider.gameObject.tag; if (playerTag == "Player" || playerTag == "Player2") { - // HealthSystemAttribute healthScript = otherCollider.gameObject.GetComponent(); - // if (healthScript != null) - // { - // // subtract health from the player - // healthScript.ModifyHealth(-1); - // } this.GetComponent().flipY = false; isReturning = true; } @@ -63,11 +59,25 @@ public class EnemyReturn : Physics2DObject GameObject newDeathEffect = Instantiate(deathEffect); newDeathEffect.transform.position = this.transform.position; } - float randomX = Random.Range(0, 1); - float randomY = Random.Range(0, 1); - GameObject newDroppedObject = Instantiate(droppedObject); - newDroppedObject.transform.position = new Vector2(randomX + this.transform.position.x, randomY + this.transform.position.y); - + if (hasDroppableObject) + { + GameObject newDroppedObject = Instantiate(droppedObject); + newDroppedObject.transform.position = new Vector2(Random.Range(0, 1) + this.transform.position.x, Random.Range(0, 1) + this.transform.position.y); + } + Destroy(gameObject); + } + else if (playerTag == "Finish" && hasDroppableObject) + { + HealthSystemAttribute healthScript = GameObject.Find("CollisionDetector").gameObject.GetComponent(); + if (healthScript != null) + { + // subtract health from the player + healthScript.ModifyHealth(-1); + } + Destroy(gameObject); + } + else if (playerTag == "Finish" && isReturning) + { Destroy(gameObject); } } From 54446d676bda7343b7977ef9544ef64c37aae6c9 Mon Sep 17 00:00:00 2001 From: Philip White Date: Mon, 1 Nov 2021 21:17:37 +0000 Subject: [PATCH 15/23] Update Increase Pastie Spawn Range & Bullet Delete --- .../Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs | 2 +- Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs index a2dbfa2..fc9c43d 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs +++ b/Unity-Files/Assets/Scripts/Gameplay/TimedSelfDestructWithTimerOrShootToReturn.cs @@ -47,7 +47,7 @@ public class TimedSelfDestructWithTimerOrShootToReturn : MonoBehaviour if (objectTag == "Bullet") { GameObject.Find("CollisionDetector").GetComponent().AddDroppedItemAmountByOne(); - Destroy(other); + Destroy(other.gameObject); Destroy(gameObject); } } diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index 10515ca..72e51bf 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -62,7 +62,7 @@ public class EnemyReturn : Physics2DObject if (hasDroppableObject) { GameObject newDroppedObject = Instantiate(droppedObject); - newDroppedObject.transform.position = new Vector2(Random.Range(0, 1) + this.transform.position.x, Random.Range(0, 1) + this.transform.position.y); + newDroppedObject.transform.position = new Vector2(Random.Range(0, 2) + this.transform.position.x, Random.Range(0, 2) + this.transform.position.y); } Destroy(gameObject); } From 1d0a89a9ef9106db1e56d0e7e5bc3cf68de2d360 Mon Sep 17 00:00:00 2001 From: Philip White Date: Tue, 2 Nov 2021 16:21:52 +0000 Subject: [PATCH 16/23] Update EnemyReturn Script Optimizations --- Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index 72e51bf..fd453f1 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -29,14 +29,7 @@ public class EnemyReturn : Physics2DObject // Update is called once per frame void Update() { - if (isReturning) - { - movement = new Vector2(0f, returnSpeed); - } - else - { - movement = new Vector2(0f, -normalSpeed); - } + movement = (isReturning) ? new Vector2(0f, returnSpeed) : new Vector2(0f, -normalSpeed); } //FixedUpdate is called every frame when the physics are calculated From eaac888ac194884baa6ac05c23817b416afba863 Mon Sep 17 00:00:00 2001 From: Philip White Date: Tue, 2 Nov 2021 16:36:10 +0000 Subject: [PATCH 17/23] Update ItemStash & EnemyReturn Script Conform OOP --- Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs | 2 +- Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs index 63e7281..15edc46 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs +++ b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs @@ -13,7 +13,7 @@ public class ItemStash : MonoBehaviour if (objectTag == "Enemy" && droppedItemAmount > 0) { droppedItemAmount -= 1; - other.gameObject.GetComponent().hasDroppableObject = true; + other.gameObject.GetComponent().toggleHasDroppableObject(); } } diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index fd453f1..344c2f5 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -15,8 +15,8 @@ public class EnemyReturn : Physics2DObject [Header("Death Effect When Shot")] public GameObject deathEffect; [Header("Has Droppable Object")] - public bool hasDroppableObject = false; + private bool hasDroppableObject = false; private bool isReturning = false; private Vector2 movement = new Vector2(0f, 0f); @@ -74,4 +74,8 @@ public class EnemyReturn : Physics2DObject Destroy(gameObject); } } + public void toggleHasDroppableObject() + { + hasDroppableObject = (hasDroppableObject) ? false : true; + } } From b95dedf52dae7c94f70f125b181c180a55280765 Mon Sep 17 00:00:00 2001 From: Philip White Date: Tue, 2 Nov 2021 23:37:54 +0000 Subject: [PATCH 18/23] Added Addressables Package & Pastie Ship Sprite --- Unity-Files/Assets/AddressableAssetsData.meta | 8 ++ .../AddressableAssetSettings.asset | 91 +++++++++++++++++ .../AddressableAssetSettings.asset.meta | 8 ++ .../AssetGroupTemplates.meta | 8 ++ .../AssetGroupTemplates/Packed Assets.asset | 72 +++++++++++++ .../Packed Assets.asset.meta | 8 ++ .../AddressableAssetsData/AssetGroups.meta | 8 ++ .../AssetGroups/Built In Data.asset | 36 +++++++ .../AssetGroups/Built In Data.asset.meta | 8 ++ .../AssetGroups/Default Local Group.asset | 31 ++++++ .../Default Local Group.asset.meta | 8 ++ .../AssetGroups/Schemas.meta | 8 ++ .../Built In Data_PlayerDataGroupSchema.asset | 17 ++++ ...t In Data_PlayerDataGroupSchema.asset.meta | 8 ++ ... Local Group_BundledAssetGroupSchema.asset | 41 ++++++++ ...l Group_BundledAssetGroupSchema.asset.meta | 8 ++ ...Local Group_ContentUpdateGroupSchema.asset | 16 +++ ... Group_ContentUpdateGroupSchema.asset.meta | 8 ++ .../AddressableAssetsData/DataBuilders.meta | 8 ++ .../DataBuilders/BuildScriptFastMode.asset | 20 ++++ .../BuildScriptFastMode.asset.meta | 8 ++ .../DataBuilders/BuildScriptPackedMode.asset | 20 ++++ .../BuildScriptPackedMode.asset.meta | 8 ++ .../BuildScriptPackedPlayMode.asset | 20 ++++ .../BuildScriptPackedPlayMode.asset.meta | 8 ++ .../DataBuilders/BuildScriptVirtualMode.asset | 20 ++++ .../BuildScriptVirtualMode.asset.meta | 8 ++ .../AddressableAssetsData/DefaultObject.asset | 15 +++ .../DefaultObject.asset.meta | 8 ++ .../Assets/AddressableAssetsData/Windows.meta | 8 ++ .../Windows/addressables_content_state.bin | Bin 0 -> 1239 bytes .../addressables_content_state.bin.meta | 7 ++ .../Examples/Defender/Enemy Ship.prefab | 35 ++++--- Unity-Files/Assets/Images/Asteroids/Ship.png | 4 +- .../Assets/Images/Asteroids/Ship.png.meta | 2 +- .../Images/Asteroids/ship with pasties.png | 3 + .../Asteroids/ship with pasties.png.meta | 96 ++++++++++++++++++ Unity-Files/Packages/manifest.json | 1 + Unity-Files/Packages/packages-lock.json | 19 ++++ .../ProjectSettings/EditorBuildSettings.asset | 4 +- 40 files changed, 692 insertions(+), 22 deletions(-) create mode 100644 Unity-Files/Assets/AddressableAssetsData.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset create mode 100644 Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/Windows.meta create mode 100644 Unity-Files/Assets/AddressableAssetsData/Windows/addressables_content_state.bin create mode 100644 Unity-Files/Assets/AddressableAssetsData/Windows/addressables_content_state.bin.meta create mode 100644 Unity-Files/Assets/Images/Asteroids/ship with pasties.png create mode 100644 Unity-Files/Assets/Images/Asteroids/ship with pasties.png.meta diff --git a/Unity-Files/Assets/AddressableAssetsData.meta b/Unity-Files/Assets/AddressableAssetsData.meta new file mode 100644 index 0000000..49167c7 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dde42c888c2b0ee41a1b73bfc2c8426d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset new file mode 100644 index 0000000..5620c76 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3} + m_Name: AddressableAssetSettings + m_EditorClassIdentifier: + m_DefaultGroup: 9b24bac643382694fafda8c47ea29882 + m_OptimizeCatalogSize: 0 + m_BuildRemoteCatalog: 0 + m_BundleLocalCatalog: 0 + m_DisableCatalogUpdateOnStart: 0 + m_IgnoreUnsupportedFilesInBuild: 0 + m_UniqueBundleIds: 0 + m_maxConcurrentWebRequests: 500 + m_ContiguousBundles: 0 + m_RemoteCatalogBuildPath: + m_Id: + m_RemoteCatalogLoadPath: + m_Id: + m_overridePlayerVersion: + m_GroupAssets: + - {fileID: 11400000, guid: ac3d2bd4bcc87e148980ba31a0c3efc4, type: 2} + - {fileID: 11400000, guid: 61501c81529c96441b0043a560d7c128, type: 2} + m_BuildSettings: + m_CompileScriptsInVirtualMode: 0 + m_CleanupStreamingAssetsAfterBuilds: 1 + m_LogResourceManagerExceptions: 1 + m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles + m_ProfileSettings: + m_Profiles: + - m_InheritedParent: + m_Id: 7ae12ba11f7decb40913f881b4164421 + m_ProfileName: Default + m_Values: + - m_Id: 661f262ec5573db4a9e3122e4fc1d60d + m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' + - m_Id: 90862ebb45d63c44b89f8d2a0f72cc8d + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: a7c63d9d0b9a063458a7c08af8083993 + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: 657cef3068cb0364dac8714f4c4c2364 + m_Value: ServerData/[BuildTarget] + - m_Id: 8c245e4cb399bb748acd3ef82e8bd1f6 + m_Value: http://localhost/[BuildTarget] + m_ProfileEntryNames: + - m_Id: 661f262ec5573db4a9e3122e4fc1d60d + m_Name: BuildTarget + m_InlineUsage: 0 + - m_Id: 90862ebb45d63c44b89f8d2a0f72cc8d + m_Name: LocalBuildPath + m_InlineUsage: 0 + - m_Id: a7c63d9d0b9a063458a7c08af8083993 + m_Name: LocalLoadPath + m_InlineUsage: 0 + - m_Id: 657cef3068cb0364dac8714f4c4c2364 + m_Name: RemoteBuildPath + m_InlineUsage: 0 + - m_Id: 8c245e4cb399bb748acd3ef82e8bd1f6 + m_Name: RemoteLoadPath + m_InlineUsage: 0 + m_ProfileVersion: 1 + m_LabelTable: + m_LabelNames: + - default + m_SchemaTemplates: [] + m_GroupTemplateObjects: + - {fileID: 11400000, guid: e8909e0d9670cf24b9357138a0c29cf0, type: 2} + m_InitializationObjects: [] + m_CertificateHandlerType: + m_AssemblyName: + m_ClassName: + m_ActivePlayerDataBuilderIndex: 3 + m_DataBuilders: + - {fileID: 11400000, guid: e66acd448b20d7a498d7d0a00321ce7e, type: 2} + - {fileID: 11400000, guid: 2cf0341230fbc45409301f65f6b97745, type: 2} + - {fileID: 11400000, guid: 47235629f5cb6224cac5deaa7f639589, type: 2} + - {fileID: 11400000, guid: f045ec03a2b7ba545ae3177d13cba3f9, type: 2} + m_ActiveProfileId: 7ae12ba11f7decb40913f881b4164421 + m_HostingServicesManager: + m_HostingServiceInfos: [] + m_Settings: {fileID: 11400000} + m_NextInstanceId: 0 + m_RegisteredServiceTypeRefs: [] diff --git a/Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta b/Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta new file mode 100644 index 0000000..834ddaf --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b578c43e9c81da43bb4ce36f20bc48a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates.meta new file mode 100644 index 0000000..9d936bf --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6ff76534513c634db23d2e0286569db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset new file mode 100644 index 0000000..345362f --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4623118312765661686 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 0} + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: + m_ClassName: + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: + m_LoadPath: + m_Id: + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: + m_ClassName: + m_BundleNaming: 0 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3} + m_Name: Packed Assets + m_EditorClassIdentifier: + m_SchemaObjects: + - {fileID: -4623118312765661686} + - {fileID: 8280779208375453927} + m_Description: Pack assets into asset bundles. + m_Settings: {fileID: 0} +--- !u!114 &8280779208375453927 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 0} + m_StaticContent: 0 diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta new file mode 100644 index 0000000..0bf4a37 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8909e0d9670cf24b9357138a0c29cf0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroups.meta new file mode 100644 index 0000000..7d6910c --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59e9f538662e97b448025fc5d8637c23 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset new file mode 100644 index 0000000..aab9163 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Built In Data + m_EditorClassIdentifier: + m_GroupName: Built In Data + m_Data: + m_SerializedData: [] + m_GUID: 2031d56dea662e946ae06379f88ca734 + m_SerializeEntries: + - m_GUID: Resources + m_Address: Resources + m_ReadOnly: 1 + m_SerializedLabels: [] + m_MainAsset: {fileID: 0} + m_TargetAsset: {fileID: 0} + - m_GUID: EditorSceneList + m_Address: EditorSceneList + m_ReadOnly: 1 + m_SerializedLabels: [] + m_MainAsset: {fileID: 0} + m_TargetAsset: {fileID: 0} + m_ReadOnly: 1 + m_Settings: {fileID: 11400000, guid: 0b578c43e9c81da43bb4ce36f20bc48a, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 206e232f6671ccc47abd7f2e65a13383, type: 2} diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta new file mode 100644 index 0000000..50cbc8d --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac3d2bd4bcc87e148980ba31a0c3efc4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset new file mode 100644 index 0000000..e57bdcc --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Default Local Group + m_EditorClassIdentifier: + m_GroupName: Default Local Group + m_Data: + m_SerializedData: [] + m_GUID: 9b24bac643382694fafda8c47ea29882 + m_SerializeEntries: + - m_GUID: 1e6561e946c90b94895946b3cfb12f82 + m_Address: pastieShip + m_ReadOnly: 0 + m_SerializedLabels: [] + m_MainAsset: {fileID: 2800000, guid: 1e6561e946c90b94895946b3cfb12f82, type: 3} + m_TargetAsset: {fileID: 2800000, guid: 1e6561e946c90b94895946b3cfb12f82, type: 3} + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: 0b578c43e9c81da43bb4ce36f20bc48a, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 029211c210dab174e8f1cf04a7265e40, type: 2} + - {fileID: 11400000, guid: 9e8407396db611c44a21501717a6c096, type: 2} diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta new file mode 100644 index 0000000..7abc90a --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61501c81529c96441b0043a560d7c128 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas.meta new file mode 100644 index 0000000..bb66b4a --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8afbb8d8c2c607c47ad0e1d1ad1c2d2b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset new file mode 100644 index 0000000..e83bcc8 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3} + m_Name: Built In Data_PlayerDataGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: ac3d2bd4bcc87e148980ba31a0c3efc4, type: 2} + m_IncludeResourcesFolders: 1 + m_IncludeBuildSettingsScenes: 1 diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta new file mode 100644 index 0000000..f042dde --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 206e232f6671ccc47abd7f2e65a13383 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset new file mode 100644 index 0000000..ddcfac5 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: Default Local Group_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 61501c81529c96441b0043a560d7c128, type: 2} + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: 90862ebb45d63c44b89f8d2a0f72cc8d + m_LoadPath: + m_Id: a7c63d9d0b9a063458a7c08af8083993 + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta new file mode 100644 index 0000000..5b49713 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e8407396db611c44a21501717a6c096 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset new file mode 100644 index 0000000..bf5de87 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: Default Local Group_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 61501c81529c96441b0043a560d7c128, type: 2} + m_StaticContent: 0 diff --git a/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 0000000..2b3c840 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 029211c210dab174e8f1cf04a7265e40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders.meta b/Unity-Files/Assets/AddressableAssetsData/DataBuilders.meta new file mode 100644 index 0000000..2bfe9c2 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d633935421d148f4b9c3bcea6d08ff0b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset new file mode 100644 index 0000000..50d30dc --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88d21199f5d473f4db36845f2318f180, type: 3} + m_Name: BuildScriptFastMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta new file mode 100644 index 0000000..e92e893 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e66acd448b20d7a498d7d0a00321ce7e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset new file mode 100644 index 0000000..ec875f9 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e2e0ffa088c91d41a086d0b8cb16bdc, type: 3} + m_Name: BuildScriptPackedMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta new file mode 100644 index 0000000..a12926d --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f045ec03a2b7ba545ae3177d13cba3f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset new file mode 100644 index 0000000..7628845 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad8c280d42ee0ed41a27db23b43dd2bf, type: 3} + m_Name: BuildScriptPackedPlayMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta new file mode 100644 index 0000000..b87bf4f --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47235629f5cb6224cac5deaa7f639589 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset new file mode 100644 index 0000000..dfb2d58 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb0e4994b34add1409fd8ccaf4a82de5, type: 3} + m_Name: BuildScriptVirtualMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta new file mode 100644 index 0000000..77921a1 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2cf0341230fbc45409301f65f6b97745 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset b/Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset new file mode 100644 index 0000000..97694ff --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a189bb168d8d90478a09ea08c2f3d72, type: 3} + m_Name: DefaultObject + m_EditorClassIdentifier: + m_AddressableAssetSettingsGuid: 0b578c43e9c81da43bb4ce36f20bc48a diff --git a/Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset.meta b/Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset.meta new file mode 100644 index 0000000..1e9e4fb --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/DefaultObject.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 188067350a96ab9458c39950b9df42d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/Windows.meta b/Unity-Files/Assets/AddressableAssetsData/Windows.meta new file mode 100644 index 0000000..e27fa11 --- /dev/null +++ b/Unity-Files/Assets/AddressableAssetsData/Windows.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45000619e698ff44d86acbf4b4ccdcda +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Unity-Files/Assets/AddressableAssetsData/Windows/addressables_content_state.bin new file mode 100644 index 0000000000000000000000000000000000000000..e78326ea6fd84864027d8826ee4050ab9930815a GIT binary patch literal 1239 zcmbVMU2oGc6m3S^HMA8%2#Lq?K4tl6)=pv%TgAj+jH=rJ38Bc1Z(3`PJ!}V55I=%n z4A;&W-4oT4=tMWMPtLvf+%&vKqwyOLd$&h#3t@UGm{|pflq%4g%sJ@bC1pmcoxyuh znn`gG2JYM$Oe$_F1qT8uqX^#_OshF(`5RbW$SV*BqT;+|>0db3nrEH+P-`$cII0+@ z>(BK>3IoEN8)Be^1pRAHR-kSa^uZ~*iMlz-mq1TMA@x%Qr8F=hhH$w!m4r@-S@!D{ zN0p$MkLNYL=H4cXCXU#NbV@#bwj~;EzP0}1+FrZA{Q%)f9L7-)ML`$`abmA%)NbO7 zF1`o@4C5m5ZR+hdLc`xi*tT)wZ@-$u&4v8S!7A9cWRAyjHPg*`))KNreg~oFBb+*p zU#IWav{H27ahKAvT^RrR0A-rIeI lK^!H+{rzD$EJ&Od!!%9fd6 Date: Tue, 2 Nov 2021 23:38:39 +0000 Subject: [PATCH 19/23] Update Enemy Sprite Change if it Steals Pastie --- Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index 344c2f5..bf52d62 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.AddressableAssets; [RequireComponent(typeof(Rigidbody2D))] public class EnemyReturn : Physics2DObject @@ -14,8 +15,8 @@ public class EnemyReturn : Physics2DObject public GameObject droppedObject; [Header("Death Effect When Shot")] public GameObject deathEffect; - [Header("Has Droppable Object")] - + //[Header("Has Droppable Object")] + private Sprite shipWithPasties; private bool hasDroppableObject = false; private bool isReturning = false; private Vector2 movement = new Vector2(0f, 0f); @@ -23,7 +24,7 @@ public class EnemyReturn : Physics2DObject // Start is called before the first frame update void Start() { - + Addressables.LoadAssetAsync("pastieShip").Completed += handle => { shipWithPasties = handle.Result; }; } // Update is called once per frame @@ -77,5 +78,9 @@ public class EnemyReturn : Physics2DObject public void toggleHasDroppableObject() { hasDroppableObject = (hasDroppableObject) ? false : true; + if (hasDroppableObject) + { + this.GetComponent().sprite = shipWithPasties; + } } } From bd00c9ef27265c430de565aaef85bee988dbe0df Mon Sep 17 00:00:00 2001 From: Philip White Date: Tue, 2 Nov 2021 23:41:17 +0000 Subject: [PATCH 20/23] Added New Sprites --- .../Assets/Images/Blocks/Castle tower.png | 4 +- .../Assets/Images/Blocks/Castle wall.png | 3 + .../Assets/Images/Blocks/Castle wall.png.meta | 96 +++++++++++++++++++ .../Assets/Images/Blocks/Cornish flag.png | 3 + .../Images/Blocks/Cornish flag.png.meta | 96 +++++++++++++++++++ .../Assets/Images/Blocks/PIle of pasties.png | 3 + .../Images/Blocks/PIle of pasties.png.meta | 96 +++++++++++++++++++ 7 files changed, 299 insertions(+), 2 deletions(-) create mode 100644 Unity-Files/Assets/Images/Blocks/Castle wall.png create mode 100644 Unity-Files/Assets/Images/Blocks/Castle wall.png.meta create mode 100644 Unity-Files/Assets/Images/Blocks/Cornish flag.png create mode 100644 Unity-Files/Assets/Images/Blocks/Cornish flag.png.meta create mode 100644 Unity-Files/Assets/Images/Blocks/PIle of pasties.png create mode 100644 Unity-Files/Assets/Images/Blocks/PIle of pasties.png.meta diff --git a/Unity-Files/Assets/Images/Blocks/Castle tower.png b/Unity-Files/Assets/Images/Blocks/Castle tower.png index 3742ea0..ef80e40 100644 --- a/Unity-Files/Assets/Images/Blocks/Castle tower.png +++ b/Unity-Files/Assets/Images/Blocks/Castle tower.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bf7b4093de89f4c53fbcb7ae7535af2de149d0895ef3227373cadfe654f27c0 -size 5216 +oid sha256:40069e0f7a855d0a7b7a9d085e70d62efc9fb15336d5ffb3f5d300bb0f2a996e +size 5763 diff --git a/Unity-Files/Assets/Images/Blocks/Castle wall.png b/Unity-Files/Assets/Images/Blocks/Castle wall.png new file mode 100644 index 0000000..45a68f6 --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/Castle wall.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49e0df79d56fbe1c6f33a21c838fd93152c53251a315a482f391fa1a1122062e +size 15599 diff --git a/Unity-Files/Assets/Images/Blocks/Castle wall.png.meta b/Unity-Files/Assets/Images/Blocks/Castle wall.png.meta new file mode 100644 index 0000000..6f45f8c --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/Castle wall.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 53505d92be4d26e4fb71c0f249711532 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Blocks/Cornish flag.png b/Unity-Files/Assets/Images/Blocks/Cornish flag.png new file mode 100644 index 0000000..3fade5f --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/Cornish flag.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f32767b80d93e4603694c6da2386fd0b2f8fd3428170aca45af4509e99539fcd +size 538 diff --git a/Unity-Files/Assets/Images/Blocks/Cornish flag.png.meta b/Unity-Files/Assets/Images/Blocks/Cornish flag.png.meta new file mode 100644 index 0000000..cdff464 --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/Cornish flag.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 0286bde8818149a4d9bddb459b7f878d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Blocks/PIle of pasties.png b/Unity-Files/Assets/Images/Blocks/PIle of pasties.png new file mode 100644 index 0000000..6fe3fd2 --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/PIle of pasties.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a23411f27b9bf63212a6faac4d8241ea944c0098d62e77be11df7a25388c0416 +size 4197 diff --git a/Unity-Files/Assets/Images/Blocks/PIle of pasties.png.meta b/Unity-Files/Assets/Images/Blocks/PIle of pasties.png.meta new file mode 100644 index 0000000..31b849f --- /dev/null +++ b/Unity-Files/Assets/Images/Blocks/PIle of pasties.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 42050708fbf96444096a94f6226e7b85 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From fb9f847dbc43d07143dd31da5b07ebbb49f78f23 Mon Sep 17 00:00:00 2001 From: Philip White Date: Tue, 2 Nov 2021 23:53:06 +0000 Subject: [PATCH 21/23] Added New Sprites into Scene --- .../Assets/Examples/Defender/Defender.unity | 362 +++++++++++++++++- .../ProjectSettings/ProjectSettings.asset | 2 +- Unity-Files/ProjectSettings/TagManager.asset | 1 + 3 files changed, 349 insertions(+), 16 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 12d344c..eb539d0 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -458,7 +458,171 @@ MonoBehaviour: rigidbody2D: {fileID: 0} typeOfControl: 1 speed: 5 - constrainedDistance: 5 + constrainedDistance: 6 +--- !u!1 &288784317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 288784318} + - component: {fileID: 288784319} + m_Layer: 0 + m_Name: Cornish flag (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &288784318 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288784317} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.6, y: 1.53, z: 0} + m_LocalScale: {x: 1.6399, y: 1.6399, z: 0.81995} + m_Children: [] + m_Father: {fileID: 965912684} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &288784319 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288784317} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 10 + m_Sprite: {fileID: 21300000, guid: 0286bde8818149a4d9bddb459b7f878d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &353042924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 353042925} + - component: {fileID: 353042926} + m_Layer: 0 + m_Name: PIle of pasties (1) + m_TagString: Pastie + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &353042925 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353042924} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.28, y: 0.71000004, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 965912684} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &353042926 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353042924} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 10 + m_Sprite: {fileID: 21300000, guid: 42050708fbf96444096a94f6226e7b85, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &396721111 GameObject: m_ObjectHideFlags: 0 @@ -693,7 +857,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 668653126} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.79, y: 5, z: 0} + m_LocalPosition: {x: -0.77, y: 5, z: 0} m_LocalScale: {x: 1.0063003, y: 1.0063004, z: 0.5031502} m_Children: [] m_Father: {fileID: 965912684} @@ -806,8 +970,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 950081911} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.02, y: 0.61, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0.0141, y: 0.21, z: 0} + m_LocalScale: {x: 1.2, y: 1.2, z: 1} m_Children: [] m_Father: {fileID: 965912684} m_RootOrder: 5 @@ -852,14 +1016,14 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: 00ae0125fcaab6942979154f6275ae0b, type: 3} + m_Sprite: {fileID: 21300000, guid: 53505d92be4d26e4fb71c0f249711532, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 17.75735, y: 1.2300253} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 + m_Size: {x: 14.47987, y: 1.2} + m_AdaptiveModeThreshold: 100 + m_SpriteTileMode: 1 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 @@ -896,6 +1060,10 @@ Transform: - {fileID: 668653128} - {fileID: 883890380} - {fileID: 950081912} + - {fileID: 1061207722} + - {fileID: 288784318} + - {fileID: 1530896881} + - {fileID: 353042925} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -965,7 +1133,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 990867867} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -4.39, z: 0} + m_LocalPosition: {x: 0, y: -4.94, z: 0} m_LocalScale: {x: 1, y: 1, z: 2} m_Children: [] m_Father: {fileID: 0} @@ -1114,6 +1282,88 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1061207721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1061207722} + - component: {fileID: 1061207723} + m_Layer: 0 + m_Name: Cornish flag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1061207722 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061207721} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.95, y: 1.53, z: 0} + m_LocalScale: {x: 1.6399, y: 1.6399, z: 0.81995} + m_Children: [] + m_Father: {fileID: 965912684} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1061207723 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061207721} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 10 + m_Sprite: {fileID: 21300000, guid: 0286bde8818149a4d9bddb459b7f878d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1066252771 GameObject: m_ObjectHideFlags: 0 @@ -1329,7 +1579,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.64, y: 0.64} + m_Size: {x: 0.64, y: 0.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1343,12 +1593,94 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1444297364} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -8.13, y: 1.45, z: 0} - m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 0.5} + m_LocalPosition: {x: -8.26, y: 0.8, z: 0} + m_LocalScale: {x: 2, y: 2, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1530896880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530896881} + - component: {fileID: 1530896882} + m_Layer: 0 + m_Name: PIle of pasties + m_TagString: Pastie + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1530896881 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530896880} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.58, y: 0.71000004, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 965912684} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1530896882 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530896880} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 10 + m_Sprite: {fileID: 21300000, guid: 42050708fbf96444096a94f6226e7b85, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.64, y: 0.64} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1659683273 GameObject: m_ObjectHideFlags: 0 @@ -1477,7 +1809,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.64, y: 0.64} + m_Size: {x: 0.64, y: 0.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1491,8 +1823,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1744543747} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.15, y: 1.45, z: 0} - m_LocalScale: {x: 3.3018234, y: 4.5048623, z: 0.5} + m_LocalPosition: {x: 8.26, y: 0.82, z: 0} + m_LocalScale: {x: 2, y: 2, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} m_RootOrder: 0 diff --git a/Unity-Files/ProjectSettings/ProjectSettings.asset b/Unity-Files/ProjectSettings/ProjectSettings.asset index 21a4906..6050a44 100644 --- a/Unity-Files/ProjectSettings/ProjectSettings.asset +++ b/Unity-Files/ProjectSettings/ProjectSettings.asset @@ -624,7 +624,7 @@ PlayerSettings: webGLThreadsSupport: 0 webGLDecompressionFallback: 0 scriptingDefineSymbols: - 1: GAMEOBJECT_HEADER;DEFAULT_INSPECTORS;CUSTOM_INSPECTORS + 1: GAMEOBJECT_HEADER;DEFAULT_INSPECTORS;CUSTOM_INSPECTORS;USE_ADDRESSABLES additionalCompilerArguments: {} platformArchitecture: iPhone: 1 diff --git a/Unity-Files/ProjectSettings/TagManager.asset b/Unity-Files/ProjectSettings/TagManager.asset index aeb1095..3691ffc 100644 --- a/Unity-Files/ProjectSettings/TagManager.asset +++ b/Unity-Files/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - Bullet - Ground - Pickup + - Pastie layers: - Default - TransparentFX From fa8cffae135bc7e9499d4599ff9ea99b50e6ea6a Mon Sep 17 00:00:00 2001 From: Philip White Date: Wed, 3 Nov 2021 00:05:42 +0000 Subject: [PATCH 22/23] Update ItemStash for Dissapearing Pasties --- .../Assets/Examples/Defender/Defender.unity | 4 ++-- .../Assets/Scripts/Gameplay/ItemStash.cs | 21 ++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index eb539d0..41b1eab 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -566,7 +566,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 353042924} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.28, y: 0.71000004, z: 0} + m_LocalPosition: {x: 7.18, y: 0.71000004, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} @@ -1624,7 +1624,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530896880} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.58, y: 0.71000004, z: 0} + m_LocalPosition: {x: -7.14, y: 0.71000004, z: 0} m_LocalScale: {x: 1.5, y: 1.5, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} diff --git a/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs index 15edc46..86baed4 100644 --- a/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs +++ b/Unity-Files/Assets/Scripts/Gameplay/ItemStash.cs @@ -7,6 +7,8 @@ public class ItemStash : MonoBehaviour [Header("Dropped Item Amount")] public int droppedItemAmount = 3; + private GameObject[] pasties; + private void OnTriggerEnter2D(Collider2D other) { string objectTag = other.gameObject.tag; @@ -22,8 +24,25 @@ public class ItemStash : MonoBehaviour droppedItemAmount += 1; } + private void Start() + { + pasties = GameObject.FindGameObjectsWithTag("Pastie"); + } private void Update() { - + if (droppedItemAmount == 0 && pasties[0].GetComponent().enabled == true) + { + foreach (GameObject pastie in pasties) + { + pastie.GetComponent().enabled = false; + } + } + else if (droppedItemAmount != 0 && pasties[0].GetComponent().enabled == false) + { + foreach (GameObject pastie in pasties) + { + pastie.GetComponent().enabled = true; + } + } } } From 7e9946c146804d35600cacd7c8e97969e420183c Mon Sep 17 00:00:00 2001 From: Philip White Date: Wed, 3 Nov 2021 00:24:49 +0000 Subject: [PATCH 23/23] Update Removed Moon in Scene --- .../Assets/Examples/Defender/Defender.unity | 93 +------------------ 1 file changed, 5 insertions(+), 88 deletions(-) diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 41b1eab..55925f7 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -488,7 +488,7 @@ Transform: m_LocalScale: {x: 1.6399, y: 1.6399, z: 0.81995} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &288784319 SpriteRenderer: @@ -570,7 +570,7 @@ Transform: m_LocalScale: {x: 1.5, y: 1.5, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &353042926 SpriteRenderer: @@ -863,88 +863,6 @@ Transform: m_Father: {fileID: 965912684} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &883890379 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 883890380} - - component: {fileID: 883890381} - m_Layer: 0 - m_Name: Moon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &883890380 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883890379} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.48, y: 7.7400002, z: 0} - m_LocalScale: {x: 1, y: 1, z: 0.5} - m_Children: [] - m_Father: {fileID: 965912684} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &883890381 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883890379} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - 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_ReceiveGI: 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: 145232093 - m_SortingLayer: -1 - m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: 1a2a613e772731b4294f30b3a8b65c39, type: 3} - m_Color: {r: 1, g: 0.9724138, b: 0, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 2.07, y: 1.89} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &950081911 GameObject: m_ObjectHideFlags: 0 @@ -974,7 +892,7 @@ Transform: m_LocalScale: {x: 1.2, y: 1.2, z: 1} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &950081913 SpriteRenderer: @@ -1058,7 +976,6 @@ Transform: - {fileID: 1444297366} - {fileID: 467411917} - {fileID: 668653128} - - {fileID: 883890380} - {fileID: 950081912} - {fileID: 1061207722} - {fileID: 288784318} @@ -1311,7 +1228,7 @@ Transform: m_LocalScale: {x: 1.6399, y: 1.6399, z: 0.81995} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1061207723 SpriteRenderer: @@ -1628,7 +1545,7 @@ Transform: m_LocalScale: {x: 1.5, y: 1.5, z: 0.5} m_Children: [] m_Father: {fileID: 965912684} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1530896882 SpriteRenderer: