diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 0e84eab9a..fd71ac061 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -4329,54 +4329,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 360820267} m_CullTransparentMesh: 1 ---- !u!1 &373177638 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 373177640} - - component: {fileID: 373177639} - m_Layer: 0 - m_Name: CustomerManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &373177639 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373177638} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7ab08469541b2aa45818fa36bbcb9cf7, type: 3} - m_Name: - m_EditorClassIdentifier: - _customerPrefab: {fileID: -2302002259734456648, guid: 23195e611c71ad44b8a1ccb2b6e0efe5, type: 3} - _customerSpawnTransform: {fileID: 1038321203} - _checkEmptySeatInterval: 0.5 - k__BackingField: [] ---- !u!4 &373177640 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373177638} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &389901520 GameObject: m_ObjectHideFlags: 0 @@ -18518,6 +18470,8 @@ GameObject: - component: {fileID: 1665075872} - component: {fileID: 1665075873} - component: {fileID: 1665075874} + - component: {fileID: 1665075876} + - component: {fileID: 1665075875} m_Layer: 0 m_Name: TycoonManager m_TagString: Untagged @@ -18558,6 +18512,8 @@ MonoBehaviour: k__BackingField: {fileID: 1665075872} k__BackingField: {fileID: 1665075873} k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} _dailyBgm: TycoonDailyBgm1 k__BackingField: _maxLevel: 0 @@ -18640,14 +18596,49 @@ MonoBehaviour: m_EditorClassIdentifier: _cleanerCrewPrefab: {fileID: 3226241112093390236, guid: fb1e288d64b813b4a9929ba9ece44956, type: 3} _servingCrewPrefab: {fileID: 1745629821853633206, guid: b692f61d994a0b94cb92cf0f2d47cfb2, type: 3} - _bartenderCrewPrefab: {fileID: 0} + _bartenderCrewPrefab: {fileID: 529038307721658883, guid: 6c1ef58eadd33b64081c2586a3ac56a8, type: 3} _cleanerCrewSpawnTransform: {fileID: 887608712} _servingCrewSpawnTransform: {fileID: 473619456} - _bartenderCrewSpawnTransform: {fileID: 181975870} + _bartenderCrewSpawnTransforms: + - {fileID: 7827484746149782382} + - {fileID: 7827484746149782381} + - {fileID: 7827484746149782380} + - {fileID: 7827484746149782379} + - {fileID: 7827484746149782378} k__BackingField: [] k__BackingField: [] k__BackingField: [] k__BackingField: [] +--- !u!114 &1665075875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665075867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03e84488b3da65549a78d481636713a3, type: 3} + m_Name: + m_EditorClassIdentifier: + _servingTableRoot: {fileID: 2111687862} + _servingTables: [] +--- !u!114 &1665075876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665075867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7ab08469541b2aa45818fa36bbcb9cf7, type: 3} + m_Name: + m_EditorClassIdentifier: + _customerPrefab: {fileID: -2302002259734456648, guid: 23195e611c71ad44b8a1ccb2b6e0efe5, type: 3} + _customerSpawnTransform: {fileID: 1038321203} + _checkEmptySeatInterval: 0.5 + k__BackingField: [] --- !u!1 &1670140492 GameObject: m_ObjectHideFlags: 0 @@ -24743,6 +24734,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108304083} m_CullTransparentMesh: 1 +--- !u!4 &2111687862 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4798925548635759970, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2130676465 PrefabInstance: m_ObjectHideFlags: 0 @@ -25477,6 +25473,10 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2275391276448498687, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2454870148848361598, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x value: 0.10645447 @@ -27168,6 +27168,31 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} +--- !u!4 &7827484746149782378 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3899178134964407113, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7827484746149782379 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2105161330376411049, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7827484746149782380 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7954596617158864844, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7827484746149782381 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5132263271615600687, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7827484746149782382 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 112080237734196469, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8086743652407108747 PrefabInstance: m_ObjectHideFlags: 0 @@ -27341,7 +27366,6 @@ SceneRoots: - {fileID: 91463582} - {fileID: 1472541870} - {fileID: 1665075868} - - {fileID: 373177640} - {fileID: 338206472} - {fileID: 141729588} - {fileID: 852387592} diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/MakingCocktail.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/MakingCocktail.cs new file mode 100644 index 000000000..cf668cba8 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/MakingCocktail.cs @@ -0,0 +1,29 @@ +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Crews; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Crew/BartenderCrew")] + public class MakingCocktail : Action + { + private BartenderCrew _bartenderCrew; + + public override void OnAwake() + { + _bartenderCrew = GetComponent(); + } + + public override void OnStart() + { + _bartenderCrew.MakingCocktail(); + } + + public override TaskStatus OnUpdate() + { + if (!_bartenderCrew.BalloonUi.IsWaitTimeOver()) return TaskStatus.Running; + + _bartenderCrew.CompletedMakingCocktail(); + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/MakingCocktail.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/MakingCocktail.cs.meta new file mode 100644 index 000000000..a9af50d0a --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/MakingCocktail.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 323974932928ca745b53f51449c24bbc diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs new file mode 100644 index 000000000..a3972d51c --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs @@ -0,0 +1,49 @@ +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Crews; +using BlueWater.Tycoons; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Crew/ServerCrew")] + public class Refind : Action + { + private ServerCrew _serverCrew; + private ServingTable _emptyServingTable; + + public override void OnAwake() + { + _serverCrew = GetComponent(); + } + + public override TaskStatus OnUpdate() + { + var tycoonManager = TycoonManager.Instance; + var orderedCustomer = tycoonManager.CustomerController.FindCustomerMatchingItem(_serverCrew.CurrentPickupItem); + + if (orderedCustomer != null) + { + orderedCustomer.IsMatchedServer = true; + _serverCrew.OrderedCustomer = orderedCustomer; + _serverCrew.CrewInteraction = orderedCustomer; + + return TaskStatus.Success; + } + + if (_emptyServingTable == null) + { + _emptyServingTable = tycoonManager.ServingTableController.FindEmptyServingTable(); + _serverCrew.CrewInteraction = _emptyServingTable; + return TaskStatus.Running; + } + + _serverCrew.AIMovement.Move(_emptyServingTable.CenterTransform.position); + + if (!_serverCrew.CanInteractionPosition()) return TaskStatus.Running; + + _serverCrew.AIMovement.StopMove(); + _serverCrew.CrewInteraction.InteractionCrew(_serverCrew); + + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs.meta new file mode 100644 index 000000000..50ddd60b0 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Action/Refind.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e221d1e8881662145991fe3b3bbe49a7 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/CheckOrderedCocktail.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/CheckOrderedCocktail.cs new file mode 100644 index 000000000..eea596faf --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/CheckOrderedCocktail.cs @@ -0,0 +1,21 @@ +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Crews; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Crew/BartenderCrew")] + public class CheckOrderedCocktail : Conditional + { + private BartenderCrew _bartenderCrew; + + public override void OnAwake() + { + _bartenderCrew = GetComponent(); + } + + public override TaskStatus OnUpdate() + { + return _bartenderCrew.IsOnMission ? TaskStatus.Success : TaskStatus.Failure; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/CheckOrderedCocktail.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/CheckOrderedCocktail.cs.meta new file mode 100644 index 000000000..452f3ba1f --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/CheckOrderedCocktail.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3f7649c82776ef143ae43ddd1c953267 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Cleaning.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs similarity index 81% rename from Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Cleaning.cs rename to Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs index 27b2f8e9f..50db60022 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Cleaning.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs @@ -23,19 +23,13 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - if (_crew.CrewInteraction == null) + if (_crew.CrewInteraction == null || !_crew.CrewInteraction.CanInteractionCrew()) { _crew.AIMovement.StopMove(); _crew.ResetMission(); return TaskStatus.Failure; } - if (!_crew.CrewInteraction.CanInteractionCrew()) - { - _crew.AIMovement.StopMove(); - return TaskStatus.Failure; - } - if (!_crew.CanInteractionPosition()) return TaskStatus.Running; _crew.AIMovement.StopMove(); diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Cleaning.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs.meta similarity index 100% rename from Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Cleaning.cs.meta rename to Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/OnMission.cs.meta diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs new file mode 100644 index 000000000..aadcf9700 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs @@ -0,0 +1,43 @@ +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Crews; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Crew/ServerCrew")] + public class Serving : Conditional + { + private ServerCrew _serverCrew; + + public override void OnAwake() + { + _serverCrew = GetComponent(); + } + + public override void OnStart() + { + _serverCrew.CrewInteraction = _serverCrew.OrderedCustomer; + if (_serverCrew.CrewInteraction != null) + { + _serverCrew.AIMovement.Move(_serverCrew.CrewInteraction.CenterTransform.position); + } + } + + public override TaskStatus OnUpdate() + { + if (!_serverCrew.CrewInteraction.CanInteractionCrew()) + { + _serverCrew.AIMovement.StopMove(); + _serverCrew.OrderedCustomer = null; + _serverCrew.CrewInteraction = null; + return TaskStatus.Failure; + } + + if (!_serverCrew.CanInteractionPosition()) return TaskStatus.Running; + + _serverCrew.AIMovement.StopMove(); + _serverCrew.CrewInteraction.InteractionCrew(_serverCrew); + + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs.meta new file mode 100644 index 000000000..534e8393c --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/Serving.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 82e10d305650ed049ad92311a5e3d40c diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs new file mode 100644 index 000000000..a60ac2323 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs @@ -0,0 +1,43 @@ +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Npcs.Crews; + +namespace BlueWater.BehaviorTrees.Actions +{ + [TaskCategory("Custom/Npc/Crew/ServerCrew")] + public class TakeServingItem : Conditional + { + private ServerCrew _serverCrew; + + public override void OnAwake() + { + _serverCrew = GetComponent(); + } + + public override void OnStart() + { + if (_serverCrew.CrewInteraction != null && _serverCrew.CurrentPickupItem == null) + { + _serverCrew.AIMovement.Move(_serverCrew.CrewInteraction.CenterTransform.position); + } + } + + public override TaskStatus OnUpdate() + { + if (_serverCrew.CurrentPickupItem != null) return TaskStatus.Success; + + if (_serverCrew.CrewInteraction == null || !_serverCrew.CrewInteraction.CanInteractionCrew()) + { + _serverCrew.AIMovement.StopMove(); + _serverCrew.ResetMission(); + return TaskStatus.Failure; + } + + if (!_serverCrew.CanInteractionPosition()) return TaskStatus.Running; + + _serverCrew.AIMovement.StopMove(); + _serverCrew.CrewInteraction.InteractionCrew(_serverCrew); + + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs.meta b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs.meta new file mode 100644 index 000000000..3b9a6282c --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Npc/Crew/Conditional/TakeServingItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2fff0f43a8dff044d9916e32e96c7452 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs index 396ed1370..e425606e1 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/Vomit.cs @@ -13,7 +13,8 @@ namespace BlueWater.BehaviorTrees.Actions public class Vomit : Action { private Customer _customer; - private bool _isVomit; + private bool _canVomit; + private bool _isVomiting; private Vector3 _vomitingPosition; public override void OnAwake() @@ -26,7 +27,7 @@ namespace BlueWater.BehaviorTrees.Actions var random = Random.Range(0f, 100f); if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingPercent) { - _isVomit = true; + _canVomit = true; _vomitingPosition = _customer.AIMovement.SetRandomPoint(); _customer.AIMovement.Move(_vomitingPosition); } @@ -34,12 +35,18 @@ namespace BlueWater.BehaviorTrees.Actions public override TaskStatus OnUpdate() { - if (!_isVomit) return TaskStatus.Success; + if (!_canVomit) return TaskStatus.Success; if (!_customer.AIMovement.HasReachedDestination()) return TaskStatus.Running; + + if (!_isVomiting) + { + _customer.Vomit(); + _isVomiting = true; + return TaskStatus.Running; + } - _customer.Vomit(); - return TaskStatus.Success; + return _customer.IsVomited ? TaskStatus.Success : TaskStatus.Running; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/Crew/BartenderCrew.cs b/Assets/02.Scripts/Character/Npc/Crew/BartenderCrew.cs index 9efab0fc9..2e90f08e6 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/BartenderCrew.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/BartenderCrew.cs @@ -1,9 +1,46 @@ -using UnityEngine; +using BlueWater.Npcs.Customers; +using BlueWater.Tycoons; namespace BlueWater.Npcs.Crews { public class BartenderCrew: Crew { + public BartenderTable MyBartenderTable { get; private set; } + public Customer OrderedCustomer { get; set; } + public override void ResetMission() + { + base.ResetMission(); + + OrderedCustomer = null; + } + + public void SetBartenderTable(BartenderTable bartenderTable) => MyBartenderTable = bartenderTable; + + public void SetOrderedCustomer(Customer orderedCustomer) + { + OrderedCustomer = orderedCustomer; + IsOnMission = true; + } + + public void MakingCocktail() + { + OrderedCustomer.CurrentBill.BartenderMakingCocktail(); + BalloonUi.OrderItem(OrderedCustomer.OrderedCocktailData.Idx, 0, 15); + + IsMakingCocktail = true; + } + + public void CompletedMakingCocktail() + { + if (OrderedCustomer.CurrentBill) + { + OrderedCustomer.CurrentBill.BartenderCompleteMakingCocktail(); + } + BalloonUi.DiscardItem(); + MyBartenderTable.CompleteMakingCocktail(OrderedCustomer.OrderedCocktailData); + IsMakingCocktail = false; + ResetMission(); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/Crew/Crew.cs b/Assets/02.Scripts/Character/Npc/Crew/Crew.cs index b53207e0e..bbd26516c 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/Crew.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/Crew.cs @@ -14,6 +14,7 @@ namespace BlueWater.Npcs.Crews { public const string Idle = "Idle"; public const string Walk = "Run"; + public const string ServingIdle = "ServingIdle"; public const string Serving = "Serving"; public const string CleaningFloor = "CleaningFloor"; public const string CleaningTable = "CleaningTable"; @@ -75,7 +76,7 @@ namespace BlueWater.Npcs.Crews } } - public ICrewInteraction CrewInteraction { get; protected set; } + public ICrewInteraction CrewInteraction { get; set; } public bool IsOnMission { get; set; } public bool IsCleaningFloor { get; set; } public bool IsCleaningTable { get; set; } @@ -89,9 +90,10 @@ namespace BlueWater.Npcs.Crews public IState CurrentState { get; private set; } public IState IdleState { get; private set; } public IState WalkingState { get; private set; } + public IState ServingIdleState { get; private set; } + public IState ServingState { get; private set; } public IState CleaningFloorState { get; private set; } public IState CleaningTableState { get; private set; } - public IState ServingState { get; private set; } public IState MakingCocktailState { get; private set; } #endregion @@ -141,6 +143,7 @@ namespace BlueWater.Npcs.Crews { IdleState = new IdleState(); WalkingState = new WalkingState(); + ServingIdleState = new ServingIdleState(); ServingState = new ServingState(); CleaningFloorState = new CleaningFloorState(); CleaningTableState = new CleaningTableState(); diff --git a/Assets/02.Scripts/Character/Npc/Crew/ServerCrew.cs b/Assets/02.Scripts/Character/Npc/Crew/ServerCrew.cs index 0d37ecb5e..e46dc574d 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/ServerCrew.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/ServerCrew.cs @@ -1,10 +1,19 @@ using BlueWater.Interfaces; -using UnityEngine; +using BlueWater.Npcs.Customers; namespace BlueWater.Npcs.Crews { public class ServerCrew: Crew { + public Customer OrderedCustomer { get; set; } + public IPickup CurrentPickupItem { get; set; } + public override void ResetMission() + { + base.ResetMission(); + + OrderedCustomer = null; + CurrentPickupItem = null; + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Npc/Crew/State/ServingIdleState.cs b/Assets/02.Scripts/Character/Npc/Crew/State/ServingIdleState.cs new file mode 100644 index 000000000..bf73ebef4 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Crew/State/ServingIdleState.cs @@ -0,0 +1,39 @@ +using BlueWater.Interfaces; + +namespace BlueWater.Npcs.Crews +{ + public class ServingIdleState : IState + { + public void EnterState(Crew character) + { + character.SpineController.PlayAnimation(CrewSpineAnimation.ServingIdle, true); + } + + public void UpdateState(Crew character) + { + if (character.IsMoving) + { + if (character.IsServing) + { + character.TransitionToState(character.WalkingState); + } + else + { + character.TransitionToState(character.ServingState); + } + } + else if (!character.IsMoving) + { + if (!character.IsServing) + { + character.TransitionToState(character.IdleState); + } + } + } + + public void ExitState(Crew character) + { + + } + } +} diff --git a/Assets/02.Scripts/Character/Npc/Crew/State/ServingIdleState.cs.meta b/Assets/02.Scripts/Character/Npc/Crew/State/ServingIdleState.cs.meta new file mode 100644 index 000000000..cf477252b --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Crew/State/ServingIdleState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: afd7c038ff62b644f98d20d220bb13a8 diff --git a/Assets/02.Scripts/Character/Npc/Crew/State/ServingState.cs b/Assets/02.Scripts/Character/Npc/Crew/State/ServingState.cs index 24b53d79b..0e01fea71 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/State/ServingState.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/State/ServingState.cs @@ -11,15 +11,23 @@ namespace BlueWater.Npcs.Crews public void UpdateState(Crew character) { - if (character.IsServing) return; - if (character.IsMoving) { - character.TransitionToState(character.WalkingState); + if (!character.IsServing) + { + character.TransitionToState(character.WalkingState); + } } else if (!character.IsMoving) { - character.TransitionToState(character.IdleState); + if (character.IsServing) + { + character.TransitionToState(character.ServingIdleState); + } + else + { + character.TransitionToState(character.IdleState); + } } } diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index 3ff5342ef..167799127 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -3,6 +3,7 @@ using BehaviorDesigner.Runtime; using BlueWater.Enemies; using BlueWater.Interfaces; using BlueWater.Items; +using BlueWater.Npcs.Crews; using BlueWater.Players; using BlueWater.Tycoons; using BlueWater.Uis; @@ -22,6 +23,10 @@ namespace BlueWater.Npcs.Customers public const string HappyRun = "HappyRun"; public const string Upset = "Upset"; public const string UpsetRun = "UpsetRun"; + public const string Vomiting = "Vomiting"; + public const string VomitingForm = "VomitingForm"; + public const string VomitingIdle = "VomitingIdle"; + public const string VomitingRun = "VomitingRun"; } public enum CustomerInteractionType @@ -30,7 +35,7 @@ namespace BlueWater.Npcs.Customers OrderCocktail } - public class Customer : MonoBehaviour, IPlayerInteraction + public class Customer : MonoBehaviour, IPlayerInteraction, ICrewInteraction { // Variables @@ -82,7 +87,7 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public float InteractionRadius { get; private set; } = 2f; - + [field: SerializeField] public string InteractionMessage { get; set; } @@ -102,6 +107,9 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public Bill CurrentBill { get; set; } + [field: SerializeField] + public bool IsMatchedServer { get; set; } + [field: SerializeField] public bool IsReceivedItem { get; set; } @@ -110,32 +118,9 @@ namespace BlueWater.Npcs.Customers [SerializeField] private CustomerInteractionType _customerInteractionType; - - // private int _happyPoint; - // public int HappyPoint - // { - // get => _happyPoint; - // private set - // { - // var newHappyPoint = Mathf.Max(0, value); - // _happyPoint = newHappyPoint; - // } - // } - - private bool _isMoving; - public bool IsMoving - { - get => _isMoving; - set - { - if (_isMoving == value) return; - - _isMoving = value; - SpineController.PlayAnimation(_isMoving - ? CustomerSpineAnimation.Walk - : CustomerSpineAnimation.Idle, true); - } - } + + public bool IsMoving { get; private set; } + public bool IsVomited { get; set; } private Vector3 _currentDirection = Vector3.right; @@ -157,6 +142,16 @@ namespace BlueWater.Npcs.Customers private int _tipAmount; private bool _isQuitting; + + // State + public IState CurrentState { get; private set; } + public IState IdleState { get; private set; } + public IState WalkingState { get; private set; } + public IState HappyState { get; private set; } + public IState UpsetState { get; private set; } + public IState VomitState { get; private set; } + + public event Action OnInteractionCompleted; #endregion @@ -176,6 +171,7 @@ namespace BlueWater.Npcs.Customers private void Update() { + CurrentState.UpdateState(this); HandleMovement(); FlipVisualLook(); } @@ -216,9 +212,16 @@ namespace BlueWater.Npcs.Customers { CurrentLevelData = levelData; _spawnTransform = spawnTransform; - //CustomerData = CustomerManager.Instance.GetRandomCustomerData(); - //AIMovement.SetMoveSpeed(CustomerData.MoveSpeed); - //HappyPoint = CustomerData.BaseHappyPoint; + + IdleState = new IdleState(); + WalkingState = new WalkingState(); + HappyState = new HappyState(); + UpsetState = new UpsetState(); + VomitState = new VomitState(); + + CurrentState = IdleState; + CurrentState.EnterState(this); + BehaviorTree.EnableBehavior(); } @@ -272,6 +275,8 @@ namespace BlueWater.Npcs.Customers { OrderedCocktailData = cocktailData; CurrentTableSeat.SetFood(OrderedCocktailData.Sprite); + BalloonUi.ReceiveItem(cocktailData); + TransitionToState(IsOrderedSucceed ? HappyState : UpsetState); } public void Interaction() @@ -283,11 +288,10 @@ namespace BlueWater.Npcs.Customers case CustomerInteractionType.OrderCocktail: var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem(); var servedCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(currentPickupItem.Idx); - ServedItem(servedCocktailData); - BalloonUi.ReceiveItem(servedCocktailData); - EventManager.InvokeCocktailServedToCustomer(servedCocktailData); IsOrderedSucceed = currentPickupItem.Idx == OrderedCocktailData.Idx; IsReceivedItem = true; + ServedItem(servedCocktailData); + EventManager.InvokeCocktailServedToCustomer(servedCocktailData); EventManager.InvokeOrderResult(this, IsOrderedSucceed); break; default: @@ -311,6 +315,29 @@ namespace BlueWater.Npcs.Customers } } + public void InteractionCrew(Crew crew) + { + var serverCrew = (ServerCrew)crew; + var currentPickupItem = serverCrew.CurrentPickupItem; + var servedCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(currentPickupItem.Idx); + IsOrderedSucceed = currentPickupItem.Idx == OrderedCocktailData.Idx; + IsReceivedItem = true; + ServedItem(servedCocktailData); + serverCrew.BalloonUi.DiscardItem(); + serverCrew.ResetMission(); + EventManager.InvokeOrderResult(this, IsOrderedSucceed); + } + + public void CancelInteractionCrew() + { + throw new NotImplementedException(); + } + + public bool CanInteractionCrew() + { + return !IsReceivedItem; + } + public virtual void ShowInteractionUi() { SpineController.EnableCustomMaterial(); @@ -341,7 +368,12 @@ namespace BlueWater.Npcs.Customers _customerInteractionType = CustomerInteractionType.None; } - //public void AddHappyPoint(int value) => HappyPoint += value; + public void TransitionToState(IState newState) + { + CurrentState.ExitState(this); + CurrentState = newState; + CurrentState.EnterState(this); + } public void Bark(string conversation, BarkOrder barkOrder = BarkOrder.Random) { @@ -380,33 +412,27 @@ namespace BlueWater.Npcs.Customers PayMoneyParticle.Play(); PayMoneyUi.PayMoney(gold); - TycoonManager.Instance.TycoonStatus.CurrentExp += exp; + + EventManager.InvokeChangeExp(exp); TycoonManager.Instance.TycoonStatus.CurrentGold += gold; } - // public void PayMoney(int foodPrice, int tipAmount) - // { - // _foodPrice = foodPrice; - // _tipAmount = tipAmount; - // _paidAmount = _foodPrice + _tipAmount; - // - // PayMoneyParticle.gameObject.SetActive(true); - // PayMoneyParticle.Play(); - // PayMoneyUi.PayMoney(_paidAmount); - // } - public void Vomit() { AIMovement.StopMove(); + TransitionToState(VomitState); + } + + public void InstanceVomit() + { var spawnPosition = transform.position + new Vector3(0f, 0f, 0.1f); Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation); + IsVomited = true; + TransitionToState(IdleState); } public void CheckOut() { - //var customerVisitInfo = new CustomerVisitInfo(HappyPoint, _foodPrice, _tipAmount, _paidAmount); - //TycoonManager.Instance.TycoonStageController.RegisterCustomerVisitInfo(customerVisitInfo); - AIMovement.StopMove(); BehaviorTree.DisableBehavior(); Destroy(gameObject); @@ -434,6 +460,7 @@ namespace BlueWater.Npcs.Customers CurrentTableSeat = null; } AIMovement.Move(_spawnTransform.position); + TransitionToState(WalkingState); } #endregion diff --git a/Assets/02.Scripts/Character/Npc/Customer/State.meta b/Assets/02.Scripts/Character/Npc/Customer/State.meta new file mode 100644 index 000000000..905f1864e --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94c4bb0b727c07e499d892694eb28ea0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs new file mode 100644 index 000000000..1fdb16a85 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs @@ -0,0 +1,25 @@ +using BlueWater.Interfaces; + +namespace BlueWater.Npcs.Customers +{ + public class HappyState : IState + { + public void EnterState(Customer character) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Happy, true); + } + + public void UpdateState(Customer character) + { + if (character.IsMoving) + { + character.TransitionToState(character.WalkingState); + } + } + + public void ExitState(Customer character) + { + + } + } +} diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs.meta b/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs.meta new file mode 100644 index 000000000..9fbd19af1 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a1655fd234d71354790b530cdab0f4ae diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs new file mode 100644 index 000000000..2525d10b3 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs @@ -0,0 +1,37 @@ +using BlueWater.Interfaces; + +namespace BlueWater.Npcs.Customers +{ + public class IdleState : IState + { + public void EnterState(Customer character) + { + if (character.IsVomited) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingIdle, true); + } + else if (character.IsReceivedItem) + { + character.SpineController.PlayAnimation(character.IsOrderedSucceed ? + CustomerSpineAnimation.Happy : CustomerSpineAnimation.Upset, true); + } + else if (!character.IsReceivedItem) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Idle, true); + } + } + + public void UpdateState(Customer character) + { + if (character.IsMoving) + { + character.TransitionToState(character.WalkingState); + } + } + + public void ExitState(Customer character) + { + + } + } +} diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs.meta b/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs.meta new file mode 100644 index 000000000..8055a6126 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a6b78a75123555743908927243bc2e87 diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs new file mode 100644 index 000000000..8d58a4a5d --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs @@ -0,0 +1,25 @@ +using BlueWater.Interfaces; + +namespace BlueWater.Npcs.Customers +{ + public class UpsetState : IState + { + public void EnterState(Customer character) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Upset, true); + } + + public void UpdateState(Customer character) + { + if (character.IsMoving) + { + character.TransitionToState(character.WalkingState); + } + } + + public void ExitState(Customer character) + { + + } + } +} diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs.meta b/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs.meta new file mode 100644 index 000000000..7344baba6 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 06c63b91a30ef9a4f8d9858d030cc9ca diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs new file mode 100644 index 000000000..91a71ca09 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs @@ -0,0 +1,33 @@ +using BlueWater.Interfaces; + +namespace BlueWater.Npcs.Customers +{ + public class VomitState : IState + { + private bool _isVomiting; + + public void EnterState(Customer character) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingForm, false); + } + + public void UpdateState(Customer character) + { + if (character.SpineController.IsAnimationComplete()) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Vomiting, false); + _isVomiting = true; + } + + if (_isVomiting && character.SpineController.IsAnimationComplete()) + { + character.InstanceVomit(); + } + } + + public void ExitState(Customer character) + { + + } + } +} diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs.meta b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs.meta new file mode 100644 index 000000000..59edc85ea --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 86a04f8fd6e5b334e82d98529451507d diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs new file mode 100644 index 000000000..0461d7ad4 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs @@ -0,0 +1,37 @@ +using BlueWater.Interfaces; + +namespace BlueWater.Npcs.Customers +{ + public class WalkingState : IState + { + public void EnterState(Customer character) + { + if (character.IsVomited) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingRun, true); + } + else if (character.IsReceivedItem) + { + character.SpineController.PlayAnimation(character.IsOrderedSucceed ? + CustomerSpineAnimation.HappyRun : CustomerSpineAnimation.UpsetRun, true); + } + else if (!character.IsReceivedItem) + { + character.SpineController.PlayAnimation(CustomerSpineAnimation.Walk, true); + } + } + + public void UpdateState(Customer character) + { + if (!character.IsMoving) + { + character.TransitionToState(character.IdleState); + } + } + + public void ExitState(Customer character) + { + + } + } +} diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs.meta b/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs.meta new file mode 100644 index 000000000..5f20ad454 --- /dev/null +++ b/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c1afb819b0d06f045b036151ef43be1b diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs b/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs index 199b56c8a..ac793ac9d 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatMovement.cs @@ -212,28 +212,6 @@ namespace BlueWater.Players.Combat public bool CanMove() { return IsMoveEnabled; - - // if (!IsMoveEnabled || IsDashing) return false; - // - // var isActivatingSkill = _skillHandler?.IsActivatingSkill ?? false; - // var isStunned = _stunnable?.IsStunned ?? false; - // // if (isStunned) - // // { - // // IsMoving = false; - // // } - // var isAttacking = _comboAttackable?.CurrentComboAttackCount > 0; - // - // var canMove = !isActivatingSkill && !isStunned && !isAttacking; - // if (!canMove) - // { - // if (!Rigidbody.isKinematic) - // { - // Rigidbody.linearVelocity = Vector3.zero; - // } - // IsMoving = false; - // } - // - // return canMove; } public void Move() @@ -261,11 +239,6 @@ namespace BlueWater.Players.Combat } PushPower = Mathf.Max(0, PushPower - PushPowerReduction * Time.deltaTime); - - // CurrentDirection = _inputDirection; - // IsMoving = _inputDirection != Vector3.zero; - // var finalVelocity = _inputDirection * (MoveSpeed * MoveSpeedCoefficient); - // Rigidbody.linearVelocity = finalVelocity; } public void AddForce(Vector3 force, ForceMode forceMode) diff --git a/Assets/02.Scripts/Character/SpineController.cs b/Assets/02.Scripts/Character/SpineController.cs index b0f51d49e..2bb224b93 100644 --- a/Assets/02.Scripts/Character/SpineController.cs +++ b/Assets/02.Scripts/Character/SpineController.cs @@ -124,11 +124,6 @@ namespace BlueWater.Players return trackEntry; } - public void ClearTrack(int trackIndex = 0) - { - _animationState.ClearTrack(trackIndex); - } - public void SetSkin(string skinName) { if (SkeletonAnimation == null && _animationState == null) return; @@ -168,26 +163,6 @@ namespace BlueWater.Players var randomSkinName = _randomStrings[randomSkin]; SetSkin(randomSkinName); } - - public async Awaitable WaitForAnimationCompletion(TrackEntry trackEntry, bool isReverse = false) - { - if (isReverse) - { - await AwaitUntil(() => trackEntry.TrackTime <= 0); - } - else - { - await AwaitUntil(() => trackEntry.IsComplete); - } - } - - public async Awaitable AwaitUntil(Func condition) - { - while (!condition()) - { - await Awaitable.NextFrameAsync(); - } - } public void EnableCustomMaterial() { @@ -205,6 +180,20 @@ namespace BlueWater.Players _previousEnabled = false; } + public bool IsAnimationComplete(int trackIndex = 0) + { + if (!SkeletonAnimation || _animationState == null) return false; + + var currentTrackEntry = _animationState.GetCurrent(trackIndex); + if (currentTrackEntry == null) + { + Debug.LogWarning($"트랙 {trackIndex}에서 재생 중인 애니메이션이 없습니다."); + return false; + } + + return currentTrackEntry.IsComplete; + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index b37aa2f8a..d45f1be53 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -86,10 +86,10 @@ namespace BlueWater } // 경험치 변경 이벤트 - public static Action OnChangeExp; - public static void InvokeChangeExp(ExpData expData) + public static Action OnChangeExp; + public static void InvokeChangeExp(int addedExp) { - OnChangeExp?.Invoke(expData); + OnChangeExp?.Invoke(addedExp); } // 골드 변경 이벤트 diff --git a/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs new file mode 100644 index 000000000..6ed676364 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs @@ -0,0 +1,19 @@ +using BlueWater.Interfaces; + +namespace BlueWater.Tycoons +{ + public class BartenderTable : ServingTable + { + public override bool CanInteraction() + { + return false; + } + + public void CompleteMakingCocktail(IPickup cocktailData) + { + CurrentPickupItem = cocktailData; + CocktailGlassImage.enabled = true; + InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs.meta b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs.meta new file mode 100644 index 000000000..9c80a6580 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0dbd41efa5688944084c710e7c96b2ad diff --git a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs index 634265a24..767c6cf4b 100644 --- a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs @@ -1,15 +1,19 @@ using System; +using System.Collections; using BlueWater.Interfaces; using BlueWater.Npcs.Crews; +using BlueWater.Npcs.Customers; using BlueWater.Utility; using UnityEngine; +using UnityEngine.Serialization; namespace BlueWater.Tycoons { public class ServingTable : InteractionFurniture, ICrewInteraction { + [FormerlySerializedAs("_cocktailGlassImage")] [SerializeField] - private SpriteRenderer _cocktailGlassImage; + protected SpriteRenderer CocktailGlassImage; // 서빙 테이블 기준 아이템이 있는지 없는지 private IPickup _currentPickupItem; @@ -22,21 +26,36 @@ namespace BlueWater.Tycoons if (_currentPickupItem != null) { - var crewController = TycoonManager.Instance.CrewController; - Utils.StartUniqueCoroutine(this, ref _findServerCrewInstance, - crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.ServerCrews, crew => crew.OnMission(this))); + Utils.StartUniqueCoroutine(this, ref _findCustomerMatchingItemInstance, FindCustomerMatchingItem()); + } + else + { + if (_findCustomerMatchingItemInstance != null) + { + StopCoroutine(_findCustomerMatchingItemInstance); + _findCustomerMatchingItemInstance = null; + } + if (_findServerCrewInstance != null) + { + StopCoroutine(_findServerCrewInstance); + _findServerCrewInstance = null; + } } } } private Material _originalCocktailGlassMaterial; + private Coroutine _findCustomerMatchingItemInstance; private Coroutine _findServerCrewInstance; + private Customer _orderedCustomer; + + public event Action OnInteractionCompleted; protected override void Awake() { base.Awake(); - _originalCocktailGlassMaterial = _cocktailGlassImage.material; + _originalCocktailGlassMaterial = CocktailGlassImage.material; } public override void Interaction() @@ -47,7 +66,7 @@ namespace BlueWater.Tycoons EventManager.InvokeTakeFromServingTable(); CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(CurrentPickupItem); CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); - _cocktailGlassImage.enabled = false; + CocktailGlassImage.enabled = false; InteractionCanvas.BalloonUi.DiscardItem(); CurrentPickupItem = null; } @@ -59,7 +78,7 @@ namespace BlueWater.Tycoons CurrentTycoonPlayer.TycoonPickupHandler.GiveItem(CurrentPickupItem); CurrentTycoonPlayer.InteractionCanvas.BalloonUi.DiscardItem(); InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); - _cocktailGlassImage.enabled = true; + CocktailGlassImage.enabled = true; } } @@ -76,19 +95,40 @@ namespace BlueWater.Tycoons InteractionMessage = CurrentPickupItem != null ? "음료 들기" : "음료 내려놓기"; base.ShowInteractionUi(); - _cocktailGlassImage.material = OutlineMaterial; + CocktailGlassImage.material = OutlineMaterial; } public override void HideInteractionUi() { base.HideInteractionUi(); - _cocktailGlassImage.material = _originalCocktailGlassMaterial; + CocktailGlassImage.material = _originalCocktailGlassMaterial; } public void InteractionCrew(Crew crew) { - throw new NotImplementedException(); + // 테이블의 칵테일을 가져가는 경우 + if (CurrentPickupItem != null) + { + var serverCrew = (ServerCrew)crew; + serverCrew.CurrentPickupItem = CurrentPickupItem; + serverCrew.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + serverCrew.OrderedCustomer = _orderedCustomer; + serverCrew.IsServing = true; + CocktailGlassImage.enabled = false; + InteractionCanvas.BalloonUi.DiscardItem(); + CurrentPickupItem = null; + } + else + { + var serverCrew = (ServerCrew)crew; + CurrentPickupItem = serverCrew.CurrentPickupItem; + serverCrew.CurrentPickupItem = null; + serverCrew.BalloonUi.DiscardItem(); + CocktailGlassImage.enabled = true; + InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem); + serverCrew.ResetMission(); + } } public void CancelInteractionCrew() @@ -98,9 +138,26 @@ namespace BlueWater.Tycoons public bool CanInteractionCrew() { - throw new NotImplementedException(); + return CurrentPickupItem != null && _orderedCustomer != null; } - public event Action OnInteractionCompleted; + private IEnumerator FindCustomerMatchingItem() + { + var waitTime = new WaitForSeconds(2f); + while (true) + { + _orderedCustomer = TycoonManager.Instance.CustomerController.FindCustomerMatchingItem(_currentPickupItem); + if (_orderedCustomer != null) + { + _orderedCustomer.IsMatchedServer = true; + var crewController = TycoonManager.Instance.CrewController; + Utils.StartUniqueCoroutine(this, ref _findServerCrewInstance, + crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.ServerCrews, crew => crew.OnMission(this))); + yield break; + } + + yield return waitTime; + } + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index a71af3324..be80e5753 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -110,6 +110,7 @@ namespace BlueWater.Tycoons { _playerElapsedTime = 0f; EventManager.OnInteracting?.Invoke(_playerElapsedTime); + GameManager.Instance.CurrentTycoonPlayer.IsCleaningTable = true; _isPlayerInteracting = true; } @@ -117,6 +118,7 @@ namespace BlueWater.Tycoons { _playerElapsedTime = 0f; EventManager.OnInteracting?.Invoke(_playerElapsedTime); + GameManager.Instance.CurrentTycoonPlayer.IsCleaningTable = false; _isPlayerInteracting = false; } diff --git a/Assets/02.Scripts/Tycoon/CrewController.cs b/Assets/02.Scripts/Tycoon/CrewController.cs index ad769bcc7..fdf207108 100644 --- a/Assets/02.Scripts/Tycoon/CrewController.cs +++ b/Assets/02.Scripts/Tycoon/CrewController.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using BlueWater.Npcs.Crews; +using BlueWater.Npcs.Customers; using BlueWater.Utility; using Sirenix.OdinInspector; using UnityEngine; @@ -28,7 +29,7 @@ namespace BlueWater.Tycoons private Transform _servingCrewSpawnTransform; [SerializeField] - private Transform _bartenderCrewSpawnTransform; + private List _bartenderCrewSpawnTransforms; [field: Title("실시간 데이터")] [field: SerializeField] @@ -48,6 +49,7 @@ namespace BlueWater.Tycoons EventManager.OnCreateCleanerCrew += CreateCleanerCrew; EventManager.OnCreateServerCrew += CreateServerCrew; EventManager.OnCreateBartenderCrew += CreateBartenderCrew; + EventManager.OnOrderedCocktail += FindBartenderCrew; } private void OnDestroy() @@ -55,6 +57,7 @@ namespace BlueWater.Tycoons EventManager.OnCreateCleanerCrew -= CreateCleanerCrew; EventManager.OnCreateServerCrew -= CreateServerCrew; EventManager.OnCreateBartenderCrew -= CreateBartenderCrew; + EventManager.OnOrderedCocktail -= FindBartenderCrew; } public CleanerCrew CreateCleanerCrew() @@ -79,9 +82,11 @@ namespace BlueWater.Tycoons public BartenderCrew CreateBartenderCrew() { - var newCrew = Instantiate(_bartenderCrewPrefab, _bartenderCrewSpawnTransform.position, _bartenderCrewPrefab.transform.rotation); + var currentBartenderCount = BartenderCrews.Count; + var newCrew = Instantiate(_bartenderCrewPrefab, _bartenderCrewSpawnTransforms[currentBartenderCount].position, _bartenderCrewPrefab.transform.rotation); Utils.RegisterList(BartenderCrews, newCrew); Utils.RegisterList(Crews, newCrew); + newCrew.SetBartenderTable(_bartenderCrewSpawnTransforms[currentBartenderCount].GetComponentInParent()); newCrew.Initialize(); return newCrew; @@ -114,5 +119,34 @@ namespace BlueWater.Tycoons yield return waitTime; } } + + private void FindBartenderCrew(Customer orderedCustomer) + { + StartCoroutine(FindBartenderCrewCoroutine(orderedCustomer)); + } + + private IEnumerator FindBartenderCrewCoroutine(Customer orderedCustomer) + { + var waitTime = new WaitForSeconds(2f); + var tycoonIngredientController = TycoonManager.Instance.TycoonIngredientController; + while (true) + { + foreach (var element in BartenderCrews) + { + if (orderedCustomer.IsReceivedItem) yield break; + + var orderedCocktailIngredients = orderedCustomer.OrderedCocktailData.GetValidIngredients(); + if (!tycoonIngredientController.IsMakingCocktail(orderedCocktailIngredients)) break; + + if (element.MyBartenderTable.CurrentPickupItem != null || element.IsOnMission) continue; + + element.SetOrderedCustomer(orderedCustomer); + tycoonIngredientController.ConsumeMakingCocktailIngredient(orderedCocktailIngredients); + yield break; + } + + yield return waitTime; + } + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/CustomerController.cs b/Assets/02.Scripts/Tycoon/CustomerController.cs index de1555901..484a1d579 100644 --- a/Assets/02.Scripts/Tycoon/CustomerController.cs +++ b/Assets/02.Scripts/Tycoon/CustomerController.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using BlueWater.Interfaces; using BlueWater.Npcs.Customers; using BlueWater.Utility; using Sirenix.OdinInspector; @@ -115,12 +116,18 @@ namespace BlueWater.Tycoons Utils.UnregisterList(InstanceCustomers, customer); } - public void CheckInstanceCustomerBills() + public Customer FindCustomerMatchingItem(IPickup servingTableItem) { foreach (var element in InstanceCustomers) { + if (servingTableItem.Idx != element.OrderedCocktailData.Idx) continue; + if (element.IsMatchedServer) continue; + + return element; } + + return null; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/ServingTableController.cs b/Assets/02.Scripts/Tycoon/ServingTableController.cs index bc613b138..5c06d48b0 100644 --- a/Assets/02.Scripts/Tycoon/ServingTableController.cs +++ b/Assets/02.Scripts/Tycoon/ServingTableController.cs @@ -16,5 +16,10 @@ namespace BlueWater.Tycoons { _servingTables = _servingTableRoot.GetComponentsInChildren().ToList(); } + + public ServingTable FindEmptyServingTable() + { + return _servingTables.FirstOrDefault(element => element.CurrentPickupItem == null); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs index 547e1feca..244d3e3e8 100644 --- a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs @@ -81,6 +81,23 @@ namespace BlueWater.Tycoons return validCocktails; } + public bool IsMakingCocktail(List cocktailIngredients) + { + var activatedBarrels = GetActivatedBarrels(); + return cocktailIngredients.All(element => + activatedBarrels.Find(barrel => barrel.GetLiquidData().Idx == element.Idx && barrel.CurrentAmount >= element.Amount)); + } + + public void ConsumeMakingCocktailIngredient(List cocktailIngredients) + { + var activatedBarrels = GetActivatedBarrels(); + foreach (var element in cocktailIngredients) + { + var barrel = activatedBarrels.Find(barrel => barrel.GetLiquidData().Idx == element.Idx); + barrel.Consume(element.Amount); + } + } + public List GetActivatedBarrels() { return _barrels.Where(barrel => barrel.IsActivated).ToList(); diff --git a/Assets/02.Scripts/Tycoon/TycoonManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs index 61b03710c..60cf0797e 100644 --- a/Assets/02.Scripts/Tycoon/TycoonManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -18,6 +18,12 @@ namespace BlueWater.Tycoons [field: SerializeField] public CrewController CrewController { get; private set; } + + [field: SerializeField] + public CustomerController CustomerController { get; private set; } + + [field: SerializeField] + public ServingTableController ServingTableController { get; private set; } [SerializeField] private string _dailyBgm; @@ -56,6 +62,8 @@ namespace BlueWater.Tycoons TycoonStageController = GetComponent(); TycoonIngredientController = GetComponent(); CrewController = GetComponent(); + CustomerController = GetComponent(); + ServingTableController = GetComponent(); } public LevelData GetCurrentLevelData() diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs index 9a887e265..851651a62 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStatus.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -84,12 +84,9 @@ namespace BlueWater.Tycoons get => _currentExp; set { - if (_currentLevel >= _maxLevel) return; + if (CurrentLevel >= MaxLevel) return; - var previousExp = _currentExp; - var addedExp = value - previousExp; _currentExp = value; - EventManager.InvokeChangeExp(new ExpData(_currentLevel, previousExp, addedExp)); } } diff --git a/Assets/02.Scripts/Ui/Tycoon/Bill.cs b/Assets/02.Scripts/Ui/Tycoon/Bill.cs index 4053b2414..0dae25614 100644 --- a/Assets/02.Scripts/Ui/Tycoon/Bill.cs +++ b/Assets/02.Scripts/Ui/Tycoon/Bill.cs @@ -28,6 +28,9 @@ namespace BlueWater [SerializeField] private GameObject _makingCocktailPivotObject; + + [SerializeField] + private GameObject _checkImageObject; [SerializeField] private GameObject _stampImageObject; @@ -61,6 +64,7 @@ namespace BlueWater _orderImage.sprite = customer.OrderedCocktailData.Sprite; _orderImage.gameObject.SetActive(true); _makingCocktailPivotObject.SetActive(false); + _checkImageObject.SetActive(false); _stampImageObject.SetActive(false); _tableNumberText.text = customer.CurrentTableSeat.TableNumber.ToString(); _tableNumberImageObject.SetActive(true); @@ -154,6 +158,7 @@ namespace BlueWater { _slider.gameObject.SetActive(false); _makingCocktailPivotObject.SetActive(false); + _checkImageObject.gameObject.SetActive(false); _orderImage.gameObject.SetActive(false); _stampImageObject.SetActive(false); _tableNumberImageObject.SetActive(false); @@ -166,5 +171,17 @@ namespace BlueWater onDestroyAction?.Invoke(); Destroy(gameObject); } + + public void BartenderMakingCocktail() + { + _makingCocktailPivotObject.gameObject.SetActive(true); + } + + public void BartenderCompleteMakingCocktail() + { + _makingCocktailPivotObject.gameObject.SetActive(false); + _checkImageObject.gameObject.SetActive(true); + _animationController.SetAnimationParameter("isBartenderChecked", true); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs b/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs index 84e91180a..ada690286 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ExpUi.cs @@ -24,7 +24,7 @@ namespace BlueWater.Uis [SerializeField] private float _animationTime = 0.2f; - private Queue _expQueue = new(); + private Queue _expQueue = new(); private Coroutine _changeExpInstance; private Color _originalColor; private Tween _tween; @@ -58,9 +58,9 @@ namespace BlueWater.Uis _levelText.text = levelData.Idx; } - private void ChangeExp(ExpData expData) + private void ChangeExp(int addedExp) { - _expQueue.Enqueue(expData); + _expQueue.Enqueue(addedExp); if (!_isAnimating) { Utils.StartUniqueCoroutine(this, ref _changeExpInstance, AnimateExpChange()); @@ -72,11 +72,9 @@ namespace BlueWater.Uis _isAnimating = true; while (_expQueue.Count > 0) { - var expQueue = _expQueue.Dequeue(); - var currentLevel = expQueue.CurrentLevel; - var currentLevelData = TycoonManager.Instance.LevelDataSo.GetDataByIdx(currentLevel.ToString()); - var startExp = expQueue.StartExp; - var addedExp = expQueue.AddedExp; + var currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); + var startExp = TycoonManager.Instance.TycoonStatus.CurrentExp; + var addedExp = _expQueue.Dequeue(); var requireExp = currentLevelData.RequiredExp; var endExp = startExp + addedExp; var remainExp = endExp - requireExp; @@ -85,10 +83,10 @@ namespace BlueWater.Uis while (true) { var newExp = Mathf.Lerp(startExp, endExp, elapsedTime / _animationTime); + TycoonManager.Instance.TycoonStatus.CurrentExp = (int)newExp; var expClamp = Mathf.Clamp01(newExp / requireExp); _expSlider.value = expClamp; - - newExp = (int)newExp; + if (newExp >= requireExp) { _tween.Restart(); @@ -101,6 +99,7 @@ namespace BlueWater.Uis _expSlider.value = 0f; newExp = 0; + TycoonManager.Instance.TycoonStatus.CurrentExp = (int)newExp; startExp = 0; endExp = remainExp; remainExp = endExp - requireExp; @@ -123,7 +122,7 @@ namespace BlueWater.Uis [Button("경험치 증가 테스트")] private void Test(int exp) { - TycoonManager.Instance.TycoonStatus.CurrentExp += exp; + EventManager.InvokeChangeExp(exp); } } } \ No newline at end of file diff --git a/Assets/03.Images/Ui/Tycoon/Check.png b/Assets/03.Images/Ui/Tycoon/Check.png new file mode 100644 index 000000000..71ec7e576 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Check.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Check.png.meta b/Assets/03.Images/Ui/Tycoon/Check.png.meta new file mode 100644 index 000000000..ba4a4e7a3 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Check.png.meta @@ -0,0 +1,396 @@ +fileFormatVersion: 2 +guid: 21e4be4a341e655458aa1b8455d3860f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Check_0 + rect: + serializedVersion: 2 + x: 0 + y: 2048 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 181622d332f8903418d6a151c694f666 + internalID: 596334599 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_1 + rect: + serializedVersion: 2 + x: 1024 + y: 2048 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2c79a0fc0803b304e88fee0c56bdcc21 + internalID: -147191287 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_2 + rect: + serializedVersion: 2 + x: 2048 + y: 2048 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c75e8bc573aa9f843a0b4edaa2e07003 + internalID: -1127003578 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_3 + rect: + serializedVersion: 2 + x: 3072 + y: 2048 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f454b6c3335cd8b49b8ece0e36ea22bd + internalID: 1641716054 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_4 + rect: + serializedVersion: 2 + x: 4096 + y: 2048 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6267864140bea524d9dd563c9f978a3b + internalID: 1513449738 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_5 + rect: + serializedVersion: 2 + x: 0 + y: 1024 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 342a0e5d3208e96419c02fff8821265d + internalID: 351649321 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_6 + rect: + serializedVersion: 2 + x: 1024 + y: 1024 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bc87fd09853781f4f8ca3ea1e3b27ebf + internalID: 1073272426 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_7 + rect: + serializedVersion: 2 + x: 2048 + y: 1024 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e7062f56d00de8f4d84141b5e96e1c05 + internalID: 1212594532 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_8 + rect: + serializedVersion: 2 + x: 3072 + y: 1024 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b279812a9d423ba4e940dd12efe07952 + internalID: -1157809890 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_9 + rect: + serializedVersion: 2 + x: 4096 + y: 1024 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0eb18a1b6f7caab409c56fb7708f7328 + internalID: -122489167 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Check_10 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1024 + height: 1024 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b72e5ce0937d2c6428457126b18130d3 + internalID: -852591673 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: f03b38466d2ed2d4d9725b17c1981174 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Check_0: 596334599 + Check_1: -147191287 + Check_10: -852591673 + Check_2: -1127003578 + Check_3: 1641716054 + Check_4: 1513449738 + Check_5: 351649321 + Check_6: 1073272426 + Check_7: 1212594532 + Check_8: -1157809890 + Check_9: -122489167 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab new file mode 100644 index 000000000..1508e3ff9 --- /dev/null +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab @@ -0,0 +1,1144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &126151493473085455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126151493484984327} + - component: {fileID: 126151493484747657} + - component: {fileID: 126151493483491779} + m_Layer: 5 + m_Name: Main Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &126151493484984327 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473085455} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 126151493484884023} + m_Father: {fileID: 7293985954889289183} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 2.2, y: 12.9} + m_SizeDelta: {x: 120, y: 140} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &126151493484747657 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473085455} + m_CullTransparentMesh: 0 +--- !u!114 &126151493483491779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473085455} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &126151493473201319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126151493484884023} + - component: {fileID: 126151493484754027} + - component: {fileID: 126151493483402833} + - component: {fileID: 126151493485040859} + - component: {fileID: 126151493480433323} + m_Layer: 5 + m_Name: Bubble Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &126151493484884023 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3571829164687521184} + m_Father: {fileID: 126151493484984327} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &126151493484754027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_CullTransparentMesh: 0 +--- !u!114 &126151493483402833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b7f09c3867e11ae4cb69aeb93463acd6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!225 &126151493485040859 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!95 &126151493480433323 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126151493473201319} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 62b8011547f389344ba48f87b2ada51c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 2 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &813964778509222274 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3748026497419659573} + - component: {fileID: 479823629690914954} + - component: {fileID: 2588384133887034894} + - component: {fileID: 2961986041977982893} + m_Layer: 14 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3748026497419659573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2397117528733804567} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!33 &479823629690914954 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Mesh: {fileID: 0} +--- !u!23 &2588384133887034894 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2} + - {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2} + 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: 5 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2961986041977982893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813964778509222274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: d96ab46e9aca1d142b153e02ea521a2a, type: 2} + initialSkinName: 01Suit + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: Idle + loop: 1 + timeScale: 1 +--- !u!1 &2781393898199067900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7164452667333806733} + - component: {fileID: 2294203980036400646} + - component: {fileID: 3455991743305696554} + - component: {fileID: 8501950329115254991} + - component: {fileID: 8922295334492411225} + m_Layer: 14 + m_Name: DialogueSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7164452667333806733 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2397117528733804567} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2294203980036400646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} + m_Name: + m_EditorClassIdentifier: + m_overrideName: + m_overrideUseMessage: + maxUseDistance: 5 + events: + onSelect: + m_PersistentCalls: + m_Calls: [] + onDeselect: + m_PersistentCalls: + m_Calls: [] + onUse: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3455991743305696554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} + m_Name: + m_EditorClassIdentifier: + trigger: 8192 + condition: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + setQuestState: 1 + questName: + questState: 0 + setQuestEntryState: 0 + questEntryNumber: 1 + questEntryState: 0 + setAnotherQuestEntryState: 0 + anotherQuestEntryNumber: 1 + anotherQuestEntryState: 0 + luaCode: + sequence: + sequenceSpeaker: {fileID: 0} + sequenceListener: {fileID: 0} + waitOneFrameOnStartOrEnable: 1 + alertMessage: + textTable: {fileID: 0} + alertDuration: 0 + sendMessages: [] + barkSource: 0 + barkConversation: + barkEntryID: -1 + barkEntryTitle: + barkText: + barkTextSequence: + barker: {fileID: 0} + barkTarget: {fileID: 0} + barkOrder: 0 + allowBarksDuringConversations: 0 + skipBarkIfNoValidEntries: 0 + cacheBarkLines: 0 + conversation: + conversationConversant: {fileID: 0} + conversationActor: {fileID: 0} + startConversationEntryID: -1 + startConversationEntryTitle: + overrideDialogueUI: {fileID: 0} + exclusive: 0 + replace: 0 + queue: 0 + skipIfNoValidEntries: 0 + preventRestartOnSameFrameEnded: 0 + stopConversationOnTriggerExit: 0 + marginToAllowTriggerExit: 0.2 + stopConversationIfTooFar: 0 + maxConversationDistance: 5 + monitorConversationDistanceFrequency: 1 + showCursorDuringConversation: 0 + pauseGameDuringConversation: 0 + setActiveActions: [] + setEnabledActions: [] + setAnimatorStateActions: [] + onExecute: + m_PersistentCalls: + m_Calls: [] + useConversationTitlePicker: 1 + useBarkTitlePicker: 1 + useQuestNamePicker: 1 + selectedDatabase: {fileID: 11400000, guid: bde86f268240d1041a808e449d9cac43, type: 2} +--- !u!114 &8501950329115254991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a64578247383140469c45370654a984a, type: 3} + m_Name: + m_EditorClassIdentifier: + actor: Customer + persistentDataName: + portrait: {fileID: 0} + spritePortrait: {fileID: 0} + barkUISettings: + barkUI: {fileID: 9027939020919762395} + barkUIOffset: {x: 0, y: 0, z: 0} + standardDialogueUISettings: + subtitlePanelNumber: 0 + customSubtitlePanel: {fileID: 0} + customSubtitlePanelOffset: {x: 0, y: 0, z: 0} + menuPanelNumber: 0 + customMenuPanel: {fileID: 0} + customMenuPanelOffset: {x: 0, y: 0, z: 0} + useMenuPanelFor: 0 + portraitAnimatorController: {fileID: 0} + setSubtitleColor: 0 + applyColorToPrependedName: 0 + prependActorNameSeparator: ': ' + prependActorNameFormat: '{0}{1}' + subtitleColor: {r: 1, g: 1, b: 1, a: 1} +--- !u!114 &8922295334492411225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781393898199067900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66fdf8d5019aaec4bab62570407b9cd1, type: 3} + m_Name: + m_EditorClassIdentifier: + once: 0 + conversation: OrderFood + condition: + luaConditions: [] + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + skipIfNoValidEntries: 0 + exclusive: 0 + conversant: {fileID: 0} + useConversationTitlePicker: 1 + selectedDatabase: {fileID: 0} + barkOrder: 0 + allowDuringConversations: 0 + cacheBarkLines: 0 + target: {fileID: 0} + trigger: 32 +--- !u!1 &7260635347182713621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2397117528733804567} + - component: {fileID: 5913499722605887790} + - component: {fileID: 3035760932289101816} + - component: {fileID: 944025264553094021} + - component: {fileID: 6606567362296327409} + - component: {fileID: 957405049979454141} + - component: {fileID: 2615952973387112450} + - component: {fileID: 5279376384905517670} + - component: {fileID: 17978457728262906} + - component: {fileID: 529038307721658883} + m_Layer: 14 + m_Name: BartenderCrew + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2397117528733804567 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + serializedVersion: 2 + 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_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3748026497419659573} + - {fileID: 7164452667333806733} + - {fileID: 7293985954889289183} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &5913499722605887790 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!136 &3035760932289101816 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.1 + m_Height: 0.5 + m_Direction: 1 + m_Center: {x: 0, y: 0.25, z: 0} +--- !u!114 &944025264553094021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + drawGizmos: 1 + detailedGizmos: 0 + startEndModifier: + addPoints: 0 + exactStartPoint: 3 + exactEndPoint: 3 + useRaycasting: 0 + mask: + serializedVersion: 2 + m_Bits: 4294967295 + useGraphRaycasting: 0 + traversableTags: -1 + tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + graphMask: + value: 1 +--- !u!114 &6606567362296327409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + radius: 0.1 + height: 0.5 + canMove: 1 + maxSpeed: 2 + gravity: {x: NaN, y: NaN, z: NaN} + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + endReachedDistance: 0.5 + whenCloseToDestination: 0 + rvoDensityBehavior: + enabled: 1 + densityThreshold: 0.5 + returnAfterBeingPushedAway: 0 + progressAverage: 0 + lastJobDensityResult: 0 + centerOffsetCompatibility: NaN + repathRateCompatibility: NaN + canSearchCompability: 0 + orientation: 0 + enableRotation: 0 + autoRepath: + mode: 2 + period: 0.5 + sensitivity: 10 + maximumPeriod: 2 + visualizeSensitivity: 0 + targetCompatibility: {fileID: 0} + maxAcceleration: -2.5 + rotationSpeed: 360 + slowdownDistance: 1 + pickNextWaypointDist: 0.2 + alwaysDrawGizmos: 0 + slowWhenNotFacingTarget: 1 + preventMovingBackwards: 0 + constrainInsideGraph: 0 +--- !u!114 &957405049979454141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77f586f285b3847808d79083bd19ef1f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + quality: 0 + splitAtEveryPortal: 0 + accountForGridPenalties: 0 +--- !u!114 &2615952973387112450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3} + m_Name: + m_EditorClassIdentifier: + startWhenEnabled: 0 + asynchronousLoad: 0 + pauseWhenDisabled: 0 + restartWhenComplete: 0 + logTaskChanges: 0 + group: 0 + resetValuesOnRestart: 0 + externalBehavior: {fileID: 11400000, guid: 700e4713e87b6d146a693ed991e100ae, type: 2} + mBehaviorSource: + behaviorName: BartenderCrew + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true,"GameObjectmValue":0}]}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: + - {fileID: 7260635347182713621} + byteData: + byteDataArray: + Version: 1.7.9 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 1 +--- !u!114 &5279376384905517670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 2961986041977982893} + _originalMaterial: {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2} + _replacementMaterial: {fileID: 2100000, guid: 288a49bf884b6fc4bbb57fe5d2f4da06, type: 2} + _initialSkinName: 01Maid + _isRandomSkin: 1 + _isRandomRange: 0 + _randomRange: {x: 0, y: 1} + _randomStrings: + - 01Maid + - 02Maid + - 03Maid +--- !u!114 &17978457728262906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75b48aa4b99043cb9e665a892ec46c75, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &529038307721658883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260635347182713621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 787288dc6b6ba3a47b6deca211317c89, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 2397117528733804567} + k__BackingField: {fileID: 5913499722605887790} + k__BackingField: {fileID: 3035760932289101816} + k__BackingField: {fileID: 2615952973387112450} + k__BackingField: {fileID: 3748026497419659573} + k__BackingField: {fileID: 2588384133887034894} + k__BackingField: {fileID: 8922295334492411225} + k__BackingField: {fileID: 5339802213853544233} + k__BackingField: {fileID: 1469338590548789471} + k__BackingField: {fileID: 5279376384905517670} + k__BackingField: {fileID: 17978457728262906} +--- !u!1 &7812544424410854405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3571829164687521184} + - component: {fileID: 6778029842967471712} + - component: {fileID: 4017910736750065323} + - component: {fileID: 5622065931100864621} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3571829164687521184 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 126151493484884023} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6778029842967471712 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + m_CullTransparentMesh: 1 +--- !u!114 &4017910736750065323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uBB50\uAC00 \uC88B\uC744\uAE4C.." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!210 &5622065931100864621 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7812544424410854405} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 6 + m_SortAtRoot: 0 +--- !u!1001 &2718897986636601543 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2397117528733804567} + m_Modifications: + - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a327d1fc80d90bd438cfcd1ad2b219c7, type: 3} + - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_FillAmount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_FillMethod + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_FillOrigin + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3} + - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 4119792729305172665, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Name + value: InteractionCanvas + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 33.3 + objectReference: {fileID: 0} + - target: {fileID: 8141102490971775899, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + insertIndex: -1 + addedObject: {fileID: 126151493484984327} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + insertIndex: -1 + addedObject: {fileID: 9027939020919762395} + m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} +--- !u!114 &1469338590548789471 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3593684458396504088, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5339802213853544233 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8043919875794167790, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7522674838449308991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7293985954889289183 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7522674838449308991 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9027939020919762395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7522674838449308991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35b689d0205d778479b0dac3b159c3b4, type: 3} + m_Name: + m_EditorClassIdentifier: + canvasGroup: {fileID: 126151493485040859} + barkText: + m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 4017910736750065323} + nameText: + m_uiText: {fileID: 0} + m_textMeshProUGUI: {fileID: 0} + includeName: 0 + portraitImage: {fileID: 0} + showPortraitImage: 0 + doneTime: 0 + animationTransitions: + showTrigger: Show + hideTrigger: Hide + duration: 3 + keepInView: 0 + waitUntilSequenceEnds: 0 + cancelWaitUntilSequenceEndsIfReplacingBark: 0 + waitForContinueButton: 0 + textDisplaySetting: 0 diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab.meta b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab.meta new file mode 100644 index 000000000..b05edad3b --- /dev/null +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6c1ef58eadd33b64081c2586a3ac56a8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab b/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab index 05c8acb1d..7e47a386a 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Crews/ServerCrew.prefab @@ -768,9 +768,9 @@ MonoBehaviour: _isRandomRange: 0 _randomRange: {x: 0, y: 1} _randomStrings: - - 01Maid - - 02Maid - - 03Maid + - 01Suit + - 02Suit + - 03Suit --- !u!114 &17978457728262906 MonoBehaviour: m_ObjectHideFlags: 0 @@ -998,7 +998,7 @@ PrefabInstance: - target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3} + objectReference: {fileID: 21300000, guid: e7b746bc5bff9d64fb1129b9aa8ccf3e, type: 3} - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1063,6 +1063,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 33.3 objectReference: {fileID: 0} + - target: {fileID: 8141102490971775899, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index d45e72422..51ab6b5ff 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -205,11 +205,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5701996018619210215} - - {fileID: 790144698020171886} - - {fileID: 5559400221697507446} - - {fileID: 5881185964479335323} - - {fileID: 7251359079948161700} + - {fileID: 8225314152015310938} + - {fileID: 3787924782869109888} + - {fileID: 2147223887336074083} + - {fileID: 7971114974575117062} + - {fileID: 5022839729795059686} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1374224201695919457 @@ -2044,68 +2044,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 117106204208961762} m_PrefabAsset: {fileID: 0} ---- !u!1001 &128984391524895884 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5776045902233640550} - m_Modifications: - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.x - value: -5.1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.z - value: -5.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_Name - value: ServingTable (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} ---- !u!4 &790144698020171886 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - m_PrefabInstance: {fileID: 128984391524895884} - m_PrefabAsset: {fileID: 0} --- !u!1001 &238274131033979986 PrefabInstance: m_ObjectHideFlags: 0 @@ -2902,6 +2840,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 917864417232971400} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1653223809729804161 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5776045902233640550} + m_Modifications: + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.x + value: -4.2 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.z + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_Name + value: BartenderTable (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} +--- !u!4 &2147223887336074083 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + m_PrefabInstance: {fileID: 1653223809729804161} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1717170598469241424 PrefabInstance: m_ObjectHideFlags: 0 @@ -4290,6 +4290,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 4454847877275915547} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4588182244597694562 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5776045902233640550} + m_Modifications: + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.x + value: -5.1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.z + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_Name + value: BartenderTable (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} +--- !u!4 &3787924782869109888 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + m_PrefabInstance: {fileID: 4588182244597694562} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4713408351574990725 PrefabInstance: m_ObjectHideFlags: 0 @@ -4352,72 +4414,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 4713408351574990725} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4907966878471849221 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5776045902233640550} - m_Modifications: - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.x - value: -6 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.z - value: -5.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_Name - value: ServingTable - objectReference: {fileID: 0} - - target: {fileID: 8706977556548979489, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} ---- !u!4 &5701996018619210215 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - m_PrefabInstance: {fileID: 4907966878471849221} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4951637507715304094 PrefabInstance: m_ObjectHideFlags: 0 @@ -4480,68 +4476,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: b3ebd96a054999f449bad045e6334acb, type: 3} m_PrefabInstance: {fileID: 4951637507715304094} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5051882093702667412 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5776045902233640550} - m_Modifications: - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.x - value: -4.2 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.z - value: -5.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_Name - value: ServingTable (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} ---- !u!4 &5559400221697507446 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - m_PrefabInstance: {fileID: 5051882093702667412} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5106682169580967265 PrefabInstance: m_ObjectHideFlags: 0 @@ -5020,6 +4954,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} m_PrefabInstance: {fileID: 5553610883883680695} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5659231338933818116 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5776045902233640550} + m_Modifications: + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.x + value: -2.4 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.z + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_Name + value: BartenderTable (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} +--- !u!4 &5022839729795059686 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + m_PrefabInstance: {fileID: 5659231338933818116} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5722224821455478106 PrefabInstance: m_ObjectHideFlags: 0 @@ -5560,68 +5556,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: b3ebd96a054999f449bad045e6334acb, type: 3} m_PrefabInstance: {fileID: 6526153460580896826} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6531131564544366457 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5776045902233640550} - m_Modifications: - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.x - value: -3.3 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.z - value: -5.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_Name - value: ServingTable (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} ---- !u!4 &5881185964479335323 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - m_PrefabInstance: {fileID: 6531131564544366457} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6594563473990712272 PrefabInstance: m_ObjectHideFlags: 0 @@ -6096,6 +6030,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 7118319782221672339} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7323416091489148900 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5776045902233640550} + m_Modifications: + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.x + value: -3.3 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.z + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_Name + value: BartenderTable (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} +--- !u!4 &7971114974575117062 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + m_PrefabInstance: {fileID: 7323416091489148900} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7815781463784416606 PrefabInstance: m_ObjectHideFlags: 0 @@ -6364,68 +6360,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 7960602612696021638} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8043172050540613190 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5776045902233640550} - m_Modifications: - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.x - value: -2.4 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalPosition.z - value: -5.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - propertyPath: m_Name - value: ServingTable (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} ---- !u!4 &7251359079948161700 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} - m_PrefabInstance: {fileID: 8043172050540613190} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8194048684285091157 PrefabInstance: m_ObjectHideFlags: 0 @@ -7052,6 +6986,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 8672589958834113685} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8726631719728475320 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5776045902233640550} + m_Modifications: + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.x + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalPosition.z + value: -5.5 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + propertyPath: m_Name + value: BartenderTable + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} +--- !u!4 &8225314152015310938 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: cfc8eb86b28d82b46995575cd12e9d09, type: 3} + m_PrefabInstance: {fileID: 8726631719728475320} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8930707640525847677 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab new file mode 100644 index 000000000..8f5c53031 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab @@ -0,0 +1,319 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5426810056585111802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8688861165770414157} + m_Layer: 8 + m_Name: BartenderSpawn + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8688861165770414157 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426810056585111802} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.6, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 809828747251277026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6373979881487551315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8080204312657253144} + - component: {fileID: 535721072425912087} + m_Layer: 8 + m_Name: CocktailGlassImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8080204312657253144 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6373979881487551315} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.679, z: -0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 203741387490724426} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &535721072425912087 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6373979881487551315} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 6 + m_Sprite: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 2973381882573389317, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: BartenderTable + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9659258 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.2588191 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 7624213675240184438, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: 2 + addedObject: {fileID: 8688861165770414157} + - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 8080204312657253144} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 4366825669518001782} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!4 &203741387490724426 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!4 &809828747251277026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4366825669518001782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0dbd41efa5688944084c710e7c96b2ad, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 6533109861150454071} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: 1 + k__BackingField: 0.7 + k__BackingField: + IsOpened: 0 + CocktailGlassImage: {fileID: 535721072425912087} +--- !u!4 &5927803667513949971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!212 &6077686033771388879 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab.meta new file mode 100644 index 000000000..d382ba247 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cfc8eb86b28d82b46995575cd12e9d09 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Uis/Tycoons/Bill.prefab b/Assets/05.Prefabs/Uis/Tycoons/Bill.prefab index c026de79c..40e90a6ca 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/Bill.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/Bill.prefab @@ -165,6 +165,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2978111754004746161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9221717543066437816} + - component: {fileID: 3435787241198268361} + - component: {fileID: 8961549178773681412} + m_Layer: 5 + m_Name: CheckImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9221717543066437816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2978111754004746161} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 491169346809573176} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: -90, y: -90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3435787241198268361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2978111754004746161} + m_CullTransparentMesh: 1 +--- !u!114 &8961549178773681412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2978111754004746161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 596334599, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3628541221857890036 GameObject: m_ObjectHideFlags: 0 @@ -347,10 +422,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 491169346809573176} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: -60, y: -60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &776608766868378085 CanvasRenderer: @@ -426,6 +501,7 @@ RectTransform: - {fileID: 6645972450045353238} - {fileID: 4101085107370292335} - {fileID: 6337954123549054090} + - {fileID: 9221717543066437816} - {fileID: 8259920586739715282} - {fileID: 7989580489010594267} m_Father: {fileID: 0} @@ -512,9 +588,10 @@ MonoBehaviour: _slider: {fileID: 7083250868190644559} _filledImage: {fileID: 2789272209311033423} _orderImage: {fileID: 1094699508538862306} - _tableNumberImageObject: {fileID: 2596367034953283962} _makingCocktailPivotObject: {fileID: 8887727100253185871} + _checkImageObject: {fileID: 2978111754004746161} _stampImageObject: {fileID: 5106576306180920836} + _tableNumberImageObject: {fileID: 2596367034953283962} _tableNumberText: {fileID: 882719813517343284} _startColor: {r: 0, g: 1, b: 0, a: 1} _endColor: {r: 1, g: 0, b: 0, a: 1} diff --git a/Assets/07.Animations/Uis/Bill/BartenderChecked.anim b/Assets/07.Animations/Uis/Bill/BartenderChecked.anim new file mode 100644 index 000000000..60b86ee9d --- /dev/null +++ b/Assets/07.Animations/Uis/Bill/BartenderChecked.anim @@ -0,0 +1,102 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BartenderChecked + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 596334599, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.11666667 + value: {fileID: -147191287, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.2 + value: {fileID: -1127003578, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.28333333 + value: {fileID: 1641716054, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.4 + value: {fileID: 1513449738, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.51666665 + value: {fileID: 351649321, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.6 + value: {fileID: 1073272426, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.68333334 + value: {fileID: 1212594532, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.8 + value: {fileID: -1157809890, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 0.9166667 + value: {fileID: -122489167, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - time: 1 + value: {fileID: -852591673, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + attribute: m_Sprite + path: CheckImage + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4077136913 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 596334599, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: -147191287, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: -1127003578, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: 1641716054, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: 1513449738, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: 351649321, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: 1073272426, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: 1212594532, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: -1157809890, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: -122489167, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + - {fileID: -852591673, guid: 21e4be4a341e655458aa1b8455d3860f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/Uis/Bill/BartenderChecked.anim.meta b/Assets/07.Animations/Uis/Bill/BartenderChecked.anim.meta new file mode 100644 index 000000000..547303a4c --- /dev/null +++ b/Assets/07.Animations/Uis/Bill/BartenderChecked.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f5867f4a6cf8b441887be6e30eba1f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/Uis/Bill/Bill.controller b/Assets/07.Animations/Uis/Bill/Bill.controller index de1f4a650..e04524489 100644 --- a/Assets/07.Animations/Uis/Bill/Bill.controller +++ b/Assets/07.Animations/Uis/Bill/Bill.controller @@ -13,6 +13,7 @@ AnimatorState: m_Transitions: - {fileID: -3078738568503769026} - {fileID: 6773118582328985963} + - {fileID: -4160006912554970518} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -28,6 +29,59 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-5501573292665770024 +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: isAnimationTrigger + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: isOrderedSucceed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2510105194293781130} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-4160006912554970518 +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: isBartenderChecked + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2704987845043047076} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3078738568503769026 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -103,6 +157,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: isBartenderChecked + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -142,6 +202,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &2704987845043047076 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BartenderChecked + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5316906029072152627} + - {fileID: -5501573292665770024} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 8f5867f4a6cf8b441887be6e30eba1f3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &5165102397849608243 AnimatorStateMachine: serializedVersion: 6 @@ -153,23 +241,54 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 2510105194293781130} - m_Position: {x: 490, y: 190, z: 0} + m_Position: {x: 600, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -262726275448414841} - m_Position: {x: 510, y: 60, z: 0} + m_Position: {x: 600, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: -7492876922963201345} - m_Position: {x: 250, y: 120, z: 0} + m_Position: {x: 50, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2704987845043047076} + m_Position: {x: 280, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_AnyStatePosition: {x: -150, y: 20, z: 0} + m_EntryPosition: {x: -150, y: 120, z: 0} + m_ExitPosition: {x: 860, y: 140, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -7492876922963201345} +--- !u!1101 &5316906029072152627 +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: isAnimationTrigger + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: isOrderedSucceed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -262726275448414841} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &6773118582328985963 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes b/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes index a390ca5d5..dec2e2153 100644 Binary files a/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes and b/Assets/08.Spines/Characters/Npcs/Crews/Crew.skel.bytes differ diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat index d0fd3a58a..be78ec497 100644 --- a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _RECEIVE_SHADOWS - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -33,7 +34,7 @@ Material: - _Cutoff: 0.1 - _DoubleSidedLighting: 0 - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 + - _ReceiveShadows: 1 - _StencilComp: 8 - _StencilRef: 1 - _StraightAlphaInput: 1 diff --git a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat index 00a3fe24d..b1c65e86f 100644 --- a/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat +++ b/Assets/08.Spines/Characters/Npcs/Crews/Crew_Crew_2.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _RECEIVE_SHADOWS - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -33,7 +34,7 @@ Material: - _Cutoff: 0.1 - _DoubleSidedLighting: 0 - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 + - _ReceiveShadows: 1 - _StencilComp: 8 - _StencilRef: 1 - _StraightAlphaInput: 1 diff --git a/Assets/11.BehaviorTree/BartenderCrew.asset b/Assets/11.BehaviorTree/BartenderCrew.asset new file mode 100644 index 000000000..e391a5b62 --- /dev/null +++ b/Assets/11.BehaviorTree/BartenderCrew.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b23f08d2ae4cba14087c1ed36193d82b, type: 3} + m_Name: BartenderCrew + m_EditorClassIdentifier: + mBehaviorSource: + behaviorName: Customer + behaviorDescription: + mTaskData: + types: [] + parentIndex: + startIndex: + variableStartIndex: + JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(548.5,11.3636351)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(-2.36053467,152.585861)"},"ID":1,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(0,120)"},"ID":2,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-157.989319,125.146851)"},"ID":3,"Name":"Success + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.CheckOrderedCocktail","NodeData":{"Offset":"(-237.655518,149.097412)"},"ID":4,"Name":"Check + Ordered Cocktail","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.MakingCocktail","NodeData":{"Offset":"(-4.782568,145.6521)"},"ID":5,"Name":"Making + Cocktail","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(188.260864,145.6521)"},"ID":6,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(152.26709,126.376556)"},"ID":7,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' + fieldSerializationData: + typeName: [] + fieldNameHash: + startIndex: + dataPosition: + unityObjects: [] + byteData: + byteDataArray: + Version: 1.7.9 diff --git a/Assets/11.BehaviorTree/BartenderCrew.asset.meta b/Assets/11.BehaviorTree/BartenderCrew.asset.meta new file mode 100644 index 000000000..ff38c908c --- /dev/null +++ b/Assets/11.BehaviorTree/BartenderCrew.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 700e4713e87b6d146a693ed991e100ae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/11.BehaviorTree/Customer.asset b/Assets/11.BehaviorTree/Customer.asset index e4e6a0105..d222ed098 100644 --- a/Assets/11.BehaviorTree/Customer.asset +++ b/Assets/11.BehaviorTree/Customer.asset @@ -35,7 +35,7 @@ MonoBehaviour: Fail","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.MoveSpawnPosition","NodeData":{"Offset":"(-3.28204346,144.4049)"},"ID":13,"Name":"Move Spawn Position","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.CheckOut","NodeData":{"Offset":"(152.261658,140)"},"ID":14,"Name":"Check Out","Instant":true}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(742.794,147.214279)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":15,"Name":"Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.MoveSpawnPosition","NodeData":{"Offset":"(-298.843353,152.3807)"},"ID":16,"Name":"Move - Spawn Position","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.Vomit","NodeData":{"Offset":"(-134.094391,154.430084)"},"ID":17,"Name":"Vomit","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-2.775899,148.649414)"},"ID":18,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Actions.MoveSpawnPosition","NodeData":{"Offset":"(140.7489,148.095245)"},"ID":19,"Name":"Move + Spawn Position","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.Vomit","NodeData":{"Offset":"(-134.094391,154.430084)"},"ID":17,"Name":"Vomit","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-2.775899,148.649414)"},"ID":18,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Actions.MoveSpawnPosition","NodeData":{"Offset":"(140.7489,148.095245)"},"ID":19,"Name":"Move Spawn Position","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.CheckOut","NodeData":{"Offset":"(290.7482,150)"},"ID":20,"Name":"Check Out","Instant":true}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' fieldSerializationData: diff --git a/Assets/11.BehaviorTree/ServerCrew.asset b/Assets/11.BehaviorTree/ServerCrew.asset index 5a58d9a90..47b80e402 100644 --- a/Assets/11.BehaviorTree/ServerCrew.asset +++ b/Assets/11.BehaviorTree/ServerCrew.asset @@ -20,15 +20,19 @@ MonoBehaviour: parentIndex: startIndex: variableStartIndex: - JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(548.5,11.3636351)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(-2.36053467,152.585861)"},"ID":1,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(0,120)"},"ID":2,"Name":"Cleaner - Cycle","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-2.54729939,179.727264)"},"ID":3,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-225.263184,152.083344)"},"ID":4,"Name":"Succes + JSONSerialization: '{"EntryTask":{"Type":"BehaviorDesigner.Runtime.Tasks.EntryTask","NodeData":{"Offset":"(548.5,11.3636351)"},"ID":0,"Name":"Entry","Instant":true},"RootTask":{"Type":"BehaviorDesigner.Runtime.Tasks.Repeater","NodeData":{"Offset":"(-2.36053467,152.585861)"},"ID":1,"Name":"Repeater","Instant":true,"SharedIntcount":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0},"SharedBoolrepeatForever":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedBoolendOnFailure":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(0,120)"},"ID":2,"Name":"Server + Cycle","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(-2.54729939,179.727264)"},"ID":3,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-328.711365,152.083344)"},"ID":4,"Name":"Succes Sequence","Instant":true,"AbortTypeabortType":"LowerPriority","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.CheckOnMission","NodeData":{"Offset":"(-120,150)"},"ID":5,"Name":"Check - On Mission","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(140.876663,145.4505)"},"ID":6,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-105,147.5)"},"ID":7,"Name":"Succes - Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OnMission","NodeData":{"Offset":"(-140,150)"},"ID":8,"Name":"On - Mission","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.CompleteMission","NodeData":{"Offset":"(0,150)"},"ID":9,"Name":"Complete - Mission","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(162.857178,152.857422)"},"ID":10,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(150,145.2378)"},"ID":11,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(289.942871,151.213776)"},"ID":12,"Name":"Fail - Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.MoveToRandomPositionInRange","NodeData":{"Offset":"(-100.101685,148.086548)"},"ID":13,"Name":"Move - To Random Position In Range","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(99.99939,150)"},"ID":14,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' + On Mission","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(140.876663,145.4505)","Comment":"\uc11c\ube59\ud14c\uc774\ube14\uc5d0\uc11c + \uc74c\ub8cc\ub97c \ub4e4\uc5c8\ub294\uc9c0 \uccb4\ud06c"},"ID":6,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-136.249985,147.5)"},"ID":7,"Name":"Succes + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.TakeServingItem","NodeData":{"Offset":"(-90,150)"},"ID":8,"Name":"Take + Serving Item","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(93.74995,150)","Comment":"\uc190\ub2d8\uc5d0\uac8c + \uc11c\ube59\uc744 \uc131\uacf5\ud588\ub294\uc9c0 \uccb4\ud06c"},"ID":9,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-198.778625,149.4115)"},"ID":10,"Name":"Succes + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.Serving","NodeData":{"Offset":"(-170,150)"},"ID":11,"Name":"Serving","Instant":true},{"Type":"BlueWater.BehaviorTrees.Actions.CompleteMission","NodeData":{"Offset":"(0,150)"},"ID":12,"Name":"Complete + Mission","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(160,150)"},"ID":13,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(190.697632,148.3722)"},"ID":14,"Name":"Fail + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(-50,149.535156)"},"ID":15,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}},{"Type":"BlueWater.BehaviorTrees.Actions.Refind","NodeData":{"Offset":"(90,149.535156)"},"ID":16,"Name":"Refind","Instant":true}]}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(118.750023,145.2378)"},"ID":17,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(376.1497,151.213776)"},"ID":18,"Name":"Fail + Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.MoveToRandomPositionInRange","NodeData":{"Offset":"(-100.101685,148.086548)"},"ID":19,"Name":"Move + To Random Position In Range","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(99.99939,150)"},"ID":20,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":2},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":false},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":1}}]}]}]}]},"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true}]}' fieldSerializationData: typeName: [] fieldNameHash: