diff --git a/Assets/Prefabs/Enemy1.prefab b/Assets/Prefabs/Enemy1.prefab new file mode 100644 index 0000000..16c9de4 --- /dev/null +++ b/Assets/Prefabs/Enemy1.prefab @@ -0,0 +1,253 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3443726424894457733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3664510047316835804} + - component: {fileID: 7177358733894156904} + - component: {fileID: 2681605802920612892} + - component: {fileID: 7729196975184859594} + - component: {fileID: 7516579429804424906} + - component: {fileID: 5924775154812931700} + m_Layer: 0 + m_Name: Enemy1 + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3664510047316835804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443726424894457733} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8511392115440294401} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7177358733894156904 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443726424894457733} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: -6531650029369869252, guid: e3947200ccf82a24a9a0027459618d55, 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.375, y: 0.375} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &2681605802920612892 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443726424894457733} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.1875 +--- !u!50 &7729196975184859594 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443726424894457733} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!114 &7516579429804424906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443726424894457733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36753dfc46d484df186dc8cc4b61b712, type: 3} + m_Name: + m_EditorClassIdentifier: + dirChangeDuration: 2 + wanderSpeed: 1 + seekSpeed: 2 +--- !u!114 &5924775154812931700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3443726424894457733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f0a43b17e365425092c1fc543d7cbfe, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 2 +--- !u!1 &5667590237587315832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8511392115440294401} + - component: {fileID: 3476938476775992701} + m_Layer: 0 + m_Name: Awarness + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8511392115440294401 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5667590237587315832} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3664510047316835804} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &3476938476775992701 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5667590237587315832} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 3 diff --git a/Assets/Prefabs/Enemy1.prefab.meta b/Assets/Prefabs/Enemy1.prefab.meta new file mode 100644 index 0000000..3b2d0f5 --- /dev/null +++ b/Assets/Prefabs/Enemy1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 56112ef4abb3f4c9fb488ffecc0207d8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index cf014fb..7bbc0ba 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -23,12 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 549529339} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.232, z: 0} m_LocalScale: {x: 5, y: 2, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8805537700787760100} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7017491928982299223 GameObject: @@ -53,13 +54,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7017491928982299223} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8805537700787760100} m_Father: {fileID: 8805537702490983440} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8805537700787760099 GameObject: @@ -72,7 +74,7 @@ GameObject: - component: {fileID: 8805537700787760100} - component: {fileID: 8805537700787760101} m_Layer: 0 - m_Name: BarrelArt + m_Name: Barrel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -85,13 +87,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8805537700787760099} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.24, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 549529340} m_Father: {fileID: 3858389907847018898} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8805537700787760101 SpriteRenderer: @@ -104,11 +107,15 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -154,10 +161,13 @@ GameObject: m_Component: - component: {fileID: 8805537702490983440} - component: {fileID: 8805537702490983455} - - component: {fileID: 8805537702490983441} + - component: {fileID: 298094141} + - component: {fileID: 8503483745385123733} + - component: {fileID: 4303489147495518978} + - component: {fileID: 8063383182793680407} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -169,13 +179,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8805537702490983454} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3858389907847018898} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8805537702490983455 SpriteRenderer: @@ -188,11 +199,15 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -228,7 +243,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &8805537702490983441 +--- !u!114 &298094141 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -244,12 +259,12 @@ MonoBehaviour: m_Name: Movement m_Type: 0 m_ExpectedControlType: - m_Id: 876ed586-fb98-4044-aad0-8d1912981c68 + m_Id: edcac87f-d7b1-46ba-a50b-10773bf6f3a1 m_Processors: m_Interactions: m_SingletonActionBindings: - m_Name: 2D Vector - m_Id: a4f932df-3ac6-4067-87fe-3e89017d569e + m_Id: 175a960a-fdc1-4c3e-a99b-d79aa948bf7b m_Path: 2DVector m_Interactions: m_Processors: @@ -257,7 +272,7 @@ MonoBehaviour: m_Action: Movement m_Flags: 4 - m_Name: up - m_Id: e03bb443-921d-4a17-8eff-21ee2aa46197 + m_Id: cda0d181-65b6-4d9f-8eb0-9952bedc7bf0 m_Path: /w m_Interactions: m_Processors: @@ -265,7 +280,7 @@ MonoBehaviour: m_Action: Movement m_Flags: 8 - m_Name: down - m_Id: 6b613c4b-0c99-4cbf-acc4-4b4f7fdeb0eb + m_Id: 4640b72d-cf70-41ca-afc8-2da1eebe7925 m_Path: /s m_Interactions: m_Processors: @@ -273,7 +288,7 @@ MonoBehaviour: m_Action: Movement m_Flags: 8 - m_Name: left - m_Id: a7c6c0dc-224d-4ab8-bf79-b01f3373a789 + m_Id: 1ed223c7-9337-42db-96f2-ccadea540102 m_Path: /a m_Interactions: m_Processors: @@ -281,48 +296,145 @@ MonoBehaviour: m_Action: Movement m_Flags: 8 - m_Name: right - m_Id: c5aaf275-7d14-4808-a3aa-e458acfbc952 + m_Id: 9387f53e-4bd5-4dc9-a555-065d739af4f1 m_Path: /d m_Interactions: m_Processors: m_Groups: m_Action: Movement m_Flags: 8 + m_Flags: 0 mousePosition: m_Name: Mouse Position m_Type: 0 m_ExpectedControlType: - m_Id: b4c2f47b-1865-4243-a8dc-19e9d0851462 + m_Id: a5d79cde-142e-4a21-bfbf-44fc962e9f44 m_Processors: m_Interactions: m_SingletonActionBindings: - m_Name: - m_Id: cfc2aba2-e925-4968-bbd7-321096f086d3 + m_Id: c9e5ffe0-ee57-4904-be77-90b68f420f2b m_Path: /position m_Interactions: m_Processors: m_Groups: m_Action: Mouse Position m_Flags: 0 + m_Flags: 0 fireAction: m_Name: Fire m_Type: 0 m_ExpectedControlType: - m_Id: d1dd9dbe-1a4e-41c9-81cf-10a9dad0221e + m_Id: 4e7315ae-bce3-4819-9604-21929a74c49a m_Processors: m_Interactions: m_SingletonActionBindings: - m_Name: - m_Id: d4bd88ca-5ae7-47bc-9017-d9f5944b726c + m_Id: 623d551f-12e4-4725-a82a-0facaf64ae7c + m_Path: /space + m_Interactions: + m_Processors: + m_Groups: + m_Action: Fire + m_Flags: 0 + - m_Name: + m_Id: 99f1aba5-2287-42f5-972c-e75cacd04a0d m_Path: /leftButton m_Interactions: m_Processors: m_Groups: m_Action: Fire m_Flags: 0 - speed: 5 + m_Flags: 0 mainCamera: {fileID: 0} - fireRate: 5 + speed: 2 + fireRate: 2 projectileGo: {fileID: 940344813558074916, guid: 4b32e914426c07f4fa4f44db1bbc6afa, type: 3} projectileSpawn: {fileID: 549529340} barrelTransform: {fileID: 3858389907847018898} +--- !u!61 &8503483745385123733 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805537702490983454} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 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.5859375, y: 0.546875} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.5859375, y: 0.546875} + m_EdgeRadius: 0 +--- !u!50 &4303489147495518978 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805537702490983454} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!114 &8063383182793680407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805537702490983454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f0a43b17e365425092c1fc543d7cbfe, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 10 diff --git a/Assets/Prefabs/Projectile.prefab b/Assets/Prefabs/Projectile.prefab index 8f469f3..f40ad02 100644 --- a/Assets/Prefabs/Projectile.prefab +++ b/Assets/Prefabs/Projectile.prefab @@ -25,13 +25,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 940344813558074916} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8235354404481829665} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3229313761022417873 MonoBehaviour: @@ -46,9 +47,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 7 + lifeTime: 5 + damage: 2 --- !u!50 &1082271441580440863 Rigidbody2D: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -59,10 +62,16 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -92,12 +101,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8329164775744005515} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7492968586097603671} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8994506715824561311 SpriteRenderer: @@ -110,11 +120,15 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -158,21 +172,41 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8329164775744005515} m_Enabled: 1 + serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0.1} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.12, y: 0.26} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.09375, y: 0.203125} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.12, y: 0.26} + m_Size: {x: 0.1, y: 0.2} m_EdgeRadius: 0 diff --git a/Assets/Scenes/iteration_1.unity b/Assets/Scenes/iteration_1.unity index 4177650..b6deced 100644 --- a/Assets/Scenes/iteration_1.unity +++ b/Assets/Scenes/iteration_1.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -104,7 +100,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,23 +113,29 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &486556677 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8805537702490983440, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} + m_PrefabInstance: {fileID: 746622325} + m_PrefabAsset: {fileID: 0} --- !u!1001 &746622325 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 8805537700787760099, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} - propertyPath: m_Name - value: Barrel - objectReference: {fileID: 0} + - target: {fileID: 298094141, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} + propertyPath: mainCamera + value: + objectReference: {fileID: 1092763158} - target: {fileID: 8805537702490983440, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} propertyPath: m_RootOrder value: 1 @@ -178,23 +180,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8805537702490983441, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} - propertyPath: speed - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8805537702490983441, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} - propertyPath: fireRate - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8805537702490983441, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} - propertyPath: mainCamera - value: - objectReference: {fileID: 1092763158} - target: {fileID: 8805537702490983454, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b39be18c93ba649837b43ea0b6b5a4, type: 3} --- !u!1 &820531058 GameObject: @@ -221,12 +214,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820531058} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1722323543} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!483693784 &820531060 TilemapRenderer: @@ -239,11 +233,15 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2297,6 +2295,7 @@ GameObject: - component: {fileID: 1092763159} - component: {fileID: 1092763158} - component: {fileID: 1092763157} + - component: {fileID: 1092763160} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2326,9 +2325,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -2362,13 +2369,90 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1092763156} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1092763160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092763156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f26d2652963384d78a5a5c295ffea5fd, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 486556677} + box: + serializedVersion: 2 + x: -2 + y: -2 + width: 4 + height: 4 +--- !u!1001 &1381696769 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3443726424894457733, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_Name + value: Enemy1 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalPosition.x + value: -6.1643977 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalPosition.y + value: 3.082702 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664510047316835804, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56112ef4abb3f4c9fb488ffecc0207d8, type: 3} --- !u!1 &1722323541 GameObject: m_ObjectHideFlags: 0 @@ -2405,11 +2489,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1722323541} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 820531059} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1092763159} + - {fileID: 746622325} + - {fileID: 1722323543} + - {fileID: 1381696769} diff --git a/Assets/Scripts/FollowBox.cs b/Assets/Scripts/FollowBox.cs new file mode 100644 index 0000000..3035a6d --- /dev/null +++ b/Assets/Scripts/FollowBox.cs @@ -0,0 +1,49 @@ +using UnityEngine; + +public class FollowBox : MonoBehaviour +{ + public Transform target; + + public Rect box; + + private Vector3 _position; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (target == null) + { + return; + } + + _position = transform.position; + if (_position.x + box.x > target.position.x) + { + //Debug.Log($"position {_position}\nBox eval {_position.x + box.x}\nTarget position {target.position}"); + _position.x = target.position.x + box.x + box.width; + } + + if (_position.x + (box.x + box.width) < target.position.x) + { + _position.x = target.position.x - (box.x + box.width); + } + + if (_position.y + box.y > target.position.y) + { + _position.y = target.position.y + box.y + box.height; + } + + if (_position.y + (box.y + box.height) < target.position.y) + { + _position.y = target.position.y - (box.y + box.height); + } + + transform.position = _position; + } +} diff --git a/Assets/Scripts/FollowBox.cs.meta b/Assets/Scripts/FollowBox.cs.meta new file mode 100644 index 0000000..50586a1 --- /dev/null +++ b/Assets/Scripts/FollowBox.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f26d2652963384d78a5a5c295ffea5fd \ No newline at end of file diff --git a/Assets/Scripts/Health.cs b/Assets/Scripts/Health.cs new file mode 100644 index 0000000..2327ae3 --- /dev/null +++ b/Assets/Scripts/Health.cs @@ -0,0 +1,30 @@ +using UnityEngine; + +public class Health : MonoBehaviour +{ + public float maxHealth; + public System.Action OnDeath; + + private float _currentHealth; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + private void Start() + { + _currentHealth = maxHealth; + } + + public void DealDamage(float damage) + { + _currentHealth -= damage; + if (_currentHealth <= 0) + { + Debug.Log($"{gameObject.name} is dead!"); + OnDeath(); + } + } + + public void HealHealth(float health) + { + _currentHealth = Mathf.Min(_currentHealth + health, maxHealth); + } +} diff --git a/Assets/Scripts/Health.cs.meta b/Assets/Scripts/Health.cs.meta new file mode 100644 index 0000000..254c359 --- /dev/null +++ b/Assets/Scripts/Health.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5f0a43b17e365425092c1fc543d7cbfe \ No newline at end of file diff --git a/Assets/Scripts/MeleeEnemy.cs b/Assets/Scripts/MeleeEnemy.cs new file mode 100644 index 0000000..a46e9ae --- /dev/null +++ b/Assets/Scripts/MeleeEnemy.cs @@ -0,0 +1,99 @@ +using UnityEngine; + +[RequireComponent(typeof(Health))] +public class MeleeEnemy : MonoBehaviour +{ + enum State + { + Wandering = 0, + Seeking = 1, + Dead = 2, + }; + + //private State _currentState; + private System.Action updateFunc; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + //_currentState = State::Wandering; + updateFunc = DoWander; + var h = GetComponent(); + h.OnDeath += ProcessDeath; + } + +#region Wander + [Header("Wander")] + public float dirChangeDuration = 2; + public float wanderSpeed; + + private Vector3 wanderDir; + private float _lastDirChange = -2; + private void DoWander() + { + if (_lastDirChange + dirChangeDuration < Time.time) + { + wanderDir.x = Random.Range(-1f, 1f); + wanderDir.y = Random.Range(-1f, 1f); + _lastDirChange = Time.time; + //Debug.Log($"New wander dir: {wanderDir}"); + } + + transform.position += wanderDir * wanderSpeed * Time.deltaTime; + } +#endregion Wander + +#region Seek + [Header("Seek")] + public float seekSpeed = 2; + + private Transform _target; + private void DoSeek() + { + var dir = (_target.position - transform.position).normalized; + transform.position += dir * seekSpeed * Time.deltaTime; + } +#endregion Seek + + private void DoSleep() + { + + } + + // Update is called once per frame + private void Update() + { + updateFunc(); + } + + private void ProcessDeath() + { + // TODO: effects + Destroy(gameObject); + } + + private void OnTriggerEnter2D(Collider2D other) + { + if (other.CompareTag("Player")) + { + //Debug.Log("Player is in our sphere"); + _target = other.transform; + updateFunc = DoSeek; + } + } + + private void OnCollisionEnter2D(Collision2D other) + { + if (other.collider.CompareTag("Player")) + { + Debug.Log("We have hit the player!"); + var health = other.gameObject.GetComponent(); + if (health != null) + { + updateFunc = DoSleep; + Destroy(gameObject); + health.DealDamage(5); + } + } + } +} diff --git a/Assets/Scripts/MeleeEnemy.cs.meta b/Assets/Scripts/MeleeEnemy.cs.meta new file mode 100644 index 0000000..600492a --- /dev/null +++ b/Assets/Scripts/MeleeEnemy.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 36753dfc46d484df186dc8cc4b61b712 \ No newline at end of file diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index c16dd16..b9ab037 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -2,13 +2,14 @@ using System; using UnityEngine; using UnityEngine.InputSystem; +[RequireComponent(typeof(Health))] public class Player : MonoBehaviour { public InputAction movement; public InputAction mousePosition; public InputAction fireAction; - public float speed = 10; public Camera mainCamera; + public float speed = 10; public float fireRate; public GameObject projectileGo; public Transform projectileSpawn; @@ -22,17 +23,27 @@ public class Player : MonoBehaviour private Action _aimingFunction; private void Start() + { + _transform = transform; + var h = GetComponent(); + h.OnDeath += ProcessDeath; + } + + private void OnEnable() { movement.Enable(); - // TODO: if no controller detected, enable mouse. mousePosition.Enable(); _aimingFunction = MouseAim; // TODO: Aim stick - fireAction.Enable(); fireAction.started += StartFire; fireAction.canceled += EndFire; - _transform = transform; + } + + private void OnDisable() + { + movement.Disable(); + mousePosition.Disable(); } private void StartFire(InputAction.CallbackContext cbContext) @@ -62,7 +73,6 @@ public class Player : MonoBehaviour angle *= -1; } - //_transform.eulerAngles = Vector3.forward * angle; barrelTransform.eulerAngles = Vector3.forward * angle; } @@ -92,4 +102,10 @@ public class Player : MonoBehaviour Instantiate(projectileGo, projectileSpawn.position, projectileSpawn.rotation); } } + + private void ProcessDeath() + { + // TODO: effects, gameover screen, etc. + Destroy(gameObject); + } } diff --git a/Assets/Scripts/Projectile.cs b/Assets/Scripts/Projectile.cs index e6787f7..271bd46 100644 --- a/Assets/Scripts/Projectile.cs +++ b/Assets/Scripts/Projectile.cs @@ -5,18 +5,37 @@ public class Projectile : MonoBehaviour { private Transform _transform; private Rigidbody2D _rigidbody; + private float _startTime; public float speed = 7; + public float lifeTime = 5; + public float damage = 2; private void Start() { _transform = transform; _rigidbody = GetComponent(); _rigidbody.gravityScale = 0; + _startTime = Time.time; } private void Update() { _transform.position += _transform.up * (speed * Time.deltaTime); + + if (_startTime + lifeTime < Time.time) + { + Destroy(gameObject); + } + } + + // TODO: ignore owner + private void OnCollisionEnter2D(Collision2D collision) + { + var health = collision.gameObject.GetComponent(); + if (health != null) + { + health.DealDamage(damage); + } } } diff --git a/Assets/Spritsheets/sheet_tanks.png.meta b/Assets/Spritsheets/sheet_tanks.png.meta index dfa49f9..76cb9ef 100644 --- a/Assets/Spritsheets/sheet_tanks.png.meta +++ b/Assets/Spritsheets/sheet_tanks.png.meta @@ -261,7 +261,7 @@ TextureImporter: 213: 8707436237485916330 second: treeSmall.png externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -278,10 +278,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -291,8 +293,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -320,8 +322,10 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -331,9 +335,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -343,6 +348,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -359,6 +378,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -380,6 +400,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -401,6 +422,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -422,6 +444,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -443,6 +466,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -464,6 +488,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -485,6 +510,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -506,6 +532,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -527,6 +554,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -548,6 +576,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -569,6 +598,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -590,6 +620,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -611,6 +642,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -632,6 +664,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -653,6 +686,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -674,6 +708,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -695,6 +730,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -716,6 +752,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -737,6 +774,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -758,6 +796,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -779,6 +818,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -800,6 +840,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -821,6 +862,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -842,6 +884,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -863,6 +906,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -884,6 +928,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -905,6 +950,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -926,6 +972,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -947,6 +994,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -968,6 +1016,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -989,6 +1038,7 @@ TextureImporter: alignment: 7 pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1010,6 +1060,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1031,6 +1082,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1052,6 +1104,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1073,6 +1126,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1094,6 +1148,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1115,6 +1170,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1136,6 +1192,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1157,6 +1214,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1178,6 +1236,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1199,6 +1258,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1220,6 +1280,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1241,6 +1302,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1262,6 +1324,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1283,6 +1346,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1304,6 +1368,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1325,6 +1390,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1346,6 +1412,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1367,6 +1434,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1388,6 +1456,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1409,6 +1478,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1430,6 +1500,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1451,6 +1522,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1472,6 +1544,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1493,6 +1566,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1514,6 +1588,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1535,6 +1610,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1556,6 +1632,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1577,6 +1654,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1598,6 +1676,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1619,6 +1698,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1640,6 +1720,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1661,6 +1742,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1682,6 +1764,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1703,6 +1786,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1724,6 +1808,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1745,6 +1830,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1766,6 +1852,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1787,6 +1874,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1808,6 +1896,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1829,6 +1918,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1850,6 +1940,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1871,6 +1962,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1892,6 +1984,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1913,6 +2006,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1934,6 +2028,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1955,6 +2050,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1976,6 +2072,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -1997,6 +2094,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2018,6 +2116,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2039,6 +2138,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2060,6 +2160,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2081,6 +2182,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2102,6 +2204,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2123,6 +2226,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2144,6 +2248,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -2155,6 +2260,7 @@ TextureImporter: edges: [] weights: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -2164,9 +2270,97 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + spriteCustomMetadata: + entries: [] + nameFileIdTable: + barrelBeige.png: -3998710580892445282 + barrelBeige_outline.png: -7477798812926722097 + barrelBlack.png: 3674656268087028563 + barrelBlack_outline.png: -5487600144086905492 + barrelBlue.png: 3032405748175628304 + barrelBlue_outline.png: -2010980955885669400 + barrelGreen.png: -4655039957060953392 + barrelGreen_outline.png: -4994951833088967198 + barrelGreen_side.png: 4982637768979216687 + barrelGreen_side_damaged.png: -8368485449085435849 + barrelGreen_up.png: -6531650029369869252 + barrelGrey_sde_rust.png: -4849936017250208222 + barrelGrey_side.png: 8603964539862204406 + barrelGrey_up.png: 5735671340074591575 + barrelRed.png: -7738183107879934526 + barrelRed_outline.png: 6412504248339571876 + barrelRed_side.png: 7869340455462019338 + barrelRed_up.png: 5765717766275434201 + bulletBeige.png: -6807659485009291076 + bulletBeigeSilver.png: 7046470701328351299 + bulletBeigeSilver_outline.png: -1859915352825295479 + bulletBeige_outline.png: -5646696457320939449 + bulletBlue.png: -42233181778024767 + bulletBlueSilver.png: 4807691601528572987 + bulletBlueSilver_outline.png: 6677223725121152227 + bulletBlue_outline.png: -6270360741778355495 + bulletGreen.png: -2188339265354130246 + bulletGreenSilver.png: 5731514149852361757 + bulletGreenSilver_outline.png: -461000747117155579 + bulletGreen_outline.png: 7052692420760656810 + bulletRed.png: 8726327230089540446 + bulletRedSilver.png: 6874673282510725395 + bulletRedSilver_outline.png: -5536605620269384643 + bulletRed_outline.png: -3192677803129398182 + bulletSilver.png: -4027427408794736843 + bulletSilverSilver.png: -8437964177988552626 + bulletSilverSilver_outline.png: -8975933132768679423 + bulletSilver_outline.png: 5250483087203809961 + bulletYellow.png: -8817197911436625561 + bulletYellowSilver.png: 8755784964962939074 + bulletYellowSilver_outline.png: 2238165697687046559 + bulletYellow_outline.png: -1356147014019499767 + dirt.png: 5315189978236590363 + grass.png: -1010530962649890918 + oil.png: -5361559629346268412 + sand.png: -482986622496041442 + sandbagBeige.png: 4100598722548881869 + sandbagBrown.png: -9126071476222813189 + smokeGrey0.png: -8452809755313565582 + smokeGrey1.png: 3407880101171352395 + smokeGrey2.png: 2491064037990326809 + smokeGrey3.png: 6856759834157090986 + smokeGrey4.png: 796289543035812177 + smokeGrey5.png: -1566520801209727407 + smokeOrange0.png: 6578705774759682233 + smokeOrange1.png: 2286720313221427204 + smokeOrange2.png: 7714303104857095815 + smokeOrange3.png: -7122511164386938688 + smokeOrange4.png: 8903306226935018098 + smokeOrange5.png: 8068572311644381088 + smokeWhite0.png: 6784805044913993942 + smokeWhite1.png: -5292647830184107460 + smokeWhite2.png: -2354984118396398359 + smokeWhite3.png: -7904940104200158552 + smokeWhite4.png: -5753633368755142815 + smokeWhite5.png: 3204114107294374315 + smokeYellow0.png: -3232735750063831375 + smokeYellow1.png: 2074095754505946083 + smokeYellow2.png: 3169240539607706735 + smokeYellow3.png: -5895996468200655789 + smokeYellow4.png: 3225800792442041447 + smokeYellow5.png: 3893828534250366469 + tankBeige.png: -8055944065117174999 + tankBeige_outline.png: 1072077224259886335 + tankBlack.png: 305200898916785479 + tankBlack_outline.png: 6429223304102030103 + tankBlue.png: -574662044077708817 + tankBlue_outline.png: -6115267694332673035 + tankGreen.png: 6981943689483637337 + tankGreen_outline.png: 6444648289286387833 + tankRed.png: 4319672837034334888 + tankRed_outline.png: -1860899817641957812 + tracksLarge.png: -1679306383164140350 + tracksSmall.png: 1851550789188087507 + treeLarge.png: -8262074229558958461 + treeSmall.png: 8707436237485916330 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/MultiplayerManager.asset b/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 0000000..2a93664 --- /dev/null +++ b/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 833e6ef..cd24fc2 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.4f1 -m_EditorVersionWithRevision: 2020.2.4f1 (becced5a802b) +m_EditorVersion: 6000.0.39f1 +m_EditorVersionWithRevision: 6000.0.39f1 (15ea7ed0b100) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json index 6f3e60f..6ed312a 100644 --- a/ProjectSettings/SceneTemplateSettings.json +++ b/ProjectSettings/SceneTemplateSettings.json @@ -4,164 +4,123 @@ { "userAdded": false, "type": "UnityEngine.AnimationClip", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Animations.AnimatorController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.AnimatorOverrideController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Audio.AudioMixerController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.ComputeShader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Cubemap", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.GameObject", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.LightingDataAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.LightingSettings", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Material", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.MonoScript", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.PhysicMaterial", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.VolumeProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.SceneAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Shader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.ShaderVariantCollection", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Texture", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Texture2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Timeline.TimelineAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 } ], "defaultDependencyTypeInfo": { "userAdded": false, "type": "", - "ignore": false, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, "newSceneOverride": 0 } \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..2d9e381 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -2,8 +2,9 @@ %TAG !u! tag:unity3d.com,2011: --- !u!78 &1 TagManager: - serializedVersion: 2 - tags: [] + serializedVersion: 3 + tags: + - Enemy layers: - Default - TransparentFX @@ -41,3 +42,5 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + m_RenderingLayers: + - Default