diff --git a/Assets/Characters/Innkeeper/temp_innkeeper.controller b/Assets/Characters/Innkeeper/temp_innkeeper.controller
index 23f57cf4991f8dd61fd6006d23b20b7f638a747f..dcf7ce5327ef22739e3f34561c48873492334fb0 100644
--- a/Assets/Characters/Innkeeper/temp_innkeeper.controller
+++ b/Assets/Characters/Innkeeper/temp_innkeeper.controller
@@ -8,12 +8,12 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: isGrabingItem
- m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: isWalking
m_EventTreshold: 0
+ - m_ConditionMode: 1
+ m_ConditionEvent: Grab
+ m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6424040991502894633}
m_Solo: 0
@@ -40,7 +40,7 @@ AnimatorStateTransition:
m_ConditionEvent: isWalking
m_EventTreshold: 0
- m_ConditionMode: 2
- m_ConditionEvent: isGrabingItem
+ m_ConditionEvent: hasBeer
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4050699182086185040}
@@ -56,47 +56,95 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &-7121187823170688171
+--- !u!1102 &-7451206669443295686
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Place
+ m_Speed: -1.5
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 3136160004207224634}
+ 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: -3054162700712550113, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-6424040991502894633
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Grab
+ m_Speed: 1.5
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -4922715164762872715}
+ 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: -3054162700712550113, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1101 &-4922715164762872715
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: isGrabingItem
- m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: isWalking
- m_EventTreshold: 0
+ m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: -6424040991502894633}
+ m_DstState: {fileID: 5797124481400522495}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.75
- m_HasExitTime: 0
+ m_ExitTime: 0.92941177
+ m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1102 &-6424040991502894633
+--- !u!1102 &-4100007883360773246
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New State 1
- m_Speed: 1.5
+ m_Name: WalkCarry
+ m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: -4922715164762872715}
- - {fileID: 2639990871915950092}
+ - {fileID: 621489038332536075}
+ - {fileID: 6893862463180618535}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -106,13 +154,13 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: -3054162700712550113, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Motion: {fileID: 7198581000158396941, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1101 &-4922715164762872715
+--- !u!1101 &-4081070382691546885
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -120,9 +168,6 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 2
- m_ConditionEvent: isGrabingItem
- m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: isWalking
m_EventTreshold: 0
@@ -134,13 +179,13 @@ AnimatorStateTransition:
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.92941177
+ m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &-4081070382691546885
+--- !u!1101 &-468531454205966257
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -148,14 +193,11 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 2
- m_ConditionEvent: isWalking
- m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: isGrabingItem
+ - m_ConditionMode: 1
+ m_ConditionEvent: hasBeer
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 5797124481400522495}
+ m_DstState: {fileID: -4100007883360773246}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
@@ -183,7 +225,19 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- - m_Name: isGrabingItem
+ - m_Name: Grab
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: Place
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: hasBeer
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
@@ -202,6 +256,34 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
+--- !u!1101 &621489038332536075
+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: hasBeer
+ m_EventTreshold: 0
+ - m_ConditionMode: 1
+ m_ConditionEvent: isWalking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 4050699182086185040}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1107 &1119914646677379252
AnimatorStateMachine:
serializedVersion: 5
@@ -216,10 +298,16 @@ AnimatorStateMachine:
m_Position: {x: 320, y: 70, z: 0}
- serializedVersion: 1
m_State: {fileID: 4050699182086185040}
- m_Position: {x: 320, y: 230, z: 0}
+ m_Position: {x: 110, y: 230, z: 0}
- serializedVersion: 1
m_State: {fileID: -6424040991502894633}
m_Position: {x: 610, y: 230, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -7451206669443295686}
+ m_Position: {x: 640, y: -10, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -4100007883360773246}
+ m_Position: {x: 350, y: 230, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -230,22 +318,16 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5797124481400522495}
---- !u!1101 &2639990871915950092
+--- !u!1101 &3136160004207224634
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: isWalking
- m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: isGrabingItem
- m_EventTreshold: 0
+ m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 4050699182086185040}
+ m_DstState: {fileID: 5797124481400522495}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
@@ -253,7 +335,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.92941177
- m_HasExitTime: 0
+ m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@@ -265,12 +347,12 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New State 0
+ m_Name: Walk
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -4081070382691546885}
- - {fileID: -7121187823170688171}
+ - {fileID: -468531454205966257}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -286,6 +368,62 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &4153459314146860573
+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: isWalking
+ m_EventTreshold: 0
+ - m_ConditionMode: 1
+ m_ConditionEvent: Place
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7451206669443295686}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.9294118
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &5597358596704479176
+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: isWalking
+ m_EventTreshold: 0
+ - m_ConditionMode: 1
+ m_ConditionEvent: hasBeer
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -4100007883360773246}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &5797124481400522495
AnimatorState:
serializedVersion: 5
@@ -293,12 +431,14 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New State
+ m_Name: Idle
m_Speed: 0.6
m_CycleOffset: 0
m_Transitions:
- {fileID: -7944423207119123836}
- {fileID: -8523957562752397774}
+ - {fileID: 4153459314146860573}
+ - {fileID: 5597358596704479176}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -314,3 +454,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &6893862463180618535
+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: isWalking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 5797124481400522495}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
diff --git a/Assets/Characters/NPC Presets/patron.controller b/Assets/Characters/NPC Presets/patron.controller
new file mode 100644
index 0000000000000000000000000000000000000000..c0f22473a466fd1761609df520ba75106cdec14c
--- /dev/null
+++ b/Assets/Characters/NPC Presets/patron.controller
@@ -0,0 +1,739 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8658269010281493852
+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: isWalking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7528433675551925452}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-8654759700476170407
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 5754660234098347416}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-8257657130034641234
+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: Drink
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 8438452115470768797}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-8062360061285783863
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Sitting
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -8654759700476170407}
+ 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: -8660240708845369778, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1101 &-7874329283464269166
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7528433675551925452}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8125
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-7708765588212758208
+AnimatorStateTransition:
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Drink
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 8438452115470768797}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-7692336136080472528
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Drink 1
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 516477226606405396}
+ 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: -7485126902665781086, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag: Drinking
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-7528433675551925452
+AnimatorState:
+ serializedVersion: 5
+ 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: -2441928535073248064}
+ - {fileID: -3922858207003145684}
+ 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: 6407382594004523037, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag: Idle
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1101 &-6250643556987343680
+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: isWalking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7528433675551925452}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-3922858207003145684
+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: Sit
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -8062360061285783863}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-3199592983246403181
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 5331853065140425172}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.94545454
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-3056470790431957809
+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: Grab
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 3126158935733303845}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-2716214772883419106
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -556986854862013952}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.70213664
+ m_TransitionOffset: 0
+ m_ExitTime: 0.5145743
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-2441928535073248064
+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: isWalking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1958124249856496948}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-2023943508206676633
+AnimatorStateTransition:
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Drink
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 8438452115470768797}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-1958124249856496948
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Walking
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -6250643556987343680}
+ - {fileID: -3056470790431957809}
+ 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: 4229663185133050356, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1101 &-1761085440523603621
+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: StandUp
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1320533442871628081}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.9444444
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-1320533442871628081
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: StandingUp
+ m_Speed: -1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -7874329283464269166}
+ 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: -8660240708845369778, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-556986854862013952
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: WalkingBeer
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -8658269010281493852}
+ 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: 7198581000158396941, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: patron
+ serializedVersion: 5
+ m_AnimatorParameters:
+ - m_Name: isWalking
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: Sit
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: Drink
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: StandUp
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: Grab
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: Put
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: 1342407388512600443}
+ 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!1101 &516477226606405396
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 5754660234098347416}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.94545454
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1107 &1342407388512600443
+AnimatorStateMachine:
+ serializedVersion: 5
+ 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: -7528433675551925452}
+ m_Position: {x: 320, y: 0, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -1958124249856496948}
+ m_Position: {x: 80, y: 160, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -8062360061285783863}
+ m_Position: {x: 590, y: 0, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 5754660234098347416}
+ m_Position: {x: 590, y: 140, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 8438452115470768797}
+ m_Position: {x: 890, y: 140, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 5331853065140425172}
+ m_Position: {x: 890, y: 250, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -7692336136080472528}
+ m_Position: {x: 890, y: 360, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -1320533442871628081}
+ m_Position: {x: 590, y: 280, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -556986854862013952}
+ m_Position: {x: 320, y: 290, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 3126158935733303845}
+ m_Position: {x: 80, y: 290, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: -60, z: 0}
+ m_EntryPosition: {x: 40, y: 0, z: 0}
+ m_ExitPosition: {x: 330, y: -110, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: -7528433675551925452}
+--- !u!1101 &1935347823698010748
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7692336136080472528}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.9444444
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &3126158935733303845
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Grab
+ m_Speed: 1.5
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -2716214772883419106}
+ 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: -3054162700712550113, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &5331853065140425172
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SittingIdle 1
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1935347823698010748}
+ 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: 6894377730433954889, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &5754660234098347416
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SittingIdle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -8257657130034641234}
+ - {fileID: -1761085440523603621}
+ 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: 6894377730433954889, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag: SittingIdle
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &8438452115470768797
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Drink
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -3199592983246403181}
+ 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: -7485126902665781086, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
+ m_Tag: Drinking
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Characters/NPC Presets/patron.controller.meta b/Assets/Characters/NPC Presets/patron.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c3ed218658c0ccb0d0eca8bceef35065f607e338
--- /dev/null
+++ b/Assets/Characters/NPC Presets/patron.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c81cf2d05680c4e41b6381fd2c1605fc
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Characters/NPC Presets/temp_inn_idle_guard.controller b/Assets/Characters/NPC Presets/temp_inn_idle_guard.controller
index 1265a94f92d649777e9978e35cb87f6313dfd7bb..cd40c3dd3523795cf0611cdc9a6cf27a992416ef 100644
--- a/Assets/Characters/NPC Presets/temp_inn_idle_guard.controller
+++ b/Assets/Characters/NPC Presets/temp_inn_idle_guard.controller
@@ -7,7 +7,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New State 1
+ m_Name: IdleSitting
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@@ -56,7 +56,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New State 0
+ m_Name: Drink
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@@ -71,7 +71,7 @@ AnimatorState:
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -7485126902665781086, guid: 3e19433b10bd15a4dafee6b94c2128a7, type: 3}
- m_Tag:
+ m_Tag: Drinking
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
@@ -83,8 +83,8 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New State 1 0
- m_Speed: 0.125
+ m_Name: IdleStand
+ m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 4030858184077812148}
@@ -207,7 +207,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: New State
+ m_Name: Sit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
diff --git a/Assets/Prefabs/Patron.prefab b/Assets/Prefabs/Patron.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..911507b2e287e635c5a34003d3286cd1479f03ce
--- /dev/null
+++ b/Assets/Prefabs/Patron.prefab
@@ -0,0 +1,331 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &801104722722870835
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 801104722722870838}
+ - component: {fileID: 801104722722870833}
+ - component: {fileID: 801104722722870834}
+ - component: {fileID: 801104722722870837}
+ m_Layer: 0
+ m_Name: Patron
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &801104722722870838
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 801104722722870835}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 4.9, y: 1, z: -1.41}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 328713961622664869}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &801104722722870833
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 801104722722870835}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ m_Radius: 0.5
+ m_Height: 2
+ m_Direction: 1
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &801104722722870834
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 801104722722870835}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7de7bfde5d6eb9548b97d2201fc03f56, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ BeerPosition: {fileID: 0}
+ SeatPosition: {fileID: 0}
+ SittingTransform: {fileID: 0}
+ Manager: {fileID: 0}
+ Animator: {fileID: 8812939269560473939}
+ Beer: {fileID: 9066158159872409301}
+ State: 0
+ DrinkingTime: 25
+ SleepTime: 6
+--- !u!195 &801104722722870837
+NavMeshAgent:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 801104722722870835}
+ m_Enabled: 1
+ m_AgentTypeID: 0
+ m_Radius: 0.35
+ m_Speed: 2.5
+ m_Acceleration: 8
+ avoidancePriority: 50
+ m_AngularSpeed: 240
+ m_StoppingDistance: 0.4
+ m_AutoTraverseOffMeshLink: 1
+ m_AutoBraking: 1
+ m_AutoRepath: 1
+ m_Height: 1.82
+ m_BaseOffset: 1
+ m_WalkableMask: 4294967295
+ m_ObstacleAvoidanceType: 4
+--- !u!1001 &801104722220958718
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1736176999969738843}
+ m_Modifications:
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.00078
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00047
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00105
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.6043425
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.7965088
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.011208617
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.014772652
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -2.047
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -179.428
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 74.368
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_Name
+ value: Pivo
+ objectReference: {fileID: 0}
+ - target: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+--- !u!1 &9066158159872409301 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ m_PrefabInstance: {fileID: 801104722220958718}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &801104723462667054
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 801104722722870838}
+ m_Modifications:
+ - target: {fileID: 57026569963425288, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 276022282012734101, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 349622397028767537, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_Name
+ value: npc_townsman_male
+ objectReference: {fileID: 0}
+ - target: {fileID: 734165710238672901, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 987404307315095881, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.97
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2075900981898486988, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2190346068352583725, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2873630286264729665, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3188036329752134993, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3272463425281358301, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3683430323632634300, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3899063653874448159, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4225038352890307680, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4670852875839591819, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4907616476307233936, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5080558950284079658, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5629256494869655433, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5848911294473170625, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6144252844773078349, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6752564951238563278, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6920303454738270368, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7993250688680762279, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8166082836581786237, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ propertyPath: m_Controller
+ value:
+ objectReference: {fileID: 9100000, guid: c81cf2d05680c4e41b6381fd2c1605fc, type: 2}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+--- !u!4 &328713961622664869 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1121901099668458891, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ m_PrefabInstance: {fileID: 801104723462667054}
+ m_PrefabAsset: {fileID: 0}
+--- !u!95 &8812939269560473939 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 8166082836581786237, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ m_PrefabInstance: {fileID: 801104723462667054}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &1736176999969738843 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1370848317063785333, guid: 9a305556f030dac49b343a9335e79f83, type: 3}
+ m_PrefabInstance: {fileID: 801104723462667054}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Patron.prefab.meta b/Assets/Prefabs/Patron.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..abf1dbe92ee41b5aadbce96aa4e9eda90551e18f
--- /dev/null
+++ b/Assets/Prefabs/Patron.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e8f48935439c60044bdefa3a4d88d99a
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Pivo.prefab b/Assets/Prefabs/Pivo.prefab
index be0a8d79adc24735f3842c37b5e845a9c9cb0dc9..c17d1c98938e0b82f1f0913dc7b2a08b8ddba75e 100644
--- a/Assets/Prefabs/Pivo.prefab
+++ b/Assets/Prefabs/Pivo.prefab
@@ -428,7 +428,7 @@ Transform:
m_GameObject: {fileID: 8561182705715936555}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0.6235961, y: 0.6235961, z: 0.6235961}
m_Children:
- {fileID: 2746023918511301422}
- {fileID: 4497182281914946100}
diff --git a/Assets/Prefabs/Pullitr.prefab b/Assets/Prefabs/Pullitr.prefab
index 1463d9ede78170bf3b4b70aa4cd389c0d73b4d58..fb2adceb35a3d341570ba81ca42d8d5d7a5b0698 100644
--- a/Assets/Prefabs/Pullitr.prefab
+++ b/Assets/Prefabs/Pullitr.prefab
@@ -234,7 +234,7 @@ Transform:
m_GameObject: {fileID: 8561182705715936555}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0.62, y: 0.62, z: 0.62}
m_Children:
- {fileID: 4497182281914946100}
m_Father: {fileID: 0}
diff --git a/Assets/Scenes/hospoda.unity b/Assets/Scenes/hospoda.unity
index 9882e3349d4a8be2f3057865156ca44ee02e42eb..d779446fcb5a82394007b2f07d0108c793f4cf04 100644
--- a/Assets/Scenes/hospoda.unity
+++ b/Assets/Scenes/hospoda.unity
@@ -106,15 +106,15 @@ NavMeshSettings:
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
- agentRadius: 0.5
- agentHeight: 2
+ agentRadius: 0.35
+ agentHeight: 1.8
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
- cellSize: 0.16666667
+ cellSize: 0.11666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
@@ -380,6 +380,79 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 67088746}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &73712658
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1456985507}
+ m_Modifications:
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.00078
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00047
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00105
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.6043425
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.7965088
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.011208617
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.014772652
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -2.047
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -179.428
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 74.368
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_Name
+ value: Pivo
+ objectReference: {fileID: 0}
+ - target: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
--- !u!4 &87132127 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 96c71504d0acbc6459a8a0b0ebfa127b, type: 3}
@@ -463,6 +536,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4655853085821256091, guid: bb88017613cd70449a3e4339ab0e180e, type: 3}
m_PrefabInstance: {fileID: 99793029}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &105553360 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ m_PrefabInstance: {fileID: 1708335391}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &128554686
GameObject:
m_ObjectHideFlags: 0
@@ -1077,6 +1155,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6162275508259798824, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
+ propertyPath: m_Carve
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8420058757083525253, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_AABB.m_Center.x
value: 0.0037436485
@@ -1202,7 +1284,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2650018851450219167, guid: af563cc048b059649bdebc94d1fcb208, type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 2650018851450219167, guid: af563cc048b059649bdebc94d1fcb208, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2084,7 +2166,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.y
- value: 18.702723
+ value: 18.67
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.z
@@ -2202,282 +2284,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ab4eae98a9a157e4eb73636bcc828e34, type: 3}
m_PrefabInstance: {fileID: 467393516}
m_PrefabAsset: {fileID: 0}
---- !u!1 &472725904
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 472725909}
- - component: {fileID: 472725908}
- - component: {fileID: 472725907}
- - component: {fileID: 472725906}
- - component: {fileID: 472725905}
- - component: {fileID: 472725910}
- m_Layer: 0
- m_Name: Patron
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &472725905
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 472725904}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 7de7bfde5d6eb9548b97d2201fc03f56, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- BeerPosition: {fileID: 1499804431}
- SeatPosition: {fileID: 1697476266}
- Reach: 2
- Manager: {fileID: 2001424748}
- State: 0
- SleepTime: 1
---- !u!136 &472725906
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 472725904}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- m_Radius: 0.5
- m_Height: 2
- m_Direction: 1
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &472725907
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 472725904}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &472725908
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 472725904}
- m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &472725909
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 472725904}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 1, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 2135727429}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!195 &472725910
-NavMeshAgent:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 472725904}
- m_Enabled: 1
- m_AgentTypeID: 0
- m_Radius: 0.5
- m_Speed: 3.5
- m_Acceleration: 8
- avoidancePriority: 50
- m_AngularSpeed: 120
- m_StoppingDistance: 0
- m_AutoTraverseOffMeshLink: 1
- m_AutoBraking: 1
- m_AutoRepath: 1
- m_Height: 2
- m_BaseOffset: 1
- m_WalkableMask: 4294967295
- m_ObstacleAvoidanceType: 4
---- !u!1 &483637937
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 483637943}
- - component: {fileID: 483637942}
- - component: {fileID: 483637941}
- - component: {fileID: 483637940}
- - component: {fileID: 483637939}
- - component: {fileID: 483637938}
- m_Layer: 0
- m_Name: Patron
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!195 &483637938
-NavMeshAgent:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 483637937}
- m_Enabled: 1
- m_AgentTypeID: 0
- m_Radius: 0.5
- m_Speed: 3.5
- m_Acceleration: 8
- avoidancePriority: 50
- m_AngularSpeed: 120
- m_StoppingDistance: 0
- m_AutoTraverseOffMeshLink: 1
- m_AutoBraking: 1
- m_AutoRepath: 1
- m_Height: 2
- m_BaseOffset: 1
- m_WalkableMask: 4294967295
- m_ObstacleAvoidanceType: 4
---- !u!114 &483637939
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 483637937}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 7de7bfde5d6eb9548b97d2201fc03f56, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- BeerPosition: {fileID: 1499804431}
- SeatPosition: {fileID: 1405605992}
- Reach: 2
- Manager: {fileID: 2001424748}
- State: 0
- SleepTime: 1
---- !u!136 &483637940
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 483637937}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- m_Radius: 0.5
- m_Height: 2
- m_Direction: 1
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &483637941
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 483637937}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &483637942
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 483637937}
- m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &483637943
+--- !u!4 &472725909 stripped
Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ m_PrefabInstance: {fileID: 801104722389233571}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 483637937}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 2.04, y: 1, z: -3.44}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 2135727429}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &504093661
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2565,7 +2376,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.y
- value: 18.702723
+ value: 18.673
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.z
@@ -2784,6 +2595,41 @@ Transform:
m_Father: {fileID: 2023407934}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &637187262 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7631664292336791710, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ m_PrefabInstance: {fileID: 1359297625}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &659207165
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 659207166}
+ m_Layer: 0
+ m_Name: sitting3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &659207166
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 659207165}
+ m_LocalRotation: {x: 0, y: 0.3917752, z: 0, w: 0.920061}
+ m_LocalPosition: {x: 0.822, y: 1, z: 0.592}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1922239055}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 46.13, z: 0}
--- !u!4 &690365494 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 96c71504d0acbc6459a8a0b0ebfa127b, type: 3}
@@ -2987,6 +2833,66 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5970353076711004144, guid: 6167952e8a276ee48a16e35f5ff629e8, type: 3}
m_PrefabInstance: {fileID: 815928200}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &829512618
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 829512619}
+ m_Layer: 0
+ m_Name: barrels
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &829512619
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 829512618}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 9.41, y: 0.326, z: 4.27}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1121604066}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &842166082
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 842166083}
+ m_Layer: 0
+ m_Name: sitting1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &842166083
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 842166082}
+ m_LocalRotation: {x: -0, y: 0.9300813, z: -0, w: 0.36735377}
+ m_LocalPosition: {x: 0.761, y: 1, z: -0.814}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1697476266}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 136.895, z: 0}
--- !u!1 &851202256
GameObject:
m_ObjectHideFlags: 0
@@ -3420,7 +3326,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 967590504}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.311, y: 1, z: 1.093}
+ m_LocalPosition: {x: 8.483, y: 0.895, z: 1.837}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1121604066}
@@ -3702,6 +3608,30 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1047617336 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 9094244029417688282, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ m_PrefabInstance: {fileID: 1359297625}
+ m_PrefabAsset: {fileID: 0}
+--- !u!95 &1047617337 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 9094244029417688281, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ m_PrefabInstance: {fileID: 1359297625}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1047617338
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1047617336}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: eeb359b26c404e44c81bea7feb909447, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Animator: {fileID: 1047617337}
+ Beer: {fileID: 105553360}
--- !u!95 &1048970148 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 351388401417740641, guid: d394234d25fe8ba4e86e88fe437dd8fd, type: 3}
@@ -3737,16 +3667,16 @@ NavMeshAgent:
m_GameObject: {fileID: 1050815510}
m_Enabled: 1
m_AgentTypeID: 0
- m_Radius: 0.5
+ m_Radius: 0.38
m_Speed: 3.5
m_Acceleration: 8
avoidancePriority: 50
- m_AngularSpeed: 120
- m_StoppingDistance: 0
+ m_AngularSpeed: 240
+ m_StoppingDistance: 0.1
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
- m_Height: 2
+ m_Height: 1.85
m_BaseOffset: 1
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
@@ -3763,13 +3693,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
State: 0
- Barrels: {fileID: 690365494}
+ Barrels: {fileID: 829512619}
Beers: {fileID: 967590505}
WaitingPlace: {fileID: 297387833}
- Reach: 1.3
Agent: {fileID: 1050815511}
Animator: {fileID: 1048970148}
Manager: {fileID: 2001424748}
+ HeldItem: {fileID: 1354612706}
--- !u!136 &1050815513
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -3780,7 +3710,7 @@ CapsuleCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
- m_Radius: 0.5
+ m_Radius: 0.35
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
@@ -3846,7 +3776,7 @@ Transform:
m_Children:
- {fileID: 1191640707}
m_Father: {fileID: 2135727429}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: -128.992, z: 0}
--- !u!1001 &1054960112
PrefabInstance:
@@ -4024,6 +3954,7 @@ Transform:
- {fileID: 1733275198}
- {fileID: 1499804431}
- {fileID: 967590505}
+ - {fileID: 829512619}
m_Father: {fileID: 991757214}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4065,6 +3996,144 @@ Transform:
m_Father: {fileID: 2023407934}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1161848717
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2135727429}
+ m_Modifications:
+ - target: {fileID: 85110251861136171, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 633521342487398843, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: BeerPosition
+ value:
+ objectReference: {fileID: 1499804431}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SeatPosition
+ value:
+ objectReference: {fileID: 1405605992}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: Manager
+ value:
+ objectReference: {fileID: 2001424748}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: DrinkingTime
+ value: 24
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SleepTime
+ value: 5.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: State
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SittingTransform
+ value:
+ objectReference: {fileID: 1855542356}
+ - target: {fileID: 801104722722870835, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_Name
+ value: Patron2
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870837, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_Speed
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -5.82
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -2.37
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1548029515793789699, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1716166615211483106, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2770901955310732019, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2819313456548396671, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3242370752577289071, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4674530237397408548, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4900350708232332857, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5694031721063032766, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6049683462914989395, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+--- !u!4 &1161848718 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ m_PrefabInstance: {fileID: 1161848717}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1187261086
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4380,6 +4449,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
m_PrefabInstance: {fileID: 1376841062}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1354612706 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ m_PrefabInstance: {fileID: 73712658}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1358968836
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4393,7 +4467,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8076468875683243513, guid: d394234d25fe8ba4e86e88fe437dd8fd, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.81
+ value: -0.98
objectReference: {fileID: 0}
- target: {fileID: 8076468875683243513, guid: d394234d25fe8ba4e86e88fe437dd8fd, type: 3}
propertyPath: m_LocalPosition.z
@@ -4478,7 +4552,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
propertyPath: m_LocalPosition.x
- value: 6.143
+ value: 6.374
objectReference: {fileID: 0}
- target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
propertyPath: m_LocalPosition.y
@@ -4486,7 +4560,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
propertyPath: m_LocalPosition.z
- value: -3.928
+ value: -4.193
objectReference: {fileID: 0}
- target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
propertyPath: m_LocalRotation.x
@@ -4506,7 +4580,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
propertyPath: m_RootOrder
- value: 0
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4543,7 +4617,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.y
- value: 18.702723
+ value: 18.673
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.z
@@ -4611,12 +4685,18 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1405605991}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.94, y: 0.939, z: -2.44}
+ m_LocalPosition: {x: -6.645, y: 0, z: -2.389}
m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
+ m_Children:
+ - {fileID: 1855542356}
m_Father: {fileID: 1733275198}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1456985507 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7818972388342989575, guid: d394234d25fe8ba4e86e88fe437dd8fd, type: 3}
+ m_PrefabInstance: {fileID: 1358968836}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1465767666
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4799,7 +4879,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1499804430}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.189, y: 1, z: 0.824}
+ m_LocalPosition: {x: 7.337, y: 1, z: 1.067}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1121604066}
@@ -5320,12 +5400,86 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1697476265}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.166, y: 0.939, z: 4.426}
+ m_LocalPosition: {x: 0.516, y: 0, z: 4.263}
m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
+ m_Children:
+ - {fileID: 842166083}
m_Father: {fileID: 1733275198}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1708335391
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 637187262}
+ m_Modifications:
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.00078
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00047
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00105
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.6043425
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.7965088
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.011208617
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.014772652
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -2.047
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -179.428
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 74.368
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.0062444
+ objectReference: {fileID: 0}
+ - target: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_Name
+ value: Pivo
+ objectReference: {fileID: 0}
+ - target: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
--- !u!1 &1712369298
GameObject:
m_ObjectHideFlags: 0
@@ -5387,6 +5541,7 @@ Transform:
m_Children:
- {fileID: 1697476266}
- {fileID: 1405605992}
+ - {fileID: 1922239055}
m_Father: {fileID: 1121604066}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5562,6 +5717,36 @@ Transform:
m_CorrespondingSourceObject: {fileID: 90222651654754150, guid: 09d90488eb053fb4a9f2a96f428c1598, type: 3}
m_PrefabInstance: {fileID: 1500118682}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1855542355
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1855542356}
+ m_Layer: 0
+ m_Name: sitting2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1855542356
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1855542355}
+ m_LocalRotation: {x: 0, y: -0.38252217, z: 0, w: 0.9239463}
+ m_LocalPosition: {x: -0.649, y: 1, z: 0.649}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1405605992}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: -44.98, z: 0}
--- !u!1001 &1867232879
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5701,6 +5886,37 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 96c71504d0acbc6459a8a0b0ebfa127b, type: 3}
+--- !u!1 &1922239054
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1922239055}
+ m_Layer: 0
+ m_Name: seat3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1922239055
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1922239054}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 4.268, y: 0, z: -6.291}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 659207166}
+ m_Father: {fileID: 1733275198}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1922634887
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6304,6 +6520,148 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 96c71504d0acbc6459a8a0b0ebfa127b, type: 3}
+--- !u!1001 &2031562204
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2135727429}
+ m_Modifications:
+ - target: {fileID: 481302951790756455, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: DrinkingTime
+ value: 21.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SleepTime
+ value: 6.35
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: BeerPosition
+ value:
+ objectReference: {fileID: 1499804431}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: Manager
+ value:
+ objectReference: {fileID: 2001424748}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: State
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SeatPosition
+ value:
+ objectReference: {fileID: 1922239055}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SittingTransform
+ value:
+ objectReference: {fileID: 659207166}
+ - target: {fileID: 801104722722870835, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_Name
+ value: Patron3
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 4.09
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -4.921
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2770901955310732019, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4035283392045466258, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4396174301711273009, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4674530237397408548, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4900350708232332857, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5461788212884598437, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5593433297460660484, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5694031721063032766, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6049683462914989395, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6245356387500748512, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7033342885561873991, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7630927069253383047, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+--- !u!4 &2031562205 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ m_PrefabInstance: {fileID: 2031562204}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2135727428
GameObject:
m_ObjectHideFlags: 0
@@ -6331,14 +6689,100 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 472725909}
+ - {fileID: 1161848718}
+ - {fileID: 2031562205}
- {fileID: 1776606525}
- {fileID: 1272232469}
- - {fileID: 472725909}
- - {fileID: 483637943}
- {fileID: 1050815516}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &801104722389233571
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2135727429}
+ m_Modifications:
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: BeerPosition
+ value:
+ objectReference: {fileID: 1499804431}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SeatPosition
+ value:
+ objectReference: {fileID: 1697476266}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: Manager
+ value:
+ objectReference: {fileID: 2001424748}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: SittingTransform
+ value:
+ objectReference: {fileID: 842166083}
+ - target: {fileID: 801104722722870834, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: State
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870835, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_Name
+ value: Patron1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870837, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_Speed
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870837, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_StoppingDistance
+ value: 0.4
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 4.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -1.41
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 801104722722870838, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: e8f48935439c60044bdefa3a4d88d99a, type: 3}
--- !u!1001 &1041221331941220805
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6352,7 +6796,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.y
- value: 18.702723
+ value: 18.678
objectReference: {fileID: 0}
- target: {fileID: 5787971219544792173, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
propertyPath: m_LocalPosition.z
diff --git a/Assets/Scenes/hospoda/NavMesh.asset b/Assets/Scenes/hospoda/NavMesh.asset
index a26fbbde307f9d1d8c05f3895ed64f43c1cac67b..210da1c7caf56d55fef0bd54e739ebb0cefb87bb 100644
Binary files a/Assets/Scenes/hospoda/NavMesh.asset and b/Assets/Scenes/hospoda/NavMesh.asset differ
diff --git a/Assets/Scripts/AI/BeerMaster.cs b/Assets/Scripts/AI/BeerMaster.cs
index faf179bb9e497e12d10aef19805467fe3d4c4f8a..e6b70fd2ee7b9b28e3cc608f34a33245f3d43eb9 100644
--- a/Assets/Scripts/AI/BeerMaster.cs
+++ b/Assets/Scripts/AI/BeerMaster.cs
@@ -1,68 +1,103 @@
-using UnityEngine;
-using UnityEngine.AI;
-
-namespace Nudle.Scripts.AI
-{
- public class BeerMaster : MonoBehaviour
- {
- [SerializeField]
- private AIState State = AIState.WAITING;
- public Transform Barrels;
- public Transform Beers;
- public Transform WaitingPlace;
- public float Reach;
- public NavMeshAgent Agent;
- public Animator Animator;
- public BeerManager Manager;
-
- internal void Update()
- {
- switch (State)
- {
- case AIState.WAITING:
+using UnityEngine;
+using UnityEngine.AI;
+
+namespace Nudle.Scripts.AI
+{
+ public class BeerMaster : MonoBehaviour
+ {
+ [SerializeField]
+ private AIState State = AIState.WAITING;
+
+ public Transform Barrels;
+ public Transform Beers;
+ public Transform WaitingPlace;
+ public NavMeshAgent Agent;
+ public Animator Animator;
+ public BeerManager Manager;
+
+ public GameObject HeldItem;
+
+ private float Timer;
+ private bool ShouldGetBeers;
+
+ internal void Update()
+ {
+ switch (State)
+ {
+ case AIState.WAITING:
+ if (Agent.remainingDistance <= 0.01f)
+ Animator.SetBool("isWalking", false);
+ if (ShouldGetBeers)
{
- Animator.SetBool("isGrabingItem", false);
- Animator.SetBool("isWalking", false);
- }
- break;
- case AIState.GETTING_BEERS:
- if (Vector3.Distance(transform.position, Barrels.position) <= Reach)
- {
- Agent.destination = Beers.position;
- State = AIState.RETURNING;
- Animator.SetBool("isGrabingItem", false);
- Animator.SetBool("isWalking", true);
- }
- break;
- case AIState.RETURNING:
- if (Vector3.Distance(transform.position, Beers.position) <= Reach)
- {
- Agent.destination = WaitingPlace.position;
- State = AIState.WAITING;
- Manager.SendMessage("PlaceBeers");
- Animator.SetBool("isWalking", true);
- Animator.SetBool("isGrabingItem", false);
- }
- break;
- }
- }
-
- public void GrabBeers()
- {
- if (State == AIState.WAITING)
- {
- State = AIState.GETTING_BEERS;
- Agent.destination = Barrels.position;
- Animator.SetBool("isWalking", false);
- Animator.SetBool("isGrabingItem", true);
- }
- }
-
- private enum AIState
- {
- WAITING,
- GETTING_BEERS,
- RETURNING,
- }
- }
-}
+ State = AIState.GETTING_BEERS;
+ Agent.destination = Barrels.position;
+ Animator.SetBool("isWalking", true);
+ ShouldGetBeers = false;
+ }
+ break;
+
+ case AIState.GETTING_BEERS:
+ if (Agent.remainingDistance <= 0.01f)
+ {
+ State = AIState.GRABBING;
+ Timer = 2.5f;
+ Animator.SetTrigger("Grab");
+ Animator.SetBool("isWalking", false);
+ }
+ break;
+
+ case AIState.RETURNING:
+ if (Agent.remainingDistance <= 0.01f)
+ {
+ State = AIState.PLACING_BEERS;
+ Timer = 2.5f;
+ Animator.SetTrigger("Place");
+ Animator.SetBool("isWalking", false);
+ }
+ break;
+
+ case AIState.GRABBING:
+ Timer -= Time.deltaTime;
+ if (Timer <= 0f)
+ {
+ Agent.destination = Beers.position;
+ State = AIState.RETURNING;
+ Animator.SetBool("isWalking", true);
+ Animator.SetBool("hasBeer", true);
+ HeldItem.SetActive(true);
+ }
+ break;
+
+ case AIState.PLACING_BEERS:
+ Timer -= Time.deltaTime;
+ if (Timer <= 0f)
+ {
+ Agent.destination = WaitingPlace.position;
+ State = AIState.WAITING;
+ Manager.SendMessage("PlaceBeers");
+ Animator.SetBool("isWalking", true);
+ Animator.SetBool("hasBeer", false);
+ HeldItem.SetActive(false);
+ }
+ break;
+ }
+ }
+
+ public void GrabBeers()
+ {
+ if (State == AIState.WAITING)
+ {
+ ShouldGetBeers = true;
+ }
+ }
+
+ private enum AIState
+ {
+ WAITING,
+ GETTING_BEERS,
+ RETURNING,
+ GRABBING,
+ PLACING_BEERS,
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/AI/Patron.cs b/Assets/Scripts/AI/Patron.cs
index 2603daa54930771ee86a3e3f55d31594355aab8e..8d2763a3a146eb01ffece95845ce84fc56a25bb4 100644
--- a/Assets/Scripts/AI/Patron.cs
+++ b/Assets/Scripts/AI/Patron.cs
@@ -7,15 +7,24 @@ namespace Nudle.Scripts.AI
{
public Transform BeerPosition;
public Transform SeatPosition;
- public float Reach;
+ public Transform SittingTransform;
public BeerManager Manager;
+ public Animator Animator;
+ public GameObject Beer;
[SerializeField]
- private AIState State = AIState.SITTING_WITHOUT_BEER;
+ private AIState State = AIState.SEEKING_BEER;
+
private float Timer;
private NavMeshAgent Agent;
- public float SleepTime = 1f;
+ public float DrinkingTime = 25f;
+ public float SleepTime = 6f;
+
+ private readonly float LerpTotalTime = 1.2f;
+ private float LerpTime;
+ private Vector3 OriginalPos;
+ private Vector3 OriginalRot;
internal void Start()
{
@@ -30,6 +39,10 @@ namespace Nudle.Scripts.AI
SittingWithoutBeer();
break;
+ case AIState.GETTING_UP:
+ GettingUp();
+ break;
+
case AIState.SEEKING_BEER:
SeekingBeer();
break;
@@ -38,6 +51,10 @@ namespace Nudle.Scripts.AI
ReturningToSeat();
break;
+ case AIState.SITTING_DOWN:
+ SittingDown();
+ break;
+
case AIState.SITTING_WITH_BEER:
SittingWithBeer();
break;
@@ -54,7 +71,7 @@ namespace Nudle.Scripts.AI
if (Timer <= 0)
{
State = AIState.DRINKING;
- Timer = SleepTime;
+ Timer = DrinkingTime;
}
}
@@ -63,15 +80,21 @@ namespace Nudle.Scripts.AI
Timer -= Time.deltaTime;
if (Timer <= 0 && Manager.AvailibleBeers() > 0)
{
- State = AIState.SEEKING_BEER;
- Agent.destination = BeerPosition.position;
+ State = AIState.GETTING_UP;
+ Animator.SetTrigger("StandUp");
+ Animator.ResetTrigger("Sit");
+ LerpTime = 0;
+ OriginalPos = gameObject.transform.position;
+ OriginalRot = gameObject.transform.rotation.eulerAngles;
}
}
private void DrinkingBeer()
{
- // TODO: PLAY DRINKING ANIMATION
+ if (Timer > 19f && Timer < 21f)
+ Animator.SetTrigger("Drink");
Timer -= Time.deltaTime;
+ Beer.SetActive(Animator.GetCurrentAnimatorStateInfo(0).IsTag("Drinking"));
if (Timer <= 0)
{
State = AIState.SITTING_WITHOUT_BEER;
@@ -81,28 +104,64 @@ namespace Nudle.Scripts.AI
private void SeekingBeer()
{
- if (Vector3.Distance(transform.position, BeerPosition.position) <= Reach && Manager.AvailibleBeers() > 0)
+ if (Agent.remainingDistance <= Agent.stoppingDistance + 0.01f && Manager.AvailibleBeers() > 0)
{
- State = AIState.RETURNING_TO_SEAT;
- Agent.destination = SeatPosition.position;
- Manager.SendMessage("RemoveBeer");
+ Animator.SetTrigger("Grab");
+ if (Animator.GetNextAnimatorStateInfo(0).IsName("WalkingBeer"))
+ {
+ Animator.ResetTrigger("Grab");
+ State = AIState.RETURNING_TO_SEAT;
+ Agent.destination = SeatPosition.position;
+ Manager.SendMessage("RemoveBeer");
+ }
}
}
private void ReturningToSeat()
{
- if (Vector3.Distance(transform.position, SeatPosition.position) <= Reach)
+ if (Agent.remainingDistance <= Agent.stoppingDistance + 0.01f)
+ {
+ State = AIState.SITTING_DOWN;
+ Animator.SetBool("isWalking", false);
+ Agent.enabled = false;
+ Animator.SetTrigger("Sit");
+ Animator.ResetTrigger("StandUp");
+ LerpTime = 0;
+ OriginalPos = gameObject.transform.position;
+ OriginalRot = gameObject.transform.rotation.eulerAngles;
+ }
+ }
+
+ private void SittingDown()
+ {
+ LerpTime += Time.deltaTime;
+ gameObject.transform.position = Vector3.Lerp(OriginalPos, SittingTransform.position, LerpTime / LerpTotalTime);
+ gameObject.transform.rotation = Quaternion.Euler(Vector3.Lerp(OriginalRot, SittingTransform.rotation.eulerAngles, LerpTime / LerpTotalTime));
+ if (Animator.GetCurrentAnimatorStateInfo(0).IsTag("SittingIdle"))
{
State = AIState.SITTING_WITH_BEER;
Timer = SleepTime;
}
}
+ private void GettingUp()
+ {
+ if (Animator.GetCurrentAnimatorStateInfo(0).IsTag("Idle"))
+ {
+ State = AIState.SEEKING_BEER;
+ Agent.enabled = true;
+ Agent.destination = BeerPosition.position;
+ Animator.SetBool("isWalking", true);
+ }
+ }
+
private enum AIState
{
SITTING_WITHOUT_BEER,
+ GETTING_UP,
SEEKING_BEER,
RETURNING_TO_SEAT,
+ SITTING_DOWN,
SITTING_WITH_BEER,
DRINKING,
}
diff --git a/Assets/Scripts/BeerHider.cs b/Assets/Scripts/BeerHider.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f46916048646b40ea0cad258af09a90066de1370
--- /dev/null
+++ b/Assets/Scripts/BeerHider.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Nudle.Scripts
+{
+ public class BeerHider : MonoBehaviour
+ {
+ public Animator Animator;
+ public GameObject Beer;
+
+ internal void Update()
+ {
+ Beer.SetActive(Animator.GetCurrentAnimatorStateInfo(0).IsTag("Drinking"));
+ }
+ }
+}
diff --git a/Assets/Scripts/BeerHider.cs.meta b/Assets/Scripts/BeerHider.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..28a2839a3a85f47a3f0373e1e72963a465f26475
--- /dev/null
+++ b/Assets/Scripts/BeerHider.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eeb359b26c404e44c81bea7feb909447
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset
index d53f9de6a86810edddf3841cf437c2f49f744f0f..fe36c315aec47f8978dcfabe0af6974b89b46693 100644
--- a/ProjectSettings/NavMeshAreas.asset
+++ b/ProjectSettings/NavMeshAreas.asset
@@ -73,8 +73,8 @@ NavMeshProjectSettings:
m_Settings:
- serializedVersion: 2
agentTypeID: 0
- agentRadius: 0.5
- agentHeight: 2
+ agentRadius: 0.35
+ agentHeight: 1.8
agentSlope: 45
agentClimb: 0.75
ledgeDropHeight: 0