Browse Source

Made the cannons able to start at different points in their countdowns. Made falling off things cost lives (player is currently notified a turn late).

master
s3607057 (Angus Niven) 5 years ago
parent
commit
db19ee9723
3 changed files with 93 additions and 2 deletions
  1. +90
    -0
      Assets/Prefabs/Map Sections/Width 7/Two-part 7-1.prefab
  2. +1
    -0
      Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs
  3. +2
    -2
      Assets/Scripts/Traps/ShootingCannon.cs

+ 90
- 0
Assets/Prefabs/Map Sections/Width 7/Two-part 7-1.prefab View File

@ -1461,6 +1461,16 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: shootingRight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -2843,6 +2853,11 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -3356,6 +3371,11 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -3880,6 +3900,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -4403,6 +4428,16 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: shootingRight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -5629,6 +5664,16 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: shootingRight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -6882,6 +6927,16 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: shootingRight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -7460,6 +7515,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -9899,6 +9959,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: shootingRight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -10273,6 +10343,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: shootingRight
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -10930,6 +11010,11 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh
@ -11030,6 +11115,11 @@ PrefabInstance:
propertyPath: countdowntimer propertyPath: countdowntimer
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3}
propertyPath: countdown
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
type: 3} type: 3}
propertyPath: m_Mesh propertyPath: m_Mesh

+ 1
- 0
Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs View File

@ -70,6 +70,7 @@ public class RacetrackGameMode : GameMode
if (player.character.respawnNeeded) if (player.character.respawnNeeded)
{ {
respawningPlayers.Add(player); respawningPlayers.Add(player);
player.client.Lives--;
} }
else else
{ {

+ 2
- 2
Assets/Scripts/Traps/ShootingCannon.cs View File

@ -13,7 +13,7 @@ public class ShootingCannon : ActiveBlock
public TextMeshPro counter; public TextMeshPro counter;
public TextMeshPro counter2; public TextMeshPro counter2;
int countdowntimer = 3; int countdowntimer = 3;
int countdown;
public int countdown = 3;
public override int GetInitative() public override int GetInitative()
{ {
@ -23,7 +23,7 @@ public class ShootingCannon : ActiveBlock
private void Start() private void Start()
{ {
countdown = countdowntimer;
//countdown = countdowntimer;
} }
private void Update() private void Update()
{ {

Loading…
Cancel
Save