From 9088ec6d47ccd2d4c58023f0183c5f617fa5c6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20=C5=A0ev=C4=8D=C3=ADk?= <sevcika1@fit.cvut.cz>
Date: Fri, 15 Jan 2021 21:04:19 +0100
Subject: [PATCH] Improve inn scene
Fix Beermaster race condition
Add animations to beermaster
Replace tictacs with people
---
.../Innkeeper/temp_innkeeper.controller | 261 +++-
.../Characters/NPC Presets/patron.controller | 739 ++++++++++++
.../NPC Presets/patron.controller.meta | 8 +
.../temp_inn_idle_guard.controller | 12 +-
Assets/Prefabs/Patron.prefab | 331 ++++++
Assets/Prefabs/Patron.prefab.meta | 7 +
Assets/Prefabs/Pivo.prefab | 2 +-
Assets/Prefabs/Pullitr.prefab | 2 +-
Assets/Scenes/hospoda.unity | 1048 ++++++++++++-----
Assets/Scenes/hospoda/NavMesh.asset | Bin 14732 -> 18500 bytes
Assets/Scripts/AI/BeerMaster.cs | 169 +--
Assets/Scripts/AI/Patron.cs | 83 +-
Assets/Scripts/BeerHider.cs | 17 +
Assets/Scripts/BeerHider.cs.meta | 11 +
ProjectSettings/NavMeshAreas.asset | 4 +-
15 files changed, 2255 insertions(+), 439 deletions(-)
create mode 100644 Assets/Characters/NPC Presets/patron.controller
create mode 100644 Assets/Characters/NPC Presets/patron.controller.meta
create mode 100644 Assets/Prefabs/Patron.prefab
create mode 100644 Assets/Prefabs/Patron.prefab.meta
create mode 100644 Assets/Scripts/BeerHider.cs
create mode 100644 Assets/Scripts/BeerHider.cs.meta
diff --git a/Assets/Characters/Innkeeper/temp_innkeeper.controller b/Assets/Characters/Innkeeper/temp_innkeeper.controller
index 23f57cf..dcf7ce5 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 0000000..c0f2247
--- /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 0000000..c3ed218
--- /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 1265a94..cd40c3d 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 0000000..911507b
--- /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 0000000..abf1dbe
--- /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 be0a8d7..c17d1c9 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 1463d9e..fb2adce 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 9882e33..d779446 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
GIT binary patch
literal 18500
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
Ipq%XVztq6XSO5S3
literal 14732
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
diff --git a/Assets/Scripts/AI/BeerMaster.cs b/Assets/Scripts/AI/BeerMaster.cs
index faf179b..e6b70fd 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 2603daa..8d2763a 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 0000000..f469160
--- /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 0000000..28a2839
--- /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 d53f9de..fe36c31 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
--
GitLab