diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
index 0eddc34..9d992aa 100644
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@@ -248,6 +248,9 @@
/D/Unity/2019.4.13f1/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll
+
+ /D/Unity/Projects/Projekt/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll
+
/D/Unity/2019.4.13f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll
@@ -602,17 +605,86 @@
/D/Unity/2019.4.13f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/UnityEditor.TestRunner.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/UnityEngine.TestRunner.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.VSCode.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/UnityEngine.UI.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Timeline.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/PsdPlugin.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Rider.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/UnityEditor.UI.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Mathematics.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 2587b22..8db13ca 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -55,9 +55,9 @@
-
-
-
+
+
+
/D/Unity/2019.4.13f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll
@@ -592,17 +592,80 @@
/D/Unity/2019.4.13f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.VSCode.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/UnityEngine.UI.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Timeline.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/PsdPlugin.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Rider.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll
+
/D/Unity/Projects/Projekt/Library/ScriptAssemblies/UnityEditor.UI.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Mathematics.dll
+
+
+ /D/Unity/Projects/Projekt/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
diff --git a/Assets/CameraController.cs b/Assets/CameraController.cs
deleted file mode 100644
index 234fbab..0000000
--- a/Assets/CameraController.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-// Class for following the player with the camera
-public class CameraController : MonoBehaviour {
- // Camera speed
- public float speed = 0.1f;
- // GameObject to be followed.
- public Transform target;
- // Our own transform
- private Transform _tr;
-
- // Center position of the target relative to the camera.
- public Vector3 offset;
-
- private float _goingSince;
- private bool _goingRight;
-
- // Store initial values
- void Start()
- {
- _tr = transform;
- offset = target.position - _tr.position;
- }
-
- // Update positions
- void FixedUpdate()
- {
- if (!target) return;
- float horiz = Input.GetAxis("Horizontal");
- if (_goingSince == 0 && Mathf.Abs(horiz) > 0.1f)
- {
- _goingRight = horiz > 0;
- _goingSince = Time.time;
- }
-
- if (Mathf.Abs(horiz) < 0.01f)
- _goingSince = 0;
-
- // Get where the camera should be, and what movement is required.
- var ownPos = _tr.position;
- Vector3 anchorPosL = ownPos + offset;
- Vector3 anchorPosR = ownPos + new Vector3(-offset.x, offset.y, offset.z);
- var targetPos = target.position;
- Vector3 movementL = targetPos - anchorPosL;
- Vector3 movementR = targetPos - anchorPosR;
- if (movementL.x > 0 && movementR.x < 0
- && _goingSince == 0)
- return;
- var movement = (_goingSince != 0 ? _goingRight : movementL.x < movementR.x)
- ? movementL //Ha már egy ideje megyünk egy irányba vagy ha arra közelebb van a kamerának, akkor arra megy
- : movementR;
-
- // Update position based on movement and speed.
- Vector3 newCamPos = ownPos + movement * speed;
- ownPos = newCamPos;
- _tr.position = ownPos;
- }
-}
\ No newline at end of file
diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta
new file mode 100644
index 0000000..e8b0c20
--- /dev/null
+++ b/Assets/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 02552c03564501d69bc0a7c08eee562d
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Rocket.prefab b/Assets/Prefabs/Rocket.prefab
new file mode 100644
index 0000000..41a6b1b
--- /dev/null
+++ b/Assets/Prefabs/Rocket.prefab
@@ -0,0 +1,132 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6006275050469676560
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4070025166081053470}
+ - component: {fileID: 2084791786893166414}
+ - component: {fileID: 5991448782009560204}
+ - component: {fileID: 5192784953082789806}
+ m_Layer: 0
+ m_Name: Rocket
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4070025166081053470
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006275050469676560}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -8.091, y: 2.788, z: 0}
+ m_LocalScale: {x: 0.2910633, y: 0.2910633, z: 0.2910633}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2084791786893166414
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006275050469676560}
+ 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_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: b4517dd4973adc4b8a4da0c0030e7ebb, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1, y: 0.48}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!50 &5991448782009560204
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006275050469676560}
+ m_BodyType: 0
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
+--- !u!61 &5192784953082789806
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6006275050469676560}
+ 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.001339294}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 1, y: 0.48}
+ newSize: {x: 1, y: 0.48}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 1, y: 0.27385223}
+ m_EdgeRadius: 0
diff --git a/Assets/Prefabs/Rocket.prefab.meta b/Assets/Prefabs/Rocket.prefab.meta
new file mode 100644
index 0000000..2775b82
--- /dev/null
+++ b/Assets/Prefabs/Rocket.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7debf3c35b28387fdbec1c1c9942afae
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta
new file mode 100644
index 0000000..e81abd9
--- /dev/null
+++ b/Assets/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a22aae98ac4b01a9fb6ad3ff0ee1c66a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CameraController.cs b/Assets/Scripts/CameraController.cs
new file mode 100644
index 0000000..2527c96
--- /dev/null
+++ b/Assets/Scripts/CameraController.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// Class for following the player with the camera
+public class CameraController : MonoBehaviour {
+ // Camera speed
+ public float speed = 0.05f;
+ // GameObject to be followed.
+ public Transform target;
+ // Our own transform
+ private Transform tr;
+
+ // Center position of the target relative to the camera.
+ public Vector3 offset;
+
+ // Store initial values
+ void Start()
+ {
+ tr = transform;
+ offset = target.position - tr.position;
+ }
+
+ // Update positions
+ void FixedUpdate ()
+ {
+ if (!target) return;
+ // Get where the camera should be, and what movement is required.
+ var position = tr.position;
+ Vector3 anchorPos = position + offset;
+ Vector3 movement = target.position - anchorPos;
+
+ // Update position based on movement and speed.
+ Vector3 newCamPos = position + movement*speed;
+ position = newCamPos;
+ tr.position = position;
+ }
+}
\ No newline at end of file
diff --git a/Assets/CameraController.cs.meta b/Assets/Scripts/CameraController.cs.meta
similarity index 100%
rename from Assets/CameraController.cs.meta
rename to Assets/Scripts/CameraController.cs.meta
diff --git a/Assets/OwnCharacterController.cs b/Assets/Scripts/OwnCharacterController.cs
similarity index 68%
rename from Assets/OwnCharacterController.cs
rename to Assets/Scripts/OwnCharacterController.cs
index 924f364..40623eb 100644
--- a/Assets/OwnCharacterController.cs
+++ b/Assets/Scripts/OwnCharacterController.cs
@@ -31,17 +31,14 @@ public class OwnCharacterController : MonoBehaviour
}
rb.AddForce(new Vector2(input * 5, 0));
- var cols = new Collider2D[5];
- /*if (Input.GetButtonDown("Jump") && rb.OverlapCollider(new ContactFilter2D(), cols) > 0
- && cols.Any(col => col.CompareTag("Tiled")))*/
if (Input.GetButtonDown("Jump") && IsOnGround())
- rb.AddForce(new Vector2(0, 3), ForceMode2D.Impulse);
+ rb.AddForce(new Vector2(0, 4), ForceMode2D.Impulse);
}
private bool IsOnGround()
{
- var bounds = collider.bounds;
- return Physics.CheckCapsule(bounds.center, new Vector3(bounds.center.x, bounds.min.y - 0.1f, bounds.center.z),
- 0.28f);
+ var res = new List();
+ rb.OverlapCollider(new ContactFilter2D(), res);
+ return res.Any(col => col.CompareTag("Ground"));
}
}
\ No newline at end of file
diff --git a/Assets/OwnCharacterController.cs.meta b/Assets/Scripts/OwnCharacterController.cs.meta
similarity index 100%
rename from Assets/OwnCharacterController.cs.meta
rename to Assets/Scripts/OwnCharacterController.cs.meta
diff --git a/Assets/Tiling.cs b/Assets/Scripts/Tiling.cs
similarity index 100%
rename from Assets/Tiling.cs
rename to Assets/Scripts/Tiling.cs
diff --git a/Assets/Tiling.cs.meta b/Assets/Scripts/Tiling.cs.meta
similarity index 100%
rename from Assets/Tiling.cs.meta
rename to Assets/Scripts/Tiling.cs.meta
diff --git a/Assets/Sprites/FreeArt_GunConstructionKit_v03_show 1.png b/Assets/Sprites/FreeArt_GunConstructionKit_v03_show 1.png
new file mode 100644
index 0000000..aa3e2fd
Binary files /dev/null and b/Assets/Sprites/FreeArt_GunConstructionKit_v03_show 1.png differ
diff --git a/Assets/Sprites/FreeArt_GunConstructionKit_v03_show 1.png.meta b/Assets/Sprites/FreeArt_GunConstructionKit_v03_show 1.png.meta
new file mode 100644
index 0000000..5e186df
--- /dev/null
+++ b/Assets/Sprites/FreeArt_GunConstructionKit_v03_show 1.png.meta
@@ -0,0 +1,584 @@
+fileFormatVersion: 2
+guid: e85a5dfbe00d05491b7f1688ea28a74e
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: -4039092134429452683
+ second: FreeArt_GunConstructionKit_v03_show 1_0
+ - first:
+ 213: 7593652464763449360
+ second: FreeArt_GunConstructionKit_v03_show 1_1
+ - first:
+ 213: 5963069755386087121
+ second: FreeArt_GunConstructionKit_v03_show 1_2
+ - first:
+ 213: -2373669949047551478
+ second: FreeArt_GunConstructionKit_v03_show 1_3
+ - first:
+ 213: 3168567323999402520
+ second: FreeArt_GunConstructionKit_v03_show 1_4
+ - first:
+ 213: -3276142857295589482
+ second: FreeArt_GunConstructionKit_v03_show 1_5
+ - first:
+ 213: 345772978339323005
+ second: FreeArt_GunConstructionKit_v03_show 1_6
+ - first:
+ 213: 7146878168074291195
+ second: FreeArt_GunConstructionKit_v03_show 1_7
+ - first:
+ 213: 2962028742609513468
+ second: FreeArt_GunConstructionKit_v03_show 1_8
+ - first:
+ 213: 3492330109409574161
+ second: FreeArt_GunConstructionKit_v03_show 1_9
+ - first:
+ 213: 5419354221086950693
+ second: FreeArt_GunConstructionKit_v03_show 1_10
+ - first:
+ 213: 6619594916043565443
+ second: FreeArt_GunConstructionKit_v03_show 1_11
+ - first:
+ 213: -3687901602437855238
+ second: FreeArt_GunConstructionKit_v03_show 1_12
+ - first:
+ 213: -6409808785093328517
+ second: FreeArt_GunConstructionKit_v03_show 1_13
+ - first:
+ 213: -17209673539908455
+ second: FreeArt_GunConstructionKit_v03_show 1_14
+ - first:
+ 213: 3489947205644151425
+ second: FreeArt_GunConstructionKit_v03_show 1_15
+ - first:
+ 213: -3912130014173825461
+ second: FreeArt_GunConstructionKit_v03_show 1_16
+ - first:
+ 213: 3401487033475215052
+ second: FreeArt_GunConstructionKit_v03_show 1_17
+ - first:
+ 213: -5291947086266923911
+ second: FreeArt_GunConstructionKit_v03_show 1_18
+ - first:
+ 213: 501867711590438757
+ second: FreeArt_GunConstructionKit_v03_show 1_19
+ 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
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 2
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ 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
+ - 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:
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_0
+ rect:
+ serializedVersion: 2
+ x: 109
+ y: 2497
+ width: 253
+ height: 138
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 57612409a1342f7c0800000000000000
+ internalID: -4039092134429452683
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_1
+ rect:
+ serializedVersion: 2
+ x: 1236
+ y: 2492
+ width: 370
+ height: 157
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 010befd0fa2126960800000000000000
+ internalID: 7593652464763449360
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_2
+ rect:
+ serializedVersion: 2
+ x: 109
+ y: 2290
+ width: 253
+ height: 140
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 1d6c9ac495411c250800000000000000
+ internalID: 5963069755386087121
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_3
+ rect:
+ serializedVersion: 2
+ x: 467
+ y: 2259
+ width: 270
+ height: 175
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: a0a4001f1c70f0fd0800000000000000
+ internalID: -2373669949047551478
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_4
+ rect:
+ serializedVersion: 2
+ x: 1236
+ y: 2268
+ width: 425
+ height: 155
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 81af4e1813309fb20800000000000000
+ internalID: 3168567323999402520
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_5
+ rect:
+ serializedVersion: 2
+ x: 109
+ y: 2062
+ width: 200
+ height: 118
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 69f8675dd6dc882d0800000000000000
+ internalID: -3276142857295589482
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_6
+ rect:
+ serializedVersion: 2
+ x: 1236
+ y: 2012
+ width: 370
+ height: 210
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: d7c18da11be6cc400800000000000000
+ internalID: 345772978339323005
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_7
+ rect:
+ serializedVersion: 2
+ x: 109
+ y: 1880
+ width: 249
+ height: 128
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: bf7001df3dfce2360800000000000000
+ internalID: 7146878168074291195
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_8
+ rect:
+ serializedVersion: 2
+ x: 438
+ y: 1854
+ width: 302
+ height: 208
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: cfbacb9a27d3b1920800000000000000
+ internalID: 2962028742609513468
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_9
+ rect:
+ serializedVersion: 2
+ x: 109
+ y: 1618
+ width: 312
+ height: 123
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 11d32c93bbf377030800000000000000
+ internalID: 3492330109409574161
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_10
+ rect:
+ serializedVersion: 2
+ x: 512
+ y: 1613
+ width: 214
+ height: 132
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 525c6eb73f9653b40800000000000000
+ internalID: 5419354221086950693
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_11
+ rect:
+ serializedVersion: 2
+ x: 952
+ y: 1631
+ width: 702
+ height: 212
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 38922c701868ddb50800000000000000
+ internalID: 6619594916043565443
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_12
+ rect:
+ serializedVersion: 2
+ x: 92
+ y: 1351
+ width: 392
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: af7091c2801f1dcc0800000000000000
+ internalID: -3687901602437855238
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_13
+ rect:
+ serializedVersion: 2
+ x: 906
+ y: 1310
+ width: 687
+ height: 244
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: b71855eded8cb07a0800000000000000
+ internalID: -6409808785093328517
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_14
+ rect:
+ serializedVersion: 2
+ x: 952
+ y: 1041
+ width: 781
+ height: 175
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 99c04f1a4ebd2cff0800000000000000
+ internalID: -17209673539908455
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_15
+ rect:
+ serializedVersion: 2
+ x: 952
+ y: 767
+ width: 836
+ height: 181
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 18a69453e78ce6030800000000000000
+ internalID: 3489947205644151425
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_16
+ rect:
+ serializedVersion: 2
+ x: 40
+ y: 421
+ width: 890
+ height: 278
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: b46760eba7255b9c0800000000000000
+ internalID: -3912130014173825461
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_17
+ rect:
+ serializedVersion: 2
+ x: 952
+ y: 417
+ width: 880
+ height: 252
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: cce23626f62843f20800000000000000
+ internalID: 3401487033475215052
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_18
+ rect:
+ serializedVersion: 2
+ x: 161
+ y: 27
+ width: 674
+ height: 219
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 97485e8b92a3f86b0800000000000000
+ internalID: -5291947086266923911
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: FreeArt_GunConstructionKit_v03_show 1_19
+ rect:
+ serializedVersion: 2
+ x: 952
+ y: 41
+ width: 549
+ height: 244
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 5671691560ef6f600800000000000000
+ internalID: 501867711590438757
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Sprites/MilitaryRocketWithFlames.png b/Assets/Sprites/MilitaryRocketWithFlames.png
new file mode 100644
index 0000000..076c7ec
Binary files /dev/null and b/Assets/Sprites/MilitaryRocketWithFlames.png differ
diff --git a/Assets/Sprites/MilitaryRocketWithFlames.png.meta b/Assets/Sprites/MilitaryRocketWithFlames.png.meta
new file mode 100644
index 0000000..d487d3c
--- /dev/null
+++ b/Assets/Sprites/MilitaryRocketWithFlames.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: b4517dd4973adc4b8a4da0c0030e7ebb
+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
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ 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/Assets/Sprites/pngwing.com.png b/Assets/Sprites/pngwing.com.png
new file mode 100644
index 0000000..2119876
Binary files /dev/null and b/Assets/Sprites/pngwing.com.png differ
diff --git a/Assets/Sprites/pngwing.com.png.meta b/Assets/Sprites/pngwing.com.png.meta
new file mode 100644
index 0000000..16d2a04
--- /dev/null
+++ b/Assets/Sprites/pngwing.com.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: b7c58d679d4a108e2874b2fa3b5c70e4
+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
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ 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/Packages/manifest.json b/Packages/manifest.json
index c57468d..06473f0 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -9,6 +9,7 @@
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.2",
+ "com.unity.mathematics": "1.2.1",
"com.unity.timeline": "1.2.14",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index cc272c3..ea9bcb2 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -99,8 +99,8 @@
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
- "version": "1.1.0",
- "depth": 1,
+ "version": "1.2.1",
+ "depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index dab86a1..5b2cfea 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -4,7 +4,7 @@
TagManager:
serializedVersion: 2
tags:
- - Tiled
+ - Ground
layers:
- Default
- TransparentFX