diff --git a/Assets/Prefabs/Environment/LureSpotA.prefab b/Assets/Prefabs/Environment/LureSpotA.prefab
index 2671ea8c..ba1eb61e 100644
--- a/Assets/Prefabs/Environment/LureSpotA.prefab
+++ b/Assets/Prefabs/Environment/LureSpotA.prefab
@@ -260,6 +260,7 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: aaf36cd26cf74334e9c7db6c1b03b3fb, type: 2}
iconRenderer: {fileID: 6258593095132504700}
onItemSlotted:
diff --git a/Assets/Prefabs/Environment/LuringSpotB.prefab b/Assets/Prefabs/Environment/LuringSpotB.prefab
index be961e2f..698e3ded 100644
--- a/Assets/Prefabs/Environment/LuringSpotB.prefab
+++ b/Assets/Prefabs/Environment/LuringSpotB.prefab
@@ -1168,6 +1168,7 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: f97b9e24d6dceb145b56426c1152ebeb, type: 2}
iconRenderer: {fileID: 2343214996212089369}
onItemSlotted:
diff --git a/Assets/Prefabs/Environment/LuringSpotC.prefab b/Assets/Prefabs/Environment/LuringSpotC.prefab
index 1faf2aed..31ea2547 100644
--- a/Assets/Prefabs/Environment/LuringSpotC.prefab
+++ b/Assets/Prefabs/Environment/LuringSpotC.prefab
@@ -346,6 +346,7 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2}
iconRenderer: {fileID: 2825253017896168654}
onItemSlotted:
diff --git a/Assets/Prefabs/Environment/SoundBird.prefab b/Assets/Prefabs/Environment/SoundBird.prefab
index e267d6a8..61fccab3 100644
--- a/Assets/Prefabs/Environment/SoundBird.prefab
+++ b/Assets/Prefabs/Environment/SoundBird.prefab
@@ -201,6 +201,7 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: d28f5774afad9d14f823601707150700, type: 2}
iconRenderer: {fileID: 8875860401447896107}
onItemSlotted:
diff --git a/Assets/Prefabs/Items/BasePickup.prefab b/Assets/Prefabs/Items/BasePickup.prefab
index b13242dd..d4d66574 100644
--- a/Assets/Prefabs/Items/BasePickup.prefab
+++ b/Assets/Prefabs/Items/BasePickup.prefab
@@ -166,6 +166,7 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: 0c6986639ca176a419c92f5a327d95ce, type: 2}
iconRenderer: {fileID: 7494677664706785084}
--- !u!1001 &8589202998731622905
diff --git a/Assets/Prefabs/Items/Basketball.prefab b/Assets/Prefabs/Items/Basketball.prefab
index f6c53954..226b4b21 100644
--- a/Assets/Prefabs/Items/Basketball.prefab
+++ b/Assets/Prefabs/Items/Basketball.prefab
@@ -140,5 +140,6 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: 43f22dbbb4c0eec4f8108d0f0eea43c2, type: 2}
iconRenderer: {fileID: 4055726361761331703}
diff --git a/Assets/Prefabs/Items/BlueBall.prefab b/Assets/Prefabs/Items/BlueBall.prefab
index ea8ef5a0..6e0ce6fd 100644
--- a/Assets/Prefabs/Items/BlueBall.prefab
+++ b/Assets/Prefabs/Items/BlueBall.prefab
@@ -140,5 +140,6 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: a8baa800efa25a344a95b190cf349e2d, type: 2}
iconRenderer: {fileID: 4774534086162962138}
diff --git a/Assets/Prefabs/Items/BowlingBall.prefab b/Assets/Prefabs/Items/BowlingBall.prefab
index 3d408bf6..f4b7c050 100644
--- a/Assets/Prefabs/Items/BowlingBall.prefab
+++ b/Assets/Prefabs/Items/BowlingBall.prefab
@@ -140,5 +140,6 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: 560ba2059ce14dc4da580e2f43b2e65f, type: 2}
iconRenderer: {fileID: 4986096986936361008}
diff --git a/Assets/Prefabs/Items/Yellowball.prefab b/Assets/Prefabs/Items/Yellowball.prefab
index 8489733c..1294c0a8 100644
--- a/Assets/Prefabs/Items/Yellowball.prefab
+++ b/Assets/Prefabs/Items/Yellowball.prefab
@@ -140,5 +140,6 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
+ customSaveId:
itemData: {fileID: 11400000, guid: 3b1f3472171abc943bb099ce31d6fc7c, type: 2}
iconRenderer: {fileID: 4266110216568578813}
diff --git a/Assets/Prefabs/Puzzles/AnneLise.meta b/Assets/Prefabs/Puzzles/AnneLise.meta
new file mode 100644
index 00000000..744a6744
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4ba7ab934550ef3429162c9047baef80
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Puzzles/AnneLiseBush.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab
similarity index 78%
rename from Assets/Prefabs/Puzzles/AnneLiseBush.prefab
rename to Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab
index 4570d66c..c0e06b30 100644
--- a/Assets/Prefabs/Puzzles/AnneLiseBush.prefab
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab
@@ -223,14 +223,10 @@ GameObject:
- component: {fileID: 2071071585578300598}
- component: {fileID: 1454372124634854912}
- component: {fileID: 4122067414526815177}
- - component: {fileID: 4903273501345439385}
- - component: {fileID: 2741639361616064442}
- component: {fileID: 2314863751758196186}
+ - component: {fileID: 2741639361616064442}
+ - component: {fileID: 4903273501345439385}
- component: {fileID: 1054459649399154791}
- - component: {fileID: 2770949942920407845}
- - component: {fileID: 7195342261017603838}
- - component: {fileID: 8402611524192218844}
- - component: {fileID: 4113824276608814112}
m_Layer: 10
m_Name: Hidden
m_TagString: Untagged
@@ -254,7 +250,6 @@ Transform:
- {fileID: 4869210501364084835}
- {fileID: 763096397695369605}
- {fileID: 852327051512792946}
- - {fileID: 3192833574548965410}
m_Father: {fileID: 8259693476957892150}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1454372124634854912
@@ -315,6 +310,46 @@ BoxCollider2D:
m_AutoTiling: 0
m_Size: {x: 5.42, y: 4}
m_EdgeRadius: 0
+--- !u!114 &2314863751758196186
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1011363502278351410}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: AppleHillsScripts::Interactions.Interactable
+ isOneTime: 0
+ cooldown: -1
+ characterToInteract: 1
+ interactionStarted:
+ m_PersistentCalls:
+ m_Calls: []
+ interactionInterrupted:
+ m_PersistentCalls:
+ m_Calls: []
+ characterArrived:
+ m_PersistentCalls:
+ m_Calls: []
+ interactionComplete:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &2741639361616064442
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1011363502278351410}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 25bbad45f1fa4183b30ad76c62256fd6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: AppleHillsScripts::Dialogue.DialogueComponent
+ dialogueGraph: {fileID: 0}
--- !u!82 &4903273501345439385
AudioSource:
m_ObjectHideFlags: 0
@@ -412,200 +447,7 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!114 &2741639361616064442
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1011363502278351410}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 25bbad45f1fa4183b30ad76c62256fd6, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Dialogue.DialogueComponent
- dialogueGraph: {fileID: 3965311268370046156, guid: 46759f564789eb143b76724597351ddb, type: 3}
---- !u!114 &2314863751758196186
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1011363502278351410}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Interactions.Interactable
- isOneTime: 0
- cooldown: -1
- characterToInteract: 1
- interactionStarted:
- m_PersistentCalls:
- m_Calls: []
- interactionInterrupted:
- m_PersistentCalls:
- m_Calls: []
- characterArrived:
- m_PersistentCalls:
- m_Calls: []
- interactionComplete:
- m_PersistentCalls:
- m_Calls: []
--- !u!114 &1054459649399154791
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1011363502278351410}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource
- audioSourceType: 0
- audioSource: {fileID: 0}
- clipPriority: 0
- sourcePriority: 1
---- !u!114 &2770949942920407845
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1011363502278351410}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Interactions.Interactable
- isOneTime: 0
- cooldown: -1
- characterToInteract: 1
- interactionStarted:
- m_PersistentCalls:
- m_Calls: []
- interactionInterrupted:
- m_PersistentCalls:
- m_Calls: []
- characterArrived:
- m_PersistentCalls:
- m_Calls: []
- interactionComplete:
- m_PersistentCalls:
- m_Calls: []
---- !u!82 &7195342261017603838
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1011363502278351410}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_Resource: {fileID: 0}
- m_PlayOnAwake: 0
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
---- !u!114 &8402611524192218844
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1011363502278351410}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 25bbad45f1fa4183b30ad76c62256fd6, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Dialogue.DialogueComponent
- dialogueGraph: {fileID: 3965311268370046156, guid: 810524054ceb4324fa4a594b416dde43, type: 3}
---- !u!114 &4113824276608814112
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -940,9 +782,8 @@ GameObject:
- component: {fileID: 1193493154550576580}
- component: {fileID: 7652960462502122104}
- component: {fileID: 989520896849684110}
- - component: {fileID: 5658658341667119776}
m_Layer: 0
- m_Name: AnneLiseBush
+ m_Name: AnneLiseBaseBush
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1160,103 +1001,6 @@ MonoBehaviour:
audioSource: {fileID: 0}
clipPriority: 0
sourcePriority: 0
---- !u!82 &5658658341667119776
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5943355783477523754}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_Resource: {fileID: 0}
- m_PlayOnAwake: 1
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
--- !u!1 &6948354193133336628
GameObject:
m_ObjectHideFlags: 0
@@ -1610,7 +1354,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6911087736377923223}
- - component: {fileID: 3552553650332385501}
- component: {fileID: 33904425063383983}
- component: {fileID: 1494215563975893862}
- component: {fileID: 962877523590950341}
@@ -1641,18 +1384,6 @@ Transform:
- {fileID: 6330838396794415978}
m_Father: {fileID: 8259693476957892150}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3552553650332385501
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7816038554732339800}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
- m_Name:
- m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.State
--- !u!95 &33904425063383983
Animator:
serializedVersion: 7
@@ -1854,160 +1585,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1001 &2023150653904962002
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 2071071585578300598}
- m_Modifications:
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 600
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 218
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -218
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 1.88
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0.65
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6499933157207406972, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Name
- value: DialogueCanvas
- objectReference: {fileID: 0}
- - target: {fileID: 6771925387362164676, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_PresetInfoIsWorld
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 440
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 61.45
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 300
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -86.5
- objectReference: {fileID: 0}
- - target: {fileID: 8307219291215824345, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 218
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
---- !u!224 &3192833574548965410 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- m_PrefabInstance: {fileID: 2023150653904962002}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &4289827099693551234
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Puzzles/AnneLiseBush.prefab.meta b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Puzzles/AnneLiseBush.prefab.meta
rename to Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab.meta
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab
new file mode 100644
index 00000000..5eb504c1
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab
@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &3195881368778955934
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: dialogueGraph
+ value:
+ objectReference: {fileID: 3965311268370046156, guid: 46759f564789eb143b76724597351ddb, type: 3}
+ - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBushB Variant
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -27.09
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3.58
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab.meta b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab.meta
new file mode 100644
index 00000000..64a4ca9f
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f15bf96f88d21b14191ad80200912775
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab
new file mode 100644
index 00000000..c0f906f8
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab
@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &1821939616807664211
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: reactionClipToPlay
+ value:
+ objectReference: {fileID: 8300000, guid: 33f05a858a3520a45bdec9db2cc6693c, type: 3}
+ - target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: dialogueGraph
+ value:
+ objectReference: {fileID: 3965311268370046156, guid: dd4e693761c2f6b41b02a07b1a74bbd1, type: 3}
+ - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBush_FootballBird
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 54.84
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -37.62
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab.meta b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab.meta
new file mode 100644
index 00000000..82d14552
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fc42c3bdda1c86d49b0bf80c28e5d372
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab
new file mode 100644
index 00000000..0d1dbcbd
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab
@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &1354737084349956748
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: dialogueGraph
+ value:
+ objectReference: {fileID: 3965311268370046156, guid: 810524054ceb4324fa4a594b416dde43, type: 3}
+ - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBushC Variant
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 15.12
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 33.35
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab.meta b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab.meta
new file mode 100644
index 00000000..e0111678
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 21444cac99fc9944a85884eccbc8b78d
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab
new file mode 100644
index 00000000..257d3286
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab
@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &8113932533366191520
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: reactionClipToPlay
+ value:
+ objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3}
+ - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBush_SoundBird
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -71.04
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 67.12
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab.meta b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab.meta
new file mode 100644
index 00000000..2a458d14
--- /dev/null
+++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3fa494ec083cbe54a86c3a1b107a90c0
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity
index e383b15c..726caef7 100644
--- a/Assets/Scenes/Levels/Quarry.unity
+++ b/Assets/Scenes/Levels/Quarry.unity
@@ -2865,8 +2865,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
--- !u!114 &159432895 stripped
MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 661675797}
+ m_CorrespondingSourceObject: {fileID: 1246697221241124994, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ m_PrefabInstance: {fileID: 2558461749605481847}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
@@ -437137,11 +437137,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 490855892}
m_PrefabAsset: {fileID: 0}
---- !u!4 &495804796 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2071071585578300598, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 661675797}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &498313310
PrefabInstance:
m_ObjectHideFlags: 0
@@ -438197,164 +438192,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3}
m_PrefabInstance: {fileID: 528141185}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &534194577
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 693396273}
- m_Modifications:
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 600
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 218
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -218
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 2.46
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0.25
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3535066688902750632, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Camera
- value:
- objectReference: {fileID: 1653475492}
- - target: {fileID: 6499933157207406972, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Name
- value: DialogueCanvas
- objectReference: {fileID: 0}
- - target: {fileID: 6771925387362164676, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_PresetInfoIsWorld
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 440
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 61.45
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 300
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -86.5
- objectReference: {fileID: 0}
- - target: {fileID: 8307219291215824345, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 218
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
---- !u!224 &534194578 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- m_PrefabInstance: {fileID: 534194577}
- m_PrefabAsset: {fileID: 0}
--- !u!114 &538228069 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7273455074532059757, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
@@ -440416,122 +440253,10 @@ Transform:
m_Children: []
m_Father: {fileID: 1794862441}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &661675797
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1713711799}
- m_Modifications:
- - target: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: birdGameStats
- value:
- objectReference: {fileID: 708284665}
- - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: reactionClipToPlay
- value:
- objectReference: {fileID: 8300000, guid: 33f05a858a3520a45bdec9db2cc6693c, type: 3}
- - target: {fileID: 1494215563975893862, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: clipToPlay
- value:
- objectReference: {fileID: 8300000, guid: 33f05a858a3520a45bdec9db2cc6693c, type: 3}
- - target: {fileID: 1494215563975893862, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: reactionClipToPlay
- value:
- objectReference: {fileID: 8300000, guid: 33f05a858a3520a45bdec9db2cc6693c, type: 3}
- - target: {fileID: 4630528656982513176, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_Name
- value: AnneLiseBushA
- objectReference: {fileID: 0}
- - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_Layer
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 7933520853652686364, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.x
- value: 1.02911
- objectReference: {fileID: 0}
- - target: {fileID: 7933520853652686364, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.42616653
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.x
- value: 54.84
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.y
- value: -37.62
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_ConstrainProportionsScale
- value: 1
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 2071071585578300598, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: 0
- addedObject: {fileID: 1982530897}
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1872179205}
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1872179204}
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1872179203}
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1872179206}
- m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
--- !u!4 &661675798 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 661675797}
+ m_CorrespondingSourceObject: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ m_PrefabInstance: {fileID: 2558461749605481847}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &666234666
PrefabInstance:
@@ -441212,11 +440937,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3}
m_PrefabInstance: {fileID: 689881711}
m_PrefabAsset: {fileID: 0}
---- !u!4 &693396273 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 2071071585578300598, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 841182293}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &696969628
PrefabInstance:
m_ObjectHideFlags: 0
@@ -443634,164 +443354,6 @@ MonoBehaviour:
audioSource: {fileID: 0}
clipPriority: 0
sourcePriority: 0
---- !u!1 &801067978 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 841182293}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &801067982
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 801067978}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 25bbad45f1fa4183b30ad76c62256fd6, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Dialogue.DialogueComponent
- dialogueGraph: {fileID: 3965311268370046156, guid: cccf504e8af617a4295c5d0110ee29bb, type: 3}
---- !u!82 &801067983
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 801067978}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_Resource: {fileID: 0}
- m_PlayOnAwake: 0
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
---- !u!114 &801067984
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 801067978}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Interactions.Interactable
- isOneTime: 0
- cooldown: -1
- characterToInteract: 1
- interactionStarted:
- m_PersistentCalls:
- m_Calls: []
- interactionInterrupted:
- m_PersistentCalls:
- m_Calls: []
- characterArrived:
- m_PersistentCalls:
- m_Calls: []
- interactionComplete:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &801067985
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 801067978}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource
- audioSourceType: 0
- audioSource: {fileID: 0}
- clipPriority: 0
- sourcePriority: 1
--- !u!1 &812734406
GameObject:
m_ObjectHideFlags: 0
@@ -444586,122 +444148,10 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 839967529}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &841182293
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 123989455}
- m_Modifications:
- - target: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: birdGameStats
- value:
- objectReference: {fileID: 708284665}
- - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: reactionClipToPlay
- value:
- objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3}
- - target: {fileID: 1494215563975893862, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: clipToPlay
- value:
- objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3}
- - target: {fileID: 1494215563975893862, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: reactionClipToPlay
- value:
- objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3}
- - target: {fileID: 4630528656982513176, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_Name
- value: AnneLiseBushD
- objectReference: {fileID: 0}
- - target: {fileID: 7933520853652686364, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.x
- value: 1.02911
- objectReference: {fileID: 0}
- - target: {fileID: 7933520853652686364, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.42616272
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalScale.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.x
- value: -71.04
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.y
- value: 67.12
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_ConstrainProportionsScale
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 2071071585578300598, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: 1
- addedObject: {fileID: 534194578}
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 801067984}
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 801067983}
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 801067982}
- - targetCorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- insertIndex: -1
- addedObject: {fileID: 801067985}
- m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
--- !u!4 &841182294 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 841182293}
+ m_CorrespondingSourceObject: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ m_PrefabInstance: {fileID: 6535840132433368489}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &845071531
PrefabInstance:
@@ -449416,75 +448866,10 @@ PolygonCollider2D:
- {x: -1.5542128, y: -1.2452139}
- {x: 1.0351933, y: 0.054999232}
m_UseDelaunayMesh: 0
---- !u!1001 &1070397503
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1007550749}
- m_Modifications:
- - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: birdGameStats
- value:
- objectReference: {fileID: 708284665}
- - target: {fileID: 3250676030474002554, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_Camera
- value:
- objectReference: {fileID: 1653475492}
- - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_Name
- value: AnneLiseBushC
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.x
- value: 15.12
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.y
- value: 33.35
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
--- !u!4 &1070397504 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 1070397503}
+ m_CorrespondingSourceObject: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ m_PrefabInstance: {fileID: 8058740013708592448}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1073425382
GameObject:
@@ -450475,6 +449860,14 @@ PrefabInstance:
propertyPath: m_Camera
value:
objectReference: {fileID: 1653475492}
+ - target: {fileID: 5669232128196148255, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 5.7399993
+ objectReference: {fileID: 0}
+ - target: {fileID: 5669232128196148255, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 12.129999
+ objectReference: {fileID: 0}
- target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
propertyPath: mowerAudioPlayer
value:
@@ -453315,8 +452708,8 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1249289160 stripped
MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 841182293}
+ m_CorrespondingSourceObject: {fileID: 8691813482230052721, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ m_PrefabInstance: {fileID: 6535840132433368489}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
@@ -458649,8 +458042,8 @@ SpriteRenderer:
m_SpriteSortPoint: 0
--- !u!114 &1516406291 stripped
MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 1070397503}
+ m_CorrespondingSourceObject: {fileID: 1930077052983656541, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ m_PrefabInstance: {fileID: 8058740013708592448}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
@@ -458941,159 +458334,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 1527358006}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &1530790494
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 495804796}
- m_Modifications:
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 600
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 218
- objectReference: {fileID: 0}
- - target: {fileID: 1539728007164444029, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -218
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 1.75911
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0.4038329
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3535066688902750632, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Camera
- value:
- objectReference: {fileID: 1653475492}
- - target: {fileID: 6499933157207406972, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_Name
- value: DialogueCanvas
- objectReference: {fileID: 0}
- - target: {fileID: 6771925387362164676, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_PresetInfoIsWorld
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.x
- value: 440
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 61.45
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 300
- objectReference: {fileID: 0}
- - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -86.5
- objectReference: {fileID: 0}
- - target: {fileID: 8307219291215824345, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- propertyPath: m_SizeDelta.y
- value: 218
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
--- !u!1001 &1536430601
PrefabInstance:
m_ObjectHideFlags: 0
@@ -465376,164 +464616,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3}
m_PrefabInstance: {fileID: 1864374653}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1872179199 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 661675797}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &1872179203
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1872179199}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 25bbad45f1fa4183b30ad76c62256fd6, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Dialogue.DialogueComponent
- dialogueGraph: {fileID: 3965311268370046156, guid: dd4e693761c2f6b41b02a07b1a74bbd1, type: 3}
---- !u!82 &1872179204
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1872179199}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_Resource: {fileID: 0}
- m_PlayOnAwake: 0
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
---- !u!114 &1872179205
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1872179199}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::Interactions.Interactable
- isOneTime: 0
- cooldown: -1
- characterToInteract: 1
- interactionStarted:
- m_PersistentCalls:
- m_Calls: []
- interactionInterrupted:
- m_PersistentCalls:
- m_Calls: []
- characterArrived:
- m_PersistentCalls:
- m_Calls: []
- interactionComplete:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &1872179206
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1872179199}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3}
- m_Name:
- m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource
- audioSourceType: 0
- audioSource: {fileID: 0}
- clipPriority: 0
- sourcePriority: 1
--- !u!1 &1877702733
GameObject:
m_ObjectHideFlags: 0
@@ -468198,11 +467280,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
m_PrefabInstance: {fileID: 1855590167}
m_PrefabAsset: {fileID: 0}
---- !u!224 &1982530897 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
- m_PrefabInstance: {fileID: 1530790494}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &1990424113
PrefabInstance:
m_ObjectHideFlags: 0
@@ -470959,8 +470036,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
--- !u!114 &2126981195 stripped
MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 1548124686061025687}
+ m_CorrespondingSourceObject: {fileID: 2621079340772286031, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ m_PrefabInstance: {fileID: 3917799031583628180}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
@@ -471665,75 +470742,10 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f44866deaba5f5c4a90f0330dd9957f0, type: 3}
---- !u!1001 &1548124686061025687
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 344005859}
- m_Modifications:
- - target: {fileID: 758737138199654186, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_Camera
- value:
- objectReference: {fileID: 1653475492}
- - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: birdGameStats
- value:
- objectReference: {fileID: 708284665}
- - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_Name
- value: AnneLiseBushB
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.x
- value: -27.09
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.y
- value: 3.58
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
--- !u!4 &1548124686061025688 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
- m_PrefabInstance: {fileID: 1548124686061025687}
+ m_CorrespondingSourceObject: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ m_PrefabInstance: {fileID: 3917799031583628180}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2428672463423402429
PrefabInstance:
@@ -471820,6 +470832,67 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
+--- !u!1001 &2558461749605481847
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 1713711799}
+ m_Modifications:
+ - target: {fileID: 709589478205869975, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: birdGameStats
+ value:
+ objectReference: {fileID: 708284665}
+ - target: {fileID: 5418919921209364345, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBushA
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 54.84
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -37.62
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3}
--- !u!1001 &2926576032425091693
PrefabInstance:
m_ObjectHideFlags: 0
@@ -472137,6 +471210,71 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3346526f3046f424196615241a307104, type: 3}
+--- !u!1001 &3917799031583628180
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 344005859}
+ m_Modifications:
+ - target: {fileID: 2800568559834674100, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_Camera
+ value:
+ objectReference: {fileID: 1653475492}
+ - target: {fileID: 4380364850094877018, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: birdGameStats
+ value:
+ objectReference: {fileID: 708284665}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -27.09
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3.58
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6843886318979936936, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9088553995465337268, guid: f15bf96f88d21b14191ad80200912775, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBushB
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f15bf96f88d21b14191ad80200912775, type: 3}
--- !u!1001 &3978117984697153445
PrefabInstance:
m_ObjectHideFlags: 0
@@ -472604,6 +471742,71 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5624291602052377355, guid: 2b23896b733c2ae4cba6dcf21193402b, type: 3}
m_PrefabInstance: {fileID: 5320929981885366459}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6535840132433368489
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 123989455}
+ m_Modifications:
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -71.04
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 67.12
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2513413482015490186, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBushD
+ objectReference: {fileID: 0}
+ - target: {fileID: 6920441724407775332, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: birdGameStats
+ value:
+ objectReference: {fileID: 708284665}
+ - target: {fileID: 6920441724407775332, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+ propertyPath: reactionClipToPlay
+ value:
+ objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
--- !u!1001 &7530821580781571560
PrefabInstance:
m_ObjectHideFlags: 0
@@ -472923,6 +472126,67 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
m_PrefabInstance: {fileID: 8013274907828598643}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8058740013708592448
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 1007550749}
+ m_Modifications:
+ - target: {fileID: 170254427933030216, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: birdGameStats
+ value:
+ objectReference: {fileID: 708284665}
+ - target: {fileID: 4663464957986912166, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_Name
+ value: AnneLiseBushC
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 15.12
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 33.35
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6948118848987327674, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Input/PlayerTouchController.cs b/Assets/Scripts/Input/PlayerTouchController.cs
index 805907ec..835a5d18 100644
--- a/Assets/Scripts/Input/PlayerTouchController.cs
+++ b/Assets/Scripts/Input/PlayerTouchController.cs
@@ -2,14 +2,26 @@
using Pathfinding;
using AppleHills.Core.Settings;
using Core;
+using Core.SaveLoad;
+using Bootstrap;
namespace Input
{
+ ///
+ /// Saveable data for PlayerTouchController state
+ ///
+ [System.Serializable]
+ public class PlayerSaveData
+ {
+ public Vector3 worldPosition;
+ public Quaternion worldRotation;
+ }
+
///
/// Handles player movement in response to tap and hold input events.
/// Supports both direct and pathfinding movement modes, and provides event/callbacks for arrival/cancellation.
///
- public class PlayerTouchController : MonoBehaviour, ITouchInputConsumer
+ public class PlayerTouchController : MonoBehaviour, ITouchInputConsumer, ISaveParticipant
{
// --- Movement State ---
private Vector3 targetPosition;
@@ -55,6 +67,9 @@ namespace Input
private bool interruptMoveTo;
private LogVerbosity _logVerbosity = LogVerbosity.Warning;
+ // Save system tracking
+ private bool hasBeenRestored;
+
void Awake()
{
aiPath = GetComponent();
@@ -71,6 +86,9 @@ namespace Input
// Initialize settings reference using GetSettingsObject
_settings = GameManager.GetSettingsObject();
+
+ // Register for post-boot initialization
+ BootCompletionService.RegisterInitAction(InitializePostBoot);
}
void Start()
@@ -79,6 +97,29 @@ namespace Input
_logVerbosity = DeveloperSettingsProvider.Instance.GetSettings().inputLogVerbosity;
}
+ private void InitializePostBoot()
+ {
+ // Register with save system after boot
+ if (SaveLoadManager.Instance != null)
+ {
+ SaveLoadManager.Instance.RegisterParticipant(this);
+ Logging.Debug("[PlayerTouchController] Registered with SaveLoadManager");
+ }
+ else
+ {
+ Logging.Warning("[PlayerTouchController] SaveLoadManager not available for registration");
+ }
+ }
+
+ void OnDestroy()
+ {
+ // Unregister from save system
+ if (SaveLoadManager.Instance != null)
+ {
+ SaveLoadManager.Instance.UnregisterParticipant(GetSaveId());
+ }
+ }
+
///
/// Handles tap input. Always uses pathfinding to move to the tapped location.
/// Cancels any in-progress MoveToAndNotify.
@@ -415,5 +456,52 @@ namespace Input
Logging.Debug($"[PlayerTouchController] {message}");
}
}
+
+ #region ISaveParticipant Implementation
+
+ public bool HasBeenRestored => hasBeenRestored;
+
+ public string GetSaveId()
+ {
+ return "PlayerController";
+ }
+
+ public string SerializeState()
+ {
+ var saveData = new PlayerSaveData
+ {
+ worldPosition = transform.position,
+ worldRotation = transform.rotation
+ };
+ return JsonUtility.ToJson(saveData);
+ }
+
+ public void RestoreState(string serializedData)
+ {
+ if (string.IsNullOrEmpty(serializedData))
+ {
+ Logging.Debug("[PlayerTouchController] No saved state to restore");
+ hasBeenRestored = true;
+ return;
+ }
+
+ try
+ {
+ var saveData = JsonUtility.FromJson(serializedData);
+ if (saveData != null)
+ {
+ transform.position = saveData.worldPosition;
+ transform.rotation = saveData.worldRotation;
+ hasBeenRestored = true;
+ Logging.Debug($"[PlayerTouchController] Restored position: {saveData.worldPosition}");
+ }
+ }
+ catch (System.Exception ex)
+ {
+ Logging.Warning($"[PlayerTouchController] Failed to restore state: {ex.Message}");
+ }
+ }
+
+ #endregion
}
}
diff --git a/Assets/Scripts/Movement/FollowerController.cs b/Assets/Scripts/Movement/FollowerController.cs
index 810166d5..a5aeb0e6 100644
--- a/Assets/Scripts/Movement/FollowerController.cs
+++ b/Assets/Scripts/Movement/FollowerController.cs
@@ -5,12 +5,26 @@ using UnityEngine.SceneManagement;
using Utils;
using AppleHills.Core.Settings;
using Core;
+using Core.SaveLoad;
+using Bootstrap;
using UnityEngine.Events;
+///
+/// Saveable data for FollowerController state
+///
+[System.Serializable]
+public class FollowerSaveData
+{
+ public Vector3 worldPosition;
+ public Quaternion worldRotation;
+ public string heldItemSaveId; // Save ID of held pickup (if any)
+ public string heldItemDataAssetPath; // Asset path to PickupItemData
+}
+
///
/// Controls the follower character, including following the player, handling pickups, and managing held items.
///
-public class FollowerController: MonoBehaviour
+public class FollowerController : MonoBehaviour, ISaveParticipant
{
private static readonly int CombineTrigger = Animator.StringToHash("Combine");
@@ -83,6 +97,9 @@ public class FollowerController: MonoBehaviour
public UnityEvent PulverIsCombining;
private Input.PlayerTouchController _playerTouchController;
+
+ // Save system tracking
+ private bool hasBeenRestored;
void Awake()
{
@@ -103,6 +120,23 @@ public class FollowerController: MonoBehaviour
// Initialize settings references
_settings = GameManager.GetSettingsObject();
_interactionSettings = GameManager.GetSettingsObject();
+
+ // Register for post-boot initialization
+ BootCompletionService.RegisterInitAction(InitializePostBoot);
+ }
+
+ private void InitializePostBoot()
+ {
+ // Register with save system after boot
+ if (SaveLoadManager.Instance != null)
+ {
+ SaveLoadManager.Instance.RegisterParticipant(this);
+ Logging.Debug("[FollowerController] Registered with SaveLoadManager");
+ }
+ else
+ {
+ Logging.Warning("[FollowerController] SaveLoadManager not available for registration");
+ }
}
void OnEnable()
@@ -114,6 +148,12 @@ public class FollowerController: MonoBehaviour
void OnDisable()
{
SceneManager.sceneLoaded -= OnSceneLoaded;
+
+ // Unregister from save system
+ if (SaveLoadManager.Instance != null)
+ {
+ SaveLoadManager.Instance.UnregisterParticipant(GetSaveId());
+ }
}
void OnSceneLoaded(Scene scene, LoadSceneMode mode)
@@ -690,6 +730,123 @@ public class FollowerController: MonoBehaviour
#endregion ItemInteractions
+ #region ISaveParticipant Implementation
+
+ public bool HasBeenRestored => hasBeenRestored;
+
+ public string GetSaveId()
+ {
+ return "FollowerController";
+ }
+
+ public string SerializeState()
+ {
+ var saveData = new FollowerSaveData
+ {
+ worldPosition = transform.position,
+ worldRotation = transform.rotation
+ };
+
+ // Save held item if any
+ if (_cachedPickupObject != null)
+ {
+ var pickup = _cachedPickupObject.GetComponent();
+ if (pickup is SaveableInteractable saveable)
+ {
+ saveData.heldItemSaveId = saveable.GetSaveId();
+ }
+
+ if (_currentlyHeldItemData != null)
+ {
+#if UNITY_EDITOR
+ saveData.heldItemDataAssetPath = UnityEditor.AssetDatabase.GetAssetPath(_currentlyHeldItemData);
+#endif
+ }
+ }
+
+ return JsonUtility.ToJson(saveData);
+ }
+
+ public void RestoreState(string serializedData)
+ {
+ if (string.IsNullOrEmpty(serializedData))
+ {
+ Logging.Debug("[FollowerController] No saved state to restore");
+ hasBeenRestored = true;
+ return;
+ }
+
+ try
+ {
+ var saveData = JsonUtility.FromJson(serializedData);
+ if (saveData != null)
+ {
+ // Restore position and rotation
+ transform.position = saveData.worldPosition;
+ transform.rotation = saveData.worldRotation;
+
+ // Restore held item if any
+ if (!string.IsNullOrEmpty(saveData.heldItemSaveId))
+ {
+ RestoreHeldItem(saveData.heldItemSaveId, saveData.heldItemDataAssetPath);
+ }
+
+ hasBeenRestored = true;
+ Logging.Debug($"[FollowerController] Restored position: {saveData.worldPosition}");
+ }
+ }
+ catch (System.Exception ex)
+ {
+ Logging.Warning($"[FollowerController] Failed to restore state: {ex.Message}");
+ }
+ }
+
+ private void RestoreHeldItem(string heldItemSaveId, string heldItemDataAssetPath)
+ {
+ // Try to find the item by its save ID using ItemManager
+ GameObject heldObject = ItemManager.Instance?.FindPickupBySaveId(heldItemSaveId);
+
+ if (heldObject == null)
+ {
+ Logging.Warning($"[FollowerController] Could not find held item with save ID: {heldItemSaveId}");
+ return;
+ }
+
+ // Get the item data
+ PickupItemData heldData = null;
+#if UNITY_EDITOR
+ if (!string.IsNullOrEmpty(heldItemDataAssetPath))
+ {
+ heldData = UnityEditor.AssetDatabase.LoadAssetAtPath(heldItemDataAssetPath);
+ }
+#endif
+
+ if (heldData == null)
+ {
+ var pickup = heldObject.GetComponent();
+ if (pickup != null)
+ {
+ heldData = pickup.itemData;
+ }
+ }
+
+ // Restore the held item state
+ if (heldData != null)
+ {
+ var pickup = heldObject.GetComponent();
+ if (pickup != null)
+ {
+ _cachedPickupObject = heldObject;
+ _cachedPickupObject.SetActive(false); // Held items should be hidden
+ SetHeldItem(heldData, pickup.iconRenderer);
+ _animator.SetBool("IsCarrying", true);
+ Logging.Debug($"[FollowerController] Restored held item: {heldData.itemName}");
+ }
+ }
+ }
+
+ #endregion ISaveParticipant Implementation
+
#if UNITY_EDITOR
void OnDrawGizmos()
{