diff --git a/Game 1/Assets/Art/Items/rocket 1.png b/Game 1/Assets/Art/Items/rocket 1.png new file mode 100644 index 0000000..9576e2c Binary files /dev/null and b/Game 1/Assets/Art/Items/rocket 1.png differ diff --git a/Game 1/Assets/Art/Items/rocket 1.png.meta b/Game 1/Assets/Art/Items/rocket 1.png.meta new file mode 100644 index 0000000..ac6c1ab --- /dev/null +++ b/Game 1/Assets/Art/Items/rocket 1.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: bd1747809eae5c849bf2b39b9372bd4d +timeCreated: 1504790200 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + 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} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Levels/Level0.unity b/Game 1/Assets/Levels/Level0.unity index 68fd809..283a398 100644 --- a/Game 1/Assets/Levels/Level0.unity +++ b/Game 1/Assets/Levels/Level0.unity @@ -20767,10 +20767,10 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 0 + m_LinearDrag: 1 m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} + m_GravityScale: 2 + m_Material: {fileID: 6200000, guid: 886867fcc44b5bd408a23c07d28f52e5, type: 2} m_Interpolate: 1 m_SleepingMode: 1 m_CollisionDetection: 1 @@ -20852,7 +20852,7 @@ BoxCollider2D: m_GameObject: {fileID: 440329283} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 886867fcc44b5bd408a23c07d28f52e5, type: 2} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 diff --git a/Game 1/Assets/Materials.meta b/Game 1/Assets/Materials.meta new file mode 100644 index 0000000..ae040ae --- /dev/null +++ b/Game 1/Assets/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: cd077729d4e44184f854e770a83e915c +folderAsset: yes +timeCreated: 1504790419 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Materials/Friction Material.physicsMaterial2D b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D new file mode 100644 index 0000000..ad85596 --- /dev/null +++ b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D @@ -0,0 +1,10 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Friction Material + friction: 0.4 + bounciness: 0 diff --git a/Game 1/Assets/Materials/Friction Material.physicsMaterial2D.meta b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D.meta new file mode 100644 index 0000000..474f883 --- /dev/null +++ b/Game 1/Assets/Materials/Friction Material.physicsMaterial2D.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 886867fcc44b5bd408a23c07d28f52e5 +timeCreated: 1504790404 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game 1/Assets/Prefabs/Rocket.prefab b/Game 1/Assets/Prefabs/Rocket.prefab index 6a58ab0..9e7774f 100644 --- a/Game 1/Assets/Prefabs/Rocket.prefab +++ b/Game 1/Assets/Prefabs/Rocket.prefab @@ -68,7 +68,7 @@ Transform: m_GameObject: {fileID: 1994979455912998} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.43, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: - {fileID: 4412116788476952} m_Father: {fileID: 0} @@ -110,7 +110,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.046875, y: 0.390625} + oldSize: {x: 2.09, y: 1} newSize: {x: 1.5625, y: 0.390625} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -3479,7 +3479,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: f23de763eab733a4c84fe2ee17c95f32, type: 3} + m_Sprite: {fileID: 21300000, guid: bd1747809eae5c849bf2b39b9372bd4d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Game 1/ProjectSettings/ProjectVersion.txt b/Game 1/ProjectSettings/ProjectVersion.txt index 97bb79d..ca1aa05 100644 --- a/Game 1/ProjectSettings/ProjectVersion.txt +++ b/Game 1/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.1.1f1 \ No newline at end of file +m_EditorVersion: 2017.1.0f3