From fd688231c2d2aaf63e2e4a25d743903c56b9d666 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Wed, 17 Jul 2024 01:05:53 +0900 Subject: [PATCH] =?UTF-8?q?=ED=83=80=EC=9D=B4=EC=BF=A4=20=EB=A7=B5=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=86=90=EB=8B=98=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 요리 주문 기능 추가 + Props 프리팹 일부 수정 + 오늘의 메뉴 기능 연동 --- Assets/01.Scenes/01.Tycoon.unity | 208 +++++- .../BehaviorTree/Action/PlaySpineAnimation.cs | 32 + .../Action/PlaySpineAnimation.cs.meta | 3 + .../Npc/Customer/Action/OrderBeverage.cs | 16 +- .../Npc/Customer/Action/OrderFood.cs | 43 +- Assets/02.Scripts/Character/Npc/Customer.cs | 4 +- .../02.Scripts/Character/Npc/CustomerData.cs | 18 +- .../Character/Player/Tycoon/TycoonInput.cs | 2 +- .../Character/Player/Tycoon/TycoonMovement.cs | 2 +- .../Interface/IPlayerInteraction.cs | 1 + Assets/02.Scripts/Item/Item.cs | 5 +- Assets/02.Scripts/Map/MapManager.cs | 2 +- .../02.Scripts/Prop/Tycoon/Data/PotDataSo.cs | 3 + .../Prop/Tycoon/InteractionFuniture.cs | 10 + Assets/02.Scripts/Prop/Tycoon/Pot.cs | 42 +- .../ScriptableObject/StageData.asset | 2 + Assets/02.Scripts/Tycoon/TycoonManager.cs | 18 +- Assets/02.Scripts/Ui/Tycoon/CookUi.cs | 2 +- .../02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs | 59 +- .../Characters/Players/TycoonPlayer.prefab | 4 +- .../05.Prefabs/Maps/Tycoon/TycoonMap.prefab | 596 ++++++++++++------ .../Environment/Tycoon/BarrelGroup.prefab | 48 +- .../Props/Environment/Tycoon/Column.prefab | 4 +- .../Props/Environment/Tycoon/Rum.prefab | 4 + .../Props/Furniture/CustomerTable3.prefab | 4 +- .../Props/Furniture/Interactions/Pot.prefab | 157 ++++- .../05.Prefabs/Uis/InteractionCanvas.prefab | 12 +- .../Uis/Tycoons/DailyFoodSlotUi.prefab | 12 + .../Player02/02_character_Material.mat | 3 +- Assets/11.BehaviorTree/Customer.asset | 24 +- Assets/BlueWater.asset | 581 +++++++++++++++++ 31 files changed, 1611 insertions(+), 310 deletions(-) create mode 100644 Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs create mode 100644 Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs.meta diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index aab266983..568b19ded 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -812,11 +812,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -52.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -2254,11 +2254,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -3813,11 +3813,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -142.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -3994,11 +3994,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -52.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -4633,11 +4633,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -4701,6 +4701,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 566176540} m_PrefabAsset: {fileID: 0} +--- !u!114 &566176542 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 566176540} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &567774568 PrefabInstance: m_ObjectHideFlags: 0 @@ -4743,11 +4754,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -142.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -5662,6 +5673,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} m_PrefabInstance: {fileID: 639093258} m_PrefabAsset: {fileID: 0} +--- !u!114 &667539663 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 64843586} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &670055546 GameObject: m_ObjectHideFlags: 0 @@ -6052,6 +6074,17 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -40} m_SizeDelta: {x: 140, y: 40} m_Pivot: {x: 1, y: 1} +--- !u!114 &781558286 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 428517717} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &810401071 PrefabInstance: m_ObjectHideFlags: 0 @@ -7329,11 +7362,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -52.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -7397,6 +7430,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 1011627381} m_PrefabAsset: {fileID: 0} +--- !u!114 &1011627383 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 1011627381} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1016107600 GameObject: m_ObjectHideFlags: 0 @@ -7480,11 +7524,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -7548,6 +7592,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 1043781520} m_PrefabAsset: {fileID: 0} +--- !u!114 &1043781522 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 1043781520} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -10279,6 +10334,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356312470} m_CullTransparentMesh: 1 +--- !u!114 &1357481970 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 567774568} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1378992846 GameObject: m_ObjectHideFlags: 0 @@ -10384,11 +10450,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -142.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -10444,6 +10510,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 1381452131} m_PrefabAsset: {fileID: 0} +--- !u!114 &1381452133 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 1381452131} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1387937617 PrefabInstance: m_ObjectHideFlags: 0 @@ -11164,6 +11241,24 @@ MonoBehaviour: _skewerFoodSlotLocation: {fileID: 1884162516} _dessertFoodSlotLocation: {fileID: 1378992847} _dailyFoodSlotUi: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + _fryingPanFoodSlotUis: + - {fileID: 1381452133} + - {fileID: 1711926403} + - {fileID: 1043781522} + _soupFoodSlotUis: + - {fileID: 1924794517} + - {fileID: 1757198067} + - {fileID: 566176542} + _skewerFoodSlotUis: + - {fileID: 781558286} + - {fileID: 667539663} + - {fileID: 1645948248} + _dessertPanFoodSlotUis: + - {fileID: 1357481970} + - {fileID: 1011627383} + - {fileID: 2041095998} + k__BackingField: [] + _pots: [] --- !u!1 &1471090205 GameObject: m_ObjectHideFlags: 0 @@ -12481,11 +12576,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 37.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -12549,6 +12644,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 1645948246} m_PrefabAsset: {fileID: 0} +--- !u!114 &1645948248 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 1645948246} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1658965175 GameObject: m_ObjectHideFlags: 0 @@ -12938,7 +13044,7 @@ MonoBehaviour: _persistent: 0 k__BackingField: {fileID: 1665075870} k__BackingField: {fileID: 0} - _customerTables: {fileID: 0} + _dailyBgm: --- !u!114 &1665075870 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13394,11 +13500,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -52.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -13462,6 +13568,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 1711926401} m_PrefabAsset: {fileID: 0} +--- !u!114 &1711926403 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 1711926401} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1723000583 GameObject: m_ObjectHideFlags: 0 @@ -13954,6 +14071,17 @@ MonoBehaviour: pivotPointRoot: {fileID: 0} spreadOutCount: 1 showGraphs: 1 +--- !u!114 &1757198067 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 443925472} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1759838089 GameObject: m_ObjectHideFlags: 0 @@ -15676,11 +15804,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: -142.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -15740,6 +15868,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 1924794515} m_PrefabAsset: {fileID: 0} +--- !u!114 &1924794517 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 1924794515} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1925779217 GameObject: m_ObjectHideFlags: 0 @@ -16592,6 +16731,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2017406340} m_CullTransparentMesh: 1 +--- !u!114 &2041095998 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 210400510} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2048187805 GameObject: m_ObjectHideFlags: 0 @@ -18752,6 +18902,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 582435561938650247, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2548904580019888559, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2700294535905665279, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs b/Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs new file mode 100644 index 000000000..58c025dcf --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs @@ -0,0 +1,32 @@ +using System; +using BehaviorDesigner.Runtime.Tasks; +using BlueWater.Players; +using UnityEngine; +using Action = BehaviorDesigner.Runtime.Tasks.Action; + +namespace BlueWater.BehaviorTrees.Actions +{ + [Serializable] + [TaskCategory("Custom")] + public class PlaySpineAnimation : Action + { + [SerializeField] + private string _animationName; + + [SerializeField] + private bool _loop; + + private SpineController _spineController; + + public override void OnAwake() + { + _spineController = GetComponent(); + } + + public override TaskStatus OnUpdate() + { + _spineController.PlayAnimation(_animationName, _loop); + return TaskStatus.Success; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs.meta b/Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs.meta new file mode 100644 index 000000000..4b1fac045 --- /dev/null +++ b/Assets/02.Scripts/BehaviorTree/Action/PlaySpineAnimation.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 580c61b434155a947b04cf7916a36f80 +timeCreated: 1717200968 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs index 763578d06..49c54045a 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderBeverage.cs @@ -3,15 +3,13 @@ using BehaviorDesigner.Runtime.Tasks; using BlueWater.Items; using BlueWater.Npcs.Customers; using BlueWater.Uis; -using PixelCrushers.DialogueSystem; using UnityEngine; -using Action = BehaviorDesigner.Runtime.Tasks.Action; namespace BlueWater.BehaviorTrees.Actions { [TaskCategory("Custom/Npc/Customer")] [Serializable] - public class OrderBeverage : Action + public class OrderBeverage : Conditional { private Customer _customer; private CustomerData _customerData; @@ -31,7 +29,7 @@ namespace BlueWater.BehaviorTrees.Actions _customer.OnInteraction += HandleBeverageInteraction; _customer.RegisterPlayerInteraction(); - _customer.Bark("OrderFood"); + _customer.Bark("OrderBeverage"); } public override TaskStatus OnUpdate() @@ -45,11 +43,15 @@ namespace BlueWater.BehaviorTrees.Actions if (_foodBalloonUi.IsWaitTimeOver()) { - _foodBalloonUi.CancelOrder(); _customer.OnInteraction -= HandleBeverageInteraction; _customer.UnregisterPlayerInteraction(); _customer.AddHappyPoint(-3); - return TaskStatus.Success; + if (_customer.HappyPoint <= 0) + { + _foodBalloonUi.CancelOrder(); + _customer.Bark("CancelOrder"); + } + return TaskStatus.Failure; } return TaskStatus.Running; @@ -75,7 +77,7 @@ namespace BlueWater.BehaviorTrees.Actions { _customer.AddHappyPoint(1); } - // TODO : 음료를 마시는 애니메이션 + _customer.SpineController.PlayAnimation(CustomerSpineAnimation.Eat.ToString(), true); } } } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs index a6bb0f5db..3bb2b491c 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs @@ -3,15 +3,14 @@ using BehaviorDesigner.Runtime.Tasks; using BlueWater.Items; using BlueWater.Npcs.Customers; using BlueWater.Uis; -using PixelCrushers.DialogueSystem; using UnityEngine; -using Action = BehaviorDesigner.Runtime.Tasks.Action; +using Random = UnityEngine.Random; namespace BlueWater.BehaviorTrees.Actions { [TaskCategory("Custom/Npc/Customer")] [Serializable] - public class OrderFood : Action + public class OrderFood : Conditional { private Customer _customer; private CustomerData _customerData; @@ -26,14 +25,34 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - _foodBalloonUi = _customer.FoodBalloonUi; - _orderFoodIdx = 40001; - _foodBalloonUi.OrderFood(_orderFoodIdx, _customerData.WaitTime, _customerData.HurryTime); + var dailyFoodSlotUis = TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.DailyFoodMenuUi.DailyFoodSlotUis; + for (var i = 0; i < 3; i++) + { + for (var j = 0; j < dailyFoodSlotUis.Count; j++) + { + if (dailyFoodSlotUis[j].FoodData.Taste != _customerData.GetPreferredFood(i)) continue; + _orderFoodIdx = dailyFoodSlotUis[j].FoodData.Idx; + break; + } + + if (_orderFoodIdx != 0) + { + break; + } + + if (i == 2) + { + var randomIndex = Random.Range(0, dailyFoodSlotUis.Count); + _orderFoodIdx = dailyFoodSlotUis[randomIndex].FoodData.Idx; + } + } + + _foodBalloonUi = _customer.FoodBalloonUi; + _foodBalloonUi.OrderFood(_orderFoodIdx, _customerData.WaitTime, _customerData.HurryTime); _customer.OnInteraction += HandleFoodInteraction; _customer.RegisterPlayerInteraction(); _customer.Bark("OrderFood"); - //DialogueManager.Bark("OrderFood", _customer.transform); } public override TaskStatus OnUpdate() @@ -47,9 +66,14 @@ namespace BlueWater.BehaviorTrees.Actions if (_foodBalloonUi.IsWaitTimeOver()) { - _foodBalloonUi.CancelOrder(); _customer.OnInteraction -= HandleFoodInteraction; _customer.UnregisterPlayerInteraction(); + _customer.AddHappyPoint(-3); + if (_customer.HappyPoint <= 0) + { + _foodBalloonUi.CancelOrder(); + _customer.Bark("CancelOrder"); + } return TaskStatus.Failure; } @@ -75,7 +99,8 @@ namespace BlueWater.BehaviorTrees.Actions { _customer.AddHappyPoint(1); } - // TODO : 음식을 테이블에 깔고 먹는 행동 + + _customer.SpineController.PlayAnimation(CustomerSpineAnimation.Eat2.ToString(), true); } } } diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index 93269d01b..a33c802bf 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -4,7 +4,6 @@ using BlueWater.Enemies; using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Players; -using BlueWater.Players.Tycoons; using BlueWater.Tycoons; using BlueWater.Uis; using Pathfinding; @@ -73,6 +72,9 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public bool EnableInteraction { get; private set; } = true; + [field: SerializeField] + public float InteractionRadius { get; private set; } = 2f; + private IAstarAI _astarAi; public TableSeat TableSeat { get; private set; } diff --git a/Assets/02.Scripts/Character/Npc/CustomerData.cs b/Assets/02.Scripts/Character/Npc/CustomerData.cs index 154dda861..1345bb0b9 100644 --- a/Assets/02.Scripts/Character/Npc/CustomerData.cs +++ b/Assets/02.Scripts/Character/Npc/CustomerData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using BlueWater.Items; using Sirenix.OdinInspector; using UnityEngine; using Random = UnityEngine.Random; @@ -32,13 +33,13 @@ namespace BlueWater.Npcs.Customers public int BaseHappyPoint { get; set; } [field: SerializeField, Tooltip("선호하는 음식 우선순위1"), BoxGroup("Json 데이터 영역")] - public int PreferredFood1 { get; set; } + public FoodTaste PreferredFood1 { get; set; } [field: SerializeField, Tooltip("선호하는 음식 우선순위2"), BoxGroup("Json 데이터 영역")] - public int PreferredFood2 { get; set; } + public FoodTaste PreferredFood2 { get; set; } [field: SerializeField, Tooltip("선호하는 음식 우선순위3"), BoxGroup("Json 데이터 영역")] - public int PreferredFood3 { get; set; } + public FoodTaste PreferredFood3 { get; set; } [field: SerializeField, Tooltip("음료를 주문할 확률"), BoxGroup("Json 데이터 영역")] public int OrderBeverageRate { get; set; } @@ -48,5 +49,16 @@ namespace BlueWater.Npcs.Customers var dropChance = Random.Range(0, 101); return dropChance <= OrderBeverageRate; } + + public FoodTaste GetPreferredFood(int index) + { + return index switch + { + 0 => PreferredFood1, + 1 => PreferredFood2, + 2 => PreferredFood3, + _ => throw new ArgumentOutOfRangeException() + }; + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index 4e54cafa9..62ae7b1c5 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -140,7 +140,7 @@ namespace BlueWater.Players.Tycoons if (!interaction.CanInteraction()) continue; var distance = Vector3.Distance(transform.position, interaction.Transform.position); - if (distance > InteractionRadius || distance >= closestDistance) continue; + if (distance > interaction.InteractionRadius || distance >= closestDistance) continue; closestDistance = distance; closestInteraction = interaction; diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index d5e98e814..8900e6fac 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -14,7 +14,7 @@ namespace BlueWater.Players.Tycoons private SpineController _spineController; // Move - [field: SerializeField, Range(1f, 10f), Tooltip("이동 속도")] + [field: SerializeField, Range(1f, 20f), Tooltip("이동 속도")] public float MoveSpeed { get; private set; } = 7f; public float MoveSpeedCoefficient { get; private set; } = 1f; diff --git a/Assets/02.Scripts/Interface/IPlayerInteraction.cs b/Assets/02.Scripts/Interface/IPlayerInteraction.cs index df10162a9..6a27a9123 100644 --- a/Assets/02.Scripts/Interface/IPlayerInteraction.cs +++ b/Assets/02.Scripts/Interface/IPlayerInteraction.cs @@ -8,6 +8,7 @@ namespace BlueWater.Interfaces Canvas InteractionCanvas { get; } Transform InteractionUi { get; } bool EnableInteraction { get; } + float InteractionRadius { get; } void Interaction(); bool CanInteraction(); diff --git a/Assets/02.Scripts/Item/Item.cs b/Assets/02.Scripts/Item/Item.cs index 78b554b87..63bbfb229 100644 --- a/Assets/02.Scripts/Item/Item.cs +++ b/Assets/02.Scripts/Item/Item.cs @@ -34,7 +34,10 @@ namespace BlueWater.Items [field: Title("드랍 옵션")] [field: SerializeField, Tooltip("키 입력을 통한 아이템 획득")] public bool EnableInteraction { get; private set; } = true; - + + [field: SerializeField] + public float InteractionRadius { get; private set; } = 2f; + [SerializeField] protected bool UseAutoDestroy = true; diff --git a/Assets/02.Scripts/Map/MapManager.cs b/Assets/02.Scripts/Map/MapManager.cs index 14b3bb308..1d2b6996e 100644 --- a/Assets/02.Scripts/Map/MapManager.cs +++ b/Assets/02.Scripts/Map/MapManager.cs @@ -37,7 +37,7 @@ namespace BlueWater.Maps public GhostBarrelMapController GhostBarrelMapController { get; private set; } [field: SerializeField] - public string DailyBgm { get; private set; }= "DailyBgm1"; + public string DailyBgm { get; private set; } = "DailyBgm1"; [SerializeField] private List _mapControllers; diff --git a/Assets/02.Scripts/Prop/Tycoon/Data/PotDataSo.cs b/Assets/02.Scripts/Prop/Tycoon/Data/PotDataSo.cs index 6f58227d0..f0bebe265 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Data/PotDataSo.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Data/PotDataSo.cs @@ -7,6 +7,9 @@ namespace BlueWater.Tycoons { [field: SerializeField] public int MaxFireWoodCount = 20; + + [field: SerializeField] + public int StartFireWoodCount = 10; [field: SerializeField] public FireWoodLevel[] FireWoodLevel = new FireWoodLevel[5]; diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index a0917faaf..03ea00cc1 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -1,3 +1,4 @@ +using System; using BlueWater.Interfaces; using BlueWater.Players.Tycoons; using Sirenix.OdinInspector; @@ -19,9 +20,18 @@ namespace BlueWater.Tycoons [field: SerializeField] public bool EnableInteraction { get; private set; } = true; + [field: SerializeField] + public float InteractionRadius { get; private set; } = 2f; + protected TycoonPlayer CurrentTycoonPlayer; private bool _isQuitting; + private void OnDrawGizmosSelected() + { + Gizmos.color = Color.blue; + Gizmos.DrawWireSphere(transform.position, InteractionRadius); + } + protected virtual void Awake() { InitializeComponents(); diff --git a/Assets/02.Scripts/Prop/Tycoon/Pot.cs b/Assets/02.Scripts/Prop/Tycoon/Pot.cs index 0ab21b79d..9046eca52 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Pot.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Pot.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using BlueWater.Items; +using BlueWater.Uis; using Sirenix.OdinInspector; using TMPro; using UnityEngine; @@ -15,7 +16,10 @@ namespace BlueWater.Tycoons private TMP_Text _cookGauge; [SerializeField, Required] - private TMP_Text _fireWoodCount; + private TMP_Text _fireWoodQuantity; + + [SerializeField, Required] + private TMP_Text _foodQuantity; // TODO : 추후에 다시 활성화 하는 기능 필요 [SerializeField] @@ -23,9 +27,12 @@ namespace BlueWater.Tycoons [SerializeField] private int _fireWoodIdx = 70001; - + + [Title("실시간 데이터")] + [SerializeField] + private TycoonItemSlotUi _currentDailyFoodUi; + private Queue _cookedFoodDatas = new(); - private FoodData _currentFoodData; private int _currentFireWoodCount; private float _currentCookGauge; private float _startTime = float.PositiveInfinity; @@ -34,6 +41,8 @@ namespace BlueWater.Tycoons { TycoonManager.Instance.OnTycoonOpenedEvent += OpenTycoonSwitch; base.OnEnable(); + + _currentDailyFoodUi = TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.DailyFoodMenuUi.InitializePot(this); } private void Update() @@ -44,13 +53,14 @@ namespace BlueWater.Tycoons var currentFireWoodLevel = _potDataSo.FireWoodLevel[level]; // 음식 게이지 관리 및 음식 생성 - if (_currentFoodData != null && _currentFoodData.Plate < _cookedFoodDatas.Count) + var currentFoodData = _currentDailyFoodUi.FoodData; + if (currentFoodData != null && currentFoodData.Idx != 0 && _cookedFoodDatas.Count < currentFoodData.Plate) { _currentCookGauge += currentFireWoodLevel.CookGauge * Time.deltaTime; - if (_currentCookGauge >= _currentFoodData.CookGauge) + if (_currentCookGauge >= currentFoodData.CookGauge) { _currentCookGauge = 0f; - _cookedFoodDatas.Enqueue(_currentFoodData); + _cookedFoodDatas.Enqueue(currentFoodData); } } @@ -70,8 +80,9 @@ namespace BlueWater.Tycoons } // Ui 표기 - _cookGauge.text = $"{(int)_currentCookGauge}/{_currentFoodData?.CookGauge ?? 0}"; - _fireWoodCount.text = $"{_currentFireWoodCount}/{_potDataSo.MaxFireWoodCount}"; + _cookGauge.text = $"{(int)_currentCookGauge}/{currentFoodData?.CookGauge ?? 0}"; + _fireWoodQuantity.text = $"{_currentFireWoodCount}/{_potDataSo.MaxFireWoodCount}"; + _foodQuantity.text = $"{_cookedFoodDatas.Count}/{currentFoodData?.Plate ?? 0}"; } public override void Interaction() @@ -87,8 +98,8 @@ namespace BlueWater.Tycoons } else { - CurrentTycoonPlayer.CarryItem(_currentFoodData.Idx, ItemQuality.None); - _cookedFoodDatas.Dequeue(); + var foodData = _cookedFoodDatas.Dequeue(); + CurrentTycoonPlayer.CarryItem(foodData.Idx, ItemQuality.None); } } @@ -96,7 +107,7 @@ namespace BlueWater.Tycoons { var isCarriedItem = CurrentTycoonPlayer.IsCarriedItem(); var isFullFireWood = _currentFireWoodCount >= _potDataSo.MaxFireWoodCount; - var isEmptyCookedFood = _currentFoodData == null || _cookedFoodDatas.Count <= 0; + var isEmptyCookedFood = _currentDailyFoodUi.FoodData == null || _cookedFoodDatas.Count <= 0; return _isOpened && ((isCarriedItem && !isFullFireWood) || !isCarriedItem && !isEmptyCookedFood); } @@ -117,15 +128,10 @@ namespace BlueWater.Tycoons private void OpenTycoonSwitch() { + _cookedFoodDatas = new Queue(_currentDailyFoodUi.FoodData.Plate); _isOpened = true; _currentCookGauge = 0; - _currentFireWoodCount = 0; - } - - public void CookFood(FoodData foodData) - { - _currentFoodData = foodData; - _cookedFoodDatas = new Queue(_currentFoodData.Plate); + _currentFireWoodCount = _potDataSo.StartFireWoodCount; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/StageData.asset b/Assets/02.Scripts/ScriptableObject/StageData.asset index 0c8debb9e..9057dcac8 100644 --- a/Assets/02.Scripts/ScriptableObject/StageData.asset +++ b/Assets/02.Scripts/ScriptableObject/StageData.asset @@ -13,3 +13,5 @@ MonoBehaviour: m_Name: StageData m_EditorClassIdentifier: k__BackingField: 0c00000012000000180000001e00000024000000 + WaitTimeInStarted: 2 + CustomerEntryInterval: 15 diff --git a/Assets/02.Scripts/Tycoon/TycoonManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs index 94891a9c1..ef853868d 100644 --- a/Assets/02.Scripts/Tycoon/TycoonManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -1,17 +1,13 @@ using System; +using BlueWater.Audios; using UnityEngine; using Sirenix.OdinInspector; namespace BlueWater.Tycoons { - public enum BuildableObjectType - { - None = 0, - CustomerTable - } - public class TycoonManager : Singleton { + [field: Title("컴포넌트")] [field: SerializeField] public CustomerTableController CustomerTableController { get; private set; } @@ -19,7 +15,7 @@ namespace BlueWater.Tycoons public TycoonStageController TycoonStageController { get; private set; } [SerializeField] - private Transform _customerTables; + private string _dailyBgm; // TODO : 타이쿤 오픈 연출 추가, 게임시간 흐름, 타이쿤 시작하면 상호작용 금지해야하는 것들 public Action OnTycoonOpenedEvent; @@ -29,6 +25,14 @@ namespace BlueWater.Tycoons { InitializeComponents(); } + + private void Start() + { + if (!string.IsNullOrEmpty(_dailyBgm)) + { + AudioManager.Instance.PlayBgm(_dailyBgm); + } + } [Button("컴포넌트 초기화")] private void InitializeComponents() diff --git a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs index c24c7092a..bdf2e6fd8 100644 --- a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs @@ -183,7 +183,7 @@ namespace BlueWater.Uis public void CheckCookable() { - if (_selectedFoodData == null) + if (_selectedFoodData == null || _selectedFoodData.Idx == 0) { _cookButton.interactable = false; _cookText.color = _cookButton.colors.disabledColor; diff --git a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs index b0481e5e4..2546b9968 100644 --- a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using BlueWater.Items; +using BlueWater.Tycoons; using Sirenix.OdinInspector; using UnityEngine; @@ -26,10 +27,25 @@ namespace BlueWater.Uis [SerializeField, Required] private TycoonItemSlotUi _dailyFoodSlotUi; + [Title("실시간 데이터")] + [SerializeField] private List _fryingPanFoodSlotUis = new(3); + + [SerializeField] private List _soupFoodSlotUis = new(3); + + [SerializeField] private List _skewerFoodSlotUis = new(3); + + [SerializeField] private List _dessertPanFoodSlotUis = new(3); + + [field: SerializeField] + public List DailyFoodSlotUis { get; private set; }= new(12); + + [SerializeField] + private List _pots = new(3); + private CookUi _cookUi; private void Start() @@ -41,31 +57,23 @@ namespace BlueWater.Uis { _cookUi = TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.CookUi; - _fryingPanFoodSlotUis = _fryingPanFoodSlotLocation.GetComponentsInChildren().ToList(); foreach (var element in _fryingPanFoodSlotUis) { - element.SetFoodData(null); element.AddButtonClickListener(() => RemoveDailyFood(element)); } - _soupFoodSlotUis = _soupFoodSlotLocation.GetComponentsInChildren().ToList(); foreach (var element in _soupFoodSlotUis) { - element.SetFoodData(null); element.AddButtonClickListener(() => RemoveDailyFood(element)); } - _skewerFoodSlotUis = _skewerFoodSlotLocation.GetComponentsInChildren().ToList(); foreach (var element in _skewerFoodSlotUis) { - element.SetFoodData(null); element.AddButtonClickListener(() => RemoveDailyFood(element)); } - _dessertPanFoodSlotUis = _dessertFoodSlotLocation.GetComponentsInChildren().ToList(); foreach (var element in _dessertPanFoodSlotUis) { - element.SetFoodData(null); element.AddButtonClickListener(() => RemoveDailyFood(element)); } } @@ -73,6 +81,7 @@ namespace BlueWater.Uis private void RemoveDailyFood(TycoonItemSlotUi tycoonItemSlotUi) { tycoonItemSlotUi.SetFoodData(null); + DailyFoodSlotUis.Remove(tycoonItemSlotUi); _cookUi.CheckCookable(); } @@ -82,9 +91,10 @@ namespace BlueWater.Uis foreach (var element in selectedTypeItemSlotUis) { - if (element.GetIsLocked() || element.FoodData != null) continue; - - return true; + if (!element.GetIsLocked() && element.FoodData is null or { Idx: 0 }) + { + return true; + } } return false; @@ -96,10 +106,12 @@ namespace BlueWater.Uis foreach (var element in selectedTypeItemSlotUis) { - if (element.GetIsLocked() || element.FoodData != null) continue; - - element.SetFoodData(selectedFoodData); - return; + if (!element.GetIsLocked() && element.FoodData is null or { Idx: 0 }) + { + element.SetFoodData(selectedFoodData); + DailyFoodSlotUis.Add(element); + return; + } } } @@ -125,10 +137,19 @@ namespace BlueWater.Uis 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); + return _fryingPanFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }) || + _soupFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }) || + _skewerFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }) || + _dessertPanFoodSlotUis.Any(slot => slot.FoodData is not null and not { Idx: 0 }); + } + + public TycoonItemSlotUi InitializePot(Pot pot) + { + _pots.Add(pot); + var index = _pots.Count - 1; + _fryingPanFoodSlotUis[index].SetIsLocked(false); + _fryingPanFoodSlotUis[index].SetFoodData(null); + return _fryingPanFoodSlotUis[index]; } } } \ No newline at end of file diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index 364daa4f1..bfcfae2ef 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -1732,6 +1732,8 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: {fileID: 7125556968546628472} _initialSkinName: 01 + _isRandomSkin: 0 + _randomRange: {x: 0, y: 0} --- !u!114 &1674052485383758547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1758,7 +1760,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb167e66df896c745a538310e5a52f61, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: 7 + k__BackingField: 12 --- !u!114 &909302231676134912 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index a02fef735..cb6625409 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -268,7 +268,7 @@ Transform: m_GameObject: {fileID: 215111799620397457} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -17.266, y: -6.89, z: 20.096} + m_LocalPosition: {x: -19.552, y: -6.89, z: 15.141} m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -317,7 +317,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: c3f844853711dfc4d8cf5a4cf291c31b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2363,7 +2363,7 @@ Transform: m_GameObject: {fileID: 2535973833014246860} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -18.088, y: -6.89, z: 20.096} + m_LocalPosition: {x: -20.373999, y: -6.89, z: 15.141} m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -2412,7 +2412,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: c3f844853711dfc4d8cf5a4cf291c31b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3251,7 +3251,7 @@ Transform: m_GameObject: {fileID: 5220855088217727572} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -16.426, y: -6.89, z: 20.096} + m_LocalPosition: {x: -18.712, y: -6.89, z: 15.141} m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -3300,7 +3300,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: c3f844853711dfc4d8cf5a4cf291c31b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3856,6 +3856,10 @@ Transform: - {fileID: 6049166031534435163} - {fileID: 3818770221804553492} - {fileID: 5653051193455399640} + - {fileID: 7046969042324649334} + - {fileID: 1982130450734482120} + - {fileID: 2772487097637501322} + - {fileID: 6697719068083715632} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6431317417444516108 @@ -4506,95 +4510,10 @@ Transform: - {fileID: 5367102691478051653} - {fileID: 7003513366820732525} - {fileID: 6141272788485701310} + - {fileID: 3996542398626631928} + - {fileID: 3809960263620767343} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7399037436664271384 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5882719096297190212} - - component: {fileID: 3694335376034258449} - m_Layer: 0 - m_Name: JellyfishStew (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5882719096297190212 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7399037436664271384} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -1.01, y: -7.4634027, z: 5.135} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 6858073917342497661} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &3694335376034258449 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7399037436664271384} - 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: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c3f844853711dfc4d8cf5a4cf291c31b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &7504444568037364962 GameObject: m_ObjectHideFlags: 0 @@ -4778,7 +4697,7 @@ Transform: m_GameObject: {fileID: 8025370293952639988} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -18.942, y: -6.89, z: 20.096} + m_LocalPosition: {x: -21.227999, y: -6.89, z: 15.141} m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} m_ConstrainProportionsScale: 1 m_Children: [] @@ -4827,7 +4746,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: c3f844853711dfc4d8cf5a4cf291c31b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5034,93 +4953,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8530972356202434669 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4447289371505967131} - - component: {fileID: 4006008315074597168} - m_Layer: 0 - m_Name: JellyfishStew - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4447289371505967131 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8530972356202434669} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -2.603, y: -7.4634027, z: 5.135} - m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 6858073917342497661} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &4006008315074597168 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8530972356202434669} - 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: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c3f844853711dfc4d8cf5a4cf291c31b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &8606661899048280193 GameObject: m_ObjectHideFlags: 0 @@ -5455,11 +5287,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4447289371505967131} - {fileID: 8112955290942491772} - {fileID: 1672284994681786428} - {fileID: 7702886101277180640} - - {fileID: 5882719096297190212} - {fileID: 1243799029984059225} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5734,6 +5564,10 @@ PrefabInstance: propertyPath: m_Name value: CustomerTable2 objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5752,17 +5586,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1402113424960589398} m_Modifications: + - target: {fileID: -8278684978296943735, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: k__BackingField + value: 2.5 + objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.x - value: -10.68 + value: -12.14 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1.163 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.z - value: -1.73 + value: 0.472 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalRotation.w @@ -6364,6 +6202,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 1188169479254458416} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1509721108971713600 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.z + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_Name + value: CustomerTable3 (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} +--- !u!4 &1982130450734482120 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + m_PrefabInstance: {fileID: 1509721108971713600} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1524361533534316878 PrefabInstance: m_ObjectHideFlags: 0 @@ -7226,6 +7126,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} m_PrefabInstance: {fileID: 2866029296223591591} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2957651293451063042 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.x + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_Name + value: CustomerTable3 (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} +--- !u!4 &2772487097637501322 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + m_PrefabInstance: {fileID: 2957651293451063042} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3035115317743993518 PrefabInstance: m_ObjectHideFlags: 0 @@ -8146,6 +8108,10 @@ PrefabInstance: propertyPath: m_Name value: CustomerTable2 (2) objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8332,6 +8298,10 @@ PrefabInstance: propertyPath: m_Name value: CustomerTable2 (3) objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -9118,6 +9088,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: c9a0d1b04962a6c419e9b2e2e3b73901, type: 3} m_PrefabInstance: {fileID: 6005366455880278080} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6017229650580998328 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.x + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.z + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_Name + value: CustomerTable3 (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} +--- !u!4 &6697719068083715632 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + m_PrefabInstance: {fileID: 6017229650580998328} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6442612953090237881 PrefabInstance: m_ObjectHideFlags: 0 @@ -9356,6 +9388,10 @@ PrefabInstance: propertyPath: m_Name value: CustomerTable2 (1) objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: fe26d432e89923a409383fddb77e54a6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -9754,6 +9790,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: c4421d320cae91143b529ff1324bc6c7, type: 3} m_PrefabInstance: {fileID: 7492888499889056789} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7978609961326740478 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6168185698541715357, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + propertyPath: m_Name + value: CustomerTable3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} +--- !u!4 &7046969042324649334 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1113069143766693512, guid: 41a1ae312fc8e8f45a2212d1eb401f1a, type: 3} + m_PrefabInstance: {fileID: 7978609961326740478} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8184872152076244664 PrefabInstance: m_ObjectHideFlags: 0 @@ -10142,6 +10240,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} m_PrefabInstance: {fileID: 8591663123109245248} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8719939761713456467 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4777049926120389234} + m_Modifications: + - target: {fileID: 1131033354259076350, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_Name + value: BarrelGroup (9) + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalPosition.x + value: 17.89 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalPosition.z + value: -13.82 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} +--- !u!4 &3809960263620767343 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + m_PrefabInstance: {fileID: 8719939761713456467} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8756566244395172119 PrefabInstance: m_ObjectHideFlags: 0 @@ -10220,6 +10380,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 084afcf810163854e97fddb74e7d7762, type: 3} m_PrefabInstance: {fileID: 8756566244395172119} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8838969079984921540 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4777049926120389234} + m_Modifications: + - target: {fileID: 1131033354259076350, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_Name + value: BarrelGroup (8) + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalPosition.x + value: 5.92 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalPosition.z + value: -13.82 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} +--- !u!4 &3996542398626631928 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5610572193944832828, guid: 45fce68e21b84b34e8d1aa16145380d9, type: 3} + m_PrefabInstance: {fileID: 8838969079984921540} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8952402252677842790 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab index 5f1a0343f..2b4ec38d6 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/BarrelGroup.prefab @@ -9,7 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5610572193944832828} - m_Layer: 0 + - component: {fileID: 3846404486480926934} + m_Layer: 8 m_Name: BarrelGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -37,6 +38,27 @@ Transform: - {fileID: 794487795650828388} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3846404486480926934 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1131033354259076350} + 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: 3.5, y: 4, z: 3} + m_Center: {x: 0, y: 2, z: 1.5} --- !u!1001 &347468174983340904 PrefabInstance: m_ObjectHideFlags: 0 @@ -85,6 +107,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_Name value: Barrel (4) @@ -147,6 +173,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_Name value: Barrel (2) @@ -209,6 +239,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_Name value: Barrel (5) @@ -271,6 +305,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_Name value: Barrel @@ -333,6 +371,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_Name value: Barrel (1) @@ -395,6 +437,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1519019258008198363, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_Name value: Barrel (3) diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab index f9da4ac55..dff12d9f8 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Column.prefab @@ -82,11 +82,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Size.z - value: 0.2 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Center.z - value: 0.1 + value: 0.05 objectReference: {fileID: 0} - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Sprite diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab index 4a8300280..6df1291e8 100644 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Rum.prefab @@ -64,6 +64,10 @@ PrefabInstance: propertyPath: m_Size.x value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab b/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab index 008d7244f..a50f30e1a 100644 --- a/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable3.prefab @@ -26,7 +26,7 @@ Transform: 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.306, z: 0.052} + m_LocalPosition: {x: -0.22, y: 0.265, z: 0.017999962} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -113,7 +113,7 @@ Transform: 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.306, z: 0.052000023} + m_LocalPosition: {x: 0.22, y: 0.265, z: 0.018} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab index b5aae7102..3f61bbe27 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 4246464536998368179} - component: {fileID: 4716984355533230556} m_Layer: 5 - m_Name: FireWoodCount + m_Name: FireWoodQuantity m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -26,7 +26,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2792852166853778202} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 20, y: -25} + m_AnchoredPosition: {x: 20, y: -5} m_SizeDelta: {x: 100, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4246464536998368179 @@ -67,6 +67,144 @@ MonoBehaviour: m_Calls: [] m_text: '0/20 +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 27.6 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5335729467246956321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4161153157045180900} + - component: {fileID: 5586123657750807688} + - component: {fileID: 129668539545597565} + m_Layer: 5 + m_Name: FoodQuantity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4161153157045180900 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5335729467246956321} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8469578238684922817} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 20, y: -25} + m_SizeDelta: {x: 100, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5586123657750807688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5335729467246956321} + m_CullTransparentMesh: 1 +--- !u!114 &129668539545597565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5335729467246956321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '0/10 + ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} @@ -164,7 +302,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5690541519652870384} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -172,7 +310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 20, y: -5} + m_AnchoredPosition: {x: 20, y: 15} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7201896748767826105 @@ -332,7 +470,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7624213675240184438, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x @@ -403,6 +541,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 7428735504528103099} + - targetCorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 4161153157045180900} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 @@ -434,9 +575,11 @@ MonoBehaviour: k__BackingField: {fileID: 8975593228546502023} k__BackingField: {fileID: 8793236136028073839} k__BackingField: 1 + k__BackingField: 3.5 _potDataSo: {fileID: 11400000, guid: f2500123313f37e459a902069b7ce5b2, type: 2} _cookGauge: {fileID: 8513726579380185340} - _fireWoodCount: {fileID: 4716984355533230556} + _fireWoodQuantity: {fileID: 4716984355533230556} + _foodQuantity: {fileID: 129668539545597565} _isOpened: 0 _fireWoodIdx: 70001 --- !u!224 &8469578238684922817 stripped diff --git a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab index a3adc099c..139aa8e48 100644 --- a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab +++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab @@ -95,15 +95,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3647059, g: 0.35686275, b: 0.3647059, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -248,8 +248,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1.5} + m_SizeDelta: {x: -6, y: -9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5731642412004777909 CanvasRenderer: @@ -306,7 +306,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.5 + m_fontSize: 28.3 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 diff --git a/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab index 39f86944f..1ef13d0cf 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2011150234301735800, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c0cab5e7cc9fc5147b3f0aef86b2feab, type: 3} - target: {fileID: 4888250272685488326, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Color.b value: 1 @@ -20,6 +24,10 @@ PrefabInstance: propertyPath: m_Color.r value: 1 objectReference: {fileID: 0} + - target: {fileID: 5472621884890045282, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Name value: DailyFoodSlotUi @@ -128,6 +136,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat b/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat index 0bf17bca0..74b5e7237 100644 --- a/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat +++ b/Assets/08.Spines/Characters/Players/Player02/02_character_Material.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _RECEIVE_SHADOWS - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -33,7 +34,7 @@ Material: - _Cutoff: 0.1 - _DoubleSidedLighting: 0 - _LightAffectsAdditive: 0 - - _ReceiveShadows: 0 + - _ReceiveShadows: 1 - _StencilComp: 8 - _StencilRef: 1 - _StraightAlphaInput: 1 diff --git a/Assets/11.BehaviorTree/Customer.asset b/Assets/11.BehaviorTree/Customer.asset index d154afac4..03bdd8aa6 100644 --- a/Assets/11.BehaviorTree/Customer.asset +++ b/Assets/11.BehaviorTree/Customer.asset @@ -30,15 +30,21 @@ MonoBehaviour: \uc8fc\ubb38\ud55c\ub2e4"},"ID":6,"Name":"Check Order Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(0,150)"},"ID":7,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-190,150)","Comment":"\uc74c\ub8cc \uc8fc\ubb38 \uc5ec\ubd80 \ud655\uc778"},"ID":8,"Name":"Check Order Beverage Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.CheckOrderBeverage","NodeData":{"Offset":"(-104.279724,147.200073)"},"ID":9,"Name":"Check - Order Beverage","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(120.526306,152.105225)"},"ID":10,"Name":"Order - Success Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderBeverage","NodeData":{"Offset":"(-120,150)","Comment":"\uc74c\ub8cc\ub97c - \uc8fc\ubb38\ud55c\ub2e4"},"ID":11,"Name":"Order Beverage","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(109.555481,154.653076)"},"ID":12,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-121.754784,152.857178)"},"ID":13,"Name":"Order - Failure Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedInt","NodeData":{"Offset":"(-184.8739,148.581665)"},"ID":14,"Name":"Compare - Shared Int","Instant":true,"SharedIntvariable":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"HappyPoint","IsShared":true,"Int32mValue":0},"SharedIntcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0}},{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-0.441589355,149.5423)","Comment":"\uc785\uad6c\ub85c - \ub418\ub3cc\uc544\uac04\ub2e4"},"ID":15,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(3.5,0,-16.5)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityGameObject.Destroy","NodeData":{"Offset":"(171.113159,154.032043)"},"ID":16,"Name":"Destroy","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"Singletime":0}]},{"Type":"BlueWater.BehaviorTrees.Actions.ReturnSuccess","NodeData":{"Offset":"(157.3913,154.7826)","Comment":"\uc74c\uc2dd - \uc8fc\ubb38\uc73c\ub85c \uc774\ub3d9"},"ID":17,"Name":"Return Success","Instant":true}]}]}]},{"Type":"BlueWater.BehaviorTrees.Actions.ReturnSuccess","NodeData":{"Offset":"(220,150)","Comment":"\uc74c\ub8cc - \uc8fc\ubb38 \uc2a4\ud0b5"},"ID":18,"Name":"Return Success","Instant":true}]}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1652.77856,300)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":19,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1402.77844,300)","Comment":"\uacc4\uc0b0\ud55c\ub2e4"},"ID":20,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1112.77722,300)","Comment":"\uc74c\uc2dd\uc744 - \uc8fc\ubb38\ud55c\ub2e4"},"ID":21,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"}],"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"HappyPoint","IsShared":true,"Int32mValue":0}]}' + Order Beverage","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(120,150)"},"ID":10,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-215.454575,152.272583)"},"ID":11,"Name":"Order + Success Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderBeverage","NodeData":{"Offset":"(-129.999969,154.545654)","Comment":"\uc74c\ub8cc\ub97c + \uc8fc\ubb38\ud55c\ub2e4"},"ID":12,"Name":"Order Beverage","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(3.122795,154.9408)"},"ID":13,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":5},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":3},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":5}},{"Type":"BlueWater.BehaviorTrees.Actions.PlaySpineAnimation","NodeData":{"Offset":"(151.759155,154.9408)","Comment":"Idle + Loop"},"ID":14,"Name":"Play Spine Animation","Instant":true,"String_animationName":"Idle","Boolean_loop":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(286.363831,152.272583)"},"ID":15,"Name":"Order + Failure Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedInt","NodeData":{"Offset":"(-150.783,148.581665)","Comment":"\ud574\ud53c\ud3ec\uc778\ud2b8 + == 0"},"ID":16,"Name":"Compare Shared Int","Instant":true,"SharedIntvariable":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"HappyPoint","IsShared":true,"Int32mValue":0},"SharedIntcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0}},{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(-0.441589355,149.5423)","Comment":"\uc785\uad6c\ub85c + \ub418\ub3cc\uc544\uac04\ub2e4"},"ID":17,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(3.5,0,-16.5)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityGameObject.Destroy","NodeData":{"Offset":"(171.113159,154.032043)"},"ID":18,"Name":"Destroy","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"Singletime":0}]}]}]},{"Type":"BlueWater.BehaviorTrees.Actions.ReturnSuccess","NodeData":{"Offset":"(197.777771,150)","Comment":"\uc74c\ub8cc + \uc8fc\ubb38 \uc2a4\ud0b5"},"ID":19,"Name":"Return Success","Instant":true}]}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(562.7772,150)","Comment":"\uc74c\uc2dd\uc744 + \uc8fc\ubb38\ud55c\ub2e4"},"ID":20,"Name":"Order Food Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Selector","NodeData":{"Offset":"(1.9050293,150.475769)"},"ID":21,"Name":"Selector","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(-219.999985,150)"},"ID":22,"Name":"Order + Success Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BlueWater.BehaviorTrees.Actions.OrderFood","NodeData":{"Offset":"(-130,150)","Comment":"\uc74c\uc2dd\uc744 + \uc8fc\ubb38\ud55c\ub2e4"},"ID":23,"Name":"Order Food","Instant":true},{"Type":"BehaviorDesigner.Runtime.Tasks.Wait","NodeData":{"Offset":"(1.52587891E-05,150)"},"ID":24,"Name":"Wait","Instant":true,"SharedFloatwaitTime":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":5},"SharedBoolrandomWait":{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":null,"BooleanmValue":true},"SharedFloatrandomWaitMin":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":7},"SharedFloatrandomWaitMax":{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":null,"SinglemValue":10}},{"Type":"BlueWater.BehaviorTrees.Actions.PlaySpineAnimation","NodeData":{"Offset":"(150,150)","Comment":"Idle + Loop"},"ID":25,"Name":"Play Spine Animation","Instant":true,"String_animationName":"Idle","Boolean_loop":true}]},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(290,150)"},"ID":26,"Name":"Order + Failure Sequence","Instant":true,"AbortTypeabortType":"None","Children":[{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.SharedVariables.CompareSharedInt","NodeData":{"Offset":"(-150,150)","Comment":"\ud574\ud53c\ud3ec\uc778\ud2b8 + == 0"},"ID":27,"Name":"Compare Shared Int","Instant":true,"SharedIntvariable":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"HappyPoint","IsShared":true,"Int32mValue":0},"SharedIntcompareTo":{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":null,"Int32mValue":0}},{"Type":"BlueWater.BehaviorTrees.Actions.Move","NodeData":{"Offset":"(0,150)","Comment":"\uc785\uad6c\ub85c + \ub418\ub3cc\uc544\uac04\ub2e4"},"ID":28,"Name":"Move","Instant":true,"Booleank__BackingField":true,"SharedVector3k__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":null,"Vector3mValue":"(3.5,0,-16.5)"},"SharedColliderk__BackingField":{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":null}},{"Type":"BehaviorDesigner.Runtime.Tasks.Unity.UnityGameObject.Destroy","NodeData":{"Offset":"(170,150)"},"ID":29,"Name":"Destroy","Instant":true,"SharedGameObjecttargetGameObject":{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},"Singletime":0}]}]}]}]},"DetachedTasks":[{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1652.77856,300)","Comment":"\ud1f4\uc7a5\ud55c\ub2e4"},"ID":30,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"},{"Type":"BehaviorDesigner.Runtime.Tasks.Sequence","NodeData":{"Offset":"(1402.77844,300)","Comment":"\uacc4\uc0b0\ud55c\ub2e4"},"ID":31,"Name":"Sequence","Instant":true,"Disabled":true,"AbortTypeabortType":"None"}],"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true},{"Type":"BehaviorDesigner.Runtime.SharedInt","Name":"HappyPoint","IsShared":true,"Int32mValue":0}]}' fieldSerializationData: typeName: [] fieldNameHash: diff --git a/Assets/BlueWater.asset b/Assets/BlueWater.asset index 3deba100e..c8c16563b 100644 --- a/Assets/BlueWater.asset +++ b/Assets/BlueWater.asset @@ -1224,6 +1224,587 @@ MonoBehaviour: entryGroups: [] canvasScrollPosition: {x: 0, y: 0} canvasZoom: 0.7900002 + - id: 4 + fields: + - title: Title + value: OrderBeverage + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 4 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 4 + originDialogueID: 0 + destinationConversationID: 4 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 4 + originDialogueID: 0 + destinationConversationID: 4 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + - originConversationID: 4 + originDialogueID: 0 + destinationConversationID: 4 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 428 + y: 117 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC2DC\uC6D0\uD55C\uAC8C \uB9C8\uC2DC\uACE0 \uC2F6\uC740\uAC78?" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 4 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 219 + y: 260 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC5B4\uB514\uBCF4\uC790..." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 4 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 462 + y: 256 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 4 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 717 + y: 253 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 + - id: 5 + fields: + - title: Title + value: CancelOrder + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + emTagForOldResponses: 0 + emTagForInvalidResponses: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + conversationID: 5 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: + - originConversationID: 5 + originDialogueID: 0 + destinationConversationID: 5 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + - originConversationID: 5 + originDialogueID: 0 + destinationConversationID: 5 + destinationDialogueID: 2 + isConnector: 0 + priority: 2 + - originConversationID: 5 + originDialogueID: 0 + destinationConversationID: 5 + destinationDialogueID: 3 + isConnector: 0 + priority: 2 + - originConversationID: 5 + originDialogueID: 0 + destinationConversationID: 5 + destinationDialogueID: 4 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 427 + y: 95 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uC7A5\uC0AC\uB97C \uD558\uACA0\uB2E4\uB294\uAC70\uC57C \uB9D0\uACA0\uB2E4\uB294\uAC70\uC57C!" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 5 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 168 + y: 225 + width: 160 + height: 30 + - id: 2 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uBCC4\uC810 1\uC810 \uB9AC\uBDF0\uB0A8\uAE38\uAC70\uC57C.." + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 5 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 399 + y: 231 + width: 160 + height: 30 + - id: 3 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: "\uB2E4\uC2E0 \uC624\uC9C0 \uC54A\uACA0\uC5B4!" + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 5 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 617 + y: 227 + width: 160 + height: 30 + - id: 4 + fields: + - title: Title + value: + type: 0 + typeString: + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: -1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Sequence + value: + type: 0 + typeString: + conversationID: 5 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 859 + y: 223 + width: 160 + height: 30 + entryGroups: [] + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 syncInfo: syncActors: 0 syncItems: 0