diff --git a/MuseumGame/Assets/Prefabs/Block Push.prefab b/MuseumGame/Assets/Prefabs/Block Push.prefab index a212310..409deae 100644 --- a/MuseumGame/Assets/Prefabs/Block Push.prefab +++ b/MuseumGame/Assets/Prefabs/Block Push.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 6825093372452790051} m_Layer: 0 m_Name: Block Push - m_TagString: Untagged + m_TagString: Block m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 6017868442740378832} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.037320137, y: -0.044350505, z: 0} - m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -118,7 +118,7 @@ Rigidbody2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6017868442740378832} - m_BodyType: 0 + m_BodyType: 1 m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index d8b6637..884f92e 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -354,4 +354,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c416ae7ea2da5744d9889ff703db9e54, type: 3} m_Name: m_EditorClassIdentifier: - canBePushed: 0 + canPush: 1 + pushPower: 1 diff --git a/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity b/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity index 7c0e8b2..21a8d08 100644 --- a/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity +++ b/MuseumGame/Assets/Scenes/DogLevel/NewDogSpawn.unity @@ -3227,7 +3227,7 @@ Transform: - {fileID: 145706357} - {fileID: 1899158036} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1322242890 GameObject: @@ -3305,8 +3305,65 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1411747978 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalPosition.x + value: 11.071791 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalPosition.y + value: -3.8757575 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 252195731038087074, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6017868442740378832, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} + propertyPath: m_Name + value: Block Push + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9de242c8e0269ad42866d36540e988e6, type: 3} --- !u!1 &1899158035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index 3b2ab4b..249805f 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -3518,6 +3518,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 6440678766209195335, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: canPush + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9001604349646828647, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_IsTrigger value: 1 diff --git a/MuseumGame/Assets/Scripts/blockPush.cs b/MuseumGame/Assets/Scripts/blockPush.cs index 55b3b9f..09fa8fb 100644 --- a/MuseumGame/Assets/Scripts/blockPush.cs +++ b/MuseumGame/Assets/Scripts/blockPush.cs @@ -6,17 +6,14 @@ public class blockPush : MonoBehaviour { public bool canPush = false; - private Rigidbody2D rb2d; private Rigidbody2D blockrb2d; public float pushPower = 2.0f; - public float weight = 6.0f; - private Vector2 force; // Start is called before the first frame update void Start() { - rb2d = GetComponent(); + } // Update is called once per frame @@ -25,13 +22,20 @@ public class blockPush : MonoBehaviour } - private void OnCollisionEnter2D(Collision2D collision) + private void OnCollisionStay2D(Collision2D collision) { - if(collision.collider.tag == "block" && canPush) + if(collision.collider.tag == "Block" && canPush) { + Debug.Log("pushing block"); blockrb2d = collision.collider.GetComponent(); - force = blockrb2d.velocity * pushPower; - rb2d.AddForceAtPosition(force, collision.GetContact(0).point); + if (GetComponent().faceRight) + { + blockrb2d.MovePosition(new Vector2(blockrb2d.position.x + pushPower/100, blockrb2d.position.y)); + } + else if (!GetComponent().faceRight) + { + blockrb2d.MovePosition(new Vector2(blockrb2d.position.x - pushPower/100, blockrb2d.position.y)); + } } } } diff --git a/MuseumGame/Assets/Scripts/movement.cs b/MuseumGame/Assets/Scripts/movement.cs index 6ec395b..1208094 100644 --- a/MuseumGame/Assets/Scripts/movement.cs +++ b/MuseumGame/Assets/Scripts/movement.cs @@ -38,7 +38,7 @@ public class movement : MonoBehaviour // Update is called once per frame void Update() - { + { animator.SetBool("isGliding", glider.IsGliding); if (Input.GetKeyDown("space") && numJumps > 0 && !GameManager.Instance.isPaused()) @@ -46,7 +46,7 @@ public class movement : MonoBehaviour rb2d.velocity = new Vector2(rb2d.velocity.x, 0); rb2d.AddForce(new Vector2(0, jumpForce)); isGrounded = false; - numJumps -= 1; + numJumps -= 1; } } diff --git a/MuseumGame/ProjectSettings/TagManager.asset b/MuseumGame/ProjectSettings/TagManager.asset index bfc4950..b3b77a0 100644 --- a/MuseumGame/ProjectSettings/TagManager.asset +++ b/MuseumGame/ProjectSettings/TagManager.asset @@ -13,6 +13,7 @@ TagManager: - Projectile - EnemyPlatform - OneWay + - Block layers: - Default - TransparentFX diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index ae6f938..2731d4c 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,20 +6,23 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b flags: 0 RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7b1f113b1d3c2924691e283e393ce5d32439f5e978fce9332b25 flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0