namespace 설정 오류 수정

This commit is contained in:
aube.lee
2025-01-24 18:37:47 +09:00
parent f69e89a106
commit 10f31b0222
2 changed files with 104 additions and 101 deletions

View File

@@ -3,61 +3,66 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class VariableJoystick : Joystick
namespace TON
{
public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } }
[SerializeField] private float moveThreshold = 1;
[SerializeField] private JoystickType joystickType = JoystickType.Fixed;
private Vector2 fixedPosition = Vector2.zero;
public void SetMode(JoystickType joystickType)
public class VariableJoystick : Joystick
{
this.joystickType = joystickType;
if (joystickType == JoystickType.Fixed)
public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } }
[SerializeField] private float moveThreshold = 1;
[SerializeField] private JoystickType joystickType = JoystickType.Fixed;
private Vector2 fixedPosition = Vector2.zero;
public void SetMode(JoystickType joystickType)
{
background.anchoredPosition = fixedPosition;
background.gameObject.SetActive(true);
this.joystickType = joystickType;
if (joystickType == JoystickType.Fixed)
{
background.anchoredPosition = fixedPosition;
background.gameObject.SetActive(true);
}
else
background.gameObject.SetActive(false);
}
else
background.gameObject.SetActive(false);
}
protected override void Start()
{
base.Start();
fixedPosition = background.anchoredPosition;
SetMode(joystickType);
}
public override void OnPointerDown(PointerEventData eventData)
{
if (joystickType != JoystickType.Fixed)
protected override void Start()
{
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
background.gameObject.SetActive(true);
base.Start();
fixedPosition = background.anchoredPosition;
SetMode(joystickType);
}
base.OnPointerDown(eventData);
}
public override void OnPointerUp(PointerEventData eventData)
{
if (joystickType != JoystickType.Fixed)
background.gameObject.SetActive(false);
base.OnPointerUp(eventData);
}
protected override void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam)
{
if (joystickType == JoystickType.Dynamic && magnitude > moveThreshold)
public override void OnPointerDown(PointerEventData eventData)
{
Vector2 difference = normalised * (magnitude - moveThreshold) * radius;
background.anchoredPosition += difference;
if (joystickType != JoystickType.Fixed)
{
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
background.gameObject.SetActive(true);
}
base.OnPointerDown(eventData);
}
public override void OnPointerUp(PointerEventData eventData)
{
if (joystickType != JoystickType.Fixed)
background.gameObject.SetActive(false);
base.OnPointerUp(eventData);
}
protected override void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam)
{
if (joystickType == JoystickType.Dynamic && magnitude > moveThreshold)
{
Vector2 difference = normalised * (magnitude - moveThreshold) * radius;
background.anchoredPosition += difference;
}
base.HandleInput(magnitude, normalised, radius, cam);
}
base.HandleInput(magnitude, normalised, radius, cam);
}
public enum JoystickType { Fixed, Floating, Dynamic }
}
public enum JoystickType { Fixed, Floating, Dynamic }

View File

@@ -3,64 +3,62 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
namespace TON
public class VariableJoystick : Joystick
{
public class VariableJoystick : Joystick
public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } }
[SerializeField] private float moveThreshold = 1;
[SerializeField] private JoystickType joystickType = JoystickType.Fixed;
private Vector2 fixedPosition = Vector2.zero;
public void SetMode(JoystickType joystickType)
{
public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } }
[SerializeField] private float moveThreshold = 1;
[SerializeField] private JoystickType joystickType = JoystickType.Fixed;
private Vector2 fixedPosition = Vector2.zero;
public void SetMode(JoystickType joystickType)
this.joystickType = joystickType;
if (joystickType == JoystickType.Fixed)
{
this.joystickType = joystickType;
if (joystickType == JoystickType.Fixed)
{
background.anchoredPosition = fixedPosition;
background.gameObject.SetActive(true);
}
else
background.gameObject.SetActive(false);
}
protected override void Start()
{
base.Start();
fixedPosition = background.anchoredPosition;
SetMode(joystickType);
}
public override void OnPointerDown(PointerEventData eventData)
{
if (joystickType != JoystickType.Fixed)
{
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
background.gameObject.SetActive(true);
}
base.OnPointerDown(eventData);
}
public override void OnPointerUp(PointerEventData eventData)
{
if (joystickType != JoystickType.Fixed)
background.gameObject.SetActive(false);
base.OnPointerUp(eventData);
}
protected override void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam)
{
if (joystickType == JoystickType.Dynamic && magnitude > moveThreshold)
{
Vector2 difference = normalised * (magnitude - moveThreshold) * radius;
background.anchoredPosition += difference;
}
base.HandleInput(magnitude, normalised, radius, cam);
background.anchoredPosition = fixedPosition;
background.gameObject.SetActive(true);
}
else
background.gameObject.SetActive(false);
}
public enum JoystickType { Fixed, Floating, Dynamic }
protected override void Start()
{
base.Start();
fixedPosition = background.anchoredPosition;
SetMode(joystickType);
}
public override void OnPointerDown(PointerEventData eventData)
{
if (joystickType != JoystickType.Fixed)
{
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
background.gameObject.SetActive(true);
}
base.OnPointerDown(eventData);
}
public override void OnPointerUp(PointerEventData eventData)
{
if (joystickType != JoystickType.Fixed)
background.gameObject.SetActive(false);
base.OnPointerUp(eventData);
}
protected override void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam)
{
if (joystickType == JoystickType.Dynamic && magnitude > moveThreshold)
{
Vector2 difference = normalised * (magnitude - moveThreshold) * radius;
background.anchoredPosition += difference;
}
base.HandleInput(magnitude, normalised, radius, cam);
}
}
public enum JoystickType { Fixed, Floating, Dynamic }