diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index beb93b5e7..8326ffd75 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -728,6 +728,68 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &383611830 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028035736} + m_Modifications: + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalPosition.x + value: 1.76 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalPosition.z + value: 6.16 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + propertyPath: m_Name + value: TrashCan + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} +--- !u!4 &383611831 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + m_PrefabInstance: {fileID: 383611830} + m_PrefabAsset: {fileID: 0} --- !u!1 &461791771 GameObject: m_ObjectHideFlags: 0 @@ -1316,7 +1378,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 65495 + m_Bits: 131031 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -1359,7 +1421,6 @@ MonoBehaviour: _persistent: 0 _cinemachineCameras: {fileID: 1634548838} k__BackingField: {fileID: 545850352} - MainCamera: {fileID: 873223991} --- !u!1001 &874559119 PrefabInstance: m_ObjectHideFlags: 0 @@ -1478,14 +1539,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1028043511} + - {fileID: 2081157701} + - {fileID: 1081115324} + - {fileID: 383611831} m_Father: {fileID: 923706278} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1028043511 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - m_PrefabInstance: {fileID: 1328652233} - m_PrefabAsset: {fileID: 0} --- !u!1 &1038321202 GameObject: m_ObjectHideFlags: 0 @@ -1635,7 +1693,7 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: {fileID: 1049919591} - k__BackingField: {fileID: 1496452083} + k__BackingField: {fileID: 0} --- !u!1 &1070845212 GameObject: m_ObjectHideFlags: 0 @@ -1772,6 +1830,76 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070845212} m_CullTransparentMesh: 1 +--- !u!1001 &1081115323 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028035736} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalPosition.x + value: -1.732 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalPosition.z + value: 6.42 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalPosition.x + value: -3.93 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2150999877833654613, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5130238471801096256, guid: 109afa56f22782a4baef8705031c807a, type: 3} + propertyPath: m_Name + value: BeverageMachine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 109afa56f22782a4baef8705031c807a, type: 3} +--- !u!4 &1081115324 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 109afa56f22782a4baef8705031c807a, type: 3} + m_PrefabInstance: {fileID: 1081115323} + m_PrefabAsset: {fileID: 0} --- !u!1 &1178042444 GameObject: m_ObjectHideFlags: 0 @@ -2035,35 +2163,6 @@ Transform: - {fileID: 1520533432} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1328652233 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1028035736} - m_Modifications: - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4833254060163934334, guid: bc2abb0d190003240b86437081f20536, type: 3} - propertyPath: m_Name - value: CustomerTable01 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bc2abb0d190003240b86437081f20536, type: 3} --- !u!1001 &1395162455 PrefabInstance: m_ObjectHideFlags: 0 @@ -2732,7 +2831,6 @@ GameObject: - component: {fileID: 1665075869} - component: {fileID: 1665075871} - component: {fileID: 1665075870} - - component: {fileID: 1665075872} m_Layer: 0 m_Name: RestaurantManager m_TagString: Untagged @@ -2770,7 +2868,6 @@ MonoBehaviour: _persistent: 0 k__BackingField: {fileID: 1665075871} k__BackingField: {fileID: 1665075870} - k__BackingField: {fileID: 1665075872} --- !u!114 &1665075870 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2800,19 +2897,6 @@ MonoBehaviour: _customerSpawnTransform: {fileID: 1038321203} _checkEmptySeatInterval: 0.5 _instanceCustomers: [] ---- !u!114 &1665075872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1665075867} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 609e0561d4d85804ab33cccbbbfc7927, type: 3} - m_Name: - m_EditorClassIdentifier: - _foodBalloonUiPrefab: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} --- !u!1 &1746385716 GameObject: m_ObjectHideFlags: 0 @@ -2859,7 +2943,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABIIez+cF9vwAIAAP8FAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wWFQoHubRdou4e2qHTVw9KDE0+IhbEjfxRo1f++M04ggUqREr2ZN/PmK59MaldC5o29s1I8GAHsZ4fRN/vRaYz3sOdro5fyA44+r1L4gpx49HnmXhrE+0RzZgveyuyXXityThAMWubGbudiDVPjvEM458oBmqzxxNYIfXbYviYc6vcHvTtf+JWB9mAbr+6wNx5NBuP+9WTeTcY1p5v0+me0oDPFtyUIkt+wh8ckw8pNY2G1B/Ezo5R0tSrmD2WsespLF7AmdBCSY5VRD/kXINeFvyQ/5bkDQpPeNVXKDzNpsV1VXPbbVD3ccreplL1zFSjTYDKMqqqwD9/so8qcW7O9P2VOqCRfyGzzzA8Zd77V5DY8O5ce9I6rDU8VvBagH82dNUELNHobiBocXM1aoU7VTQvINo1fpfUCDOX3sbbm8xWr3y89lKc6kt6wQf86cEtlYvvrkGSpkRsKCRZH9wfriVvk6kSIkkbkv/B1e91qw620zqOp1lOj5LvACYEAnUHd9y45aJKXmmApFptHrdSM4KfGaohwLbAEzZU/LDCiP1uC77aWrgvLLafLq9XVtuNBXVAi3PgnyYVpYXanYVtcXxd3+vj1742G4AqzewBXPAWvpG51mwyP2OCp0bra3HYzj7RlsDnPWjQPex8szLjnMRvKwQUTbSr2MjJ0UIp2ORYQFWEB9LxRfwuOeVWE2aPR8fbO3lH+OkhxfiEs4WN+I9L8+qqfjsaTtDtIB5BmMEiTkYDRTZ/FE5Ia283VoupXPSXcLt3UovFcKOIzOM+D5TpOXli+u5MfW9OavNS5WWYWQD9VEU7FgsUk+HsRcyGxzCV4L3XcS/a5YspkGxCrU6BVbOx87y1fNVFWrJTvxhOyYtP4N1wxgk8Xiav7LmFHyc+CgcLRgXiRCra8JFPyxb7+A1BLAwQUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAatWKkstKs7Mz1OyUjDVM9Qz1FFQSi9KLMgoBgqAOaWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7P5wX2/AAgAA/wUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJAAAAAAAAAAAAAAADQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADDAwAAAAA= + dataString: UEsDBBQAAAgIAABIIewucvg/sQIAAPMFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVMtu4jAU/RXk9bQKhdJ2djNA21m0RaWjLoYunPhCLIwd+VGgFf8+9zomBJCQEs59nXMf+WZSuwoKb+yDleLJCGA/O4ze2Y/OwfgIG74weiq/YO/zLoUvyYlHn1fupUG8S2HOrMBbWfzSC0XOGYJBy7mxq7FYwNA47xCec+UATdZ4itYIfXfYJgVs0/OLnp0dvhWgPdhzr4vssnvkGHSh+KoCQYQP/v19QL920ygleWSX11TAKCVdYsL8topKh7xyAXWgg5AclUUOVLEEuSh9+tMEv8znDnyT1PLtSFpsUZ2X/TZ131bcLWtun1wFqtS77UdeddqnM/ugNs+tWT02lTMS5UtZLF/5tuDOtxrbhkfH1INec7XkuYL3EvSzebAmaIFGbwOFBgdXo1aqRt2whGJ58Ku5noChOh9Sa0K7qH4z9VA1OrLL/gH968BNlYntTynJkpA7SgkWh/cH9cTNcakQosQR49/4or1iyXAvrfNoSnwSSr4TnBAI0AWkvl+QgyZ6uQmWcrFx5ErNCH5orIYIJ4IVaK78doIZ/dESnNtavE4s95yuLbFLtv0RnYRE+OCfZSemiVk3w7a4vi7u9P7t3wcNwZVm/QSufAleSd3qNhmescFDo3W9ue1m7sOmwc550QrzsPHBwoh7HqshHVww0Q7FXsYIHZSiXY4CIiMUQL8P6m/Jsa6KMHs2Ot7e0TPSXwQpji+EZfyG34l8fn3VzQc3t/lFL+9BXkAvzwYCBnddFk9Iamw3V5O6X2lKuF36oEXjuVDGV3CeB8t1nLywfP0gv1amNXmp52ZaWAD9UmdoxILFIviBEWMhUeYUvJc67iX7njFliiWIWZNoFhs73njLZ4csM1bJT+MJmbFh/ALOGMHNReLqfkpYU/GjZKBwdCDepIIVr8iU7djuP1BLAwQUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAatWKkstKs7Mz1OyUjDVM9Qz1FFQSi9KLMgoBgqAOaWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7C5y+D+xAgAA8wUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJAAAAAAAAAAAAAAA/gIAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAAC0AwAAAAA= file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 @@ -3210,6 +3294,100 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &2046989539 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2081157701} + m_Modifications: + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4833254060163934334, guid: bc2abb0d190003240b86437081f20536, type: 3} + propertyPath: m_Name + value: CustomerTable01 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bc2abb0d190003240b86437081f20536, type: 3} +--- !u!4 &2046989540 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1871400395928592747, guid: bc2abb0d190003240b86437081f20536, type: 3} + m_PrefabInstance: {fileID: 2046989539} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2081157700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2081157701} + m_Layer: 0 + m_Name: CustomerTables01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2081157701 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081157700} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2046989540} + m_Father: {fileID: 1028035736} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &5626406452199475265 PrefabInstance: m_ObjectHideFlags: 0 @@ -3262,6 +3440,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5527707380059080408, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6379312009059766371, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_Mesh value: diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs index 5de42157c..806770fc1 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/FindTable.cs @@ -1,6 +1,7 @@ using System; using BehaviorDesigner.Runtime.Tasks; using BlueWater.Npcs.Customers; +using BlueWater.Tycoons; using Action = BehaviorDesigner.Runtime.Tasks.Action; namespace BlueWater.BehaviorTrees.Actions @@ -18,15 +19,13 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { - RestaurantManager.Instance.CustomerManager.TryFindEmptySeat(_customer); + TycoonManager.Instance.CustomerManager.TryFindEmptySeat(_customer); } public override TaskStatus OnUpdate() { if (_customer.TableSeat == null) return TaskStatus.Running; - _customer.SetFoodBalloonUi(RestaurantManager.Instance.FoodBalloonUiManager.InstantiateFoodBalloon()); - _customer.FoodBalloonUi.Initialize(_customer, _customer.TableSeat); return TaskStatus.Success; } } diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs index 1408e5c85..3053f864b 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/OrderFood.cs @@ -1,6 +1,8 @@ using System; using BehaviorDesigner.Runtime.Tasks; using BlueWater.Npcs.Customers; +using BlueWater.Uis; +using UnityEngine; using Action = BehaviorDesigner.Runtime.Tasks.Action; namespace BlueWater.BehaviorTrees.Actions @@ -11,6 +13,7 @@ namespace BlueWater.BehaviorTrees.Actions { private Customer _customer; private FoodBalloonUi _foodBalloonUi; + private int _orderFoodIdx; public override void OnAwake() { @@ -20,23 +23,50 @@ namespace BlueWater.BehaviorTrees.Actions public override void OnStart() { _foodBalloonUi = _customer.FoodBalloonUi; - _foodBalloonUi.OrderFood(40001, 15f); + _orderFoodIdx = 40001; + _foodBalloonUi.OrderFood(_orderFoodIdx, 15f); + + _customer.OnInteraction += HandleFoodInteraction; + _customer.RegisterPlayerInteraction(); } public override TaskStatus OnUpdate() { if (_foodBalloonUi.IsFoodReceive()) { + _customer.OnInteraction -= HandleFoodInteraction; + _customer.UnregisterPlayerInteraction(); return TaskStatus.Success; } if (_foodBalloonUi.IsWaitTimeOver()) { _foodBalloonUi.CancelOrder(); + _customer.OnInteraction -= HandleFoodInteraction; + _customer.UnregisterPlayerInteraction(); return TaskStatus.Failure; } return TaskStatus.Running; } + + private void HandleFoodInteraction() + { + var tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer; + var carriedFoodData = tycoonPlayer.GetCurrentFoodData(); + if (carriedFoodData == null) + { + Debug.Log("플레이어가 가지고 있는 음식의 데이터가 없습니다."); + return; + } + + if (carriedFoodData.Idx == _orderFoodIdx) + { + tycoonPlayer.GiveFood(); + _foodBalloonUi.ReceiveFood(); + _customer.SetFood(carriedFoodData); + // TODO : 음식을 테이블에 깔고 먹는 행동 + } + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs index bc3da40b7..846cc6912 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Action/SetTableSeatDirection.cs @@ -16,13 +16,11 @@ namespace BlueWater.BehaviorTrees.Actions _customer = GetComponent(); } - public override void OnStart() - { - _customer.SetTableSeatPositionAndDirection(); - } - public override TaskStatus OnUpdate() { + _customer.SetTableSeatPositionAndDirection(); + _customer.TableSeat.OccupySeat(); + _customer.TableSeat.UnreserveSeat(); return TaskStatus.Success; } } diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index bfc30aec9..6bdbc3f6a 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -1,19 +1,28 @@ +using System; using BehaviorDesigner.Runtime; using BlueWater.Enemies; +using BlueWater.Interfaces; +using BlueWater.Items; using BlueWater.Players; using BlueWater.Players.Tycoons; +using BlueWater.Tycoons; +using BlueWater.Uis; using Pathfinding; using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Npcs.Customers { - public class Customer : MonoBehaviour + public class Customer : MonoBehaviour, IPlayerInteraction { // Variables + #region Variables - + // Components + [field: SerializeField] + public Transform Transform { get; private set; } + [field: SerializeField] public Rigidbody Rigidbody { get; private set; } @@ -29,63 +38,76 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public MeshRenderer MeshRenderer { get; private set; } - // Classes - [field: SerializeField, Required] - public SpineController SpineController { get; private set; } + [field: SerializeField] + public Canvas InteractionCanvas { get; private set; } - [field: SerializeField, Required] - public AiMovement AIMovement { get; private set; } + [field: SerializeField] + public Transform InteractionUi { get; private set; } [field: SerializeField] public FoodBalloonUi FoodBalloonUi { get; private set; } - + + // Classes + [field: SerializeField, Required] + public SpineController SpineController { get; private set; } + + [field: SerializeField, Required] + public AiMovement AIMovement { get; private set; } + + [field: SerializeField] + public bool EnableInteraction { get; private set; } = true; + private IAstarAI _astarAi; public TableSeat TableSeat { get; private set; } - + private bool _isMoving; + public bool IsMoving { get => _isMoving; set { if (_isMoving == value) return; - + _isMoving = value; SpineController.PlayAnimation(_isMoving ? TycoonPlayerSpineAnimation.run.ToString() : TycoonPlayerSpineAnimation.idle.ToString(), true); } } - + private Vector3 _currentDirection = Vector3.right; + public Vector3 CurrentDirection { get => _currentDirection; set { if (value == Vector3.zero) return; - + _currentDirection = value; } } private bool _isQuitting; - + public Action OnInteraction; + #endregion - + // Unity events + #region Unity events private void Awake() { InitializeComponents(); } - + private void OnApplicationQuit() { _isQuitting = true; } - + private void Update() { HandleMovement(); @@ -95,24 +117,31 @@ namespace BlueWater.Npcs.Customers private void OnDestroy() { if (_isQuitting) return; - - RestaurantManager.Instance.CustomerManager.UnregisterCustomer(this); + + TycoonManager.Instance.CustomerManager.UnregisterCustomer(this); } #endregion - + // Initialize methods + #region Initialize methods [Button("컴포넌트 초기화")] protected virtual void InitializeComponents() { + Transform = transform; Rigidbody = GetComponent(); CharacterCollider = GetComponent(); BehaviorTree = GetComponent(); VisualLook = transform.Find("VisualLook"); MeshRenderer = VisualLook.GetComponent(); - + InteractionCanvas = transform.Find("InteractionCanvas").GetComponent(); + InteractionCanvas.worldCamera = TycoonCameraManager.Instance.UiCamera; + InteractionUi = InteractionCanvas.transform.Find("InteractionUi"); + InteractionUi.localScale = Vector3.one * (1 / transform.localScale.x); + FoodBalloonUi = InteractionCanvas.transform.Find("FoodBalloonUi").GetComponent(); + SpineController = GetComponent(); AIMovement = GetComponent(); @@ -123,12 +152,13 @@ namespace BlueWater.Npcs.Customers { BehaviorTree.EnableBehavior(); } - + #endregion // Methods + #region Methods - + private void HandleMovement() { if (!_astarAi.canMove || _astarAi.isStopped) @@ -136,7 +166,7 @@ namespace BlueWater.Npcs.Customers IsMoving = false; return; } - + CurrentDirection = _astarAi.velocity.normalized; IsMoving = _astarAi.velocity != Vector3.zero || _astarAi.velocity != Vector3.positiveInfinity; } @@ -153,8 +183,12 @@ namespace BlueWater.Npcs.Customers VisualLook.localScale = localScale; } - public void SetFoodBalloonUi(FoodBalloonUi foodBalloonUi) => FoodBalloonUi = foodBalloonUi; - public void SetTableSeat(TableSeat tableSeat) => TableSeat = tableSeat; + public void SetTableSeat(TableSeat tableSeat) + { + TableSeat = tableSeat; + FoodBalloonUi.Initialize(TableSeat); + } + public void SetCurrentDirection(Vector3 normalDirection) => CurrentDirection = normalDirection; public void SetTableSeatPositionAndDirection() @@ -163,6 +197,46 @@ namespace BlueWater.Npcs.Customers SetCurrentDirection(TableSeat.TableDirection); } + public void SetFood(ItemData foodData) + { + TableSeat.SetFood(foodData.Sprite); + } + + public void Interaction() + { + OnInteraction?.Invoke(); + } + + public void ShowInteractionUi() + { + if (!InteractionUi) return; + + InteractionUi.gameObject.SetActive(true); + } + + public void HideInteractionUi() + { + if (!InteractionUi) return; + + InteractionUi.gameObject.SetActive(false); + } + + public void RegisterPlayerInteraction() + { + if (EnableInteraction) + { + GameManager.Instance.CurrentTycoonPlayer.TycoonInput.RegisterPlayerInteraction(this); + } + } + + public void UnregisterPlayerInteraction() + { + if (EnableInteraction) + { + GameManager.Instance.CurrentTycoonPlayer.TycoonInput.UnregisterPlayerInteraction(this); + } + } + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs new file mode 100644 index 000000000..1ae29ac24 --- /dev/null +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs @@ -0,0 +1,86 @@ +using BlueWater.Items; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Players.Tycoons +{ + public class TycoonFoodHandler : MonoBehaviour + { + [SerializeField] + private SpriteRenderer _foodRenderer; + + [SerializeField] + private bool _isCarriedFood; + + private ItemData _currentFoodData; + private ItemManager _itemManager; + + private void Awake() + { + InitializeComponents(); + } + + private void Start() + { + _itemManager = ItemManager.Instance; + } + + [Button("컴포넌트 초기화")] + private void InitializeComponents() + { + _foodRenderer = transform.Find("VisualLook/Food").GetComponent(); + } + + public void CarryFood(int foodIdx) + { + if (_isCarriedFood) + { + Debug.Log("이미 음식을 들고 있습니다."); + return; + } + + _currentFoodData = _itemManager.GetItemDataByIdx(foodIdx); + if (_currentFoodData == null) + { + Debug.LogError($"{foodIdx} 해당 음식을 등록할 수 없습니다."); + return; + } + + var itemSprite = _currentFoodData.Sprite; + if (!itemSprite) + { + Debug.LogWarning($"{itemSprite} 해당 음식의 이미지가 없습니다."); + } + _foodRenderer.sprite = itemSprite; + _isCarriedFood = true; + } + + public void GiveFood() + { + if (!_isCarriedFood || _currentFoodData == null) + { + Debug.Log("들고있는 음식이 없거나, 현재 음식 데이터가 비어있습니다."); + return; + } + + _currentFoodData = null; + _foodRenderer.sprite = null; + _isCarriedFood = false; + } + + public void DiscardFood() + { + if (!_isCarriedFood || _currentFoodData == null) + { + Debug.Log("들고있는 음식이 없거나, 현재 음식 데이터가 비어있습니다."); + return; + } + + _currentFoodData = null; + _foodRenderer.sprite = null; + _isCarriedFood = false; + } + + public ItemData GetCurrentFoodData() => _currentFoodData; + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs.meta b/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs.meta new file mode 100644 index 000000000..440d7d055 --- /dev/null +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonFoodHandler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8c56e1830a56e6c47bf5abe1148fc702 \ 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 75721ba1a..810db6f64 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -1,6 +1,9 @@ using System; -using System.Collections; +using System.Collections.Generic; +using BlueWater.Interfaces; using BlueWater.Uis; +using BlueWater.Utility; +using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.InputSystem; @@ -12,33 +15,56 @@ namespace BlueWater.Players.Tycoons #region variables // Components + [SerializeField] private PlayerInput _playerInput; + [SerializeField] + protected float InteractionRadius = 2f; + + private List _playerInteractions = new(); + private IPlayerInteraction _closestInteraction; + private IPlayerInteraction _previousInteraction; + // Events public event Action OnMoveInputReceived; #endregion + #region Unity events + + private void Awake() + { + InitializeComponents(); + } + + private void Update() + { + _closestInteraction = GetClosestInteraction(); + if (_closestInteraction != null) + { + _closestInteraction.ShowInteractionUi(); + if (_previousInteraction != null && _closestInteraction != _previousInteraction) + { + _previousInteraction.HideInteractionUi(); + } + _previousInteraction = _closestInteraction; + } + else + { + _previousInteraction?.HideInteractionUi(); + _previousInteraction = null; + } + } + + #endregion + // Initialize methods #region Initialize methods - public void InitializeComponents(PlayerInput playerInput) + [Button("컴포넌트 초기화")] + private void InitializeComponents() { - _playerInput = playerInput; - _playerInput.enabled = true; - PlayerInputKeyManager.Instance.SetCurrentPlayerInput(_playerInput); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); - - StartCoroutine(nameof(PlayerInputCoroutine)); - } - - private IEnumerator PlayerInputCoroutine() - { - yield return new WaitForSeconds(0.5f); - - PlayerInputKeyManager.Instance.DisableAllActionMaps(); - PlayerInputKeyManager.Instance.EnableCurrentPlayerInput(); - PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); + _playerInput = GetComponent(); } #endregion @@ -57,7 +83,7 @@ namespace BlueWater.Players.Tycoons { if (context.performed) { - // TODO : 상호작용 추가 + _closestInteraction?.Interaction(); } } @@ -65,7 +91,7 @@ namespace BlueWater.Players.Tycoons { if (context.performed) { - TycoonUiManager.Instance.RestaurantUpgradeUi.Open(TycoonUiManager.Instance.PopupUiList); + TycoonUiManager.Instance.TycoonUpgradeUi.Open(TycoonUiManager.Instance.PopupUiList); } } @@ -74,9 +100,9 @@ namespace BlueWater.Players.Tycoons { if (context.performed) { - if (!TycoonUiManager.Instance.RestaurantUpgradeUi.gameObject.activeSelf) return; + if (!TycoonUiManager.Instance.TycoonUpgradeUi.gameObject.activeSelf) return; - TycoonUiManager.Instance.RestaurantUpgradeUi.Close(); + TycoonUiManager.Instance.TycoonUpgradeUi.Close(); } } @@ -89,5 +115,36 @@ namespace BlueWater.Players.Tycoons } #endregion + + #region Methods + + public void RegisterPlayerInteraction(IPlayerInteraction playerInteraction) + { + Utils.RegisterList(_playerInteractions, playerInteraction); + } + + public void UnregisterPlayerInteraction(IPlayerInteraction playerInteraction) + { + Utils.UnregisterList(_playerInteractions, playerInteraction); + } + + private IPlayerInteraction GetClosestInteraction() + { + IPlayerInteraction closestInteraction = null; + var closestDistance = float.MaxValue; + + foreach (var interaction in _playerInteractions) + { + var distance = Vector3.Distance(transform.position, interaction.Transform.position); + if (distance > InteractionRadius || distance >= closestDistance) continue; + + closestDistance = distance; + closestInteraction = interaction; + } + + return closestInteraction; + } + + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 311fd6459..7809431db 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -1,3 +1,4 @@ +using BlueWater.Items; using Sirenix.OdinInspector; using Spine.Unity; using UnityEngine; @@ -38,6 +39,9 @@ namespace BlueWater.Players.Tycoons [field: SerializeField] public TycoonMovement TycoonMovement { get; private set; } + [field: SerializeField] + public TycoonFoodHandler TycoonFoodHandler { get; private set; } + #endregion // Unity events @@ -47,6 +51,11 @@ namespace BlueWater.Players.Tycoons { InitializeComponents(); InitializeChileComponents(); + + if (!GameManager.Instance.CurrentTycoonPlayer) + { + GameManager.Instance.SetCurrentTycoonPlayer(this); + } } private void Start() @@ -75,11 +84,11 @@ namespace BlueWater.Players.Tycoons TycoonInput = GetComponent(); TycoonMovement = GetComponent(); + TycoonFoodHandler = GetComponent(); } private void InitializeChileComponents() { - TycoonInput.InitializeComponents(PlayerInput); TycoonMovement.InitializeComponents(Rigidbody, VisualLook); } @@ -99,6 +108,12 @@ namespace BlueWater.Players.Tycoons // Input TycoonInput.OnMoveInputReceived -= TycoonMovement.HandleInputMovement; } + + // Wrapping + public void CarryFood(int foodIdx) => TycoonFoodHandler.CarryFood(foodIdx); + public void GiveFood() => TycoonFoodHandler.GiveFood(); + public void DiscardFood() => TycoonFoodHandler.DiscardFood(); + public ItemData GetCurrentFoodData() => TycoonFoodHandler.GetCurrentFoodData(); #endregion } diff --git a/Assets/02.Scripts/CombatCameraManager.cs b/Assets/02.Scripts/CombatCameraManager.cs index 393fc2d1f..c0a337193 100644 --- a/Assets/02.Scripts/CombatCameraManager.cs +++ b/Assets/02.Scripts/CombatCameraManager.cs @@ -16,7 +16,8 @@ namespace BlueWater [field: SerializeField] public CinemachineCamera BaseCombatCamera { get; private set; } - public Camera MainCamera; + public Camera MainCamera { get; private set; } + public Camera UiCamera { get; private set; } #endregion @@ -54,7 +55,8 @@ namespace BlueWater BaseCombatCamera.Priority = 1; - MainCamera = Camera.main; + MainCamera = GetComponent(); + UiCamera = MainCamera.transform.Find("UiCamera").GetComponent(); } #endregion diff --git a/Assets/02.Scripts/GameManager.cs b/Assets/02.Scripts/GameManager.cs index edd926c17..18048f84a 100644 --- a/Assets/02.Scripts/GameManager.cs +++ b/Assets/02.Scripts/GameManager.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Players.Combat; +using BlueWater.Players.Tycoons; using UnityEngine; namespace BlueWater @@ -13,6 +14,9 @@ namespace BlueWater [field: SerializeField] public CombatPlayer CurrentCombatPlayer { get; private set; } + [field: SerializeField] + public TycoonPlayer CurrentTycoonPlayer { get; private set; } + // Events public event Action OnInstantiatePlayer; @@ -25,5 +29,6 @@ namespace BlueWater } public void SetCurrentCombatPlayer(CombatPlayer combatPlayer) => CurrentCombatPlayer = combatPlayer; + public void SetCurrentTycoonPlayer(TycoonPlayer tycoonPlayer) => CurrentTycoonPlayer = tycoonPlayer; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Interface/IPlayerInteraction.cs b/Assets/02.Scripts/Interface/IPlayerInteraction.cs index 6fa26548c..2828370e5 100644 --- a/Assets/02.Scripts/Interface/IPlayerInteraction.cs +++ b/Assets/02.Scripts/Interface/IPlayerInteraction.cs @@ -5,6 +5,8 @@ namespace BlueWater.Interfaces public interface IPlayerInteraction { Transform Transform { get; } + Canvas InteractionCanvas { get; } + Transform InteractionUi { get; } bool EnableInteraction { get; } void Interaction(); diff --git a/Assets/02.Scripts/Item/Item.cs b/Assets/02.Scripts/Item/Item.cs index 36747caa0..4029e4d5b 100644 --- a/Assets/02.Scripts/Item/Item.cs +++ b/Assets/02.Scripts/Item/Item.cs @@ -26,8 +26,10 @@ namespace BlueWater.Items [SerializeField] protected SpriteRenderer SpriteRenderer; - [SerializeField] - protected Canvas Canvas; + [field: SerializeField] + public Canvas InteractionCanvas { get; private set; } + + public Transform InteractionUi { get; private set; } [field: Title("드랍 옵션")] [field: SerializeField, Tooltip("키 입력을 통한 아이템 획득")] @@ -129,8 +131,9 @@ namespace BlueWater.Items Collider = GetComponent(); VisualLook = transform.Find("VisualLook"); SpriteRenderer = VisualLook.GetComponent(); - Canvas = transform.Find("Canvas").GetComponent(); - Canvas.GetComponent().worldCamera = Camera.main; + InteractionCanvas = transform.Find("InteractionCanvas").GetComponent(); + InteractionCanvas.GetComponent().worldCamera = CombatCameraManager.Instance.UiCamera; + InteractionUi = transform.Find("InteractionUi"); } protected virtual void OnAcquired() @@ -199,16 +202,16 @@ namespace BlueWater.Items public void ShowInteractionUi() { - if (!Canvas) return; + if (!InteractionCanvas) return; - Canvas.gameObject.SetActive(true); + InteractionCanvas.gameObject.SetActive(true); } public void HideInteractionUi() { - if (!Canvas) return; + if (!InteractionCanvas) return; - Canvas.gameObject.SetActive(false); + InteractionCanvas.gameObject.SetActive(false); } private void DestroySelf() => Destroy(gameObject); diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index 831381588..e0bb66fff 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -76,9 +76,12 @@ namespace BlueWater.Items { itemPrefab = _defaultItemPrefab; } - var instantiateItem = Instantiate(itemPrefab, newDropPosition, itemPrefab.transform.rotation); + var instantiatePosition = new Vector3(dropPosition.x, dropPosition.y, dropPosition.z); + var instantiateItem = Instantiate(itemPrefab, instantiatePosition, itemPrefab.transform.rotation); instantiateItem.Initialize(element); - instantiateItem.AddForce(Vector3.up * 20f, ForceMode.Impulse); + + var dropDirection = newDropPosition - instantiatePosition; + instantiateItem.AddForce(dropDirection * 20f, ForceMode.Impulse); } } diff --git a/Assets/02.Scripts/NewBlueWater.inputactions b/Assets/02.Scripts/NewBlueWater.inputactions index 5d07c2c01..d0bc2d7f4 100644 --- a/Assets/02.Scripts/NewBlueWater.inputactions +++ b/Assets/02.Scripts/NewBlueWater.inputactions @@ -892,7 +892,7 @@ { "name": "", "id": "7ceb23c4-9187-46a0-af0b-96f4bc80ff62", - "path": "/f", + "path": "/e", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", diff --git a/Assets/02.Scripts/Prop/Restaurant.meta b/Assets/02.Scripts/Prop/Tycoon.meta similarity index 100% rename from Assets/02.Scripts/Prop/Restaurant.meta rename to Assets/02.Scripts/Prop/Tycoon.meta diff --git a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs new file mode 100644 index 000000000..7432e7aa1 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace BlueWater.Tycoons +{ + public class BeverageMachine : InteractionFurniture + { + [SerializeField] + private int _beverageIdx; + + public override void Interaction() + { + GameManager.Instance.CurrentTycoonPlayer.CarryFood(_beverageIdx); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs.meta b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs.meta new file mode 100644 index 000000000..ce39f2393 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/BeverageMachine.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0f626edd6e26d7f4aad9d388f8f72772 diff --git a/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs similarity index 69% rename from Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs rename to Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs index 59b9ea75c..8bc371d66 100644 --- a/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace BlueWater +namespace BlueWater.Tycoons { public class CustomerTable : MonoBehaviour { @@ -11,14 +11,14 @@ namespace BlueWater private void OnEnable() { - RestaurantManager.Instance.CustomerTableManager.RegisterTable(this); + TycoonManager.Instance.CustomerTableManager.RegisterTable(this); } private void OnDisable() { - if (!RestaurantManager.Instance) return; + if (!TycoonManager.Instance) return; - RestaurantManager.Instance.CustomerTableManager.UnregisterTable(this); + TycoonManager.Instance.CustomerTableManager.UnregisterTable(this); } public TableSeat FindEmptySeat() diff --git a/Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs.meta b/Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs.meta similarity index 100% rename from Assets/02.Scripts/Prop/Restaurant/CustomerTable.cs.meta rename to Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs.meta diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs new file mode 100644 index 000000000..c3a5634c2 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -0,0 +1,77 @@ +using BlueWater.Interfaces; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Tycoons +{ + public abstract class InteractionFurniture : MonoBehaviour, IPlayerInteraction + { + [field: SerializeField] + public Transform Transform { get; private set; } + + [field: SerializeField] + public Canvas InteractionCanvas { get; private set; } + + [field: SerializeField] + public Transform InteractionUi { get; private set; } + + [field: SerializeField] + public bool EnableInteraction { get; private set; } = true; + + private bool _isQuitting; + + protected virtual void Awake() + { + InitializeComponents(); + } + + protected virtual void Start() + { + if (EnableInteraction) + { + GameManager.Instance.CurrentTycoonPlayer.TycoonInput.RegisterPlayerInteraction(this); + } + } + + private void OnApplicationQuit() + { + _isQuitting = true; + } + + protected virtual void OnDestroy() + { + if (_isQuitting) return; + + if (EnableInteraction) + { + GameManager.Instance.CurrentTycoonPlayer.TycoonInput.UnregisterPlayerInteraction(this); + } + } + + [Button("컴포넌트 초기화")] + protected virtual void InitializeComponents() + { + Transform = transform; + InteractionCanvas = transform.Find("InteractionCanvas").GetComponent(); + InteractionCanvas.GetComponent().worldCamera = Camera.main; + InteractionUi = InteractionCanvas.transform.Find("InteractionUi"); + InteractionUi.localScale = Vector3.one * (1 / transform.localScale.x); + } + + public abstract void Interaction(); + + public void ShowInteractionUi() + { + if (!InteractionCanvas) return; + + InteractionCanvas.gameObject.SetActive(true); + } + + public void HideInteractionUi() + { + if (!InteractionCanvas) return; + + InteractionCanvas.gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs.meta b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs.meta new file mode 100644 index 000000000..ae5b70979 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a5b0ba8c3db8a294d840953eb2d450aa \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs similarity index 97% rename from Assets/02.Scripts/Prop/Restaurant/TableSeat.cs rename to Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index 765fd0297..55a6bfbac 100644 --- a/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace BlueWater +namespace BlueWater.Tycoons { [Serializable] public class TableSeat diff --git a/Assets/02.Scripts/Prop/Restaurant/TableSeat.cs.meta b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs.meta similarity index 100% rename from Assets/02.Scripts/Prop/Restaurant/TableSeat.cs.meta rename to Assets/02.Scripts/Prop/Tycoon/TableSeat.cs.meta diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs new file mode 100644 index 000000000..615224c02 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -0,0 +1,10 @@ +namespace BlueWater.Tycoons +{ + public class TrashCan : InteractionFurniture + { + public override void Interaction() + { + GameManager.Instance.CurrentTycoonPlayer.DiscardFood(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs.meta b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs.meta new file mode 100644 index 000000000..170888d43 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7489636ad0f8f9f429c6fb58ed56c052 diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs b/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs deleted file mode 100644 index c6a623da6..000000000 --- a/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs +++ /dev/null @@ -1,23 +0,0 @@ -using BlueWater.Uis; -using UnityEngine; - -namespace BlueWater -{ - public class FoodBalloonUiManager : MonoBehaviour - { - [SerializeField] - private FoodBalloonUi _foodBalloonUiPrefab; - - private Transform _instanceLocation; - - private void Start() - { - _instanceLocation = TycoonUiManager.Instance.MainCanvas.transform; - } - - public FoodBalloonUi InstantiateFoodBalloon() - { - return Instantiate(_foodBalloonUiPrefab, Vector3.zero, Quaternion.identity, _instanceLocation); - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs.meta b/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs.meta deleted file mode 100644 index b841725b1..000000000 --- a/Assets/02.Scripts/Restaurant/FoodBalloonUiManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 609e0561d4d85804ab33cccbbbfc7927 \ No newline at end of file diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset index ad684974f..3b080a938 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset @@ -398,7 +398,7 @@ MonoBehaviour: k__BackingField: 0 k__BackingField: 0 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300010, guid: 7008c94b2b80b9a428550c957ecf47f8, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 50001 k__BackingField: "\uD558\uD2B8 \uBC18 \uAC1C" diff --git a/Assets/02.Scripts/Restaurant.meta b/Assets/02.Scripts/Tycoon.meta similarity index 100% rename from Assets/02.Scripts/Restaurant.meta rename to Assets/02.Scripts/Tycoon.meta diff --git a/Assets/02.Scripts/Restaurant/CustomerManager.cs b/Assets/02.Scripts/Tycoon/CustomerManager.cs similarity index 96% rename from Assets/02.Scripts/Restaurant/CustomerManager.cs rename to Assets/02.Scripts/Tycoon/CustomerManager.cs index 447028370..4aa3c590f 100644 --- a/Assets/02.Scripts/Restaurant/CustomerManager.cs +++ b/Assets/02.Scripts/Tycoon/CustomerManager.cs @@ -5,7 +5,7 @@ using BlueWater.Utility; using Sirenix.OdinInspector; using UnityEngine; -namespace BlueWater +namespace BlueWater.Tycoons { public class CustomerManager : MonoBehaviour { @@ -31,7 +31,7 @@ namespace BlueWater private void Start() { - _customerTableManager = RestaurantManager.Instance.CustomerTableManager; + _customerTableManager = TycoonManager.Instance.CustomerTableManager; } public void InstantiateCustomer() diff --git a/Assets/02.Scripts/Restaurant/CustomerManager.cs.meta b/Assets/02.Scripts/Tycoon/CustomerManager.cs.meta similarity index 100% rename from Assets/02.Scripts/Restaurant/CustomerManager.cs.meta rename to Assets/02.Scripts/Tycoon/CustomerManager.cs.meta diff --git a/Assets/02.Scripts/Restaurant/CustomerTableManager.cs b/Assets/02.Scripts/Tycoon/CustomerTableManager.cs similarity index 96% rename from Assets/02.Scripts/Restaurant/CustomerTableManager.cs rename to Assets/02.Scripts/Tycoon/CustomerTableManager.cs index 8b890d14b..cebb8a429 100644 --- a/Assets/02.Scripts/Restaurant/CustomerTableManager.cs +++ b/Assets/02.Scripts/Tycoon/CustomerTableManager.cs @@ -3,7 +3,7 @@ using System.Linq; using BlueWater.Utility; using UnityEngine; -namespace BlueWater +namespace BlueWater.Tycoons { public class CustomerTableManager : MonoBehaviour { diff --git a/Assets/02.Scripts/Restaurant/CustomerTableManager.cs.meta b/Assets/02.Scripts/Tycoon/CustomerTableManager.cs.meta similarity index 100% rename from Assets/02.Scripts/Restaurant/CustomerTableManager.cs.meta rename to Assets/02.Scripts/Tycoon/CustomerTableManager.cs.meta diff --git a/Assets/02.Scripts/Restaurant/RestaurantManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs similarity index 69% rename from Assets/02.Scripts/Restaurant/RestaurantManager.cs rename to Assets/02.Scripts/Tycoon/TycoonManager.cs index 0d2b06a45..aa0ac9414 100644 --- a/Assets/02.Scripts/Restaurant/RestaurantManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -1,18 +1,15 @@ using UnityEngine; using Sirenix.OdinInspector; -namespace BlueWater +namespace BlueWater.Tycoons { - public class RestaurantManager : Singleton + public class TycoonManager : Singleton { [field: SerializeField] public CustomerManager CustomerManager { get; private set; } [field: SerializeField] public CustomerTableManager CustomerTableManager { get; private set; } - - [field: SerializeField] - public FoodBalloonUiManager FoodBalloonUiManager { get; private set; } protected override void OnAwake() { @@ -24,7 +21,6 @@ namespace BlueWater { CustomerManager = GetComponent(); CustomerTableManager = GetComponent(); - FoodBalloonUiManager = GetComponent(); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/RestaurantManager.cs.meta b/Assets/02.Scripts/Tycoon/TycoonManager.cs.meta similarity index 100% rename from Assets/02.Scripts/Restaurant/RestaurantManager.cs.meta rename to Assets/02.Scripts/Tycoon/TycoonManager.cs.meta diff --git a/Assets/02.Scripts/TycoonCameraManager.cs b/Assets/02.Scripts/TycoonCameraManager.cs index 2eacd3bca..1e9584bb1 100644 --- a/Assets/02.Scripts/TycoonCameraManager.cs +++ b/Assets/02.Scripts/TycoonCameraManager.cs @@ -20,7 +20,8 @@ namespace BlueWater [field: SerializeField] public CinemachineCamera BaseCamera { get; private set; } - public Camera MainCamera; + public Camera MainCamera { get; private set; } + public Camera UiCamera { get; private set; } // Variables private Vignette _vignette; @@ -63,7 +64,8 @@ namespace BlueWater BaseCamera.Priority = 1; - MainCamera = Camera.main; + MainCamera = GetComponent(); + UiCamera = MainCamera.transform.Find("UiCamera").GetComponent(); _vignette = GetEffect(); _vignette.active = false; diff --git a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs index af1bf2ea5..8cfd83702 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; +using BlueWater.Items; using BlueWater.Players.Combat; -using BlueWater.Uis; using Sirenix.OdinInspector; using TMPro; using UnityEngine; -namespace BlueWater.Items +namespace BlueWater.Uis { public class CombatItemInventoryUi : SwitchActionPopupUi { diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs similarity index 86% rename from Assets/02.Scripts/Restaurant/FoodBalloonUi.cs rename to Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs index 5f5e69158..2cf08ab48 100644 --- a/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs @@ -1,11 +1,11 @@ using BlueWater.Items; -using BlueWater.Npcs.Customers; +using BlueWater.Tycoons; using DG.Tweening; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.UI; -namespace BlueWater +namespace BlueWater.Uis { public class FoodBalloonUi : MonoBehaviour { @@ -15,12 +15,6 @@ namespace BlueWater [field: SerializeField, Required] public Image FoodImage { get; private set; } - - [SerializeField] - private Customer _customer; - - [SerializeField] - private Vector3 _offset = new(-0.2f, 1.5f, 0f); [Title("주문 정보")] [SerializeField, Tooltip("주문을 시작하고나서, 재촉하지 않는 최소한의 기다리는 시간")] @@ -46,13 +40,6 @@ namespace BlueWater { InitializeComponents(); } - - private void LateUpdate() - { - if (!gameObject.activeSelf || !_customer) return; - - transform.position = _customer.transform.TransformPoint(_offset); - } private void OnDestroy() { @@ -66,9 +53,8 @@ namespace BlueWater FoodImage = transform.Find("FoodImage").GetComponent(); } - public void Initialize(Customer customer, TableSeat tableSeat) + public void Initialize(TableSeat tableSeat) { - _customer = customer; _tableSeat = tableSeat; HideUi(); } @@ -120,8 +106,15 @@ namespace BlueWater public void CancelOrder() { - _tableSeat.UnreserveSeat(); _tableSeat.VacateSeat(); } + + public void ReceiveFood() + { + _tableSeat.DirtyTable(); + _tween.Kill(); + HideUi(); + _isFoodReceived = true; + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Restaurant/FoodBalloonUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Restaurant/FoodBalloonUi.cs.meta rename to Assets/02.Scripts/Ui/Tycoon/FoodBalloonUi.cs.meta diff --git a/Assets/02.Scripts/Ui/Tycoon/RestaurantUpgradeUi.cs b/Assets/02.Scripts/Ui/Tycoon/RestaurantUpgradeUi.cs deleted file mode 100644 index 756907c1b..000000000 --- a/Assets/02.Scripts/Ui/Tycoon/RestaurantUpgradeUi.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace BlueWater.Uis -{ - public class RestaurantUpgradeUi : SwitchActionPopupUi - { - - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs index de9929791..a360c5a7f 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs @@ -13,7 +13,7 @@ namespace BlueWater.Uis public Canvas MainCanvas { get; private set; } [field: SerializeField] - public RestaurantUpgradeUi RestaurantUpgradeUi { get; private set; } + public TycoonUpgradeUi TycoonUpgradeUi { get; private set; } // Variables public List PopupUiList { get; private set; } @@ -49,7 +49,7 @@ namespace BlueWater.Uis private void InitializeComponents() { MainCanvas = GetComponent(); - RestaurantUpgradeUi = GetComponentInChildren(true); + TycoonUpgradeUi = GetComponentInChildren(true); PopupUiList = new List(8); } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs new file mode 100644 index 000000000..85c3a67cb --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs @@ -0,0 +1,7 @@ +namespace BlueWater.Uis +{ + public class TycoonUpgradeUi : SwitchActionPopupUi + { + + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/RestaurantUpgradeUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/Tycoon/RestaurantUpgradeUi.cs.meta rename to Assets/02.Scripts/Ui/Tycoon/TycoonUpgradeUi.cs.meta diff --git a/Assets/03.Images/Props/Furniture/Barrel.png b/Assets/03.Images/Props/Furniture/Barrel.png new file mode 100644 index 000000000..94b989d1c Binary files /dev/null and b/Assets/03.Images/Props/Furniture/Barrel.png differ diff --git a/Assets/03.Images/Props/Furniture/TableLeg.png.meta b/Assets/03.Images/Props/Furniture/Barrel.png.meta similarity index 96% rename from Assets/03.Images/Props/Furniture/TableLeg.png.meta rename to Assets/03.Images/Props/Furniture/Barrel.png.meta index dc203150b..cc4e87459 100644 --- a/Assets/03.Images/Props/Furniture/TableLeg.png.meta +++ b/Assets/03.Images/Props/Furniture/Barrel.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3715781c43768284da9143d381ef9ca5 +guid: 22fdd4cc3908b9c4185a2e4a479ba720 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.06} spritePixelsToUnits: 2048 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -127,7 +127,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/03.Images/Props/Furniture/Box01.png b/Assets/03.Images/Props/Furniture/Box01.png new file mode 100644 index 000000000..964021af4 Binary files /dev/null and b/Assets/03.Images/Props/Furniture/Box01.png differ diff --git a/Assets/03.Images/Props/Furniture/TableTop.png.meta b/Assets/03.Images/Props/Furniture/Box01.png.meta similarity index 95% rename from Assets/03.Images/Props/Furniture/TableTop.png.meta rename to Assets/03.Images/Props/Furniture/Box01.png.meta index 052335b86..2909be724 100644 --- a/Assets/03.Images/Props/Furniture/TableTop.png.meta +++ b/Assets/03.Images/Props/Furniture/Box01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 28d46d5b3a19fd848a0e80590ea20266 +guid: 6807b962d0918ae42870c9b953a55cd7 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -46,9 +46,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 2048 + alignment: 9 + spritePivot: {x: 0.5, y: 0.23} + spritePixelsToUnits: 1024 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -127,7 +127,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/03.Images/Props/Furniture/TableLeg.png b/Assets/03.Images/Props/Furniture/TableLeg.png deleted file mode 100644 index 34437fec9..000000000 Binary files a/Assets/03.Images/Props/Furniture/TableLeg.png and /dev/null differ diff --git a/Assets/03.Images/Props/Furniture/TableTop.png b/Assets/03.Images/Props/Furniture/TableTop.png deleted file mode 100644 index 416a6f809..000000000 Binary files a/Assets/03.Images/Props/Furniture/TableTop.png and /dev/null differ diff --git a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab index ad9abd732..0649047b0 100644 --- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab +++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 813964778509222274} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2397117528733804567} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!33 &479823629690914954 MeshFilter: m_ObjectHideFlags: 0 @@ -169,6 +169,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3748026497419659573} + - {fileID: 7293985954889289183} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &5913499722605887790 @@ -367,7 +368,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} m_Name: m_EditorClassIdentifier: - _skeletonAnimation: {fileID: 2961986041977982893} + k__BackingField: {fileID: 0} _initialSkinName: 02 --- !u!114 &17978457728262906 MonoBehaviour: @@ -393,11 +394,291 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8ed3a2b9a6425d147bc79e8a53a4fea1, type: 3} m_Name: m_EditorClassIdentifier: + k__BackingField: {fileID: 2397117528733804567} k__BackingField: {fileID: 5913499722605887790} k__BackingField: {fileID: 3035760932289101816} k__BackingField: {fileID: 2615952973387112450} k__BackingField: {fileID: 3748026497419659573} k__BackingField: {fileID: 2588384133887034894} + k__BackingField: {fileID: 7800018367225963417} + k__BackingField: {fileID: 7689708008984027505} + k__BackingField: {fileID: 8566491437687787454} k__BackingField: {fileID: 5279376384905517670} k__BackingField: {fileID: 17978457728262906} - k__BackingField: {fileID: 0} + k__BackingField: 1 +--- !u!1001 &2718897986636601543 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2397117528733804567} + m_Modifications: + - target: {fileID: 4119792729305172665, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9396927 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.3420201 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Name + value: InteractionCanvas + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 33.3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + insertIndex: -1 + addedObject: {fileID: 8432469322612575415} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} +--- !u!224 &7293985954889289183 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7689708008984027505 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5695967080072346038, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} +--- !u!223 &7800018367225963417 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 5297442833789713246, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 2718897986636601543} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5882202591468924078 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7293985954889289183} + m_Modifications: + - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Name + value: FoodBalloonUi + objectReference: {fileID: 0} + - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchoredPosition.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} +--- !u!224 &8432469322612575415 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + m_PrefabInstance: {fileID: 5882202591468924078} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8566491437687787454 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + m_PrefabInstance: {fileID: 5882202591468924078} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index 16f53c8bd..6ab637ca4 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -27,13 +27,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 569530817952539991} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 9064323779972017060} m_Father: {fileID: 2798544366308408093} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!33 &6379312009059766371 MeshFilter: m_ObjectHideFlags: 0 @@ -130,6 +131,93 @@ MonoBehaviour: _animationName: idle loop: 1 timeScale: 1 +--- !u!1 &1731013725373434356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9064323779972017060} + - component: {fileID: 5527707380059080408} + m_Layer: 9 + m_Name: Food + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9064323779972017060 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731013725373434356} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.117, y: 0.234, z: -0.01} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6509241874729291456} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5527707380059080408 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731013725373434356} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 70aebc98d60422b4fa30aa5da1fe3623, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2768568390039878737 GameObject: m_ObjectHideFlags: 0 @@ -146,6 +234,7 @@ GameObject: - component: {fileID: 6662554121718997272} - component: {fileID: 1674052485383758547} - component: {fileID: 4836489897218844789} + - component: {fileID: 909302231676134912} m_Layer: 9 m_Name: TycoonPlayer m_TagString: Untagged @@ -226,7 +315,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2768568390039878737} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: @@ -404,6 +493,22 @@ MonoBehaviour: m_Calls: [] m_ActionId: 7f4f45c6-67b1-47bf-9a74-fea6f6b5fde1 m_ActionName: UI/TrackedDeviceOrientation + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 2959a0ad-c73e-43b1-b98e-9917868b2a9a + m_ActionName: 'Combat/Interaction[/Keyboard/f]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: a5d9ffcb-5c4f-4c6d-8335-9060bbea120a + m_ActionName: 'Combat/OpenDevelopMenu[/Keyboard/f1]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 2f6cc7b3-e806-4b78-b11f-e6ed70bb67ac + m_ActionName: 'Combat/ForceKillBoss[/Keyboard/f2]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 0dbf1015-499a-43fe-b252-11c232b9a1ae + m_ActionName: 'Combat/HealthPointMax[/Keyboard/f3]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Tycoon @@ -428,6 +533,7 @@ MonoBehaviour: k__BackingField: {fileID: 7125556968546628472} k__BackingField: {fileID: 1674052485383758547} k__BackingField: {fileID: 4836489897218844789} + k__BackingField: {fileID: 909302231676134912} --- !u!114 &6662554121718997272 MonoBehaviour: m_ObjectHideFlags: 0 @@ -440,7 +546,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} m_Name: m_EditorClassIdentifier: - _skeletonAnimation: {fileID: 7125556968546628472} + k__BackingField: {fileID: 7125556968546628472} _initialSkinName: 01 --- !u!114 &1674052485383758547 MonoBehaviour: @@ -454,6 +560,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2bc02c60fe9bf724885e9f5713f900ee, type: 3} m_Name: m_EditorClassIdentifier: + _playerInput: {fileID: 6054159730444663926} + InteractionRadius: 2 --- !u!114 &4836489897218844789 MonoBehaviour: m_ObjectHideFlags: 0 @@ -467,3 +575,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: k__BackingField: 7 +--- !u!114 &909302231676134912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2768568390039878737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c56e1830a56e6c47bf5abe1148fc702, type: 3} + m_Name: + m_EditorClassIdentifier: + _foodRenderer: {fileID: 5527707380059080408} + _isCarriedFood: 0 diff --git a/Assets/05.Prefabs/Items/AutoDropItem.prefab b/Assets/05.Prefabs/Items/AutoDropItem.prefab index 347b1cc3b..3a1880b83 100644 --- a/Assets/05.Prefabs/Items/AutoDropItem.prefab +++ b/Assets/05.Prefabs/Items/AutoDropItem.prefab @@ -1,107 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &316318118309449416 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 666340171847681576} - - component: {fileID: 16072863968012398} - - component: {fileID: 3466664881830510074} - - component: {fileID: 897534835685585813} - m_Layer: 13 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &666340171847681576 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01069167, y: 0.01069167, z: 0.01069167} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 482296371213806214} - m_Father: {fileID: 3930562537327335166} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 600} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &16072863968012398 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 5 - m_TargetDisplay: 0 ---- !u!114 &3466664881830510074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &897534835685585813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 65535 --- !u!1 &1513751791682743921 GameObject: m_ObjectHideFlags: 0 @@ -289,13 +187,14 @@ MonoBehaviour: Collider: {fileID: 72705275807094440} VisualLook: {fileID: 7973014042992492397} SpriteRenderer: {fileID: 7437393363680573610} - Canvas: {fileID: 16072863968012398} + k__BackingField: {fileID: 0} k__BackingField: 0 UseAutoDestroy: 1 AutoDestroyTime: 30 DrawGizmos: 1 Radius: 3 AcquisitionTime: 0.5 + DropWaitTime: 0.7 AcquiredSfxName: GetItem ItemData: k__BackingField: 0 @@ -307,251 +206,93 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} ---- !u!1 &2815016273565104219 -GameObject: +--- !u!1001 &5313497830649713456 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 226077220011295018} - - component: {fileID: 448025115665681541} - - component: {fileID: 1697045944594333697} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &226077220011295018 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3930562537327335166} + m_Modifications: + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Name + value: InteractionCanvas + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} +--- !u!224 &666340171847681576 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 5313497830649713456} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815016273565104219} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6223355445657907225} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &448025115665681541 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815016273565104219} - m_CullTransparentMesh: 1 ---- !u!114 &1697045944594333697 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815016273565104219} - 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: F - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, 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: 34.5 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 200 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8111308071153146249 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 482296371213806214} - m_Layer: 5 - m_Name: InteractionUi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &482296371213806214 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8111308071153146249} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 6223355445657907225} - m_Father: {fileID: 666340171847681576} - 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: 0, y: 120} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8357987098767019228 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6223355445657907225} - - component: {fileID: 453554727717358886} - - component: {fileID: 1713988739707689781} - m_Layer: 5 - m_Name: Circle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6223355445657907225 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357987098767019228} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 226077220011295018} - m_Father: {fileID: 482296371213806214} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &453554727717358886 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357987098767019228} - m_CullTransparentMesh: 1 ---- !u!114 &1713988739707689781 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357987098767019228} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.3647059, g: 0.35686275, b: 0.3647059, 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_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/05.Prefabs/Items/FullHeartItem.prefab b/Assets/05.Prefabs/Items/FullHeartItem.prefab index a6ee38b7f..3c6a46bf1 100644 --- a/Assets/05.Prefabs/Items/FullHeartItem.prefab +++ b/Assets/05.Prefabs/Items/FullHeartItem.prefab @@ -52,6 +52,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6756372828448640595, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3} m_RemovedGameObjects: [] @@ -82,13 +86,14 @@ MonoBehaviour: Collider: {fileID: 2848843651262022415} VisualLook: {fileID: 5201300381511609034} SpriteRenderer: {fileID: 4737084216554679565} - Canvas: {fileID: 2788422010916109769} + k__BackingField: {fileID: 0} k__BackingField: 1 UseAutoDestroy: 1 AutoDestroyTime: 30 DrawGizmos: 1 Radius: 5 AcquisitionTime: 1 + DropWaitTime: 0.7 AcquiredSfxName: GetItem ItemData: k__BackingField: 0 @@ -101,11 +106,6 @@ MonoBehaviour: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} _healingHealthPoint: 2 ---- !u!223 &2788422010916109769 stripped -Canvas: - m_CorrespondingSourceObject: {fileID: 16072863968012398, guid: 28a379482be867746aad889c0f1c3c79, type: 3} - m_PrefabInstance: {fileID: 2777433600211998119} - m_PrefabAsset: {fileID: 0} --- !u!65 &2848843651262022415 stripped BoxCollider: m_CorrespondingSourceObject: {fileID: 72705275807094440, guid: 28a379482be867746aad889c0f1c3c79, type: 3} diff --git a/Assets/05.Prefabs/Items/HalfHeartItem.prefab b/Assets/05.Prefabs/Items/HalfHeartItem.prefab index aa16104cc..3012eb517 100644 --- a/Assets/05.Prefabs/Items/HalfHeartItem.prefab +++ b/Assets/05.Prefabs/Items/HalfHeartItem.prefab @@ -52,6 +52,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6756372828448640595, guid: 28a379482be867746aad889c0f1c3c79, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7437393363680573610, guid: 28a379482be867746aad889c0f1c3c79, type: 3} propertyPath: m_Sprite value: @@ -86,13 +90,14 @@ MonoBehaviour: Collider: {fileID: 2848843651262022415} VisualLook: {fileID: 5201300381511609034} SpriteRenderer: {fileID: 4737084216554679565} - Canvas: {fileID: 2788422010916109769} + k__BackingField: {fileID: 0} k__BackingField: 1 UseAutoDestroy: 1 AutoDestroyTime: 30 DrawGizmos: 1 Radius: 5 AcquisitionTime: 1 + DropWaitTime: 0.7 AcquiredSfxName: GetItem ItemData: k__BackingField: 0 @@ -105,11 +110,6 @@ MonoBehaviour: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} _healingHealthPoint: 1 ---- !u!223 &2788422010916109769 stripped -Canvas: - m_CorrespondingSourceObject: {fileID: 16072863968012398, guid: 28a379482be867746aad889c0f1c3c79, type: 3} - m_PrefabInstance: {fileID: 2777433600211998119} - m_PrefabAsset: {fileID: 0} --- !u!65 &2848843651262022415 stripped BoxCollider: m_CorrespondingSourceObject: {fileID: 72705275807094440, guid: 28a379482be867746aad889c0f1c3c79, type: 3} diff --git a/Assets/05.Prefabs/Items/Item.prefab b/Assets/05.Prefabs/Items/Item.prefab index 45305c81e..9854166d6 100644 --- a/Assets/05.Prefabs/Items/Item.prefab +++ b/Assets/05.Prefabs/Items/Item.prefab @@ -1,107 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &316318118309449416 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 666340171847681576} - - component: {fileID: 16072863968012398} - - component: {fileID: 3466664881830510074} - - component: {fileID: 897534835685585813} - m_Layer: 13 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &666340171847681576 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01069167, y: 0.01069167, z: 0.01069167} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 482296371213806214} - m_Father: {fileID: 3930562537327335166} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 600} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &16072863968012398 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 5 - m_TargetDisplay: 0 ---- !u!114 &3466664881830510074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &897534835685585813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316318118309449416} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 65535 --- !u!1 &1513751791682743921 GameObject: m_ObjectHideFlags: 0 @@ -222,7 +120,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7973014042992492397} - - {fileID: 666340171847681576} + - {fileID: 5809621762725332659} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &8185780986250253390 @@ -289,13 +187,14 @@ MonoBehaviour: Collider: {fileID: 72705275807094440} VisualLook: {fileID: 7973014042992492397} SpriteRenderer: {fileID: 7437393363680573610} - Canvas: {fileID: 16072863968012398} + k__BackingField: {fileID: 0} k__BackingField: 1 UseAutoDestroy: 1 AutoDestroyTime: 30 DrawGizmos: 1 Radius: 5 AcquisitionTime: 1 + DropWaitTime: 0.7 AcquiredSfxName: GetItem ItemData: k__BackingField: 0 @@ -307,251 +206,93 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} ---- !u!1 &2815016273565104219 -GameObject: +--- !u!1001 &1161342606362137515 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 226077220011295018} - - component: {fileID: 448025115665681541} - - component: {fileID: 1697045944594333697} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &226077220011295018 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3930562537327335166} + m_Modifications: + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Name + value: InteractionCanvas + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} +--- !u!224 &5809621762725332659 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 1161342606362137515} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815016273565104219} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6223355445657907225} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &448025115665681541 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815016273565104219} - m_CullTransparentMesh: 1 ---- !u!114 &1697045944594333697 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815016273565104219} - 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: F - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, 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: 34.5 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 200 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8111308071153146249 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 482296371213806214} - m_Layer: 5 - m_Name: InteractionUi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &482296371213806214 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8111308071153146249} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 6223355445657907225} - m_Father: {fileID: 666340171847681576} - 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: 0, y: 120} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8357987098767019228 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6223355445657907225} - - component: {fileID: 453554727717358886} - - component: {fileID: 1713988739707689781} - m_Layer: 5 - m_Name: Circle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6223355445657907225 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357987098767019228} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 226077220011295018} - m_Father: {fileID: 482296371213806214} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &453554727717358886 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357987098767019228} - m_CullTransparentMesh: 1 ---- !u!114 &1713988739707689781 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8357987098767019228} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.3647059, g: 0.35686275, b: 0.3647059, 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_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab b/Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab similarity index 56% rename from Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab rename to Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab index 3fa021120..6a790b913 100644 --- a/Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab +++ b/Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab @@ -9,9 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7986070582027999988} - - component: {fileID: 4147700776997737566} + - component: {fileID: 953987369095066187} m_Layer: 8 - m_Name: BaseFurnitureOpaqueLit + m_Name: BaseFurniture m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -33,8 +33,8 @@ Transform: - {fileID: 7438534416270888028} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4147700776997737566 -BoxCollider: +--- !u!136 &953987369095066187 +CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -48,12 +48,14 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 1 + m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 0.2} - m_Center: {x: 0, y: 0.5, z: 0} + serializedVersion: 2 + m_Radius: 0.5 + m_Height: 0.5 + m_Direction: 1 + m_Center: {x: 0, y: 0.5, z: 0.25} --- !u!1 &7835622629792856689 GameObject: m_ObjectHideFlags: 0 @@ -79,13 +81,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7835622629792856689} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7192483373850935599} m_Father: {fileID: 7986070582027999988} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!212 &3580758810857167321 SpriteRenderer: m_ObjectHideFlags: 0 @@ -94,8 +97,8 @@ SpriteRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7835622629792856689} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -109,7 +112,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} + - {fileID: 2100000, guid: 70aebc98d60422b4fa30aa5da1fe3623, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -141,3 +144,90 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8884531212319162473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7192483373850935599} + - component: {fileID: 9047629830516719732} + m_Layer: 8 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7192483373850935599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884531212319162473} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7438534416270888028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &9047629830516719732 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884531212319162473} + m_Enabled: 1 + m_CastShadows: 3 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ee61efd036130b847b41f878f20ddf33, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab.meta b/Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/BaseFurniture.prefab.meta diff --git a/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab b/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab index 88faed7b1..432b72e0d 100644 --- a/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab +++ b/Assets/05.Prefabs/Props/Furniture/CustomerTable01.prefab @@ -89,13 +89,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3430995138614654016} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.22, y: 0.5, z: -0.01} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: -0.22, y: 0.39, z: 0.122} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 72918880234409943} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!212 &1936537098954677604 SpriteRenderer: m_ObjectHideFlags: 0 @@ -145,7 +145,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.40234375, y: 0.28271484} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 @@ -207,7 +207,7 @@ Transform: m_GameObject: {fileID: 7259785794916276111} serializedVersion: 2 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: 0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -240,13 +240,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8221302613581290258} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.22, y: 0.5, z: -0.01} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0.22, y: 0.39, z: 0.122} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 6987995983662494743} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!212 &231587957349564794 SpriteRenderer: m_ObjectHideFlags: 0 @@ -296,7 +296,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.40234375, y: 0.28271484} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 @@ -327,7 +327,7 @@ Transform: m_GameObject: {fileID: 8821924279338320136} serializedVersion: 2 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: 0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -451,6 +451,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} + - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions.meta b/Assets/05.Prefabs/Props/Furniture/Interactions.meta new file mode 100644 index 000000000..be4d3e15b --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05c54e0fd6ab87e4da237050b7c134da +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab new file mode 100644 index 000000000..c5d29f766 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab @@ -0,0 +1,320 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3764902268943045601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7986070582027999988} + - component: {fileID: 4102385080769430677} + m_Layer: 8 + m_Name: BaseInteractionFurniture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7986070582027999988 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7438534416270888028} + - {fileID: 1180174675498993111} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &4102385080769430677 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3764902268943045601} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Height: 0.5 + m_Direction: 1 + m_Center: {x: 0, y: 0.5, z: 0.25} +--- !u!1 &7835622629792856689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7438534416270888028} + - component: {fileID: 3580758810857167321} + m_Layer: 8 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7438534416270888028 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7835622629792856689} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7192483373850935599} + m_Father: {fileID: 7986070582027999988} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &3580758810857167321 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7835622629792856689} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 70aebc98d60422b4fa30aa5da1fe3623, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8884531212319162473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7192483373850935599} + - component: {fileID: 9047629830516719732} + m_Layer: 8 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7192483373850935599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884531212319162473} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7438534416270888028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &9047629830516719732 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8884531212319162473} + m_Enabled: 1 + m_CastShadows: 3 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ee61efd036130b847b41f878f20ddf33, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &5828454349678121167 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7986070582027999988} + m_Modifications: + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.x + value: 800 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_SizeDelta.y + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + propertyPath: m_Name + value: InteractionCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} +--- !u!224 &1180174675498993111 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + m_PrefabInstance: {fileID: 5828454349678121167} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab.meta new file mode 100644 index 000000000..55001bd51 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3f9f846a7f237924e97c9acf370d991d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab new file mode 100644 index 000000000..a17b6133d --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab @@ -0,0 +1,147 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 22fdd4cc3908b9c4185a2e4a479ba720, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: BeverageMachine + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 22fdd4cc3908b9c4185a2e4a479ba720, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: -2295354521770658057} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!4 &809828747251277026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-2295354521770658057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f626edd6e26d7f4aad9d388f8f72772, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 809828747251277026} + k__BackingField: {fileID: 8975593228546502023} + k__BackingField: {fileID: 8793236136028073839} + k__BackingField: 1 + _beverageIdx: 40001 +--- !u!224 &8793236136028073839 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!223 &8975593228546502023 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab.meta new file mode 100644 index 000000000..ca0d3c263 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 109afa56f22782a4baef8705031c807a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab new file mode 100644 index 000000000..55f2ee65b --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6807b962d0918ae42870c9b953a55cd7, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: TrashCan + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6807b962d0918ae42870c9b953a55cd7, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: -8278684978296943735} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-8278684978296943735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7489636ad0f8f9f429c6fb58ed56c052, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + k__BackingField: 1 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab.meta new file mode 100644 index 000000000..b44f0430d --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f0b7d93a3fd80be429e7fdac2a2cce39 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab new file mode 100644 index 000000000..a3adc099c --- /dev/null +++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab @@ -0,0 +1,352 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4119792729305172665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5695967080072346038} + m_Layer: 5 + m_Name: InteractionUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5695967080072346038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4119792729305172665} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2297006036420256553} + m_Father: {fileID: 4648285208244819224} + 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: 0, y: 120} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4197599924312940524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2297006036420256553} + - component: {fileID: 5761809819344674326} + - component: {fileID: 6806093191539099653} + m_Layer: 5 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2297006036420256553 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197599924312940524} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5376847255443313178} + m_Father: {fileID: 5695967080072346038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5761809819344674326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197599924312940524} + m_CullTransparentMesh: 1 +--- !u!114 &6806093191539099653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197599924312940524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3647059, g: 0.35686275, b: 0.3647059, 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_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5611097802189151736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4648285208244819224} + - component: {fileID: 5297442833789713246} + - component: {fileID: 8764364725249863370} + - component: {fileID: 5028824454365225125} + m_Layer: 5 + m_Name: InteractionCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4648285208244819224 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5611097802189151736} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01069167, y: 0.01069167, z: 0.01069167} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5695967080072346038} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 800, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &5297442833789713246 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5611097802189151736} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 5 + m_TargetDisplay: 0 +--- !u!114 &8764364725249863370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5611097802189151736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &5028824454365225125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5611097802189151736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 65535 +--- !u!1 &7975211372598651755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5376847255443313178} + - component: {fileID: 5731642412004777909} + - component: {fileID: 6787004165701718833} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5376847255443313178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975211372598651755} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2297006036420256553} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5731642412004777909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975211372598651755} + m_CullTransparentMesh: 1 +--- !u!114 &6787004165701718833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7975211372598651755} + 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: E + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, 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: 34.5 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 200 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab.meta b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab.meta new file mode 100644 index 000000000..7d875e00d --- /dev/null +++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a6a0d1675321b7a43b4132ca15cf7ca0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: