Commit 165ea047 authored by Benedikt Liebmann's avatar Benedikt Liebmann
parents 73e2cf0b 71f1ce11
......@@ -27,7 +27,7 @@ PrefabInstance:
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalPosition.x
value: -1.06
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
......@@ -37,12 +37,12 @@ PrefabInstance:
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.05
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
......@@ -57,7 +57,7 @@ PrefabInstance:
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
......@@ -67,7 +67,7 @@ PrefabInstance:
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
......@@ -79,6 +79,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5822399462431454569, guid: b0f14b53e42262242b95e3e5892baf9f,
type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b0f14b53e42262242b95e3e5892baf9f, type: 3}
--- !u!1 &436640341521505314 stripped
......
......@@ -36,6 +36,7 @@ Transform:
- {fileID: 6699276605682576204}
- {fileID: 7596296274636637864}
- {fileID: 4001003703787313044}
- {fileID: 2829432981546517622}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -124,6 +125,7 @@ MonoBehaviour:
hitFX: {fileID: 1931807616638471954, guid: f1b49542c5ad6ea7a9954f01300c3246, type: 3}
laserSFX: {fileID: 3685833347554059012}
hoverSFX: {fileID: 8118261163504278534}
pickupSFX: {fileID: 615738391135021819}
--- !u!54 &1838075967204177863
Rigidbody:
m_ObjectHideFlags: 0
......@@ -244,7 +246,7 @@ AudioSource:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
......@@ -327,7 +329,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 1358a562978bb4c4995a4eba85a8ef1a, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: 0.75
m_Pitch: 1
Loop: 1
Mute: 0
......@@ -411,6 +413,133 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &8648744702113585287
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2829432981546517622}
- component: {fileID: 615738391135021819}
m_Layer: 0
m_Name: PickupSoundSource
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2829432981546517622
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8648744702113585287}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0.15998511}
m_LocalScale: {x: 3.333333, y: 3.333333, z: 3.333333}
m_Children: []
m_Father: {fileID: 1838075967204177857}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &615738391135021819
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8648744702113585287}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 9a447b98b66216b4487922a07a1d8ee5, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &1838075967555420246
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -423,6 +552,16 @@ PrefabInstance:
propertyPath: m_Name
value: PlayerModel
objectReference: {fileID: 0}
- target: {fileID: 5715126579143232267, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: f467f017358729d418bf38c40e7b984c, type: 2}
- target: {fileID: 5715126579143232267, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -498,30 +637,20 @@ PrefabInstance:
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: b57a7d6008401884681f587f48d37a71, type: 2}
- target: {fileID: 5715126579143232267, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: f467f017358729d418bf38c40e7b984c, type: 2}
- target: {fileID: 5715126579143232267, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ddf822bc9c1563449d56162810bc54b, type: 3}
--- !u!4 &6699276605682576204 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
--- !u!137 &6256094775660448605 stripped
SkinnedMeshRenderer:
m_CorrespondingSourceObject: {fileID: 5715126579143232267, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6699276605682576204 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7684202323498604895 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2ddf822bc9c1563449d56162810bc54b,
......
......@@ -159,6 +159,7 @@ Transform:
m_Children:
- {fileID: 8131777319772041833}
- {fileID: 3377558179182420325}
- {fileID: 5596066571066104426}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -225,6 +226,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
explosion: {fileID: 3849051887377255970, guid: 6dfb3bf841f5c5e448b6360edfb447cb,
type: 3}
shotSFX: {fileID: 8235080298173569105}
dropChance: 10
pickup: {fileID: 6282504407602761075, guid: de88192e9e62c2b31b892e225be920f8, type: 3}
--- !u!1 &4100566414181513900
......@@ -596,6 +598,133 @@ Transform:
m_Father: {fileID: 3045952731952003929}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8724609496564053018
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5596066571066104426}
- component: {fileID: 8235080298173569105}
m_Layer: 0
m_Name: ShotSFX
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5596066571066104426
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8724609496564053018}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.3208597, y: -7.4878044, z: 5.324868}
m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: []
m_Father: {fileID: 403112569066400171}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &8235080298173569105
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8724609496564053018}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: be9063e5910256e419f703fe4b6f12d8, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 0.5
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &8818649446812618485
GameObject:
m_ObjectHideFlags: 0
......
......@@ -23,7 +23,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 141141649259298211}
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalRotation: {x: 0, y: 0.7072302, z: 0.7069834, w: 0}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 100, y: 100, z: 100}
m_Children:
......@@ -31,7 +31,7 @@ Transform:
- {fileID: 308448015626709997}
m_Father: {fileID: 4549998171761708480}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -89.98, y: 180, z: 0}
--- !u!1 &167988787682844359
GameObject:
m_ObjectHideFlags: 0
......@@ -74,9 +74,10 @@ GameObject:
- component: {fileID: 5885875939041878202}
- component: {fileID: -7032714091151265289}
- component: {fileID: -597582237068271772}
- component: {fileID: 4780192179537917166}
m_Layer: 0
m_Name: TurtleSeeker
m_TagString: Untagged
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -90,7 +91,7 @@ Transform:
m_GameObject: {fileID: 684422770152341459}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_LocalScale: {x: 0.15, y: 0.15, z: 0.15}
m_Children:
- {fileID: 5360712816303871490}
- {fileID: 1469172663092512014}
......@@ -109,7 +110,7 @@ Animator:
m_GameObject: {fileID: 684422770152341459}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: 19dc04366e85f6b42aa59d37818d7653, type: 3}
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000, guid: aaa53b31d94f92e4081cb70a0721fbf7, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 0
......@@ -146,13 +147,26 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5171ed1e23f0f304494186a7e109be60, type: 3}
m_Name:
m_EditorClassIdentifier:
vel: 2.5
vel: 5
vomit: {fileID: 0}
rotationVel: 2.5
rotationVel: 200
TurretAnchor:
- {fileID: 1387220612188179555}
- {fileID: 2620027465756984677}
firerate: 0.5
--- !u!65 &4780192179537917166
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 684422770152341459}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 7, y: 5, z: 7}
m_Center: {x: 0, y: 2, z: 0}
--- !u!1 &1387220612188179555
GameObject:
m_ObjectHideFlags: 0
......@@ -482,7 +496,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7949495823156106357}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
......@@ -599,8 +613,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8489481556079216237}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6515847041453359535}
......@@ -610,7 +624,7 @@ Transform:
- {fileID: 5708452920995750931}
m_Father: {fileID: 5360712816303871490}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1 &8660106765129751097
GameObject:
m_ObjectHideFlags: 0
......
......@@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 40009226467166444}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.3333334, y: 1.3333334, z: 1.3333334}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4703642723941361951}
m_RootOrder: 1
......
......@@ -54,7 +54,7 @@ public class SeekerAI : MonoBehaviour
public void activate()
{
alive = true;
StartCoroutine("ShotDelay");
StartCoroutine("DelayFire");
}
// Update is called once per frame
......@@ -66,7 +66,7 @@ public class SeekerAI : MonoBehaviour
if (Vector3.Distance(transform.position, navpoints[dest].position) == 0 && dest < navpoints.Length - 1)
{
dest = Random.Range(0, 18);
dest = Random.Range(0, 12);
}
Vector3 pos = player.transform.position - transform.position;
......
......@@ -5,15 +5,14 @@ using UnityEngine;
public class ToidHeart : MonoBehaviour
{
public GameObject explosion;
private GameMaster gm;
public AudioSource shotSFX;
public int dropChance;
public PickupLogic pickup;
private bool dead;
private GameMaster gm; // Start is called before the first frame update
// Start is called before the first frame update
void Start()
void Start()
{
}
......@@ -34,7 +33,7 @@ public class ToidHeart : MonoBehaviour
int rng = Random.Range(0, 100);
if(rng <= dropChance)
Instantiate(pickup, transform.position, Quaternion.identity);
Instantiate(explosion, this.transform.position, this.transform.rotation);
Instantiate(explosion, this.transform.position, Quaternion.Euler(90, transform.rotation.y, transform.rotation.z));
Destroy(gameObject);
}
......
......@@ -8,6 +8,7 @@ public class GameMaster : MonoBehaviour
public GameObject playerModel; //Prefab Reference
public GameObject toidBasicModel;
public GameObject toidTurretModel;
public GameObject toidSeekerModel;
public EnemyBullet eBullet;
public Transform cam;
public GameObject canvas;
......@@ -161,6 +162,8 @@ public class GameMaster : MonoBehaviour
StartCoroutine(coroutine1);
StartCoroutine(coroutine2);
SpawnSeekerToid();
}
void SpawnBasicToid()
......@@ -191,6 +194,18 @@ public class GameMaster : MonoBehaviour
}
}
void SpawnSeekerToid()
{
SeekerAI toid;