Merge branch 'main' into DamianBranch

This commit is contained in:
2025-12-19 00:06:48 +01:00
47 changed files with 2581 additions and 1547 deletions

View File

@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
m_Name: EnablePulverDistanceIcon
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalAsset

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e8ae4e16ad3a1324e80cab72200f224a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -768,6 +768,22 @@ MonoBehaviour:
m_Markers:
m_Objects: []
TrackPriority: 0
--- !u!114 &-654443742838667612
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: Unity.Timeline::UnityEngine.Timeline.SignalEmitter
m_Time: 21.4
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: e8ae4e16ad3a1324e80cab72200f224a, type: 2}
--- !u!114 &-482498204822702528
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -924,6 +940,7 @@ MonoBehaviour:
- {fileID: -6287170530102907080}
- {fileID: 4011586813017667051}
- {fileID: -7776889717137299443}
- {fileID: 1434563363020218529}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 30
@@ -963,6 +980,31 @@ MonoBehaviour:
m_bufferingTime: 0.1
m_ClipProperties:
volume: 1
--- !u!114 &1434563363020218529
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: b46e36075dd1c124a8422c228e75e1fb, type: 3}
m_Name: Signal Track (2)
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalTrack
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects:
- {fileID: 7148993197427960371}
- {fileID: -654443742838667612}
--- !u!114 &3174414979484781440
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1364,6 +1406,22 @@ MonoBehaviour:
VirtualCamera:
exposedName: d88b5310ac3f22a46a9c5f0ec05b2cc8
defaultValue: {fileID: 0}
--- !u!114 &7148993197427960371
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: Unity.Timeline::UnityEngine.Timeline.SignalEmitter
m_Time: 0
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: f4c5027f532fae146a2bd77265497d69, type: 2}
--- !u!114 &7206098507584322172
MonoBehaviour:
m_ObjectHideFlags: 1

View File

@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
m_Name: HidePulverDistanceIcon
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalAsset

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f4c5027f532fae146a2bd77265497d69
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -640,6 +640,27 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 1.1
functionName: PlayLoveAudio
data: true
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 2.9666667
functionName: PlayLoveAudio
data: false
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 4.766667
functionName: PlayLoveAudio
data: true
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 6.3333335
functionName: ChangeStateString
data: CanStealFlower

View File

@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalEmitter
m_Time: 6.3
m_Time: 7.124604166666667
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: a93981b77464bc348bcdee14088cd322, type: 2}
@@ -40,6 +40,23 @@ MonoBehaviour:
m_Markers:
m_Objects:
- {fileID: -9018495397904873737}
--- !u!114 &-4702508517441630998
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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
m_Name: AudioPlayableAsset
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset
m_Clip: {fileID: 8300000, guid: fce446f959ee14b4a9b03d657279ebcb, type: 3}
m_Loop: 0
m_bufferingTime: 0.1
m_ClipProperties:
volume: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -57,12 +74,366 @@ MonoBehaviour:
- {fileID: 509216733298267447}
- {fileID: -8547476031309807575}
- {fileID: 7872897156657723126}
- {fileID: 362317104414040321}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 30
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 0}
--- !u!114 &37972417601471288
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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
m_Name: AudioPlayableAsset
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset
m_Clip: {fileID: 8300000, guid: a0a3fbb3178fbe943a1f039ddbe960a4, type: 3}
m_Loop: 0
m_bufferingTime: 0.1
m_ClipProperties:
volume: 1
--- !u!114 &362317104414040321
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: 8b22792c3b570444eb18cb78c2af3a74, type: 3}
m_Name: Audio Track
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioTrack
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 1.1666666666666667
m_ClipIn: 0
m_Asset: {fileID: 37972417601471288}
m_Duration: 0.3137916666666667
m_TimeScale: 1
m_ParentTrack: {fileID: 362317104414040321}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: traf_factory_chewcookie1
- m_Version: 1
m_Start: 2.033333333333333
m_ClipIn: 0
m_Asset: {fileID: 8088879766579214714}
m_Duration: 0.2921458333333333
m_TimeScale: 1
m_ParentTrack: {fileID: 362317104414040321}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: traf_factory_chewcookie2
- m_Version: 1
m_Start: 3.033333333333333
m_ClipIn: 0
m_Asset: {fileID: -4702508517441630998}
m_Duration: 0.34625
m_TimeScale: 1
m_ParentTrack: {fileID: 362317104414040321}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: traf_factory_chewcookie3
- m_Version: 1
m_Start: 3.933333333333333
m_ClipIn: 0
m_Asset: {fileID: 2392773854331542905}
m_Duration: 0.4328125
m_TimeScale: 1
m_ParentTrack: {fileID: 362317104414040321}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: traf_factory_chewcookie4
- m_Version: 1
m_Start: 4.733333333333333
m_ClipIn: 0
m_Asset: {fileID: 778332760970370116}
m_Duration: 2.3912708333333335
m_TimeScale: 1
m_ParentTrack: {fileID: 362317104414040321}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: traf_factory_spitoutcookie
m_Markers:
m_Objects: []
m_TrackProperties:
volume: 1
stereoPan: 0
spatialBlend: 0
--- !u!114 &509216733298267447
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -173,6 +544,40 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &778332760970370116
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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
m_Name: AudioPlayableAsset
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset
m_Clip: {fileID: 8300000, guid: 7ec3233f8e4ada443b4cab4fdfe85108, type: 3}
m_Loop: 0
m_bufferingTime: 0.1
m_ClipProperties:
volume: 1
--- !u!114 &2392773854331542905
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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
m_Name: AudioPlayableAsset
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset
m_Clip: {fileID: 8300000, guid: 25f102199518b7d4dbd9c67c9f4bae2b, type: 3}
m_Loop: 0
m_bufferingTime: 0.1
m_ClipProperties:
volume: 1
--- !u!114 &4621162860728092524
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -232,7 +637,7 @@ MonoBehaviour:
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 5629759548021528438}
m_Duration: 6.3
m_Duration: 7.124604166666667
m_TimeScale: 1
m_ParentTrack: {fileID: 7872897156657723126}
m_EaseInDuration: 0
@@ -300,3 +705,20 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &8088879766579214714
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: 4f10dd60657c6004587f237a7e90f8e4, type: 3}
m_Name: AudioPlayableAsset
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.AudioPlayableAsset
m_Clip: {fileID: 8300000, guid: 0ee393b2411a9284eae64f867aa96f24, type: 3}
m_Loop: 0
m_bufferingTime: 0.1
m_ClipProperties:
volume: 1