Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main

3 年前 · aa88e701
--- a/UOP1_Project/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AddressableAssetSettings.asset
  - {fileID: 11400000, guid: 6c178783decb345a9a49e382f91762a2, type: 2}
  - {fileID: 11400000, guid: 9bfa09de6fa8c4c54805efdeb5b7f199, type: 2}
  - {fileID: 11400000, guid: bc31801e0ff294a5696a72bf9a9fd6a5, type: 2}
+  - {fileID: 11400000, guid: fcf8490568b5a0b47a7fe58d1033bfc3, type: 2}
+  - {fileID: 11400000, guid: cecd62da149d34d45938fce625af29a6, type: 2}
+  - {fileID: 11400000, guid: 38ec9971d12cc7f408261900bfc57b00, type: 2}
  m_BuildSettings:
    m_CompileScriptsInVirtualMode: 0
    m_CleanupStreamingAssetsAfterBuilds: 1
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English
    m_ReadOnly: 1
    m_SerializedLabels:
    - Locale-en
-  - m_GUID: 8c990337c09944296842b163021829c8
-    m_Address: Interactions_en
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-en
-    - Preload
  - m_GUID: 7b418d2f8c70a4bffabe178921caf86b
    m_Address: Buttons_en
    m_ReadOnly: 1
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French
    m_ReadOnly: 1
    m_SerializedLabels:
    - Locale-fr
-  - m_GUID: 75a54b82bfa6f4f9e8239e9940432c0d
-    m_Address: Interactions_fr
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-fr
-    - Preload
  - m_GUID: 5e42d58442b78425db9a6b1aca9a9c43
    m_Address: Buttons_fr
    m_ReadOnly: 1
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian
    m_ReadOnly: 1
    m_SerializedLabels:
    - Locale-it
-  - m_GUID: 6ff28064e4e684b65b9c22aa501c01c5
-    m_Address: Interactions_it
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-it
  m_ReadOnly: 1
  m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
  m_SchemaSet:
--- a/UOP1_Project/Assets/Art/Characters/FryKing/Animation/FryKing.controller
+++ b/UOP1_Project/Assets/Art/Characters/FryKing/Animation/FryKing.controller
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8956421100952240515
+--- !u!1109 &-8812777249497871139
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: RandomIdle
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -8069313486845270575}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1109 &-8644946117464537805
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: RandomIdle
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2761778016216069562}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1102 &-8069313486845270575
-  serializedVersion: 5
+  serializedVersion: 6
-  m_Name: idle2
+  m_Name: Idle2
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: -5452522041955290304}
+  - {fileID: 126409624890999905}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &-8205877888296167064
+--- !u!1101 &-6782901406232302786
+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: IsTalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.95689654
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-5452522041955290304
+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: IsTalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.98747915
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1109 &-4735005170422830645
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: RandomIdle
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3715219850476549954}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1107 &-3724780327365071743
+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: 5822758316023152075}
+    m_Position: {x: 340, y: 200, z: 0}
+  m_ChildStateMachines:
+  - serializedVersion: 1
+    m_StateMachine: {fileID: 2366130578317120319}
+    m_Position: {x: 340, y: 310, z: 0}
+  - serializedVersion: 1
+    m_StateMachine: {fileID: 1360837410770645526}
+    m_Position: {x: 40, y: 310, z: 0}
+  m_AnyStateTransitions: []
+  m_EntryTransitions:
+  - {fileID: 4434105194318151057}
+  m_StateMachineTransitions:
+  - first: {fileID: 1360837410770645526}
+    second:
+    - {fileID: 1611166266858820703}
+    - {fileID: 4328996676989045764}
+  - first: {fileID: 2366130578317120319}
+    second:
+    - {fileID: 1692991908700994129}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 60, y: 50, z: 0}
+  m_EntryPosition: {x: 60, y: 120, z: 0}
+  m_ExitPosition: {x: 560, y: 130, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -1340454792932932879}
+--- !u!1102 &-3715219850476549954
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Talk2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 4427751658491252132}
+  - {fileID: -6782901406232302786}
+  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: -395696784264195149, guid: 6de0d3389faf44c4c94db5fc7b37778f,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-3708046205487501204
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_Conditions: []
  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 7462806247995721579}
+  m_DstState: {fileID: -8069313486845270575}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
-  m_ExitTime: 0.9563953
+  m_ExitTime: 0.98747915
--- !u!1102 &-5142550071235473073
+--- !u!1102 &-2761778016216069562
-  serializedVersion: 5
+  serializedVersion: 6
-  m_Name: talk
+  m_Name: Talk1
-  - {fileID: 5282270459937347006}
+  - {fileID: 4552751624681762378}
+  - {fileID: 5119399839995085805}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1107 &-3724780327365071743
-AnimatorStateMachine:
-  serializedVersion: 5
+--- !u!114 &-2094498617323170793
+MonoBehaviour:
-  m_Name: Base Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 7462806247995721579}
-    m_Position: {x: 190, y: 320, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -5142550071235473073}
-    m_Position: {x: 510, y: 320, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 5822758316023152075}
-    m_Position: {x: 310, y: 150, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -3148798215989835238}
-    m_Position: {x: 508, y: 486, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -8956421100952240515}
-    m_Position: {x: 270, y: 490, 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: 7462806247995721579}
--- !u!1102 &-3148798215989835238
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 52106b5e7fe9fd54bb1add9a00a5f911, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1102 &-1340454792932932879
-  serializedVersion: 5
+  serializedVersion: 6
-  m_Name: talk2
+  m_Name: Idle1
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 4484282787617113897}
+  - {fileID: -3708046205487501204}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: -395696784264195149, guid: 6de0d3389faf44c4c94db5fc7b37778f,
+  m_Motion: {fileID: -5252816984213320552, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
    m_DefaultInt: 0
    m_DefaultBool: 0
    m_Controller: {fileID: 9100000}
+  - m_Name: RandomIdle
+    m_Type: 3
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1101 &1164620430434744873
+--- !u!1101 &126409624890999905
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1340454792932932879}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9906015
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1107 &1360837410770645526
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -8069313486845270575}
+    m_Position: {x: 350, y: 210, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -1340454792932932879}
+    m_Position: {x: 350, y: -30, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions:
+  - {fileID: 6431593324012989362}
+  - {fileID: -8812777249497871139}
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours:
+  - {fileID: 6267272449170703513}
+  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: -8069313486845270575}
+--- !u!1109 &1611166266858820703
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+    m_ConditionEvent: Emote
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5822758316023152075}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1109 &1692991908700994129
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+  m_DstStateMachine: {fileID: 1360837410770645526}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1107 &2366130578317120319
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Talk
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2761778016216069562}
+    m_Position: {x: 400, y: -20, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3715219850476549954}
+    m_Position: {x: 400, y: 220, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions:
+  - {fileID: -4735005170422830645}
+  - {fileID: -8644946117464537805}
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours:
+  - {fileID: -2094498617323170793}
+  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: -2761778016216069562}
+--- !u!1109 &4328996676989045764
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsTalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 2366130578317120319}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1101 &4427751658491252132
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
-  m_DstState: {fileID: -5142550071235473073}
+  m_DstState: {fileID: -2761778016216069562}
-  m_TransitionDuration: 0.5
+  m_TransitionDuration: 0.25
-  m_ExitTime: 0.9906133
-  m_HasExitTime: 0
+  m_ExitTime: 0.9906015
+  m_HasExitTime: 1
--- !u!1101 &5282270459937347006
+--- !u!1109 &4434105194318151057
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 1360837410770645526}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1101 &4484282787617113897
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_Conditions:
-  - m_ConditionMode: 2
+  - m_ConditionMode: 1
-  m_DstState: {fileID: 7462806247995721579}
+  m_DstState: {fileID: 0}
-  m_IsExit: 0
+  m_IsExit: 1
-  m_TransitionDuration: 0.5
+  m_TransitionDuration: 0.1
-  m_ExitTime: 0.96231157
+  m_ExitTime: 0.98747915
--- !u!1102 &5822758316023152075
-AnimatorState:
-  serializedVersion: 5
+--- !u!1101 &4552751624681762378
+AnimatorStateTransition:
-  m_Name: eat_emoting
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -8205877888296167064}
-  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: 7480669504824360106, guid: 77f46436e0bd6c74fb62e9c4d11da834,
-    type: 3}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
--- !u!1101 &6642229856091307334
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3715219850476549954}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.98747915
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &5119399839995085805
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: Emote
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsTalking
-  m_DstState: {fileID: 5822758316023152075}
+  m_DstState: {fileID: 0}
-  m_IsExit: 0
+  m_IsExit: 1
-  m_ExitTime: 0.9906133
+  m_ExitTime: 0.9603175
--- !u!1102 &7462806247995721579
+--- !u!1102 &5822758316023152075
-  serializedVersion: 5
+  serializedVersion: 6
-  m_Name: idle
+  m_Name: eat_emoting
-  - {fileID: 1164620430434744873}
-  - {fileID: 6642229856091307334}
+  - {fileID: 7592154543035974071}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: -5252816984213320552, guid: 499877971136c0e42ba83dae6746f47d,
+  m_Motion: {fileID: 7480669504824360106, guid: 77f46436e0bd6c74fb62e9c4d11da834,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
+--- !u!114 &6267272449170703513
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 52106b5e7fe9fd54bb1add9a00a5f911, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1109 &6431593324012989362
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: RandomIdle
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1340454792932932879}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1101 &7592154543035974071
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 1360837410770645526}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9563953
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/PhoenixChick.controller
+++ b/UOP1_Project/Assets/Art/Characters/PhoenixChick/Animation/PhoenixChick.controller
 %TAG !u! tag:unity3d.com,2011:
 --- !u!1102 &-341500065490236183
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 5257320084029234156}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_PrefabAsset: {fileID: 0}
  m_Name: PhoenixChick
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: IsFlapping
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
    m_Controller: {fileID: 9100000}
 --- !u!1102 &1585201346637545665
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 5965338698653321936}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_TimeParameter: 
 --- !u!1107 &2503421363349087286
 AnimatorStateMachine:
-  serializedVersion: 5
+  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
    m_Position: {x: 230, y: 320, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 1585201346637545665}
-    m_Position: {x: 539, y: 249, z: 0}
+    m_Position: {x: 500, y: 190, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: -341500065490236183}
+--- !u!1101 &5257320084029234156
+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: IsFlapping
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1585201346637545665}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9916574
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &5965338698653321936
+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: IsFlapping
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -341500065490236183}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.67391306
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue
+++ b/UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue
    m_Key: Townsfolk
    m_Metadata:
      m_Items: []
+  - m_Id: 73168485301583872
+    m_Key: FryKing
+    m_Metadata:
+      m_Items: []
  m_Metadata:
    m_Items: []
  m_KeyGenerator:
--- a/UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue
+++ b/UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue
    m_Localized: Townsfolk
    m_Metadata:
      m_Items: []
+  - m_Id: 73168485301583872
+    m_Localized: Fry King
+    m_Metadata:
+      m_Items: []
  references:
    version: 1
--- a/UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue
+++ b/UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue
    m_Localized: Villageois
    m_Metadata:
      m_Items: []
+  - m_Id: 73168485301583872
+    m_Localized: Fry King
+    m_Metadata:
+      m_Items: []
  references:
    version: 1
--- a/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
+++ b/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
    m_Key: L1-Welcome
    m_Metadata:
      m_Items: []
+  - m_Id: 42717273712459776
+    m_Key: L1-Default-FryKing
+    m_Metadata:
+      m_Items: []
  m_Metadata:
    m_Items: []
  m_KeyGenerator:
--- a/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
+++ b/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
    m_Localized: You are welcome !
    m_Metadata:
      m_Items: []
+  - m_Id: 42717273712459776
+    m_Localized: Who are you!
+    m_Metadata:
+      m_Items: []
  references:
    version: 1
--- a/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
+++ b/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
    m_Localized: De rien !
    m_Metadata:
      m_Items: []
+  - m_Id: 42717273712459776
+    m_Localized: T'es qui?
+    m_Metadata:
+      m_Items: []
  references:
    version: 1
--- a/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
+++ b/UOP1_Project/Assets/LocalizationFiles/AssetTables/QuestSystem/Questline
    m_Localized: Di niente!
    m_Metadata:
      m_Items: []
+  - m_Id: 42717273712459776
+    m_Localized: tu chi sei!
+    m_Metadata:
+      m_Items: []
  references:
    version: 1
--- a/UOP1_Project/Assets/Prefabs/Characters/BardHare.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/BardHare.prefab
  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
  _startDialogueEvent: {fileID: 11400000, guid: 5cfe626f5482b914a9e46ebbe35ea1a8,
    type: 2}
+  dialogueShot: {fileID: 8538914450954758767}
  isInDialogue: 0
 --- !u!114 &8326144657377848678
 MonoBehaviour:
    appendConditionsInfo: 1
    appendActionsInfo: 1
    currentState: 
+--- !u!1 &8461499202604652648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9218043462381822119}
+  - component: {fileID: 925096899542368336}
+  - component: {fileID: 6708235082901364603}
+  m_Layer: 0
+  m_Name: cm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9218043462381822119
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8461499202604652648}
+  m_LocalRotation: {x: -0.097560786, y: 0.9022382, z: -0.28742644, w: 0.30632383}
+  m_LocalPosition: {x: 22.761536, y: -7.516693, z: -5.7937145}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7903020085764253948}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &925096899542368336
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8461499202604652648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &6708235082901364603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8461499202604652648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 1
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
+--- !u!1 &8538914450954758767
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7903020085764253948}
+  - component: {fileID: 1458786256024743524}
+  m_Layer: 0
+  m_Name: CM vcam1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &7903020085764253948
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8538914450954758767}
+  m_LocalRotation: {x: -0, y: 0.83740747, z: -0, w: -0.54657906}
+  m_LocalPosition: {x: 2.14, y: 1.09, z: 2.1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 9218043462381822119}
+  m_Father: {fileID: 2723178623857253410}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 246.265, z: 0}
+--- !u!114 &1458786256024743524
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8538914450954758767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ExcludedPropertiesInInspector:
+  - m_Script
+  m_LockStageInInspector: 
+  m_StreamingVersion: 20170927
+  m_Priority: 10
+  m_StandbyUpdate: 2
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 0}
+  m_Lens:
+    FieldOfView: 40
+    OrthographicSize: 5
+    NearClipPlane: 0.01
+    FarClipPlane: 2000
+    Dutch: 0
+    LensShift: {x: 0, y: 0}
+  m_Transitions:
+    m_BlendHint: 0
+    m_InheritPosition: 0
+    m_OnCameraLive:
+      m_PersistentCalls:
+        m_Calls: []
+  m_LegacyBlendHint: 0
+  m_ComponentOwner: {fileID: 9218043462381822119}
 --- !u!1001 &2467996762377272265
 PrefabInstance:
  m_ObjectHideFlags: 0
 --- !u!1 &3351096123413661336 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 397ae3410a140c04091159b107d04d37,
+    type: 3}
+  m_PrefabInstance: {fileID: 2467996762377272265}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2723178623857253410 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 397ae3410a140c04091159b107d04d37,
    type: 3}
  m_PrefabInstance: {fileID: 2467996762377272265}
  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Characters/FryKing.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/FryKing.prefab
  m_EditorClassIdentifier: 
  m_Weight: 1
  m_Effectors: []
+--- !u!1 &2755640767611011569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8489273322263003005}
+  - component: {fileID: 1171767605725067805}
+  - component: {fileID: 7873805157264718183}
+  m_Layer: 0
+  m_Name: cm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8489273322263003005
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2755640767611011569}
+  m_LocalRotation: {x: -0.097560786, y: 0.9022382, z: -0.28742644, w: 0.30632383}
+  m_LocalPosition: {x: 22.761536, y: -7.516693, z: -5.7937145}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3677475229646470422}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1171767605725067805
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2755640767611011569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &7873805157264718183
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2755640767611011569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 1
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
+--- !u!65 &1905561856158750783
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6627139844881529283}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.7496583, z: 1.3063112}
+  m_Center: {x: 0, y: 0.84235775, z: -0.0886696}
 --- !u!95 &7169296604771165077
 Animator:
  serializedVersion: 3
  m_Name: 
  m_EditorClassIdentifier: 
  m_RigLayers:
-  - rig: {fileID: 1443830953}
-    active: 1
+  - m_Rig: {fileID: 1443830953}
+    m_Active: 1
+--- !u!114 &3959138988332178092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6627139844881529283}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b803c85ebca51c4499674adbe5ea4a21, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _actor: {fileID: 11400000, guid: 2f14ee79b2fa2574480372fff57ec101, type: 2}
+  _defaultDialogue: {fileID: 11400000, guid: de0c5f70bf8e19743a163583c1b560f1, type: 2}
+  _questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
+  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
+  _winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
+  _loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
+  _startDialogueEvent: {fileID: 11400000, guid: 5cfe626f5482b914a9e46ebbe35ea1a8,
+    type: 2}
+  dialogueShot: {fileID: 7512624128401615669}
+  isInDialogue: 0
+--- !u!114 &4598121343800172828
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6627139844881529283}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7ca3eae09f3fc4d48bb4b74aa34cd4a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  npcState: 0
+  talkingTo: []
+--- !u!114 &8880227368449770384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6627139844881529283}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1eeda163c70b3cb4ebb88ba92f608fd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _transitionTableSO: {fileID: 11400000, guid: 820fcf3a4b0ccf04997075bbc7c589da, type: 2}
+  _debugger:
+    debugTransitions: 0
+    appendConditionsInfo: 1
+    appendActionsInfo: 1
+    currentState: 
+--- !u!1 &7512624128401615669
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3677475229646470422}
+  - component: {fileID: 4919476596335560664}
+  m_Layer: 0
+  m_Name: CM vcam1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &3677475229646470422
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7512624128401615669}
+  m_LocalRotation: {x: -0, y: -0.7953063, z: -0, w: 0.60620785}
+  m_LocalPosition: {x: 2.18, y: 1.01, z: 1.65}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8489273322263003005}
+  m_Father: {fileID: 5815136950816891769}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: -105.368, z: 0}
+--- !u!114 &4919476596335560664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7512624128401615669}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ExcludedPropertiesInInspector:
+  - m_Script
+  m_LockStageInInspector: 
+  m_StreamingVersion: 20170927
+  m_Priority: 1000
+  m_StandbyUpdate: 2
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 0}
+  m_Lens:
+    FieldOfView: 40
+    OrthographicSize: 5
+    NearClipPlane: 0.01
+    FarClipPlane: 2000
+    Dutch: 0
+    LensShift: {x: 0, y: 0}
+  m_Transitions:
+    m_BlendHint: 0
+    m_InheritPosition: 0
+    m_OnCameraLive:
+      m_PersistentCalls:
+        m_Calls: []
+  m_LegacyBlendHint: 0
+  m_ComponentOwner: {fileID: 8489273322263003005}
 --- !u!1001 &3546334096807545957
 PrefabInstance:
  m_ObjectHideFlags: 0
    m_Modifications:
    - target: {fileID: 3893772678490856660, guid: cdb27fe71f1fe2d4fab58dca9df5845e,
        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3893772678490856660, guid: cdb27fe71f1fe2d4fab58dca9df5845e,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: 3893772678490856660, guid: cdb27fe71f1fe2d4fab58dca9df5845e,
        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
+      propertyPath: m_LocalRotation.w
+      value: 1
-      propertyPath: m_LocalRotation.y
+      propertyPath: m_LocalRotation.x
-      propertyPath: m_LocalRotation.z
+      propertyPath: m_LocalRotation.y
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3893772678490856660, guid: cdb27fe71f1fe2d4fab58dca9df5845e,
-        type: 3}
-      propertyPath: m_RootOrder
+      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3893772678490856660, guid: cdb27fe71f1fe2d4fab58dca9df5845e,
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: -0
      objectReference: {fileID: 0}
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
-        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
      propertyPath: m_Name
      value: FryKing
      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 499877971136c0e42ba83dae6746f47d,
+        type: 3}
+      propertyPath: m_TagString
+      value: NPC
+      objectReference: {fileID: 0}
    - target: {fileID: 4202088655493518102, guid: 499877971136c0e42ba83dae6746f47d,
        type: 3}
      propertyPath: m_Materials.Array.data[0]
  m_SourcePrefab: {fileID: 100100000, guid: 499877971136c0e42ba83dae6746f47d, type: 3}
--- !u!4 &7362686690925288611 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: 499877971136c0e42ba83dae6746f47d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6285122109975626898}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &8996961185942063343 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: 499877971136c0e42ba83dae6746f47d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6285122109975626898}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &8000600056559789039 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: 499877971136c0e42ba83dae6746f47d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6285122109975626898}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &5203062738579045344 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: 499877971136c0e42ba83dae6746f47d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6285122109975626898}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &8551245710219264153 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: 499877971136c0e42ba83dae6746f47d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6285122109975626898}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &7184792211445134663 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: 499877971136c0e42ba83dae6746f47d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6285122109975626898}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &4086673066872506923 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: 499877971136c0e42ba83dae6746f47d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6285122109975626898}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1316800620457734591 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &4134325681153957348 stripped
+--- !u!4 &1200573009880548194 stripped
-  m_CorrespondingSourceObject: {fileID: -1271934777158936202, guid: 499877971136c0e42ba83dae6746f47d,
+  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &6627139844881529283 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 499877971136c0e42ba83dae6746f47d,
+--- !u!4 &1217195292912864750 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5178407201426131324, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &8570508131738365817 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: 499877971136c0e42ba83dae6746f47d,
+--- !u!1 &6627139844881529283 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &1217195292912864750 stripped
+--- !u!4 &6679359516171823557 stripped
-  m_CorrespondingSourceObject: {fileID: 5178407201426131324, guid: 499877971136c0e42ba83dae6746f47d,
+  m_CorrespondingSourceObject: {fileID: -8392203552951964329, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4134325681153957348 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -1271934777158936202, guid: 499877971136c0e42ba83dae6746f47d,
+    type: 3}
+  m_PrefabInstance: {fileID: 6285122109975626898}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4071018110438219231 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &1200573009880548194 stripped
+--- !u!4 &2900128966382468604 stripped
-  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: 499877971136c0e42ba83dae6746f47d,
+  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: 499877971136c0e42ba83dae6746f47d,
--- !u!4 &2900128966382468604 stripped
+--- !u!4 &7362686690925288611 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: 499877971136c0e42ba83dae6746f47d,
+    type: 3}
+  m_PrefabInstance: {fileID: 6285122109975626898}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8996961185942063343 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: 499877971136c0e42ba83dae6746f47d,
+    type: 3}
+  m_PrefabInstance: {fileID: 6285122109975626898}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8000600056559789039 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: 499877971136c0e42ba83dae6746f47d,
+    type: 3}
+  m_PrefabInstance: {fileID: 6285122109975626898}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5203062738579045344 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: 499877971136c0e42ba83dae6746f47d,
+    type: 3}
+  m_PrefabInstance: {fileID: 6285122109975626898}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8551245710219264153 stripped
-  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: 499877971136c0e42ba83dae6746f47d,
+  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: 499877971136c0e42ba83dae6746f47d,
--- !u!4 &6679359516171823557 stripped
+--- !u!4 &7184792211445134663 stripped
-  m_CorrespondingSourceObject: {fileID: -8392203552951964329, guid: 499877971136c0e42ba83dae6746f47d,
+  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: 499877971136c0e42ba83dae6746f47d,
+    type: 3}
+  m_PrefabInstance: {fileID: 6285122109975626898}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4086673066872506923 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: 499877971136c0e42ba83dae6746f47d,
+    type: 3}
+  m_PrefabInstance: {fileID: 6285122109975626898}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8570508131738365817 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: 499877971136c0e42ba83dae6746f47d,
    type: 3}
  m_PrefabInstance: {fileID: 6285122109975626898}
  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_F.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_F.prefab
  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
  _winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
  _loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
-  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
+  dialogueShot: {fileID: 4147769428160019637}
+--- !u!1 &4147769428160019637
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3681583659869480704}
+  - component: {fileID: 8511031590073880065}
+  m_Layer: 0
+  m_Name: CM vcam1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &3681583659869480704
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4147769428160019637}
+  m_LocalRotation: {x: -0, y: 0.88273513, z: -0, w: -0.4698711}
+  m_LocalPosition: {x: 1.26, y: 0.944, z: 1.71}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6720123239375698580}
+  m_Father: {fileID: 1345491811586392000}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: -123.948, z: 0}
+--- !u!114 &8511031590073880065
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4147769428160019637}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ExcludedPropertiesInInspector:
+  - m_Script
+  m_LockStageInInspector: 
+  m_StreamingVersion: 20170927
+  m_Priority: 1000
+  m_StandbyUpdate: 2
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 0}
+  m_Lens:
+    FieldOfView: 40
+    OrthographicSize: 5
+    NearClipPlane: 0.01
+    FarClipPlane: 2000
+    Dutch: 0
+    LensShift: {x: 0, y: 0}
+  m_Transitions:
+    m_BlendHint: 0
+    m_InheritPosition: 0
+    m_OnCameraLive:
+      m_PersistentCalls:
+        m_Calls: []
+  m_LegacyBlendHint: 0
+  m_ComponentOwner: {fileID: 6720123239375698580}
+--- !u!1 &5297784775662301752
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6720123239375698580}
+  - component: {fileID: 2606622639631491317}
+  - component: {fileID: 726086242675183401}
+  m_Layer: 0
+  m_Name: cm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6720123239375698580
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5297784775662301752}
+  m_LocalRotation: {x: -0.097560786, y: 0.9022382, z: -0.28742644, w: 0.30632383}
+  m_LocalPosition: {x: 22.761536, y: -7.516693, z: -5.7937145}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3681583659869480704}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2606622639631491317
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5297784775662301752}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &726086242675183401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5297784775662301752}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 1
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
 --- !u!1001 &1524077949592066091
 PrefabInstance:
  m_ObjectHideFlags: 0
    type: 3}
  m_PrefabInstance: {fileID: 1524077949592066091}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1345491811586392000 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b6150cff043dc624c8f235d7594c6ab0,
+    type: 3}
+  m_PrefabInstance: {fileID: 1524077949592066091}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_M.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_M.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2217688227613633010
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1547240789108563600}
+  - component: {fileID: 8708968269543913711}
+  - component: {fileID: 2224087981722895840}
+  m_Layer: 0
+  m_Name: cm
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1547240789108563600
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2217688227613633010}
+  m_LocalRotation: {x: -0.097560786, y: 0.9022382, z: -0.28742644, w: 0.30632383}
+  m_LocalPosition: {x: 22.761536, y: -7.516693, z: -5.7937145}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1315320751634231802}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8708968269543913711
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2217688227613633010}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &2224087981722895840
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2217688227613633010}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
+  m_PivotOffset: {x: 0, y: 0, z: 0}
+  m_AmplitudeGain: 1
+  m_FrequencyGain: 1
+  mNoiseOffsets: {x: 0, y: 0, z: 0}
+--- !u!1 &3118002457362719030
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1315320751634231802}
+  - component: {fileID: 3993251890966681978}
+  m_Layer: 0
+  m_Name: CM vcam1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &1315320751634231802
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3118002457362719030}
+  m_LocalRotation: {x: -0, y: -0.75258756, z: -0, w: 0.6584923}
+  m_LocalPosition: {x: 1.9, y: 0.979, z: 0.97}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1547240789108563600}
+  m_Father: {fileID: 5579597578339563075}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: -97.63, z: 0}
+--- !u!114 &3993251890966681978
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3118002457362719030}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ExcludedPropertiesInInspector:
+  - m_Script
+  m_LockStageInInspector: 
+  m_StreamingVersion: 20170927
+  m_Priority: 10
+  m_StandbyUpdate: 2
+  m_LookAt: {fileID: 0}
+  m_Follow: {fileID: 0}
+  m_Lens:
+    FieldOfView: 40
+    OrthographicSize: 5
+    NearClipPlane: 0.01
+    FarClipPlane: 2000
+    Dutch: 0
+    LensShift: {x: 0, y: 0}
+  m_Transitions:
+    m_BlendHint: 0
+    m_InheritPosition: 0
+    m_OnCameraLive:
+      m_PersistentCalls:
+        m_Calls: []
+  m_LegacyBlendHint: 0
+  m_ComponentOwner: {fileID: 1547240789108563600}
 --- !u!65 &7711609074253126066
 BoxCollider:
  m_ObjectHideFlags: 0
  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
  _winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
  _loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
-  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
+  dialogueShot: {fileID: 3118002457362719030}
  isInDialogue: 0
 --- !u!114 &3189127145008679332
 MonoBehaviour:
    type: 3}
  m_PrefabInstance: {fileID: 5396454823483822504}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5579597578339563075 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e700150436d28411d8a0bb8454db5c96,
+    type: 3}
+  m_PrefabInstance: {fileID: 5396454823483822504}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
+++ b/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Dying.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Dying.asset
  m_EditorClassIdentifier: 
  _actions:
  - {fileID: 11400000, guid: c9acb33fe7d59704e94783a60c2a0c84, type: 2}
+  - {fileID: 11400000, guid: ba1e9b4d062da724c909db617eb613ae, type: 2}
+  - {fileID: 11400000, guid: 6518fb359428c2e47842b5dd84c0a4e9, type: 2}
--- a/UOP1_Project/Assets/Scripts/Characters/NPC.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/NPC.cs
 using System.Collections.Generic;
 using UnityEngine;

-public enum NPCState { Idle = 0, Walk, Talk, Eat };
+public enum NPCState { Idle = 0, Walk, Talk};

 public class NPC : MonoBehaviour
 {
--- a/UOP1_Project/Assets/Scripts/Quests/StepController.cs
+++ b/UOP1_Project/Assets/Scripts/Quests/StepController.cs
 	[Header("Broadcasting on channels")]
 	//[SerializeField]
 	public DialogueDataChannelSO _startDialogueEvent = default;
-	
+
+	[Header("Dialogue Shot Camera")]
+	public GameObject dialogueShot;

 	//check if character is actif. An actif character is the character concerned by the step.
 	private DialogueDataSO _currentDialogue;
 	private void Start()
 	{
-
+		if (dialogueShot)	dialogueShot.SetActive(false);
 	}

 	void PlayDefaultDialogue()
 		_winDialogueEvent.OnEventRaised += PlayWinDialogue;
 		_loseDialogueEvent.OnEventRaised += PlayLoseDialogue;
 		isInDialogue = true;
+		if (dialogueShot)	dialogueShot.SetActive(true);
 	}
 	void EndDialogue()
 	{
 		ResumeConversation();
 		isInDialogue = false;
+		if (dialogueShot)	dialogueShot.SetActive(false);
 	}

 	void PlayLoseDialogue()
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-String-Tables-English
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-String-Tables-English
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 989d673df6cb49f488b56ae6ce01a7f4
+  m_SerializeEntries:
+  - m_GUID: 8c990337c09944296842b163021829c8
+    m_Address: Interactions_en
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+    - Preload
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 2c7ee465e974bf140b6da8373cd43f2b, type: 2}
+    - {fileID: 11400000, guid: e8dc6cafdd01b9f48a0eb43319b4685f, type: 2}
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English.asset.meta
+fileFormatVersion: 2
+guid: fcf8490568b5a0b47a7fe58d1033bfc3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-String-Tables-French
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-String-Tables-French
+  m_Data:
+    m_SerializedData: []
+  m_GUID: a03e1e4d6d832c240b67b8c65c66a59b
+  m_SerializeEntries:
+  - m_GUID: 75a54b82bfa6f4f9e8239e9940432c0d
+    m_Address: Interactions_fr
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-fr
+    - Preload
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: aa734b26428df8847be06964c75b5304, type: 2}
+    - {fileID: 11400000, guid: f2d3d7686f4ec334fbc1f4f15d25b18d, type: 2}
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-French.asset.meta
+fileFormatVersion: 2
+guid: cecd62da149d34d45938fce625af29a6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-String-Tables-Italian
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-String-Tables-Italian
+  m_Data:
+    m_SerializedData: []
+  m_GUID: c29d8dc42aaf766429d7bec54cb6eb1e
+  m_SerializeEntries:
+  - m_GUID: 6ff28064e4e684b65b9c22aa501c01c5
+    m_Address: Interactions_it
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-it
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: 3375e03a29e12c74db7958133e077468, type: 2}
+    - {fileID: 11400000, guid: a235c72ab72c9494aafb85957b596528, type: 2}
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Italian.asset.meta
+fileFormatVersion: 2
+guid: 38ec9971d12cc7f408261900bfc57b00
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_BundledAssetGroupSchema.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_BundledAssetGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: Localization-String-Tables-English_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: fcf8490568b5a0b47a7fe58d1033bfc3, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 5002d2ecf2c3647f8b6e3a264a6b45f8
+  m_LoadPath:
+    m_Id: 343a2af8396fc47cb9e730bf77e141f0
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 1
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_BundledAssetGroupSchema.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_BundledAssetGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: 2c7ee465e974bf140b6da8373cd43f2b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_ContentUpdateGroupSchema.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_ContentUpdateGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: Localization-String-Tables-English_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: fcf8490568b5a0b47a7fe58d1033bfc3, type: 2}
+  m_StaticContent: 0
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_ContentUpdateGroupSchema.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English_ContentUpdateGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: e8dc6cafdd01b9f48a0eb43319b4685f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_BundledAssetGroupSchema.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_BundledAssetGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: Localization-String-Tables-French_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: cecd62da149d34d45938fce625af29a6, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 5002d2ecf2c3647f8b6e3a264a6b45f8
+  m_LoadPath:
+    m_Id: 343a2af8396fc47cb9e730bf77e141f0
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 1
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_BundledAssetGroupSchema.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_BundledAssetGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: aa734b26428df8847be06964c75b5304
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_ContentUpdateGroupSchema.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_ContentUpdateGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: Localization-String-Tables-French_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: cecd62da149d34d45938fce625af29a6, type: 2}
+  m_StaticContent: 0
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_ContentUpdateGroupSchema.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-French_ContentUpdateGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: f2d3d7686f4ec334fbc1f4f15d25b18d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_BundledAssetGroupSchema.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_BundledAssetGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+  m_Name: Localization-String-Tables-Italian_BundledAssetGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 38ec9971d12cc7f408261900bfc57b00, type: 2}
+  m_InternalBundleIdMode: 1
+  m_Compression: 1
+  m_IncludeAddressInCatalog: 1
+  m_IncludeGUIDInCatalog: 1
+  m_IncludeLabelsInCatalog: 1
+  m_InternalIdNamingMode: 0
+  m_CacheClearBehavior: 0
+  m_IncludeInBuild: 1
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_ForceUniqueProvider: 0
+  m_UseAssetBundleCache: 1
+  m_UseAssetBundleCrc: 1
+  m_UseAssetBundleCrcForCachedBundles: 1
+  m_Timeout: 0
+  m_ChunkedTransfer: 0
+  m_RedirectLimit: -1
+  m_RetryCount: 0
+  m_BuildPath:
+    m_Id: 5002d2ecf2c3647f8b6e3a264a6b45f8
+  m_LoadPath:
+    m_Id: 343a2af8396fc47cb9e730bf77e141f0
+  m_BundleMode: 0
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+  m_BundleNaming: 1
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_BundledAssetGroupSchema.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_BundledAssetGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: 3375e03a29e12c74db7958133e077468
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_ContentUpdateGroupSchema.asset
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_ContentUpdateGroupSchema.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+  m_Name: Localization-String-Tables-Italian_ContentUpdateGroupSchema
+  m_EditorClassIdentifier: 
+  m_Group: {fileID: 11400000, guid: 38ec9971d12cc7f408261900bfc57b00, type: 2}
+  m_StaticContent: 0
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_ContentUpdateGroupSchema.asset.meta
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Italian_ContentUpdateGroupSchema.asset.meta
+fileFormatVersion: 2
+guid: a235c72ab72c9494aafb85957b596528
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/Dialogue/Default-FryKing.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Dialogue/Default-FryKing.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a0c0171b565b4074a9462307824be26c, type: 3}
+  m_Name: Default-FryKing
+  m_EditorClassIdentifier: 
+  _actor: {fileID: 11400000, guid: 2f14ee79b2fa2574480372fff57ec101, type: 2}
+  _dialogueLines:
+  - m_TableReference:
+      m_TableCollectionName: Questline Dialogue
+    m_TableEntryReference:
+      m_KeyId: 0
+      m_Key: L1-Default-FryKing
+    m_FallbackState: 0
+  _choices: []
+  _dialogueType: 0
--- a/UOP1_Project/Assets/ScriptableObjects/Dialogue/Default-FryKing.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Dialogue/Default-FryKing.asset.meta
+fileFormatVersion: 2
+guid: de0c5f70bf8e19743a163583c1b560f1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/Narrative/Actors/FryKing.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Narrative/Actors/FryKing.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f991c0f5eb9677944ae00c1b61548e72, type: 3}
+  m_Name: FryKing
+  m_EditorClassIdentifier: 
+  _actorName:
+    m_TableReference:
+      m_TableCollectionName: GUID:9c592d2d4c7fc459f94a645873569195
+    m_TableEntryReference:
+      m_KeyId: 73168485301583872
+      m_Key: 
+    m_FallbackState: 0
--- a/UOP1_Project/Assets/ScriptableObjects/Narrative/Actors/FryKing.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Narrative/Actors/FryKing.asset.meta
+fileFormatVersion: 2
+guid: 2f14ee79b2fa2574480372fff57ec101
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing.meta
+fileFormatVersion: 2
+guid: d2a67910b1a3ed444a52658ef643465c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing/FryKing_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing/FryKing_TransitionTable.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 872cbaa965d1f6e4e98365d74e2060df, type: 3}
+  m_Name: FryKing_TransitionTable
+  m_EditorClassIdentifier: 
+  _transitions:
+  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    ToState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 11d32529e8bdbc24e81d7b578426352c, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
+    ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 87426477fd21a254d8cd4ff826d4ee29, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2}
+      Operator: 1
+  - FromState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
+    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    ToState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: dcb00df815f03384cb096d4556e5ba95, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f7264f99aeb6a8046b637306314556da, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+      Operator: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing/FryKing_TransitionTable.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/FryKing/FryKing_TransitionTable.asset.meta
+fileFormatVersion: 2
+guid: 820fcf3a4b0ccf04997075bbc7c589da
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: