Super

2023-02-20 22:06:54 +01:00
parent c76add1495
commit 1b34f885b3
3 changed files with 4 additions and 3 deletions
@@ -4,7 +4,6 @@
    <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/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>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using TMPro;
+using Unity.VisualScripting;
 using UnityEngine;

 public class PlayablePlayer : Player
@@ -203,6 +204,8 @@ public class PlayablePlayer : Player

    private void OnTriggerEnter(Collider collider)
    {
+        base.OnTriggerEnter(collider);
        Layout2.SetActive(true);
    }
+    
 }
@@ -65,10 +65,9 @@ public abstract class Player : MonoBehaviour
        PlayAnimation(AnimationType.Coin);
    }
    
-    private void OnTriggerEnter(Collider c)
+    public void OnTriggerEnter(Collider c)
    {
        eventstop = true;
-        
    }
    
    public void EventStopFinished()