Merge branch 'main' into DamianBranch

2025-12-19 00:06:48 +01:00
parent 9e404f279e 45f2cd3f29
commit 3ec6141ebc
47 changed files with 2581 additions and 1547 deletions
--- a/Assets/Art/Levels/CementFactory/Sprites/Characters/Receptionist/CountingPetals.anim
+++ b/Assets/Art/Levels/CementFactory/Sprites/Characters/Receptionist/CountingPetals.anim
@@ -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