diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Trashcan.meta b/Assets/_DDD/_Addressables/Environments/Prop/Trashcan.meta new file mode 100644 index 000000000..77b81bdd3 --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Trashcan.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 604ac0c800cb9b34b9cfebbc2b27cd88 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Trashcan/Prop_Trashcan.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Trashcan/Prop_Trashcan.prefab new file mode 100644 index 000000000..9e4a2187b --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Trashcan/Prop_Trashcan.prefab @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1558740908548439679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8327749831302471016} + - component: {fileID: 8265494928291148343} + - component: {fileID: 2739769706013484733} + - component: {fileID: 5210806482330915924} + m_Layer: 0 + m_Name: Spine GameObject (Trashcan) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8327749831302471016 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558740908548439679} + 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: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6904264511603437469} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!33 &8265494928291148343 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558740908548439679} + m_Mesh: {fileID: 0} +--- !u!23 &2739769706013484733 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558740908548439679} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 77610c722f3effb469ae2e4310b971f7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &5210806482330915924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558740908548439679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 94825729fd8d91b4b8cb26e08c176a18, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: RandomBoxIdle + loop: 1 + timeScale: 1 +--- !u!1001 &2635336900336278038 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3406375906160120237, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689525833630355058, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_Name + value: Prop_Trashcan + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8881739536043914635, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + insertIndex: 0 + addedObject: {fileID: 8327749831302471016} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15c73973805ba914cbcc9929659591d9, type: 3} +--- !u!4 &6904264511603437469 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8881739536043914635, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + m_PrefabInstance: {fileID: 2635336900336278038} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Trashcan/Prop_Trashcan.prefab.meta b/Assets/_DDD/_Addressables/Environments/Prop/Trashcan/Prop_Trashcan.prefab.meta new file mode 100644 index 000000000..dcdf13f2e --- /dev/null +++ b/Assets/_DDD/_Addressables/Environments/Prop/Trashcan/Prop_Trashcan.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 597b52c86547eef4f81305a1f0bc3627 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 5f8f9542b..9cd910ad9 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -2055,6 +2055,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 88b8961b0221e5c4faab7470d64b0ae7, type: 3} m_PrefabInstance: {fileID: 1681119343} m_PrefabAsset: {fileID: 0} +--- !u!1001 &300178655 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 454759171} + m_Modifications: + - target: {fileID: 6576439486311623297, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_Name + value: Prop_Trashcan + objectReference: {fileID: 0} + - target: {fileID: 8265494928291148343, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalPosition.x + value: -0.626 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalPosition.z + value: 16.418 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} +--- !u!4 &300178656 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8667002382784386148, guid: 597b52c86547eef4f81305a1f0bc3627, type: 3} + m_PrefabInstance: {fileID: 300178655} + m_PrefabAsset: {fileID: 0} --- !u!1001 &303186985 PrefabInstance: m_ObjectHideFlags: 0 @@ -2186,136 +2252,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} ---- !u!1 &314916195 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 314916196} - - component: {fileID: 314916199} - - component: {fileID: 314916198} - - component: {fileID: 314916197} - m_Layer: 7 - m_Name: Spine GameObject (Trashcan) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &314916196 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314916195} - serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -0.59999996, y: -0.0031901114, z: 16.451588} - m_LocalScale: {x: 0.117231786, y: 0.117231786, z: 0.117231786} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 454759171} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &314916197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314916195} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 94825729fd8d91b4b8cb26e08c176a18, type: 2} - initialSkinName: - fixPrefabOverrideViaMeshFilter: 2 - initialFlipX: 0 - initialFlipY: 0 - updateWhenInvisible: 3 - separatorSlotNames: [] - zSpacing: -0.0005 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - physicsPositionInheritanceFactor: {x: 1, y: 1} - physicsRotationInheritanceFactor: 1 - physicsMovementRelativeTo: {fileID: 0} - updateTiming: 1 - unscaledTime: 0 - _animationName: RandomBoxIdle - loop: 1 - timeScale: 1 ---- !u!23 &314916198 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314916195} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 77610c722f3effb469ae2e4310b971f7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &314916199 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314916195} - m_Mesh: {fileID: 0} --- !u!1001 &328733316 PrefabInstance: m_ObjectHideFlags: 0 @@ -3086,7 +3022,7 @@ Transform: - {fileID: 1042452421} - {fileID: 597510220} - {fileID: 1235533209} - - {fileID: 314916196} + - {fileID: 300178656} - {fileID: 1872552082} - {fileID: 116540218} - {fileID: 564055759}