tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simple interactable rework

Browse Source
This commit is contained in:
Michal Pikulski
2025-10-31 13:50:08 +01:00
parent 095f21908b
commit 917230e10a
15 changed files with 1897 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Editor/CustomEditorsAndDrawers/InteractableEditor.cs
View File

@@ -1,9 +1,9 @@
using UnityEngine;
using UnityEngine;
using UnityEditor;
namespace Interactions
{
[CustomEditor(typeof(Interactable))]
[CustomEditor(typeof(InteractableBase), true)]
public class InteractableEditor : UnityEditor.Editor
{
SerializedProperty isOneTimeProp;
@@ -56,7 +56,7 @@ namespace Interactions
}
// Display character target counts
Interactable interactable = (Interactable)target;
InteractableBase interactable = (InteractableBase)target;
CharacterMoveToTarget[] moveTargets = interactable.GetComponentsInChildren<CharacterMoveToTarget>();
int trafalgarTargets = 0;
int pulverTargets = 0;
@@ -92,7 +92,7 @@ namespace Interactions
private void CreateMoveTarget(CharacterToInteract characterType)
{
Interactable interactable = (Interactable)target;
InteractableBase interactable = (InteractableBase)target;
// Create a new GameObject
GameObject targetObj = new GameObject($"{characterType}MoveTarget");

8
Assets/Editor/Tools/ItemPrefabEditor.cs
View File

@@ -8,7 +8,7 @@ namespace Editor
public class ItemPrefabEditorWindow : EditorWindow
{
private GameObject _selectedGameObject;
private Interactable _interactable;
private InteractableBase _interactable;
private PickupItemData _pickupData;
private PuzzleStepSO _objectiveData;
private UnityEditor.Editor _soEditor;
@@ -42,17 +42,17 @@ namespace Editor
if (Selection.activeGameObject != null)
{
_selectedGameObject = Selection.activeGameObject;
_interactable = _selectedGameObject.GetComponent<Interactable>();
_interactable = _selectedGameObject.GetComponent<InteractableBase>();
}
else if (Selection.activeObject is GameObject go)
{
_selectedGameObject = go;
_interactable = go.GetComponent<Interactable>();
_interactable = go.GetComponent<InteractableBase>();
}
if (_selectedGameObject == null || _interactable == null)
{
EditorGUILayout.HelpBox("Select a GameObject or prefab with an Interactable component to edit.", MessageType.Info);
EditorGUILayout.HelpBox("Select a GameObject or prefab with an InteractableBase component to edit.", MessageType.Info);
return;
}

4
Assets/Editor/Tools/PrefabCreatorWindow.cs
View File

@@ -1,4 +1,4 @@
using UnityEditor;
using UnityEditor;
using UnityEngine;
using System.IO;
using Interactions;
@@ -124,7 +124,7 @@ namespace Editor
private void CreatePrefab()
{
var go = new GameObject(_prefabName);
go.AddComponent<Interactable>();
// Note: No need to add InteractableBase separately - Pickup and ItemSlot inherit from it
go.AddComponent<BoxCollider>();
int interactableLayer = LayerMask.NameToLayer("Interactable");
if (interactableLayer != -1)