Compare commits

..

No commits in common. "7a66f72aa8f2d4cab70dfe45251c3f2923856b41" and "6128ae9982edba3e5b36051c1746742ccc73aaa1" have entirely different histories.

11 changed files with 56 additions and 701127 deletions

View File

@ -1048,18 +1048,8 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
BTC.Run("Collider.INTERACTABLES.Topf") BTC.Run("Collider.INTERACTABLES.Topf")
BTC.StopSound("StudioEventEmitter.INTERACTABLES.ZwiebelnInTopf") BTC.StopSound("StudioEventEmitter.INTERACTABLES.ZwiebelnInTopf")
BTC.Run("StudioEventEmitter.INTERACTABLES.Abloeschen") BTC.Run("StudioEventEmitter.INTERACTABLES.Abloeschen")
Composite(Marathon) {
Composite(Sequence) {
BTC.Wait(6)
BTC.SetFloat("StudioEventEmitter.INTERACTABLES.Abloeschen", "blubbern.transition", 1)
BTC.Show("GO.INTERACTABLES.ChangeSound") // Ruehren BTC.Show("GO.INTERACTABLES.ChangeSound") // Ruehren
}
Composite(Sequence) {
BTC.Run("AudioSource.AUDIO.Kueche3FZusammenKo") BTC.Run("AudioSource.AUDIO.Kueche3FZusammenKo")
}
}
// Bouillon leuchtet // Bouillon leuchtet
BTC.Enable("NamedGrabEvent/NamedOutline.INTERACTABLES.Bouillon") BTC.Enable("NamedGrabEvent/NamedOutline.INTERACTABLES.Bouillon")

View File

@ -217,18 +217,6 @@ public class BTC : MonoBehaviour {
} }
} }
[Task]
public void SetFloat(string objectName, string key, float value)
{
List<ComponentHandler> handlers = GetHandlers(objectName);
handlers.ForEach(handler => handler.SetFloat(Task.getState, key, value));
if (handlers.Count == 0)
{
Debug.LogWarning($"BTC.SetFloat: no components under the name '{objectName}'");
Task.SetSucceeded();
}
}
[Task] [Task]
public void Enable(string objectName) public void Enable(string objectName)
{ {

View File

@ -180,15 +180,6 @@ public class ComponentHandler : MonoBehaviour {
Task.SetError(); Task.SetError();
} }
public virtual void SetFloat(MyBT.NodeState nodeState, string key, float value)
{
if (Task.isDebugging)
{
Debug.LogWarning($"ComponentHandler.SetFloat: not implemented for {this.GetType()}");
}
Task.SetError();
}
public virtual void Enable(MyBT.NodeState nodeState) public virtual void Enable(MyBT.NodeState nodeState)
{ {
if (Task.isDebugging) if (Task.isDebugging)

View File

@ -114,16 +114,6 @@ public class NamedStudioEventEmitter : ComponentHandler {
return; return;
} }
} }
public override void SetFloat(NodeState nodeState, string key, float value)
{
if (nodeState == NodeState.FirstRun)
{
studioEventEmitter.SetParameter(key, value);
Task.SetSucceeded();
return;
}
}
#else #else
[Header("FMod Support disabled: Window->MyBT->PreCompiler Definitions")] [Header("FMod Support disabled: Window->MyBT->PreCompiler Definitions")]
public string dummy; public string dummy;

View File

@ -1 +1 @@
2025-01-08T20:00:27.2696630Z 2025-01-08T12:58:31.1629980Z

File diff suppressed because it is too large Load Diff

View File

@ -1,23 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
#if FMOD_AVAILABLE
using FMODUnity;
#endif
public class ChangeFMODEvent : MonoBehaviour
{
#if FMOD_AVAILABLE
[SerializeField]
EventReference _newSoundRef;
[SerializeField]
StudioEventEmitter _emitter;
void Start()
{
_emitter.Stop();
_emitter.ChangeEvent(_newSoundRef);
}
#endif
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: b0b655e179ae44f17a6518841330b41a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -10,33 +10,15 @@ public class OnStirringSound : MonoBehaviour
{ {
#if FMOD_AVAILABLE #if FMOD_AVAILABLE
[SerializeField] [SerializeField]
Rigidbody _rigidbody; EventReference stirringDrySoundRef;
StudioEventEmitter _stirringSoundEvent; [SerializeField]
StudioEventEmitter emitter;
void Start() void Start()
{ {
_stirringSoundEvent = GetComponent<StudioEventEmitter>(); emitter.Stop();
} emitter.ChangeEvent(stirringDrySoundRef);
void Update()
{
if (_rigidbody.velocity != Vector3.zero)
{
if (!_stirringSoundEvent.IsPlaying())
{
_stirringSoundEvent.Play();
}
}
else
{
_stirringSoundEvent.Stop();
}
}
void OnDestroy()
{
_stirringSoundEvent.Stop();
} }
#endif #endif
} }

View File

@ -1,28 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class OnTriggerPot : MonoBehaviour
{
[SerializeField]
string loeffelTag;
[SerializeField]
GameObject stirringSound;
private void OnTriggerEnter(Collider other)
{
if (other.tag == loeffelTag)
{
stirringSound.SetActive(true);
}
}
private void OnTriggerExit(Collider other)
{
if (other.tag == loeffelTag)
{
stirringSound.SetActive(false);
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 87cfd4637a2f74f57b00dff0a8870cb9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: