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

Rework interactables into a flatter hierarchy, reenable puzzles as well

Browse Source
This commit is contained in:
Michal Pikulski
2025-09-11 13:00:26 +02:00
parent 3a40d1a151
commit e1ff13db30
32 changed files with 981 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Assets/Editor/ItemPrefabEditor.cs
View File

@@ -1,4 +1,6 @@
using UnityEditor;
using Interactions;
using PuzzleS;
using UnityEditor;
using UnityEngine;
namespace Editor
@@ -64,27 +66,16 @@ namespace Editor
{
PrefabEditorUtility.RemoveComponent<Pickup>(_selectedGameObject);
}
// CombineWithBehavior
bool hasCombine = _selectedGameObject.GetComponent<CombineWithBehavior>() != null;
bool addCombine = EditorGUILayout.Toggle("CombineWithBehavior", hasCombine);
if (addCombine && !hasCombine)
{
PrefabEditorUtility.AddOrGetComponent<CombineWithBehavior>(_selectedGameObject);
}
else if (!addCombine && hasCombine)
{
PrefabEditorUtility.RemoveComponent<CombineWithBehavior>(_selectedGameObject);
}
// SlotItemBehavior
bool hasSlot = _selectedGameObject.GetComponent<SlotItemBehavior>() != null;
bool hasSlot = _selectedGameObject.GetComponent<ItemSlot>() != null;
bool addSlot = EditorGUILayout.Toggle("SlotItemBehavior", hasSlot);
if (addSlot && !hasSlot)
{
PrefabEditorUtility.AddOrGetComponent<SlotItemBehavior>(_selectedGameObject);
PrefabEditorUtility.AddOrGetComponent<ItemSlot>(_selectedGameObject);
}
else if (!addSlot && hasSlot)
{
PrefabEditorUtility.RemoveComponent<SlotItemBehavior>(_selectedGameObject);
PrefabEditorUtility.RemoveComponent<ItemSlot>(_selectedGameObject);
}
// ObjectiveStepBehaviour
bool hasObjective = _selectedGameObject.GetComponent<ObjectiveStepBehaviour>() != null;

8
Assets/Editor/PrefabCreatorWindow.cs
View File

@@ -1,6 +1,8 @@
using UnityEditor;
using UnityEngine;
using System.IO;
using Interactions;
using PuzzleS;
namespace Editor
{
@@ -121,13 +123,9 @@ namespace Editor
var pickup = go.AddComponent<Pickup>();
pickup.itemData = _pickupData;
}
if (_addCombineWith)
{
go.AddComponent<CombineWithBehavior>();
}
if (_addSlot)
{
go.AddComponent<SlotItemBehavior>();
go.AddComponent<ItemSlot>();
}
if (_addObjective)
{

6
Assets/Editor/SceneObjectLocatorWindow.cs
View File

@@ -3,6 +3,8 @@ using UnityEngine;
using UnityEditor.SceneManagement;
using System.Collections.Generic;
using System.Linq;
using Interactions;
using PuzzleS;
public class SceneObjectLocatorWindow : EditorWindow
{
@@ -43,12 +45,10 @@ public class SceneObjectLocatorWindow : EditorWindow
foreach (var pickup in pickups)
{
var go = pickup.gameObject;
bool hasCombine = go.GetComponent<CombineWithBehavior>() != null;
bool hasSlot = go.GetComponent<SlotItemBehavior>() != null;
bool hasSlot = go.GetComponent<ItemSlot>() != null;
pickupInfos.Add(new PickupInfo
{
pickup = pickup,
hasCombine = hasCombine,
hasSlot = hasSlot
});
}