Merge remote-tracking branch 'origin/master'

2025-01-05 19:55:00 +01:00
parent 437a332337 4d7fe1fa1c
commit fcac8ce4eb
16 changed files with 584 additions and 68 deletions
@@ -2259,6 +2259,22 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
  m_Name: ActivationPlayableAsset
  m_EditorClassIdentifier: 
+--- !u!114 &6336676974877501888
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+  m_Name: Signal Emitter
+  m_EditorClassIdentifier: 
+  m_Time: 9
+  m_Retroactive: 0
+  m_EmitOnce: 0
+  m_Asset: {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2}
 --- !u!114 &6391585419064415603
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -2460,6 +2476,8 @@ MonoBehaviour:
  m_Markers:
    m_Objects:
    - {fileID: 4919251609171802334}
+    - {fileID: -8789908730229311606}
+    - {fileID: 6336676974877501888}
 --- !u!114 &6946805870332341142
 MonoBehaviour:
  m_ObjectHideFlags: 1