Added Projectile Logic

4 years ago · d8c25e76b4
parent e5897e98f7
commit d8c25e76b4
6 changed files with 141 additions and 77 deletions
--- a/MuseumGame/Assets/Prefabs/Paint
+++ b/MuseumGame/Assets/Prefabs/Paint
--- a/MuseumGame/Assets/Prefabs/Paint
+++ b/MuseumGame/Assets/Prefabs/Paint
--- a/MuseumGame/Assets/Prefabs/Player.prefab
+++ b/MuseumGame/Assets/Prefabs/Player.prefab
@ -10,15 +10,16 @@ GameObject:
  m_Component:
  - component: {fileID: 374150667840124767}
  - component: {fileID: 374150667840124766}
-  - component: {fileID: 374150667840124768}
-  - component: {fileID: -5793387185563800375}
  - component: {fileID: 3275569032751403274}
+  - component: {fileID: 9001604349646828647}
  - component: {fileID: 4572441351392969366}
  - component: {fileID: 4796302867346557188}
-  - component: {fileID: 971613887410275354}
  - component: {fileID: 7510283663755342960}
-  - component: {fileID: 9001604349646828647}
+  - component: {fileID: -5793387185563800375}
+  - component: {fileID: 374150667840124768}
+  - component: {fileID: 971613887410275354}
  - component: {fileID: 4469907059167699923}
+  - component: {fileID: 5658169444775452094}
  m_Layer: 0
  m_Name: Player
  m_TagString: Player
@ -91,45 +92,6 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!114 &374150667840124768
-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: ae152fc78d6362b4ea5f1111aad0b919, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _Velocity: 0
-  _MaxVelocity: 6
-  _Acc: 0
-  _AccSpeed: 0.25
-  _MaxAcc: 2
-  _MinAcc: -2
-  _Deceleration: 0.8
-  jumpForce: 350
-  maxJumps: 1
-  clips:
-  - {fileID: 8300000, guid: dc86b6ab05351b641899e04f315a0a5a, type: 3}
--- !u!114 &-5793387185563800375
-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: ffee4966dfcdd6d47a1adad953d9df93, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  currentHealth: 0
-  maxHealth: 100
-  lavaDamage: 40
-  healthBar: {fileID: 3455161703679244629, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
 --- !u!70 &3275569032751403274
 CapsuleCollider2D:
  m_ObjectHideFlags: 0
@ -146,6 +108,32 @@ CapsuleCollider2D:
  m_Offset: {x: -0.0069465637, y: 0.008335909}
  m_Size: {x: 0.47140664, y: 1.1799681}
  m_Direction: 0
+--- !u!61 &9001604349646828647
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 374150667840124763}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.0062519684, y: 0.31051648}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 1.28, y: 1.28}
+    newSize: {x: 9.75, y: 11.35}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.4839111, y: 0.6089511}
+  m_EdgeRadius: 0
 --- !u!50 &4572441351392969366
 Rigidbody2D:
  serializedVersion: 4
@ -186,19 +174,6 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &971613887410275354
-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: 93764b8ff5a5045da89d2ddfc1195c97, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FallSpeed: 0.7
 --- !u!82 &7510283663755342960
 AudioSource:
  m_ObjectHideFlags: 0
@ -295,32 +270,59 @@ AudioSource:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
--- !u!61 &9001604349646828647
-BoxCollider2D:
+--- !u!114 &-5793387185563800375
+MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 374150667840124763}
  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: -0.0062519684, y: 0.31051648}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.28, y: 1.28}
-    newSize: {x: 9.75, y: 11.35}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.4839111, y: 0.6089511}
-  m_EdgeRadius: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ffee4966dfcdd6d47a1adad953d9df93, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  currentHealth: 0
+  maxHealth: 100
+  lavaDamage: 40
+  healthBar: {fileID: 3455161703679244629, guid: 9add303577184004ab77878cb3cdcf57, type: 3}
+--- !u!114 &374150667840124768
+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: ae152fc78d6362b4ea5f1111aad0b919, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  faceRight: 1
+  _Velocity: 0
+  _MaxVelocity: 6
+  _Acc: 0
+  _AccSpeed: 0.25
+  _MaxAcc: 2
+  _MinAcc: -2
+  _Deceleration: 0.8
+  jumpForce: 350
+  maxJumps: 1
+  clips:
+  - {fileID: 8300000, guid: dc86b6ab05351b641899e04f315a0a5a, type: 3}
+--- !u!114 &971613887410275354
+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: 93764b8ff5a5045da89d2ddfc1195c97, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FallSpeed: 0.7
 --- !u!114 &4469907059167699923
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -333,4 +335,23 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 37e947767f230cb45b7cca13e4b4dbb3, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  canUnShrink: 1
+  canShrink: 0
  isShrunk: 0
+  minRbSize: {x: 0, y: 0, z: 0}
+  minColSize: {x: 0, y: 0}
+  defaultRbSize: {x: 0, y: 0, z: 0}
+  defaultColSize: {x: 0, y: 0}
+--- !u!114 &5658169444775452094
+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: 0d4d7b53bd6c7264a80ed03bb45e7c07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  paintBlob: {fileID: 0}
--- a/MuseumGame/Assets/Scripts/movement.cs
+++ b/MuseumGame/Assets/Scripts/movement.cs
@ -5,7 +5,7 @@ using UnityEngine;
 public class movement : MonoBehaviour
 {
    private float horizontal, vertical;
-    private bool faceRight = true;
+    public bool faceRight = true;
    private Rigidbody2D rb2d;
    private Animator animator;

--- a/MuseumGame/Assets/Scripts/paintShoot.cs
+++ b/MuseumGame/Assets/Scripts/paintShoot.cs
@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class paintShoot : MonoBehaviour
+{
+    public Rigidbody2D paintBlob;
+    private GameObject player;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        player = GetComponent<GameObject>();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.E))
+        {
+            Instantiate(paintBlob, player.transform);
+            if (player.GetComponent<movement>().faceRight)
+            {
+                paintBlob.velocity = transform.TransformDirection(Vector2.right);
+            }
+            else
+            {
+                paintBlob.velocity = transform.TransformDirection(Vector2.left);
+            }
+        }
+    }
+}
--- a/MuseumGame/Assets/Scripts/paintShoot.cs.meta
+++ b/MuseumGame/Assets/Scripts/paintShoot.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0d4d7b53bd6c7264a80ed03bb45e7c07
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: