jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test Push Target

Browse Source
This commit is contained in:
AliIbnAbiTalib
2023-04-06 23:06:41 +02:00
parent fe220c4e4e
commit 840bc3b7a5
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+1 -1
View File
@@ -152,7 +152,7 @@
<workItem from="1680459748883" duration="4859000" /> <workItem from="1680459748883" duration="4859000" />
<workItem from="1680539278905" duration="1085000" /> <workItem from="1680539278905" duration="1085000" />
<workItem from="1680546560659" duration="3839000" /> <workItem from="1680546560659" duration="3839000" />
<workItem from="1680813239896" duration="1691000" /> <workItem from="1680813239896" duration="1933000" />
</task> </task>
<servers /> <servers />
</component> </component>
FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+2
View File
@@ -169,6 +169,7 @@ public class NoPlayablePlayer : Player
//Der Spieler steht gerade //Der Spieler steht gerade
else else
{ {
/*
if (currentField.placedItem != null) if (currentField.placedItem != null)
{ {
Trap t = currentField.placedItem.GetComponent<Trap>(); Trap t = currentField.placedItem.GetComponent<Trap>();
@@ -177,6 +178,7 @@ public class NoPlayablePlayer : Player
Destroy(t); Destroy(t);
currentField.placedItem = null; currentField.placedItem = null;
} }
*/
Vector3 currentRotation = Quaternion.ToEulerAngles(transform.rotation); Vector3 currentRotation = Quaternion.ToEulerAngles(transform.rotation);
currentRotation.y = -34; currentRotation.y = -34;
transform.rotation = Quaternion.Euler(currentRotation); transform.rotation = Quaternion.Euler(currentRotation);
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+9 -6
View File
@@ -172,13 +172,16 @@ public class PlayablePlayer : Player
//Der Spieler steht gerade //Der Spieler steht gerade
else else
{ {
if (currentField.placedItem != null) if (currentField != null)
{ {
Trap t = currentField.placedItem.GetComponent<Trap>(); if (currentField.placedItem != null)
AddCoins(-3); {
t.target.AddCoins(3); Trap t = currentField.placedItem.GetComponent<Trap>();
Destroy(t); AddCoins(-3);
currentField.placedItem = null; t.target.AddCoins(3);
Destroy(t);
currentField.placedItem = null;
}
} }
Vector3 currentRotation = Quaternion.ToEulerAngles(transform.rotation); Vector3 currentRotation = Quaternion.ToEulerAngles(transform.rotation);
currentRotation.y = -34; currentRotation.y = -34;