diff --git a/MuseumGame/Assets/Prefabs/Block Push.prefab b/MuseumGame/Assets/Prefabs/Block Push.prefab new file mode 100644 index 0000000..a212310 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Block Push.prefab @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6017868442740378832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 252195731038087074} + - component: {fileID: 5840353691288077129} + - component: {fileID: -4889586272816907109} + - component: {fileID: 6825093372452790051} + m_Layer: 0 + m_Name: Block Push + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &252195731038087074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5840353691288077129 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6017868442740378832} + 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_RayTraceProcedural: 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: 7482667652216324306, guid: db750325989564987a34393247d883b4, 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: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &-4889586272816907109 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6017868442740378832} + 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} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &6825093372452790051 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6017868442740378832} + 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 diff --git a/MuseumGame/Assets/Prefabs/Block Push.prefab.meta b/MuseumGame/Assets/Prefabs/Block Push.prefab.meta new file mode 100644 index 0000000..5c7633d --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Block Push.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9de242c8e0269ad42866d36540e988e6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index be9033b..d8b6637 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -19,6 +19,7 @@ GameObject: - component: {fileID: 374150667840124768} - component: {fileID: 971613887410275354} - component: {fileID: 4469907059167699923} + - component: {fileID: 6440678766209195335} m_Layer: 0 m_Name: Player m_TagString: Player @@ -341,3 +342,16 @@ MonoBehaviour: minColSize: {x: 0, y: 0} defaultRbSize: {x: 0, y: 0, z: 0} defaultColSize: {x: 0, y: 0} +--- !u!114 &6440678766209195335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374150667840124763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c416ae7ea2da5744d9889ff703db9e54, type: 3} + m_Name: + m_EditorClassIdentifier: + canBePushed: 0 diff --git a/MuseumGame/Assets/Scripts/blockPush.cs b/MuseumGame/Assets/Scripts/blockPush.cs new file mode 100644 index 0000000..903edd5 --- /dev/null +++ b/MuseumGame/Assets/Scripts/blockPush.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +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 + void Update() + { + + } + + private void OnCollisionEnter2D(Collision2D collision) + { + if(collision.collider.tag == "block" && canPush) + { + blockrb2d = collision.collider.GetComponent(); + force = blockrb2d.velocity * pushPower; + rb2d.AddForceAtPosition(force, ); + } + } +} diff --git a/MuseumGame/Assets/Scripts/blockPush.cs.meta b/MuseumGame/Assets/Scripts/blockPush.cs.meta new file mode 100644 index 0000000..c0cf978 --- /dev/null +++ b/MuseumGame/Assets/Scripts/blockPush.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c416ae7ea2da5744d9889ff703db9e54 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: