make dispenser available to all puzzles
This commit is contained in:
8
Assets/Desert/Runtime/Dispenser.meta
Normal file
8
Assets/Desert/Runtime/Dispenser.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 073fb5180fa20564bb163c47ccafc413
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -4,7 +4,7 @@ using UnityEngine;
|
||||
using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger;
|
||||
using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType;
|
||||
|
||||
namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
namespace EscapeRoomEngine.Desert.Runtime.Dispenser
|
||||
{
|
||||
[SelectionBase]
|
||||
[RequireComponent(typeof(Animator), typeof(Emission))]
|
||||
@@ -2,7 +2,7 @@
|
||||
using NaughtyAttributes;
|
||||
using UnityEngine;
|
||||
|
||||
namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
namespace EscapeRoomEngine.Desert.Runtime.Dispenser
|
||||
{
|
||||
[Serializable]
|
||||
public struct DispenserLightRow
|
||||
@@ -1,9 +1,9 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
namespace EscapeRoomEngine.Desert.Runtime.Dispenser
|
||||
{
|
||||
[RequireComponent(typeof(Rigidbody), typeof(Collider), typeof(Emission))]
|
||||
public class HoleOrb : MonoBehaviour
|
||||
public class DispenserOrb : MonoBehaviour
|
||||
{
|
||||
public Color Color
|
||||
{
|
||||
@@ -3,7 +3,6 @@ using System.Collections.Generic;
|
||||
using EscapeRoomEngine.Desert.Runtime.Puzzle_A;
|
||||
using EscapeRoomEngine.Engine.Runtime;
|
||||
using EscapeRoomEngine.Engine.Runtime.Modules;
|
||||
using EscapeRoomEngine.Engine.Runtime.Utilities;
|
||||
using JetBrains.Annotations;
|
||||
using NaughtyAttributes;
|
||||
using UnityEngine;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using EscapeRoomEngine.Desert.Runtime.Dispenser;
|
||||
using UnityEngine;
|
||||
|
||||
namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
{
|
||||
@@ -24,7 +25,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
var orb = other.GetComponent<HoleOrb>();
|
||||
var orb = other.GetComponent<DispenserOrb>();
|
||||
if (orb != null)
|
||||
{
|
||||
if (Active)
|
||||
@@ -40,7 +41,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
|
||||
private void OnTriggerExit(Collider other)
|
||||
{
|
||||
var orb = other.GetComponent<HoleOrb>();
|
||||
var orb = other.GetComponent<DispenserOrb>();
|
||||
if (orb != null)
|
||||
{
|
||||
var color = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor;
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
private Emission frameLight;
|
||||
|
||||
private List<Hole> _holes;
|
||||
private Dispenser _dispenser;
|
||||
private Dispenser.Dispenser _dispenser;
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
@@ -76,7 +76,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
|
||||
base.SetModule(module);
|
||||
|
||||
var firstRelatedModule = Module.relatedModules[0];
|
||||
if (firstRelatedModule.State is Dispenser dispenser)
|
||||
if (firstRelatedModule.State is Dispenser.Dispenser dispenser)
|
||||
{
|
||||
_dispenser = dispenser;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user