Commit f1f27864 authored by Markus Schlösser's avatar Markus Schlösser

Updated levels 14-16, reworked part of level 16 to be possible

parent d48222c6
......@@ -22,7 +22,7 @@ GameObject:
- component: {fileID: 58064784892578094}
- component: {fileID: 199745163004192738}
- component: {fileID: 198244601809831776}
m_Layer: 11
m_Layer: 13
m_Name: ChallengerModus
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -38,7 +38,7 @@ GameObject:
m_Component:
- component: {fileID: 4143147008631634}
- component: {fileID: 114764353408195872}
m_Layer: 11
m_Layer: 13
m_Name: ChallengerModus
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -57,7 +57,7 @@ GameObject:
- component: {fileID: 23947111915981346}
- component: {fileID: 114417361206357324}
- component: {fileID: 114644862311527322}
m_Layer: 0
m_Layer: 13
m_Name: LightSource
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -161,7 +161,7 @@ CircleCollider2D:
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 1
m_Radius: 0.4
--- !u!114 &114417361206357324
MonoBehaviour:
m_ObjectHideFlags: 1
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: 7d76a63dfd317814d9eef925c0df39c7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7302d929ac7a2f44180b44e09592ac8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -11,8 +11,6 @@ public class CannonController : MonoBehaviour, IResetable {
[SerializeField] private Animator animRadHinten;
[SerializeField] private bool ignoreEnviroment;
private Coroutine co;
private float time;
private void Start() {
......
......@@ -97,7 +97,7 @@ public class PlayerActor : MonoBehaviour, IResetable {
private void OnTriggerEnter2D(Collider2D other) {
// Collides with Hazard
if (other.gameObject.layer == 11) {
if (other.gameObject.layer == 11 || other.gameObject.layer == 13) {
StartCoroutine(Die());
}
}
......
......@@ -52,4 +52,4 @@ Physics2DSettings:
m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
m_LayerCollisionMatrix: c8e0ffffc8e0ffffc8e0ffffffffffffc8e0ffffc8e0ffffffffffffffffffffc8e0ffffc8ecffffc8e2ffffc8faffffc8e8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: c8c0ffffc8c0ffffc8c0ffffffffffffc8c0ffffc8c0ffffffffffffffffffffc8c0ffffc8ecffffc8c2ffffc8daffffc8c8ffffc8c2ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_EditorVersion: 2018.2.9f1
m_EditorVersion: 2018.2.10f1
......@@ -20,7 +20,7 @@ TagManager:
- Interactible
- Hazard
- Enviroment
-
- Challenger
-
-
-
......
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