diff --git a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs index 0cf75aa84..722186789 100644 --- a/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs +++ b/Assets/02.Scripts/Prop/Tycoon/PowerSwitch.cs @@ -1,3 +1,4 @@ +using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; @@ -25,7 +26,7 @@ namespace BlueWater.Tycoons public override bool CanInteraction() { - return !_isOpened; + return !_isOpened && TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.DailyFoodMenuUi.CanOpen(); } private void OpenTycoonSwitch() diff --git a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs index a5c090b4f..b0481e5e4 100644 --- a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs @@ -45,32 +45,32 @@ namespace BlueWater.Uis foreach (var element in _fryingPanFoodSlotUis) { element.SetFoodData(null); - element.AddButtonClickListener(() => SelectDailyFood(element)); + element.AddButtonClickListener(() => RemoveDailyFood(element)); } _soupFoodSlotUis = _soupFoodSlotLocation.GetComponentsInChildren().ToList(); foreach (var element in _soupFoodSlotUis) { element.SetFoodData(null); - element.AddButtonClickListener(() => SelectDailyFood(element)); + element.AddButtonClickListener(() => RemoveDailyFood(element)); } _skewerFoodSlotUis = _skewerFoodSlotLocation.GetComponentsInChildren().ToList(); foreach (var element in _skewerFoodSlotUis) { element.SetFoodData(null); - element.AddButtonClickListener(() => SelectDailyFood(element)); + element.AddButtonClickListener(() => RemoveDailyFood(element)); } _dessertPanFoodSlotUis = _dessertFoodSlotLocation.GetComponentsInChildren().ToList(); foreach (var element in _dessertPanFoodSlotUis) { element.SetFoodData(null); - element.AddButtonClickListener(() => SelectDailyFood(element)); + element.AddButtonClickListener(() => RemoveDailyFood(element)); } } - private void SelectDailyFood(TycoonItemSlotUi tycoonItemSlotUi) + private void RemoveDailyFood(TycoonItemSlotUi tycoonItemSlotUi) { tycoonItemSlotUi.SetFoodData(null); _cookUi.CheckCookable(); @@ -122,5 +122,13 @@ namespace BlueWater.Uis throw new ArgumentOutOfRangeException(nameof(foodType), foodType, null); } } + + public bool CanOpen() + { + return _fryingPanFoodSlotUis.Any(slot => slot.FoodData != null) || + _soupFoodSlotUis.Any(slot => slot.FoodData != null) || + _skewerFoodSlotUis.Any(slot => slot.FoodData != null) || + _dessertPanFoodSlotUis.Any(slot => slot.FoodData != null); + } } } \ No newline at end of file diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index 6de53d759..a02fef735 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -3852,10 +3852,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 257844634641091007} - - {fileID: 7238862534389156374} - - {fileID: 517739506182348329} - - {fileID: 2925951319070828573} + - {fileID: 1028689542252552374} + - {fileID: 6049166031534435163} + - {fileID: 3818770221804553492} + - {fileID: 5653051193455399640} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6431317417444516108 @@ -5682,6 +5682,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 3f301faac738d7743b5242be145dedd4, type: 3} m_PrefabInstance: {fileID: 74397869649554437} m_PrefabAsset: {fileID: 0} +--- !u!1001 &86916175446283838 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_Name + value: CustomerTable2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fe26d432e89923a409383fddb77e54a6, type: 3} +--- !u!4 &1028689542252552374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + m_PrefabInstance: {fileID: 86916175446283838} + m_PrefabAsset: {fileID: 0} --- !u!1001 &239458162136754513 PrefabInstance: m_ObjectHideFlags: 0 @@ -6504,68 +6566,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} m_PrefabInstance: {fileID: 1794384006141343106} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1904038487277742292 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1582116343231843844} - m_Modifications: - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.x - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.z - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4833254060163934334, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_Name - value: CustomerTable2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} ---- !u!4 &257844634641091007 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - m_PrefabInstance: {fileID: 1904038487277742292} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2116485349430270465 PrefabInstance: m_ObjectHideFlags: 0 @@ -6690,68 +6690,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 2157172592550403595} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2222506525307846466 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1582116343231843844} - m_Modifications: - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.x - value: -9 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.z - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4833254060163934334, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_Name - value: CustomerTable2 (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} ---- !u!4 &517739506182348329 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - m_PrefabInstance: {fileID: 2222506525307846466} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2259128091049337949 PrefabInstance: m_ObjectHideFlags: 0 @@ -7846,68 +7784,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 3291302007962681988} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3558861330957207926 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1582116343231843844} - m_Modifications: - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.x - value: -9 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.z - value: -9 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4833254060163934334, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_Name - value: CustomerTable2 (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} ---- !u!4 &2925951319070828573 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - m_PrefabInstance: {fileID: 3558861330957207926} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3578289723384366598 PrefabInstance: m_ObjectHideFlags: 0 @@ -8218,6 +8094,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} m_PrefabInstance: {fileID: 4219509720142167618} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4290968602412675996 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.x + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_Name + value: CustomerTable2 (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fe26d432e89923a409383fddb77e54a6, type: 3} +--- !u!4 &3818770221804553492 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + m_PrefabInstance: {fileID: 4290968602412675996} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4322516846788510948 PrefabInstance: m_ObjectHideFlags: 0 @@ -8342,6 +8280,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} m_PrefabInstance: {fileID: 4372651619006273178} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4684243232449143888 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.x + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.z + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_Name + value: CustomerTable2 (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fe26d432e89923a409383fddb77e54a6, type: 3} +--- !u!4 &5653051193455399640 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + m_PrefabInstance: {fileID: 4684243232449143888} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4977829239787037314 PrefabInstance: m_ObjectHideFlags: 0 @@ -9304,6 +9304,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 3f301faac738d7743b5242be145dedd4, type: 3} m_PrefabInstance: {fileID: 6621036342382228737} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6665501212622806483 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalPosition.z + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_Name + value: CustomerTable2 (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fe26d432e89923a409383fddb77e54a6, type: 3} +--- !u!4 &6049166031534435163 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + m_PrefabInstance: {fileID: 6665501212622806483} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6719915304933239705 PrefabInstance: m_ObjectHideFlags: 0 @@ -10236,68 +10298,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 785cea62243883549bddb71405b44456, type: 3} m_PrefabInstance: {fileID: 8952402252677842790} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9046913208928906109 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1582116343231843844} - m_Modifications: - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.x - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalPosition.z - value: -9 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4833254060163934334, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - propertyPath: m_Name - value: CustomerTable2 (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} ---- !u!4 &7238862534389156374 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: 1c2e9cc304729ac4a92dd2736e9eb6e1, type: 3} - m_PrefabInstance: {fileID: 9046913208928906109} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9129653386793672694 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Environment/Combat.meta b/Assets/05.Prefabs/Props/Environment/Combat.meta new file mode 100644 index 000000000..37755c026 --- /dev/null +++ b/Assets/05.Prefabs/Props/Environment/Combat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab741dd7ce3ffab459f6987ce1a6857c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Environment/FallBush01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/FallBush01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallBush01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/FallBush01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/FallBush01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/FallBush01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallBush01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/FallBush01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/FallRock01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/FallRock01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallRock01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/FallRock01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/FallRock01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/FallRock01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallRock01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/FallRock01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/FallTree01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/FallTree01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallTree01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/FallTree01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/FallTree01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/FallTree01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallTree01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/FallTree01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/FallTree02.prefab b/Assets/05.Prefabs/Props/Environment/Combat/FallTree02.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallTree02.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/FallTree02.prefab diff --git a/Assets/05.Prefabs/Props/Environment/FallTree02.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/FallTree02.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/FallTree02.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/FallTree02.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/Grass01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/Grass01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/Grass01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/Grass01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/Grass01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/Grass01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/Grass01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/Grass01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab b/Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01Group.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01Group.prefab diff --git a/Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01Group.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SmallGrass01Group.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/SmallGrass01Group.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/SummerBush01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/SummerBush01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerBush01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/SummerBush01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/SummerBush01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/SummerBush01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerBush01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/SummerBush01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/SummerBush02.prefab b/Assets/05.Prefabs/Props/Environment/Combat/SummerBush02.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerBush02.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/SummerBush02.prefab diff --git a/Assets/05.Prefabs/Props/Environment/SummerBush02.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/SummerBush02.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerBush02.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/SummerBush02.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/SummerTree01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/SummerTree01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerTree01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/SummerTree01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/SummerTree01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/SummerTree01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerTree01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/SummerTree01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/SummerTree02.prefab b/Assets/05.Prefabs/Props/Environment/Combat/SummerTree02.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerTree02.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/SummerTree02.prefab diff --git a/Assets/05.Prefabs/Props/Environment/SummerTree02.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/SummerTree02.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/SummerTree02.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/SummerTree02.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/Tree.prefab b/Assets/05.Prefabs/Props/Environment/Combat/Tree.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/Tree.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/Tree.prefab diff --git a/Assets/05.Prefabs/Props/Environment/Tree.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/Tree.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/Tree.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/Tree.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/WinterBush01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/WinterBush01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/WinterBush01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/WinterBush01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/WinterBush01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/WinterBush01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/WinterBush01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/WinterBush01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/WinterGrass01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/WinterGrass01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/WinterGrass01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/WinterGrass01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/WinterGrass01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/WinterGrass01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/WinterGrass01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/WinterGrass01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/WinterTree01.prefab b/Assets/05.Prefabs/Props/Environment/Combat/WinterTree01.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Environment/WinterTree01.prefab rename to Assets/05.Prefabs/Props/Environment/Combat/WinterTree01.prefab diff --git a/Assets/05.Prefabs/Props/Environment/WinterTree01.prefab.meta b/Assets/05.Prefabs/Props/Environment/Combat/WinterTree01.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Environment/WinterTree01.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Combat/WinterTree01.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon.meta b/Assets/05.Prefabs/Props/Environment/Tycoon.meta new file mode 100644 index 000000000..862f98397 --- /dev/null +++ b/Assets/05.Prefabs/Props/Environment/Tycoon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9918b27c2e6df314a83322d8fb99b508 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Bar.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Bar.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Bar.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Bar.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Bar.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Bar.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Bar.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Bar.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Barrel.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Barrel.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Barrel.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Barrel.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/BarrelGroup.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/BarrelGroup.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/BarrelGroup.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/BarrelGroup.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab.meta diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/BaseTycoonProp.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/BaseTycoonProp.prefab new file mode 100644 index 000000000..a97aa3f31 --- /dev/null +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/BaseTycoonProp.prefab @@ -0,0 +1,231 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3764902268943045601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7986070582027999988} + - component: {fileID: 8465497525880288504} + m_Layer: 8 + m_Name: BaseTycoonProp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7986070582027999988 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + 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: 7438534416270888028} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8465497525880288504 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + 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: 3 + m_Size: {x: 1, y: 1, z: 0.5} + m_Center: {x: 0, y: 0.5, z: 0.25} +--- !u!1 &7835622629792856689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7438534416270888028} + - component: {fileID: 3580758810857167321} + m_Layer: 8 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7438534416270888028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7835622629792856689} + 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: + - {fileID: 7192483373850935599} + m_Father: {fileID: 7986070582027999988} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &3580758810857167321 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7835622629792856689} + m_Enabled: 1 + 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: 2100000, guid: 70aebc98d60422b4fa30aa5da1fe3623, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 0} + 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8884531212319162473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7192483373850935599} + - component: {fileID: 9047629830516719732} + m_Layer: 8 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7192483373850935599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884531212319162473} + 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: 7438534416270888028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &9047629830516719732 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884531212319162473} + m_Enabled: 1 + m_CastShadows: 3 + 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: 2100000, guid: ee61efd036130b847b41f878f20ddf33, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/BaseTycoonProp.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/BaseTycoonProp.prefab.meta new file mode 100644 index 000000000..0b8ec793e --- /dev/null +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/BaseTycoonProp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 06b1e69255a5cf549a66772b84f05858 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Board.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Board.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Board.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Board.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Board.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Board.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Board.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Board.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Box.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Box.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Box.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Box.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Box.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Box.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Box.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Box.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/ChickenCoop.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/ChickenCoop.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/ChickenCoop.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/ChickenCoop.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/ChickenCoop.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/ChickenCoop.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/ChickenCoop.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/ChickenCoop.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Column.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Column.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Column.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Column.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Counter.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Counter.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Counter.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Counter.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Counter.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Counter.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Counter.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Counter.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Fence.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Fence.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Fence.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Fence.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Fence.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Fence.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Fence.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Fence.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Rum.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Rum.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Rum.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Rum.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/RumBarrel.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/RumBarrel.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/RumBarrel.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/RumBarrel.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/RumBarrel.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/RumBarrel.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/RumBarrel.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/RumBarrel.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/Stove.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Stove.prefab similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Stove.prefab rename to Assets/05.Prefabs/Props/Environment/Tycoon/Stove.prefab diff --git a/Assets/05.Prefabs/Props/Furniture/Stove.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/Stove.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Stove.prefab.meta rename to Assets/05.Prefabs/Props/Environment/Tycoon/Stove.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab.meta b/Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab.meta index 0b8ec793e..6ad3b3548 100644 --- a/Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06b1e69255a5cf549a66772b84f05858 +guid: b97349d9df2c9eb4abdca5b7559b2260 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable1.prefab b/Assets/05.Prefabs/Props/Furniture/CustomerTable1.prefab similarity index 62% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable1.prefab rename to Assets/05.Prefabs/Props/Furniture/CustomerTable1.prefab index 5b6d67b29..0419d1c6b 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable1.prefab +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable1.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1588431825011835429 +--- !u!1 &724788835535604929 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,72 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5161556643231822994} - m_Layer: 8 - m_Name: TableSeats - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5161556643231822994 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588431825011835429} - 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: - - {fileID: 72918880234409943} - - {fileID: 6987995983662494743} - m_Father: {fileID: 1871400395928592747} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3340968160590317205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8314409288261864133} - m_Layer: 8 - m_Name: Seat02 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8314409288261864133 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3340968160590317205} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6987995983662494743} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3430995138614654016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6567810361177397306} - - component: {fileID: 1936537098954677604} + - component: {fileID: 2964690548625124479} + - component: {fileID: 6236822149422532711} m_Layer: 8 m_Name: Food01 m_TagString: Untagged @@ -81,28 +17,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6567810361177397306 +--- !u!4 &2964690548625124479 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: -0.22, y: 0.39, z: 0.122} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 72918880234409943} + m_Father: {fileID: 3013392668820867302} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1936537098954677604 +--- !u!212 &6236822149422532711 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -151,7 +87,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4112995265026884530 +--- !u!1 &3345593261329410550 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -159,72 +95,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4988586968480553054} - m_Layer: 8 - m_Name: Seat01 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4988586968480553054 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4112995265026884530} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 72918880234409943} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7259785794916276111 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 72918880234409943} - m_Layer: 8 - m_Name: TableSeat01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &72918880234409943 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7259785794916276111} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4988586968480553054} - - {fileID: 6567810361177397306} - m_Father: {fileID: 5161556643231822994} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8221302613581290258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6322245974481813927} - - component: {fileID: 231587957349564794} + - component: {fileID: 4527135094192157299} + - component: {fileID: 2508811154982399617} m_Layer: 8 m_Name: Food02 m_TagString: Untagged @@ -232,28 +104,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6322245974481813927 +--- !u!4 &4527135094192157299 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0.22, y: 0.39, z: 0.122} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 6987995983662494743} + m_Father: {fileID: 7650620545660409483} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &231587957349564794 +--- !u!212 &2508811154982399617 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -302,7 +174,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8821924279338320136 +--- !u!1 &3461606380372754985 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -310,7 +182,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6987995983662494743} + - component: {fileID: 1714522929812896121} + m_Layer: 8 + m_Name: Seat02 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1714522929812896121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3461606380372754985} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7650620545660409483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5788276307657280998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9153630924747771756} + m_Layer: 8 + m_Name: Seat01 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9153630924747771756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5788276307657280998} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3013392668820867302} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7756466013142509665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7650620545660409483} m_Layer: 8 m_Name: TableSeat02 m_TagString: Untagged @@ -318,24 +252,90 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6987995983662494743 +--- !u!4 &7650620545660409483 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8821924279338320136} + m_GameObject: {fileID: 7756466013142509665} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8314409288261864133} - - {fileID: 6322245974481813927} - m_Father: {fileID: 5161556643231822994} + - {fileID: 1714522929812896121} + - {fileID: 4527135094192157299} + m_Father: {fileID: 5673800179821218247} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &8587436911065349023 +--- !u!1 &8375340281624282934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5673800179821218247} + m_Layer: 8 + m_Name: TableSeats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5673800179821218247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375340281624282934} + 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: + - {fileID: 3013392668820867302} + - {fileID: 7650620545660409483} + m_Father: {fileID: 1113069143766693512} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8728005820699174632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3013392668820867302} + m_Layer: 8 + m_Name: TableSeat01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3013392668820867302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728005820699174632} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9153630924747771756} + - {fileID: 2964690548625124479} + m_Father: {fileID: 5673800179821218247} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7036402301209193596 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -343,162 +343,126 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_SortingOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Name - value: CustomerTable01 + value: CustomerTable1 objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.z - value: 0.51575303 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.y - value: 0.35 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.z - value: 0.15787654 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.x value: 2 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.y value: 2 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.z value: 2 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.x value: 0.8 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.z value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Center.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Center.z value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 5161556643231822994} + addedObject: {fileID: 5673800179821218247} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 8002493057690629947} - m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} ---- !u!4 &1871400395928592747 stripped + addedObject: {fileID: 8517414085783629370} + m_SourcePrefab: {fileID: 100100000, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} +--- !u!4 &1113069143766693512 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!1 &4833254060163934334 stripped +--- !u!1 &6168185698541715357 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!114 &8002493057690629947 +--- !u!114 &8517414085783629370 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4833254060163934334} + m_GameObject: {fileID: 6168185698541715357} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3} @@ -508,12 +472,12 @@ MonoBehaviour: - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 4988586968480553054} - k__BackingField: {fileID: 1936537098954677604} + k__BackingField: {fileID: 9153630924747771756} + k__BackingField: {fileID: 6236822149422532711} TableDirection: {x: 1, y: 0, z: 0} - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 8314409288261864133} - k__BackingField: {fileID: 231587957349564794} + k__BackingField: {fileID: 1714522929812896121} + k__BackingField: {fileID: 2508811154982399617} TableDirection: {x: -1, y: 0, z: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable1.prefab.meta b/Assets/05.Prefabs/Props/Furniture/CustomerTable1.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable1.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/CustomerTable1.prefab.meta index 9e67571d9..fad325d8d 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable1.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc2abb0d190003240b86437081f20536 +guid: eef9d34af0c8a7f41b5329a67c4059c9 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable2.prefab b/Assets/05.Prefabs/Props/Furniture/CustomerTable2.prefab similarity index 61% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable2.prefab rename to Assets/05.Prefabs/Props/Furniture/CustomerTable2.prefab index c9d5bd6bb..018382ba9 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable2.prefab +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable2.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1588431825011835429 +--- !u!1 &724788835535604929 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,72 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5161556643231822994} - m_Layer: 8 - m_Name: TableSeats - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5161556643231822994 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588431825011835429} - 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: - - {fileID: 72918880234409943} - - {fileID: 6987995983662494743} - m_Father: {fileID: 1871400395928592747} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3340968160590317205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8314409288261864133} - m_Layer: 8 - m_Name: Seat02 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8314409288261864133 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3340968160590317205} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6987995983662494743} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3430995138614654016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6567810361177397306} - - component: {fileID: 1936537098954677604} + - component: {fileID: 2964690548625124479} + - component: {fileID: 6236822149422532711} m_Layer: 8 m_Name: Food01 m_TagString: Untagged @@ -81,28 +17,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6567810361177397306 +--- !u!4 &2964690548625124479 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -0.22, y: 0.309, z: 0.054} + m_LocalPosition: {x: -0.22, y: 0.306, z: 0.052} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 72918880234409943} + m_Father: {fileID: 3013392668820867302} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1936537098954677604 +--- !u!212 &6236822149422532711 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -151,7 +87,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4112995265026884530 +--- !u!1 &3345593261329410550 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -159,72 +95,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4988586968480553054} - m_Layer: 8 - m_Name: Seat01 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4988586968480553054 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4112995265026884530} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 72918880234409943} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7259785794916276111 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 72918880234409943} - m_Layer: 8 - m_Name: TableSeat01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &72918880234409943 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7259785794916276111} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4988586968480553054} - - {fileID: 6567810361177397306} - m_Father: {fileID: 5161556643231822994} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8221302613581290258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6322245974481813927} - - component: {fileID: 231587957349564794} + - component: {fileID: 4527135094192157299} + - component: {fileID: 2508811154982399617} m_Layer: 8 m_Name: Food02 m_TagString: Untagged @@ -232,28 +104,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6322245974481813927 +--- !u!4 &4527135094192157299 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.22, y: 0.30899996, z: 0.05400016} + m_LocalPosition: {x: 0.22, y: 0.306, z: 0.052000023} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 6987995983662494743} + m_Father: {fileID: 7650620545660409483} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &231587957349564794 +--- !u!212 &2508811154982399617 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -302,7 +174,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8821924279338320136 +--- !u!1 &3461606380372754985 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -310,7 +182,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6987995983662494743} + - component: {fileID: 1714522929812896121} + m_Layer: 8 + m_Name: Seat02 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1714522929812896121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3461606380372754985} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7650620545660409483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5788276307657280998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9153630924747771756} + m_Layer: 8 + m_Name: Seat01 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9153630924747771756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5788276307657280998} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3013392668820867302} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7756466013142509665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7650620545660409483} m_Layer: 8 m_Name: TableSeat02 m_TagString: Untagged @@ -318,24 +252,90 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6987995983662494743 +--- !u!4 &7650620545660409483 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8821924279338320136} + m_GameObject: {fileID: 7756466013142509665} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8314409288261864133} - - {fileID: 6322245974481813927} - m_Father: {fileID: 5161556643231822994} + - {fileID: 1714522929812896121} + - {fileID: 4527135094192157299} + m_Father: {fileID: 5673800179821218247} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &8587436911065349023 +--- !u!1 &8375340281624282934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5673800179821218247} + m_Layer: 8 + m_Name: TableSeats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5673800179821218247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375340281624282934} + 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: + - {fileID: 3013392668820867302} + - {fileID: 7650620545660409483} + m_Father: {fileID: 1113069143766693512} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8728005820699174632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3013392668820867302} + m_Layer: 8 + m_Name: TableSeat01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3013392668820867302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728005820699174632} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9153630924747771756} + - {fileID: 2964690548625124479} + m_Father: {fileID: 5673800179821218247} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7036402301209193596 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -343,170 +343,126 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_SortingOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: cdc14b3cd72060a4ea2572853f0db7c5, type: 3} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Name value: CustomerTable2 objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.z - value: 0.51575303 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.y - value: 0.35 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.z - value: 0.15787654 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.x value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.y value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.z value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.x value: 0.8 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.z value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Center.y value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Center.z value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: cdc14b3cd72060a4ea2572853f0db7c5, type: 3} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 5161556643231822994} + addedObject: {fileID: 5673800179821218247} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 8002493057690629947} - m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} ---- !u!4 &1871400395928592747 stripped + addedObject: {fileID: 8517414085783629370} + m_SourcePrefab: {fileID: 100100000, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} +--- !u!4 &1113069143766693512 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!1 &4833254060163934334 stripped +--- !u!1 &6168185698541715357 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!114 &8002493057690629947 +--- !u!114 &8517414085783629370 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4833254060163934334} + m_GameObject: {fileID: 6168185698541715357} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3} @@ -516,12 +472,12 @@ MonoBehaviour: - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 4988586968480553054} - k__BackingField: {fileID: 1936537098954677604} + k__BackingField: {fileID: 9153630924747771756} + k__BackingField: {fileID: 6236822149422532711} TableDirection: {x: 1, y: 0, z: 0} - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 8314409288261864133} - k__BackingField: {fileID: 231587957349564794} + k__BackingField: {fileID: 1714522929812896121} + k__BackingField: {fileID: 2508811154982399617} TableDirection: {x: -1, y: 0, z: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable2.prefab.meta b/Assets/05.Prefabs/Props/Furniture/CustomerTable2.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable2.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/CustomerTable2.prefab.meta index 2d4f3c8eb..9b61662f8 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable2.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable2.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c2e9cc304729ac4a92dd2736e9eb6e1 +guid: fe26d432e89923a409383fddb77e54a6 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab b/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab similarity index 62% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab rename to Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab index 0421df6ff..008d7244f 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1588431825011835429 +--- !u!1 &724788835535604929 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,72 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5161556643231822994} - m_Layer: 8 - m_Name: TableSeats - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5161556643231822994 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588431825011835429} - 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: - - {fileID: 72918880234409943} - - {fileID: 6987995983662494743} - m_Father: {fileID: 1871400395928592747} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3340968160590317205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8314409288261864133} - m_Layer: 8 - m_Name: Seat02 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8314409288261864133 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3340968160590317205} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6987995983662494743} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3430995138614654016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6567810361177397306} - - component: {fileID: 1936537098954677604} + - component: {fileID: 2964690548625124479} + - component: {fileID: 6236822149422532711} m_Layer: 8 m_Name: Food01 m_TagString: Untagged @@ -81,28 +17,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6567810361177397306 +--- !u!4 &2964690548625124479 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -0.22, y: 0.39, z: 0.122} + m_LocalPosition: {x: -0.22, y: 0.306, z: 0.052} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 72918880234409943} + m_Father: {fileID: 3013392668820867302} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1936537098954677604 +--- !u!212 &6236822149422532711 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -151,7 +87,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4112995265026884530 +--- !u!1 &3345593261329410550 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -159,72 +95,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4988586968480553054} - m_Layer: 8 - m_Name: Seat01 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4988586968480553054 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4112995265026884530} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 72918880234409943} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7259785794916276111 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 72918880234409943} - m_Layer: 8 - m_Name: TableSeat01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &72918880234409943 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7259785794916276111} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4988586968480553054} - - {fileID: 6567810361177397306} - m_Father: {fileID: 5161556643231822994} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8221302613581290258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6322245974481813927} - - component: {fileID: 231587957349564794} + - component: {fileID: 4527135094192157299} + - component: {fileID: 2508811154982399617} m_Layer: 8 m_Name: Food02 m_TagString: Untagged @@ -232,28 +104,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6322245974481813927 +--- !u!4 &4527135094192157299 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.22, y: 0.39, z: 0.122} + m_LocalPosition: {x: 0.22, y: 0.306, z: 0.052000023} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 6987995983662494743} + m_Father: {fileID: 7650620545660409483} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &231587957349564794 +--- !u!212 &2508811154982399617 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -302,7 +174,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8821924279338320136 +--- !u!1 &3461606380372754985 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -310,7 +182,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6987995983662494743} + - component: {fileID: 1714522929812896121} + m_Layer: 8 + m_Name: Seat02 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1714522929812896121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3461606380372754985} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7650620545660409483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5788276307657280998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9153630924747771756} + m_Layer: 8 + m_Name: Seat01 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9153630924747771756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5788276307657280998} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3013392668820867302} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7756466013142509665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7650620545660409483} m_Layer: 8 m_Name: TableSeat02 m_TagString: Untagged @@ -318,24 +252,90 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6987995983662494743 +--- !u!4 &7650620545660409483 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8821924279338320136} + m_GameObject: {fileID: 7756466013142509665} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8314409288261864133} - - {fileID: 6322245974481813927} - m_Father: {fileID: 5161556643231822994} + - {fileID: 1714522929812896121} + - {fileID: 4527135094192157299} + m_Father: {fileID: 5673800179821218247} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &8587436911065349023 +--- !u!1 &8375340281624282934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5673800179821218247} + m_Layer: 8 + m_Name: TableSeats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5673800179821218247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375340281624282934} + 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: + - {fileID: 3013392668820867302} + - {fileID: 7650620545660409483} + m_Father: {fileID: 1113069143766693512} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8728005820699174632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3013392668820867302} + m_Layer: 8 + m_Name: TableSeat01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3013392668820867302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728005820699174632} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9153630924747771756} + - {fileID: 2964690548625124479} + m_Father: {fileID: 5673800179821218247} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7036402301209193596 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -343,162 +343,126 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_SortingOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 2496c7db5d6099e468caebc7bd780dbb, type: 3} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Name value: CustomerTable3 objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.z - value: 0.51575303 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.y - value: 0.35 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.z - value: 0.15787654 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.x value: 0.8 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.z value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Center.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Center.z value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 2496c7db5d6099e468caebc7bd780dbb, type: 3} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 5161556643231822994} + addedObject: {fileID: 5673800179821218247} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 8002493057690629947} - m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} ---- !u!4 &1871400395928592747 stripped + addedObject: {fileID: 8517414085783629370} + m_SourcePrefab: {fileID: 100100000, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} +--- !u!4 &1113069143766693512 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!1 &4833254060163934334 stripped +--- !u!1 &6168185698541715357 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!114 &8002493057690629947 +--- !u!114 &8517414085783629370 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4833254060163934334} + m_GameObject: {fileID: 6168185698541715357} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3} @@ -508,12 +472,12 @@ MonoBehaviour: - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 4988586968480553054} - k__BackingField: {fileID: 1936537098954677604} + k__BackingField: {fileID: 9153630924747771756} + k__BackingField: {fileID: 6236822149422532711} TableDirection: {x: 1, y: 0, z: 0} - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 8314409288261864133} - k__BackingField: {fileID: 231587957349564794} + k__BackingField: {fileID: 1714522929812896121} + k__BackingField: {fileID: 2508811154982399617} TableDirection: {x: -1, y: 0, z: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab.meta b/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab.meta index 53f0cb0a7..9bb4cd931 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 09491e5a8c278444c83cfc25becf8b13 +guid: 41a1ae312fc8e8f45a2212d1eb401f1a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable4.prefab b/Assets/05.Prefabs/Props/Furniture/CustomerTable4.prefab similarity index 62% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable4.prefab rename to Assets/05.Prefabs/Props/Furniture/CustomerTable4.prefab index 4a9535cd6..0e12fc71e 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable4.prefab +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable4.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1588431825011835429 +--- !u!1 &724788835535604929 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,72 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5161556643231822994} - m_Layer: 8 - m_Name: TableSeats - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5161556643231822994 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588431825011835429} - 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: - - {fileID: 72918880234409943} - - {fileID: 6987995983662494743} - m_Father: {fileID: 1871400395928592747} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3340968160590317205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8314409288261864133} - m_Layer: 8 - m_Name: Seat02 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8314409288261864133 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3340968160590317205} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6987995983662494743} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3430995138614654016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6567810361177397306} - - component: {fileID: 1936537098954677604} + - component: {fileID: 2964690548625124479} + - component: {fileID: 6236822149422532711} m_Layer: 8 m_Name: Food01 m_TagString: Untagged @@ -81,28 +17,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6567810361177397306 +--- !u!4 &2964690548625124479 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -0.22, y: 0.39, z: 0.122} + m_LocalPosition: {x: -0.22, y: 0.306, z: 0.052} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 72918880234409943} + m_Father: {fileID: 3013392668820867302} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &1936537098954677604 +--- !u!212 &6236822149422532711 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3430995138614654016} + m_GameObject: {fileID: 724788835535604929} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -151,7 +87,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4112995265026884530 +--- !u!1 &3345593261329410550 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -159,72 +95,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4988586968480553054} - m_Layer: 8 - m_Name: Seat01 - m_TagString: Untagged - m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4988586968480553054 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4112995265026884530} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 72918880234409943} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7259785794916276111 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 72918880234409943} - m_Layer: 8 - m_Name: TableSeat01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &72918880234409943 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7259785794916276111} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4988586968480553054} - - {fileID: 6567810361177397306} - m_Father: {fileID: 5161556643231822994} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8221302613581290258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6322245974481813927} - - component: {fileID: 231587957349564794} + - component: {fileID: 4527135094192157299} + - component: {fileID: 2508811154982399617} m_Layer: 8 m_Name: Food02 m_TagString: Untagged @@ -232,28 +104,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6322245974481813927 +--- !u!4 &4527135094192157299 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.22, y: 0.39, z: 0.122} + m_LocalPosition: {x: 0.22, y: 0.306, z: 0.052000023} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 6987995983662494743} + m_Father: {fileID: 7650620545660409483} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &231587957349564794 +--- !u!212 &2508811154982399617 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8221302613581290258} + m_GameObject: {fileID: 3345593261329410550} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -302,7 +174,7 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8821924279338320136 +--- !u!1 &3461606380372754985 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -310,7 +182,69 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6987995983662494743} + - component: {fileID: 1714522929812896121} + m_Layer: 8 + m_Name: Seat02 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1714522929812896121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3461606380372754985} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7650620545660409483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5788276307657280998 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9153630924747771756} + m_Layer: 8 + m_Name: Seat01 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9153630924747771756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5788276307657280998} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.8, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3013392668820867302} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7756466013142509665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7650620545660409483} m_Layer: 8 m_Name: TableSeat02 m_TagString: Untagged @@ -318,24 +252,90 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6987995983662494743 +--- !u!4 &7650620545660409483 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8821924279338320136} + m_GameObject: {fileID: 7756466013142509665} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8314409288261864133} - - {fileID: 6322245974481813927} - m_Father: {fileID: 5161556643231822994} + - {fileID: 1714522929812896121} + - {fileID: 4527135094192157299} + m_Father: {fileID: 5673800179821218247} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &8587436911065349023 +--- !u!1 &8375340281624282934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5673800179821218247} + m_Layer: 8 + m_Name: TableSeats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5673800179821218247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8375340281624282934} + 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: + - {fileID: 3013392668820867302} + - {fileID: 7650620545660409483} + m_Father: {fileID: 1113069143766693512} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8728005820699174632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3013392668820867302} + m_Layer: 8 + m_Name: TableSeat01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3013392668820867302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728005820699174632} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9153630924747771756} + - {fileID: 2964690548625124479} + m_Father: {fileID: 5673800179821218247} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7036402301209193596 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -343,162 +343,126 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 10.24 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_SortingOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2953167904248670954, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 33764f4e19daeb74a8777cded617fea8, type: 3} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Name value: CustomerTable4 objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.x - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.y - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Size.z - value: 0.51575303 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.y - value: 0.35 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Center.z - value: 0.15787654 - objectReference: {fileID: 0} - - target: {fileID: 4147700776997737566, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.x value: 0.8 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Size.z value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Center.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Center.z value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 33764f4e19daeb74a8777cded617fea8, type: 3} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 5161556643231822994} + addedObject: {fileID: 5673800179821218247} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} insertIndex: -1 - addedObject: {fileID: 8002493057690629947} - m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} ---- !u!4 &1871400395928592747 stripped + addedObject: {fileID: 8517414085783629370} + m_SourcePrefab: {fileID: 100100000, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} +--- !u!4 &1113069143766693512 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!1 &4833254060163934334 stripped +--- !u!1 &6168185698541715357 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - m_PrefabInstance: {fileID: 8587436911065349023} + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + m_PrefabInstance: {fileID: 7036402301209193596} m_PrefabAsset: {fileID: 0} ---- !u!114 &8002493057690629947 +--- !u!114 &8517414085783629370 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4833254060163934334} + m_GameObject: {fileID: 6168185698541715357} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3} @@ -508,12 +472,12 @@ MonoBehaviour: - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 4988586968480553054} - k__BackingField: {fileID: 1936537098954677604} + k__BackingField: {fileID: 9153630924747771756} + k__BackingField: {fileID: 6236822149422532711} TableDirection: {x: 1, y: 0, z: 0} - k__BackingField: 0 k__BackingField: 0 k__BackingField: 1 - k__BackingField: {fileID: 8314409288261864133} - k__BackingField: {fileID: 231587957349564794} + k__BackingField: {fileID: 1714522929812896121} + k__BackingField: {fileID: 2508811154982399617} TableDirection: {x: -1, y: 0, z: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable4.prefab.meta b/Assets/05.Prefabs/Props/Furniture/CustomerTable4.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable4.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/CustomerTable4.prefab.meta index 029440d34..c949d2f78 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable4.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable4.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab731e3b491a6ce489e631c8d3424f22 +guid: 4660bbdde5089c046afb78e14740a33d PrefabImporter: externalObjects: {} userData: