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

Miau

Browse Source
This commit is contained in:
AliIbnAbiTalib
2023-04-06 23:02:36 +02:00
parent 6954dc5c88
commit fe220c4e4e
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+2 -4
View File
@@ -3,10 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment=""> <list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Items/Trap.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Items/Trap.prefab" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -154,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="874000" /> <workItem from="1680813239896" duration="1691000" />
</task> </task>
<servers /> <servers />
</component> </component>
FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+8
View File
@@ -169,6 +169,14 @@ public class NoPlayablePlayer : Player
//Der Spieler steht gerade //Der Spieler steht gerade
else else
{ {
if (currentField.placedItem != null)
{
Trap t = currentField.placedItem.GetComponent<Trap>();
AddCoins(-3);
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;
transform.rotation = Quaternion.Euler(currentRotation); transform.rotation = Quaternion.Euler(currentRotation);
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+8
View File
@@ -172,6 +172,14 @@ public class PlayablePlayer : Player
//Der Spieler steht gerade //Der Spieler steht gerade
else else
{ {
if (currentField.placedItem != null)
{
Trap t = currentField.placedItem.GetComponent<Trap>();
AddCoins(-3);
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;
transform.rotation = Quaternion.Euler(currentRotation); transform.rotation = Quaternion.Euler(currentRotation);