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

Super

Browse Source
This commit is contained in:
AliIbnAbiTalib
2023-02-20 22:06:54 +01:00
parent c76add1495
commit 1b34f885b3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
-1
View File
@@ -4,7 +4,6 @@
<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$/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$/Assets/Scripts/Players/Player.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/Player.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../Server/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../Server/.idea/workspace.xml" 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" />
FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+3
View File
@@ -1,6 +1,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using TMPro; using TMPro;
using Unity.VisualScripting;
using UnityEngine; using UnityEngine;
public class PlayablePlayer : Player public class PlayablePlayer : Player
@@ -203,6 +204,8 @@ public class PlayablePlayer : Player
private void OnTriggerEnter(Collider collider) private void OnTriggerEnter(Collider collider)
{ {
base.OnTriggerEnter(collider);
Layout2.SetActive(true); Layout2.SetActive(true);
} }
} }
FlufflParty/Assets/Scripts/Players/Player.cs
+1 -2
View File
@@ -65,10 +65,9 @@ public abstract class Player : MonoBehaviour
PlayAnimation(AnimationType.Coin); PlayAnimation(AnimationType.Coin);
} }
private void OnTriggerEnter(Collider c) public void OnTriggerEnter(Collider c)
{ {
eventstop = true; eventstop = true;
} }
public void EventStopFinished() public void EventStopFinished()