From 0f65df806047d0ba91fa2889842c70083a60066a Mon Sep 17 00:00:00 2001 From: trotFunky Date: Thu, 19 Sep 2019 16:12:50 +0200 Subject: [PATCH] Changed RigidBodies to Kinematic to prevent physics from applying on entities Changed scale of sprites to be smaller on screen --- Assets/Prefabs/EnemyBullet.prefab | 4 ++-- Assets/Prefabs/Hammer.prefab | 14 +++++++------- Assets/Prefabs/Player.prefab | 8 ++++---- Assets/Prefabs/PlayerBullet.prefab | 4 ++-- Assets/Scenes/SampleScene.unity | 6 +++--- Assets/Sprites/A10C.png.meta | 2 +- Assets/Sprites/Bullet.png.meta | 2 +- Assets/Sprites/Enemy_hammer.png.meta | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Assets/Prefabs/EnemyBullet.prefab b/Assets/Prefabs/EnemyBullet.prefab index 8be34c6..84d4281 100644 --- a/Assets/Prefabs/EnemyBullet.prefab +++ b/Assets/Prefabs/EnemyBullet.prefab @@ -135,9 +135,9 @@ Rigidbody2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7819471670070814049} - m_BodyType: 0 + m_BodyType: 1 m_Simulated: 1 - m_UseFullKinematicContacts: 0 + m_UseFullKinematicContacts: 1 m_UseAutoMass: 0 m_Mass: 0.0001 m_LinearDrag: 0 diff --git a/Assets/Prefabs/Hammer.prefab b/Assets/Prefabs/Hammer.prefab index 12c829a..0c42c52 100644 --- a/Assets/Prefabs/Hammer.prefab +++ b/Assets/Prefabs/Hammer.prefab @@ -99,18 +99,18 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: -0.007160902, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 2, y: 2} + oldSize: {x: 1, y: 1} newSize: {x: 2, y: 2} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1.1872492, y: 1.5869617} + m_Size: {x: 0.6000867, y: 0.81362534} m_EdgeRadius: 0 --- !u!114 &8041996466379372745 MonoBehaviour: @@ -124,7 +124,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0c9b3f253372ab4a6be34655fcf054b1, type: 3} m_Name: m_EditorClassIdentifier: - _maxSpeed: 1 + _maxSpeed: 2 _maxHealth: 1 _maxEnergy: 100 _energyRegen: 20 @@ -156,7 +156,7 @@ MonoBehaviour: _shotsPerSecond: 1 _bullet: {fileID: 7819471670070814049, guid: d562dc003000623c3a481b16e746d1a5, type: 3} _direction: {x: -1, y: 0} - _offset: {x: -1, y: 0.5} + _offset: {x: -0.5, y: 0.25} --- !u!114 &8041996466379372756 MonoBehaviour: m_ObjectHideFlags: 0 @@ -177,9 +177,9 @@ Rigidbody2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8041996466379372755} - m_BodyType: 0 + m_BodyType: 1 m_Simulated: 1 - m_UseFullKinematicContacts: 0 + m_UseFullKinematicContacts: 1 m_UseAutoMass: 0 m_Mass: 0.0001 m_LinearDrag: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index a5c59be..03e05c5 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -114,7 +114,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 35183fd85dde156de82c2af47fea6156, type: 3} m_Name: m_EditorClassIdentifier: - _maxSpeed: 7 + _maxSpeed: 5 _maxHealth: 3 _maxEnergy: 100 _energyRegen: 20 @@ -158,7 +158,7 @@ MonoBehaviour: _shotsPerSecond: 2 _bullet: {fileID: 4369719273071165554, guid: 5dcbc4e2919ffde8a9d89514fd293e8e, type: 3} _direction: {x: 1, y: 0} - _offset: {x: 1, y: 0.125} + _offset: {x: 0.5, y: 0.0625} --- !u!50 &-4914048659780607841 Rigidbody2D: serializedVersion: 4 @@ -167,9 +167,9 @@ Rigidbody2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2690590977808455807} - m_BodyType: 0 + m_BodyType: 1 m_Simulated: 1 - m_UseFullKinematicContacts: 0 + m_UseFullKinematicContacts: 1 m_UseAutoMass: 0 m_Mass: 0.0001 m_LinearDrag: 0 diff --git a/Assets/Prefabs/PlayerBullet.prefab b/Assets/Prefabs/PlayerBullet.prefab index b6bd339..aed535c 100644 --- a/Assets/Prefabs/PlayerBullet.prefab +++ b/Assets/Prefabs/PlayerBullet.prefab @@ -135,9 +135,9 @@ Rigidbody2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4369719273071165554} - m_BodyType: 0 + m_BodyType: 1 m_Simulated: 1 - m_UseFullKinematicContacts: 0 + m_UseFullKinematicContacts: 1 m_UseAutoMass: 0 m_Mass: 0.0001 m_LinearDrag: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 061cfd0..e076cfc 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -156,7 +156,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.18178178, g: 0.36272162, b: 0.8962264, a: 0} + m_BackGroundColor: {r: 0.8039216, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -218,12 +218,12 @@ PrefabInstance: - target: {fileID: 2690590977808455801, guid: 3ae3c84bd570eb26d86ed9ec4e5fcba0, type: 3} propertyPath: m_LocalPosition.x - value: 0.051522817 + value: -5.42 objectReference: {fileID: 0} - target: {fileID: 2690590977808455801, guid: 3ae3c84bd570eb26d86ed9ec4e5fcba0, type: 3} propertyPath: m_LocalPosition.y - value: -0.05536398 + value: -1.86 objectReference: {fileID: 0} - target: {fileID: 2690590977808455801, guid: 3ae3c84bd570eb26d86ed9ec4e5fcba0, type: 3} diff --git a/Assets/Sprites/A10C.png.meta b/Assets/Sprites/A10C.png.meta index 4d3ce2a..748d484 100644 --- a/Assets/Sprites/A10C.png.meta +++ b/Assets/Sprites/A10C.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 5 + spritePixelsToUnits: 10 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/Bullet.png.meta b/Assets/Sprites/Bullet.png.meta index c13cf37..c0f9f27 100644 --- a/Assets/Sprites/Bullet.png.meta +++ b/Assets/Sprites/Bullet.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 10 + spritePixelsToUnits: 20 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 diff --git a/Assets/Sprites/Enemy_hammer.png.meta b/Assets/Sprites/Enemy_hammer.png.meta index f2a9fdb..5870a4a 100644 --- a/Assets/Sprites/Enemy_hammer.png.meta +++ b/Assets/Sprites/Enemy_hammer.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 5 + spritePixelsToUnits: 10 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1