talk it like i walk it

blueberryPeak/Assets/Animations/MomFox.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fcb54a260cf964373a9c397637eb7dbe
+guid: e9c519b6146c241a1b32561a1ea2df79
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

blueberryPeak/Assets/Animations/MomFox/Idle.anim.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 884f84f229a084e33a813a4e22a4b942
+guid: 7fced38ef3c5445f8aeda33a22b5f361
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

blueberryPeak/Assets/Animations/MomFox/NpcController.controller

@@ -0,0 +1,159 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-7500373845041155834
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 5492027584897613559}
+    m_Position: {x: 330, y: 80, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3324693014443070739}
+    m_Position: {x: 330, y: 170, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 5492027584897613559}
+--- !u!1101 &-4853106728233491955
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Talking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5492027584897613559}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9240506
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-1315441802050401563
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Talking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3324693014443070739}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.875
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: NpcController
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Talking
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -7500373845041155834}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &3324693014443070739
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Talking
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -4853106728233491955}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 3b61f6284f2644424829e198afb542ea, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &5492027584897613559
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -1315441802050401563}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 7fced38ef3c5445f8aeda33a22b5f361, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

blueberryPeak/Assets/Animations/MomFox/NpcController.controller.meta

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

blueberryPeak/Assets/Animations/MomFox/Talking.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3b61f6284f2644424829e198afb542ea
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Animations/Player.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f4384f90bcfee4c89aee92cf0e17ea90
+guid: 6dd1534b651314d6aa6d8b2072595ce3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

blueberryPeak/Assets/Animations/Player/FoxAnimator.controller

@@ -86,7 +86,7 @@ BlendTree:
   m_Name: Blend Tree
   m_Childs:
   - serializedVersion: 2
-    m_Motion: {fileID: -6851493242495694946, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
+    m_Motion: {fileID: 7400000, guid: 7569c06fc83be46fd8ea01b4d9c27156, type: 2}
     m_Threshold: 0
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
@@ -94,7 +94,7 @@ BlendTree:
     m_DirectBlendParameter: Blend
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 7400000, guid: 03e11e9792aab4554a31cda33342d624, type: 2}
+    m_Motion: {fileID: 7400000, guid: 67415b93ced6944e1927c52e98632eba, type: 2}
     m_Threshold: 1
     m_Position: {x: 0, y: 0}
     m_TimeScale: 1
@@ -188,7 +188,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: d20ee5493b0fb49a1b88296c67eed0e9, type: 2}
+  m_Motion: {fileID: 7400000, guid: 2ff778066e7de48f1922ebe8d0b24648, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 

blueberryPeak/Assets/Animations/Player/Idle.anim.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 54b6a8c29e91640e0af00dd9febfbdb0
+guid: 7569c06fc83be46fd8ea01b4d9c27156
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

blueberryPeak/Assets/Animations/Player/Talking.anim.meta

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

blueberryPeak/Assets/Animations/Player/Walking.anim.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 03e11e9792aab4554a31cda33342d624
+guid: 67415b93ced6944e1927c52e98632eba
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

blueberryPeak/Assets/Models/Chars.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 49d65391a2e704c6fb14983ea48563fd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Models/Chars/Fox_Animations.fbx.meta

@@ -0,0 +1,281 @@
+fileFormatVersion: 2
+guid: fa906d64a96674f5d8f539c697786fa7
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: Fox.002
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: rig.001|Idle (1)
+      takeName: rig.001|Idle
+      internalID: -4511299895844640130
+      firstFrame: 0
+      lastFrame: 48
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 1
+      loopBlend: 1
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: metarig.001|Walking
+      takeName: metarig.001|Walking
+      internalID: 710664198482891239
+      firstFrame: 0
+      lastFrame: 0
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: rig.001|Idle
+      takeName: rig.001|Idle
+      internalID: 236967887387751247
+      firstFrame: 0
+      lastFrame: 48
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: rig.001|Talking
+      takeName: rig.001|Talking
+      internalID: -9186218455026214987
+      firstFrame: 0
+      lastFrame: 79
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: rig.001|Walking
+      takeName: rig.001|Walking
+      internalID: -15449869476624423
+      firstFrame: 0
+      lastFrame: 0
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: rig.001|Walking.001
+      takeName: rig.001|Walking.001
+      internalID: 9105392660187707183
+      firstFrame: 0
+      lastFrame: 24
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 1
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Models/Foliage.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d53ad0412b1f8433aa827622cea562ed
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Models/House.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c32ad436bd76f4292809f07e47634308
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Models/Misc.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ba64c2604c9654ad4a4be4e0f97f9619
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Models/Mom_Animations.fbx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: abdb1e5f60a014c1f9a748fcad57ccec
+guid: 25747ca07cfd748bdbbc74dd0f512ef1
 ModelImporter:
   serializedVersion: 22200
   internalIDToNameTable: []
@@ -22,7 +22,7 @@ ModelImporter:
     animationDoRetargetingWarnings: 0
     importAnimatedCustomProperties: 0
     importConstraints: 0
-    animationCompression: 3
+    animationCompression: 1
     animationRotationError: 0.5
     animationPositionError: 0.5
     animationScaleError: 0.5
@@ -91,11 +91,11 @@ ModelImporter:
     globalScale: 1
     rootMotionBoneName: 
     hasTranslationDoF: 0
-    hasExtraRoot: 1
+    hasExtraRoot: 0
     skeletonHasParents: 1
   lastHumanDescriptionAvatarSource: {instanceID: 0}
   autoGenerateAvatarMappingIfUnspecified: 1
-  animationType: 3
+  animationType: 2
   humanoidOversampling: 1
   avatarSetup: 1
   addHumanoidExtraRootOnlyWhenUsingAvatar: 1

blueberryPeak/Assets/Prefabs/Char/Fox.prefab

@@ -217,9 +217,9 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8096677780651394274}
   - {fileID: 1192606695672832816}
   - {fileID: 5083671953233951116}
+  - {fileID: 2314954212006895444}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2136891312007936662
@@ -3074,7 +3074,7 @@ MonoBehaviour:
   movement: {fileID: -8149295062786237634, guid: be9004d90ff609fe6a33a9a4fbcfb30a, type: 3}
   cameraTransform: {fileID: 0}
   cameraOffset: {x: 20, y: 20, z: 0}
-  _animator: {fileID: 2791388854357827224}
+  _animator: {fileID: 8556964927054202158}
   footstepEvent:
     idInternal: 0
     valueGuidInternal: 
@@ -3124,12 +3124,12 @@ MonoBehaviour:
     valueGuidInternal: 
     groupIdInternal: 0
     groupGuidInternal: 
-    WwiseObjectReference: {fileID: 11400000, guid: d67106f7196a8594cba383d033dfa14c, type: 2}
+    WwiseObjectReference: {fileID: 11400000, guid: 025cc95946034ec4486d72f885a56166, type: 2}
   valueIdInternal: 0
   groupIdInternal: 0
   valueGuidInternal: 
   groupGuidInternal: 
---- !u!1001 &8635534596370014985
+--- !u!1001 &2858351906991536319
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -3137,79 +3137,75 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 235347041090592828}
     m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalScale.x
       value: 1.625565
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalScale.y
       value: 1.625565
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalScale.z
       value: 1.625565
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.995
+      value: -1.027
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: 919132149155446097, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_Name
-      value: Model
+      value: Fox_Animations
       objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: 5866666021909216657, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 9100000, guid: f9844fceb2de146b69e99a1ac5c154a0, type: 2}
-    - target: {fileID: 5866666021909216657, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: 5866666021909216657, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
-      propertyPath: m_AnimatePhysics
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
       propertyPath: m_ApplyRootMotion
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7647849544901544727, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+    - target: {fileID: 7647849544901544727, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
       propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: 0e515c746cae044fbae3ce18a0a39687, type: 2}
@@ -3217,14 +3213,14 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
---- !u!95 &2791388854357827224 stripped
+--- !u!4 &2314954212006895444 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
-  m_PrefabInstance: {fileID: 8635534596370014985}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &8096677780651394274 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: abdb1e5f60a014c1f9a748fcad57ccec, type: 3}
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
-  m_PrefabInstance: {fileID: 8635534596370014985}
+  m_PrefabInstance: {fileID: 2858351906991536319}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &8556964927054202158 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: fa906d64a96674f5d8f539c697786fa7, type: 3}
+  m_PrefabInstance: {fileID: 2858351906991536319}
   m_PrefabAsset: {fileID: 0}

blueberryPeak/Assets/Prefabs/Char/Mom_Fox.prefab

@@ -32,7 +32,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7242259812836216254}
+  - {fileID: 8171706373455838280}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!136 &1798161946909489252
@@ -103,7 +103,7 @@ MonoBehaviour:
     reminder: []
     success: []
     repetition: []
---- !u!1001 &7136821746032568917
+--- !u!1001 &8569508809068518307
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -111,87 +111,85 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 364829294786518433}
     m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalScale.x
       value: 1.72
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalScale.y
       value: 1.72
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalScale.z
       value: 1.72
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.511
+      value: -1.504
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: -1593354738550928696, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 6de231e0d2b2c42f6bf60acb3feb908f, type: 2}
+    - target: {fileID: 919132149155446097, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_Name
-      value: Mom_Fox_Idle
+      value: Mom_Fox_Talking
       objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: 5866666021909216657, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 9100000, guid: 0002144525fc74e9a9f2137ffb0bd4d6, type: 2}
-    - target: {fileID: 5866666021909216657, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+    - target: {fileID: 5866666021909216657, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_WarningMessage
+      propertyPath: m_ApplyRootMotion
-      value: "\nBinding warning: Some generic clip(s) animate transforms that are
+      value: 0
-        already bound by a Humanoid avatar. These transforms can only be changed
-        by Humanoid clips.\n\tTransform 'DEF-forearm.R'\n\tTransform 'DEF-shin.R'\n\tTransform
-        'DEF-forearm.L'\n\tTransform 'ORG-spine.006'\n\tTransform 'DEF-shin.L'\n\tTransform
-        'MCH-spine.002'\n\tTransform 'DEF-upper_arm.R'\n\tTransform 'DEF-upper_arm.L.001'\n\tTransform
-        'DEF-foot.L'\n\tTransform 'DEF-thigh.L.001'\n\tand more ...\n\tFrom animation
-        clip 'Talking'"
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
---- !u!4 &7242259812836216254 stripped
+--- !u!4 &8171706373455838280 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2fb9c443073374716b51103cd092c8c5, type: 3}
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-  m_PrefabInstance: {fileID: 7136821746032568917}
+  m_PrefabInstance: {fileID: 8569508809068518307}
   m_PrefabAsset: {fileID: 0}

blueberryPeak/Assets/Scenes/Beach.unity

@@ -2385,49 +2385,17 @@ PrefabInstance:
       propertyPath: dialogManagerObject
       value: 
       objectReference: {fileID: 1405120884}
-    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-      propertyPath: _animator
-      value: 
-      objectReference: {fileID: 1643548183}
-    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-      propertyPath: footstepEvent
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
       propertyPath: cameraTransform
       value: 
       objectReference: {fileID: 2092541790}
-    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-      propertyPath: footstepInterval
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-      propertyPath: footstepEvent.WwiseObjectReference
-      value: 
-      objectReference: {fileID: 11400000, guid: 0a40e999cf3ad3349893f6e7878d1798, type: 2}
-    - target: {fileID: 7028596464194032373, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-      propertyPath: data.WwiseObjectReference
-      value: 
-      objectReference: {fileID: 11400000, guid: 025cc95946034ec4486d72f885a56166, type: 2}
-    - target: {fileID: 7428965207623524320, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-      propertyPath: data.WwiseObjectReference
-      value: 
-      objectReference: {fileID: 11400000, guid: 6db10d635a886864fab77277a370b163, type: 2}
     - target: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
       propertyPath: m_Name
       value: Fox
       objectReference: {fileID: 0}
-    - target: {fileID: 8869554863222431320, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+    m_RemovedComponents: []
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 5135418567864217735, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
     m_RemovedGameObjects: []
-    m_AddedGameObjects:
+    m_AddedGameObjects: []
-    - targetCorrespondingSourceObject: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1643548182}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
 --- !u!1001 &355464620
@@ -6336,11 +6304,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 23256d9e6183ca49ab546e357a0a1717, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &1070390765 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
-  m_PrefabInstance: {fileID: 355138358}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1082384625
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6575,92 +6538,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
   m_PrefabInstance: {fileID: 1143065509}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1145236504
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1436752010}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1.72
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1.72
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1.72
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.504
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_ConstrainProportionsScale
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_Name
-      value: Mom_Fox_Talking
-      objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: 0002144525fc74e9a9f2137ffb0bd4d6, type: 2}
-    - target: {fileID: 5866666021909216657, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-      propertyPath: m_ApplyRootMotion
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
---- !u!4 &1145236505 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2359f94fe27ae4ebe9de9ae6f6890067, type: 3}
-  m_PrefabInstance: {fileID: 1145236504}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1156043450
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7944,22 +7821,17 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 785968150560727197, guid: 752d00c28e3278343b00df87a0486005, type: 3}
-      propertyPath: 'm_Materials.Array.data[0]'
-      value: 
-      objectReference: {fileID: 2100000, guid: 6de231e0d2b2c42f6bf60acb3feb908f, type: 2}
     - target: {fileID: 8358918113582884329, guid: 752d00c28e3278343b00df87a0486005, type: 3}
       propertyPath: m_Name
       value: Mom_Fox
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects:
-    - {fileID: 8055387502682363652, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+    - {fileID: 8803529063169861362, guid: 752d00c28e3278343b00df87a0486005, type: 3}
-    - {fileID: 4267411631676226102, guid: 752d00c28e3278343b00df87a0486005, type: 3}
     m_AddedGameObjects:
     - targetCorrespondingSourceObject: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
       insertIndex: -1
-      addedObject: {fileID: 1145236505}
+      addedObject: {fileID: 1440842661}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 752d00c28e3278343b00df87a0486005, type: 3}
 --- !u!4 &1436752010 stripped
@@ -7967,6 +7839,88 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
   m_PrefabInstance: {fileID: 1436752009}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1440842660
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1436752010}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.72
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.72
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.72
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.504
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -1593354738550928696, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 6de231e0d2b2c42f6bf60acb3feb908f, type: 2}
+    - target: {fileID: 919132149155446097, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_Name
+      value: Mom_Animations
+      objectReference: {fileID: 0}
+    - target: {fileID: 5866666021909216657, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: c17a2f7146e83482ca22beba4c042b1d, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+--- !u!4 &1440842661 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25747ca07cfd748bdbbc74dd0f512ef1, type: 3}
+  m_PrefabInstance: {fileID: 1440842660}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1443729183
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9366,97 +9320,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
   m_PrefabInstance: {fileID: 1618478126}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1643548181
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1070390765}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1.625565
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1.625565
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1.625565
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.997
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_ConstrainProportionsScale
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_Name
-      value: Fox_Idle 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: f9844fceb2de146b69e99a1ac5c154a0, type: 2}
-    - target: {fileID: 5866666021909216657, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-      propertyPath: m_ApplyRootMotion
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
---- !u!4 &1643548182 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-  m_PrefabInstance: {fileID: 1643548181}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &1643548183 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 8fa3d563d4eb34beabe81d9e4feb1068, type: 3}
-  m_PrefabInstance: {fileID: 1643548181}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1643639913
 PrefabInstance:
   m_ObjectHideFlags: 0

blueberryPeak/Assets/Scripts/Player/DialogManager.cs

@@ -5,20 +5,49 @@ using Event = AK.Wwise.Event;
 
 public class DialogManager : MonoBehaviour
 {
+    public static DialogManager Instance;
+
     public GameObject dialogPanel;
     public TextMeshProUGUI dialogText; // Use TextMeshProUGUI instead of Text
     public PlayerMovement playerMovement;
     [SerializeField] private Event TypeSound;
 
     private Coroutine dialogCoroutine;
+    private Animator player;
+    private Animator quester;
+
+    private void Awake()
+    {
+        if (Instance == null)
+        {
+            Instance = this;
+            DontDestroyOnLoad(gameObject);
+        }
+        else
+        {
+            Destroy(gameObject); // Ensure only one instance exists
+        }
+    }
 
     private void Start()
     {
         dialogPanel.SetActive(false); // Hide on start
     }
 
-    public void ShowDialog(string message)
+    public void ShowDialog(string message, Animator player, Animator quester)
     {
+        if (player != null)
+        {
+            player.SetBool("Talking", true);
+            this.player = player;
+        }
+
+        if (quester != null)
+        {
+            quester.SetBool("Talking", true);
+            this.quester = quester;
+        }
+
         print("should be showing dialog");
         if (dialogCoroutine != null) StopCoroutine(dialogCoroutine);
         dialogCoroutine = StartCoroutine(ShowDialogCoroutine(message));
@@ -58,6 +87,18 @@ public class DialogManager : MonoBehaviour
 
     public void HideDialog()
     {
+        if (player != null)
+        {
+            player.SetBool("Talking", false);
+            player = null;
+        }
+
+        if (quester != null)
+        {
+            player.SetBool("Talking", false);
+            quester = null;
+        }
+
         dialogPanel.SetActive(false);
         playerMovement.moveAllowed = true;
     }

blueberryPeak/Assets/Scripts/Player/PlayerInteraction.cs

@@ -17,6 +17,8 @@ public class PlayerInteraction : MonoBehaviour
     private DialogManager dialogManager;
     private List<InventoryItem> inventory = new();
 
+    private GameObject speaker;
+
     private bool talking;
 
     private void Start()
@@ -47,17 +49,17 @@ public class PlayerInteraction : MonoBehaviour
 
     private void OnInteract(InputAction.CallbackContext context)
     {
-        print("talking: " + talking);
         if (context.performed && !talking)
         {
-            var speaker = interactableObjects.Count > 0 ? ColliderInteractable() : PhysicsRaycastInteractable();
+            speaker = interactableObjects.Count > 0 ? ColliderInteractable() : PhysicsRaycastInteractable();
 
             dialog = speaker.GetComponent<QuestGiver>().Talk();
             if (dialog == null) return;
 
             // immedeately start the dialog
-            dialogManager.ShowDialog("<b>" + dialog[dialogIndex].speaker + ": " + dialog[dialogIndex].text);
+            dialogManager.ShowDialog("<b>" + dialog[dialogIndex].speaker + ": " + dialog[dialogIndex].text,
-            print("testo");
+                gameObject.GetComponentInChildren<Animator>(), speaker.GetComponentInChildren<Animator>());
+
             talking = true;
             // skip the 0th dialog entry since it has already been shown
             dialogIndex++;
@@ -68,6 +70,7 @@ public class PlayerInteraction : MonoBehaviour
                 // reset the dialog to be null so it cannot be scrolled through when not in an interaction
                 dialog = null;
                 talking = false;
+                speaker = null;
                 dialogManager.HideDialog();
             }
         }
@@ -109,7 +112,9 @@ public class PlayerInteraction : MonoBehaviour
             // scroll the dialog only if there is text to be shown
 
             print(dialog[dialogIndex].text);
-            dialogManager.ShowDialog("<b>" + dialog[dialogIndex].speaker + "</b>: " + dialog[dialogIndex].text);
+            dialogManager.ShowDialog("<b>" + dialog[dialogIndex].speaker + ": " + dialog[dialogIndex].text,
+                gameObject?.GetComponentInChildren<Animator>(), speaker?.GetComponentInChildren<Animator>());
+
             dialogIndex++;
             if (dialogIndex >= dialog.Length)
             {
@@ -121,6 +126,7 @@ public class PlayerInteraction : MonoBehaviour
                 print(" " + talking);
                 talking = false;
                 print(" " + talking);
+                speaker = null;
                 dialogManager.HideDialog();
             }
         }