No More Player Pickup
This commit is contained in:
@@ -145,6 +145,9 @@ public class PlayerPickupController : MonoBehaviour
|
||||
|
||||
var hasTrick = col.TryGetComponent<TrickController>(out var trick);
|
||||
var hasPlayer = col.TryGetComponent<PlayerPlatformerController>(out var playerController);
|
||||
|
||||
if (hasPlayer) continue;
|
||||
|
||||
if (!hasTrick && !hasPlayer && !col.CompareTag("Interactable"))
|
||||
{
|
||||
continue;
|
||||
|
||||
@@ -10,6 +10,7 @@ public class PlayerPlatformerController : MonoBehaviour
|
||||
[SerializeField] private string actionMapName = "Player";
|
||||
[SerializeField] private string moveActionName = "Move";
|
||||
[SerializeField] private string jumpActionName = "Jump";
|
||||
[SerializeField] private string healActionName = "Crouch";
|
||||
[SerializeField] private string controlSchemeName = "";
|
||||
[SerializeField] private int gamepadIndex = -1;
|
||||
[SerializeField] private float moveSpeed = 6f;
|
||||
@@ -24,6 +25,7 @@ public class PlayerPlatformerController : MonoBehaviour
|
||||
private InputActionAsset runtimeActions;
|
||||
private InputAction moveAction;
|
||||
private InputAction jumpAction;
|
||||
private InputAction healAction;
|
||||
public float LastMoveX { get; private set; }
|
||||
private bool deviceFilterEnabled;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
|
||||
<Style src="project://database/Assets/UI%20Toolkit/progressBar.uss?fileID=7433441132597879392&guid=2c3cb808f8496d4438df1bd06428d6f1&type=3#progressBar"/>
|
||||
<ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); height: 20%;">
|
||||
<ui:Label text="Score: 0" name="Score" style="font-size: 40px; height: 10%;"/>
|
||||
<ui:Label text="Score: 0" name="Score" style="font-size: 40px; height: auto; background-color: rgb(0, 0, 0); color: rgb(255, 255, 255);"/>
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement style="flex-grow: 1; align-self: auto; align-items: flex-start; align-content: auto; height: 80%; flex-direction: row;">
|
||||
<ui:VisualElement style="flex-grow: 1; height: 100%; width: 10%; background-size: 100% 100%;">
|
||||
|
||||
Reference in New Issue
Block a user