Commit b1314564 authored by Benedikt Liebmann's avatar Benedikt Liebmann
parents 94ea0395 a9efdb0e
......@@ -145,8 +145,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
explosion: {fileID: 3849051887377255970, guid: 6dfb3bf841f5c5e448b6360edfb447cb,
type: 3}
spark: {fileID: 0}
shotSFX: {fileID: 0}
dropChance: 10
pickup: {fileID: 6282504407602761075, guid: de88192e9e62c2b31b892e225be920f8, type: 3}
hp: 1
--- !u!114 &5938703024482230478
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -697,6 +700,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7609079808821061672}
m_Modifications:
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy (3)
objectReference: {fileID: 0}
- target: {fileID: 6275485060623454774, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -767,10 +775,15 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
- target: {fileID: 2684925616114181608, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy (3)
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6130816089883515130, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09c989ba5177cab4bbf92614c4995ca7, type: 3}
......@@ -787,6 +800,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1781628447051768325}
m_Modifications:
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy
objectReference: {fileID: 0}
- target: {fileID: 6275485060623454774, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -857,10 +875,15 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
- target: {fileID: 2684925616114181608, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6130816089883515130, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09c989ba5177cab4bbf92614c4995ca7, type: 3}
......@@ -877,6 +900,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4557215991153168661}
m_Modifications:
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy (2)
objectReference: {fileID: 0}
- target: {fileID: 6275485060623454774, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -947,10 +975,15 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
- target: {fileID: 2684925616114181608, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy (2)
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6130816089883515130, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09c989ba5177cab4bbf92614c4995ca7, type: 3}
......@@ -967,6 +1000,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4451847589760433808}
m_Modifications:
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy (1)
objectReference: {fileID: 0}
- target: {fileID: 6275485060623454774, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -1037,10 +1075,15 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 436640341521505314, guid: 09c989ba5177cab4bbf92614c4995ca7,
- target: {fileID: 2684925616114181608, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Name
value: PS_Rotor_Enemy (1)
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6130816089883515130, guid: 09c989ba5177cab4bbf92614c4995ca7,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 09c989ba5177cab4bbf92614c4995ca7, type: 3}
......
......@@ -43,21 +43,6 @@ public class PrimaryWeaponLogic : MonoBehaviour
}
}
// Update is called once per frame
void Update()
{
if (Input.GetKeyDown("u"))
{
addUpgrade(upgradeType.DoubleShot);
}
if (Input.GetKeyDown("o"))
{
addUpgrade(upgradeType.SpreadShot);
}
}
public int[] getUpgrades()
{
return upgradeStacks;
......
......@@ -76,11 +76,6 @@ public class ShipLogic : MonoBehaviour
float vel = gameObject.GetComponent<Rigidbody>().velocity.magnitude;
hoverSFX.pitch = 1.0f + vel*0.1f;
if (Input.GetKeyDown("i"))
{
upgradeAttkSpeed(1);
}
if(valueX > 0 && (PlayerModel.transform.eulerAngles.z < 45 || PlayerModel.transform.eulerAngles.z > 200))
{
PlayerModel.transform.Rotate(0, 0, 5);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment