diff --git a/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_Corner_01.prefab b/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_Corner_01.prefab index 488a8ee2..4a098257 100644 --- a/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_Corner_01.prefab +++ b/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_Corner_01.prefab @@ -25,13 +25,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2533691573713207392} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.46246397, y: 1.1407783, z: 0.463768} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5561709389037293351} m_Father: {fileID: 9055458756796538670} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3110252276469808952 MeshFilter: @@ -52,11 +53,15 @@ MeshRenderer: 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: @@ -107,12 +112,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3196181664478244196} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00000011920929, y: 0.000000059550246, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5110928843565055657} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2477751794665388606 MeshFilter: @@ -133,11 +139,15 @@ MeshRenderer: 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: @@ -189,12 +199,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3892432266257307570} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.2273469, y: 1.2929735, z: 0.37526798} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9055458756796538670} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6839929502595673797 MeshFilter: @@ -215,11 +226,15 @@ MeshRenderer: 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: @@ -253,9 +268,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3892432266257307570} 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: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5575469538477459821, guid: 2a83511a782a6aa4dafed1f5a2bd3803, type: 3} @@ -284,12 +307,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5436698655497376947} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.35043728, y: 0.2228784, z: 0.35043836} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8941330071971294334} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2063900117880940935 MeshFilter: @@ -310,11 +334,15 @@ MeshRenderer: 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: @@ -366,15 +394,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5546436795134103488} + 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: 8577403859062096117} - {fileID: 8941330071971294334} - {fileID: 5110928843565055657} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3785760876756273057 MeshFilter: @@ -395,11 +424,15 @@ MeshRenderer: 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: @@ -433,9 +466,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5546436795134103488} 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: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 281854930238610966, guid: 2a83511a782a6aa4dafed1f5a2bd3803, type: 3} @@ -452,7 +493,6 @@ GameObject: - component: {fileID: 5461191705349619975} - component: {fileID: 745671375} - component: {fileID: 745671374} - - component: {fileID: 745671373} m_Layer: 0 m_Name: Door_L.007 m_TagString: Untagged @@ -467,13 +507,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8861791055120437142} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.67562366, y: 0.53584206, z: 0.28435135} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5363743883038329900} m_Father: {fileID: 9055458756796538670} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &635780726696194969 MeshFilter: @@ -494,11 +535,15 @@ MeshRenderer: 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: @@ -532,15 +577,23 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8861791055120437142} 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: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5320998437054024567, guid: 2a83511a782a6aa4dafed1f5a2bd3803, type: 3} --- !u!95 &745671374 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -553,22 +606,10 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &745671373 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8861791055120437142} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e8192f35a44301488ec0f072d9a16fe, type: 3} - m_Name: - m_EditorClassIdentifier: - openandclose: {fileID: 745671374} - open: 0 - Player: {fileID: 0} + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_DD_01.prefab b/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_DD_01.prefab index 54659b3a..4d6a2f9c 100644 --- a/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_DD_01.prefab +++ b/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_DD_01.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 1212533452103472478} - component: {fileID: 436849882} - component: {fileID: 436849881} - - component: {fileID: 436849880} m_Layer: 0 m_Name: Door_L.014 m_TagString: Untagged @@ -28,13 +27,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 475205527902490158} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.51074374, y: 0.5358417, z: -0.56126654} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1147801812842946770} m_Father: {fileID: 3667825465465734118} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5318170511345373949 MeshFilter: @@ -55,11 +55,15 @@ MeshRenderer: 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: @@ -93,14 +97,22 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 475205527902490158} 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 + serializedVersion: 3 m_Size: {x: 0.036133744, y: 0.9132023, z: 0.5615086} m_Center: {x: -0.018066779, y: 0.000000074505806, z: 0.27872184} --- !u!95 &436849881 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -113,25 +125,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &436849880 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475205527902490158} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e8192f35a44301488ec0f072d9a16fe, type: 3} - m_Name: - m_EditorClassIdentifier: - openandclose: {fileID: 436849881} - open: 0 - Player: {fileID: 0} + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &716408034372692830 GameObject: m_ObjectHideFlags: 0 @@ -157,12 +157,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 716408034372692830} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: -0.000000048288598, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8704638540493558513} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &46020822040797582 MeshFilter: @@ -183,11 +184,15 @@ MeshRenderer: 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: @@ -226,7 +231,6 @@ GameObject: - component: {fileID: 7145311895657260234} - component: {fileID: 1031967142} - component: {fileID: 1031967141} - - component: {fileID: 1031967140} m_Layer: 0 m_Name: Door_L.016 m_TagString: Untagged @@ -241,13 +245,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1819034272723686090} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.5107434, y: 0.5358421, z: 0.5612663} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6379548256612660979} m_Father: {fileID: 3667825465465734118} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5879759525201095746 MeshFilter: @@ -268,11 +273,15 @@ MeshRenderer: 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: @@ -306,14 +315,22 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1819034272723686090} 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 + serializedVersion: 3 m_Size: {x: 0.03613354, y: 0.9132023, z: 0.5615086} m_Center: {x: -0.018066468, y: -0.00000010430813, z: -0.27872175} --- !u!95 &1031967141 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -326,25 +343,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &1031967140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1819034272723686090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4b5e0617227fa4743be84f23d9e5cb42, type: 3} - m_Name: - m_EditorClassIdentifier: - openandclose1: {fileID: 1031967141} - open: 0 - Player: {fileID: 0} + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1936933084497127485 GameObject: m_ObjectHideFlags: 0 @@ -371,12 +376,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1936933084497127485} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.02052772, y: 1.292973, z: -0.00000035762787} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3667825465465734118} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3421298386265639475 MeshFilter: @@ -397,11 +403,15 @@ MeshRenderer: 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: @@ -435,9 +445,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1936933084497127485} 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 + serializedVersion: 3 m_Size: {x: 0.992867, y: 0.0726156, z: 1.1640103} m_Center: {x: 0.033180222, y: 0.037350822, z: 0.000000029802322} --- !u!1 &2712623804388077299 @@ -465,12 +483,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2712623804388077299} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00000071525574, y: 0.22287817, z: -0.50178933} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6113393273007859253} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2849165749163855120 MeshFilter: @@ -491,11 +510,15 @@ MeshRenderer: 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: @@ -546,12 +569,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3618840119617262501} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00000035762787, y: 0.22287841, z: 0.50178957} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6320569164762599224} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1440673626862406882 MeshFilter: @@ -572,11 +596,15 @@ MeshRenderer: 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: @@ -628,16 +656,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5262956300232747728} + 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: 1733625405196385881} - {fileID: 6320569164762599224} - {fileID: 6113393273007859253} - {fileID: 7515453489901994396} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1301579752222099146 MeshFilter: @@ -658,11 +687,15 @@ MeshRenderer: 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: @@ -696,9 +729,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5262956300232747728} 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: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -8955122113573362361, guid: 2a83511a782a6aa4dafed1f5a2bd3803, type: 3} @@ -713,7 +754,6 @@ GameObject: - component: {fileID: 7515453489901994396} - component: {fileID: 7886138107685249725} - component: {fileID: 811105022} - - component: {fileID: 811105021} m_Layer: 0 m_Name: Drawer_Script m_TagString: Untagged @@ -728,13 +768,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8051497628472091917} + 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: 8704638540493558513} m_Father: {fileID: 3667825465465734118} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &7886138107685249725 BoxCollider: @@ -744,14 +785,22 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8051497628472091917} 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 + serializedVersion: 3 m_Size: {x: 0.040511727, y: 0.29207507, z: 1.1265972} m_Center: {x: 0.5, y: 1.14, z: -1.5571675e-22} --- !u!95 &811105022 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -764,25 +813,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &811105021 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8051497628472091917} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e0d5557a01f4e0740bd53d6ed2ab7327, type: 3} - m_Name: - m_EditorClassIdentifier: - pull_01: {fileID: 811105022} - open: 0 - Player: {fileID: 0} + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8744012517389025112 GameObject: m_ObjectHideFlags: 0 @@ -808,13 +845,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8744012517389025112} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.48688418, y: 1.1407781, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4755121432489115935} m_Father: {fileID: 7515453489901994396} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9145225760431022986 MeshFilter: @@ -835,11 +873,15 @@ MeshRenderer: 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: diff --git a/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_SD_01.prefab b/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_SD_01.prefab index de3421c2..511d7419 100644 --- a/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_SD_01.prefab +++ b/Assets/3dAssets/Apartment Kit/_Prefabs/Furniture/Kitchen/Cabinets/Cabinet_Base_SD_01.prefab @@ -26,12 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750556226023206186} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.020836532, y: 1.2929733, z: 0.112944365} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1382648566164412814} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2521437409786020426 MeshFilter: @@ -52,11 +53,15 @@ MeshRenderer: 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: @@ -90,9 +95,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750556226023206186} 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 + serializedVersion: 3 m_Size: {x: 0.9928669, y: 0.07261551, z: 0.887308} m_Center: {x: 0.03318031, y: 0.037350778, z: -0.13835114} --- !u!1 &1789499886875277389 @@ -106,7 +119,6 @@ GameObject: - component: {fileID: 4399150244749549640} - component: {fileID: 4006537208810180083} - component: {fileID: 1920539283515041566} - - component: {fileID: 4958267544043016039} m_Layer: 0 m_Name: Drawer Script m_TagString: Untagged @@ -121,13 +133,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789499886875277389} + 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: 2957309903910171578} m_Father: {fileID: 1382648566164412814} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &4006537208810180083 BoxCollider: @@ -137,14 +150,22 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789499886875277389} 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 + serializedVersion: 3 m_Size: {x: 0.016357005, y: 0.29207498, z: 0.86681104} m_Center: {x: 0.51, y: 1.14, z: -0.025406778} --- !u!95 &1920539283515041566 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -157,25 +178,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &4958267544043016039 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1789499886875277389} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e0d5557a01f4e0740bd53d6ed2ab7327, type: 3} - m_Name: - m_EditorClassIdentifier: - pull_01: {fileID: 1920539283515041566} - open: 0 - Player: {fileID: 0} + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &3416032529314076247 GameObject: m_ObjectHideFlags: 0 @@ -201,13 +210,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3416032529314076247} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.48645592, y: 1.140778, z: 0.00092263} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1537724937443711599} m_Father: {fileID: 4399150244749549640} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6735679154709579746 MeshFilter: @@ -228,11 +238,15 @@ MeshRenderer: 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: @@ -283,12 +297,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5459119164660240454} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00000011920929, y: 0.00000010632314, z: -0.025406837} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2957309903910171578} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2062854714398549913 MeshFilter: @@ -309,11 +324,15 @@ MeshRenderer: 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: @@ -365,15 +384,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5987332885971693606} + 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: 6906565575329913249} - {fileID: 1671893255216528271} - {fileID: 4399150244749549640} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6089920670480847662 MeshFilter: @@ -394,11 +414,15 @@ MeshRenderer: 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: @@ -432,9 +456,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5987332885971693606} 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: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5118868820515241035, guid: 2a83511a782a6aa4dafed1f5a2bd3803, type: 3} @@ -452,7 +484,6 @@ GameObject: - component: {fileID: 1050666295784109254} - component: {fileID: 8504855302379988529} - component: {fileID: 217195733} - - component: {fileID: 217195732} m_Layer: 0 m_Name: Door_L.008 m_TagString: Untagged @@ -467,13 +498,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6260647602378257005} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.5103151, y: 0.5358415, z: -0.45585728} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4487005575141119298} m_Father: {fileID: 1382648566164412814} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7799673819601049538 MeshFilter: @@ -494,11 +526,15 @@ MeshRenderer: 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: @@ -532,9 +568,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6260647602378257005} 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 + serializedVersion: 3 m_Size: {x: 0.03613397, y: 0.9132023, z: 0.86681116} m_Center: {x: -0.018066538, y: 0.00000010430813, z: 0.43137312} --- !u!65 &8504855302379988529 @@ -545,14 +589,22 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6260647602378257005} 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 + serializedVersion: 3 m_Size: {x: 0.03613397, y: 0.9132023, z: 0.86681116} m_Center: {x: -0.018066062, y: 0.00000010430813, z: 0.43137312} --- !u!95 &217195733 Animator: - serializedVersion: 3 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -565,25 +617,13 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &217195732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6260647602378257005} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e8192f35a44301488ec0f072d9a16fe, type: 3} - m_Name: - m_EditorClassIdentifier: - openandclose: {fileID: 217195733} - open: 0 - Player: {fileID: 0} + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &6497343406749975765 GameObject: m_ObjectHideFlags: 0 @@ -609,12 +649,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6497343406749975765} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00000035762787, y: 0.22287852, z: 0.8579054} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1671893255216528271} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &563159068262514007 MeshFilter: @@ -635,11 +676,15 @@ MeshRenderer: 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: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 06fb4c80..2f57899f 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -652,28 +652,21 @@ MonoBehaviour: m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + m_ActionsAsset: {fileID: -944628639613478452, guid: 728db966a1cb6454eb419e9cc8cfaf70, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + m_PointAction: {fileID: -3961499849718030280, guid: 728db966a1cb6454eb419e9cc8cfaf70, type: 3} - m_MoveAction: {fileID: -1680190386980627800, guid: ca9f5fa95ffab41fb9a615ab714db018, + m_MoveAction: {fileID: -6660239574364456174, guid: 728db966a1cb6454eb419e9cc8cfaf70, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + m_SubmitAction: {fileID: 0} + m_CancelAction: {fileID: 0} + m_LeftClickAction: {fileID: 8772704928845118602, guid: 728db966a1cb6454eb419e9cc8cfaf70, type: 3} + m_MiddleClickAction: {fileID: 0} + m_RightClickAction: {fileID: 0} + m_ScrollWheelAction: {fileID: 0} + m_TrackedDevicePositionAction: {fileID: 0} + m_TrackedDeviceOrientationAction: {fileID: 0} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 @@ -1277,142 +1270,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 940848059} m_CullTransparentMesh: 1 ---- !u!1 &954199924 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 954199925} - - component: {fileID: 954199927} - - component: {fileID: 954199926} - 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 &954199925 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954199924} - 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: 1284986499} - 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!114 &954199926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954199924} - 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: Button - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - 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!222 &954199927 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954199924} - m_CullTransparentMesh: 1 --- !u!1 &1006829694 GameObject: m_ObjectHideFlags: 0 @@ -1748,127 +1605,6 @@ Transform: m_Children: [] m_Father: {fileID: 1976674304} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1284986498 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1284986499} - - component: {fileID: 1284986502} - - component: {fileID: 1284986501} - - component: {fileID: 1284986500} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1284986499 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1284986498} - 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: 954199925} - m_Father: {fileID: 1737216623} - 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: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1284986500 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1284986498} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.9150943, g: 0.16834284, b: 0.16834284, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1284986501} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1284986501 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1284986498} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1284986502 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1284986498} - m_CullTransparentMesh: 1 --- !u!1 &1361955493 GameObject: m_ObjectHideFlags: 0 @@ -2028,7 +1764,6 @@ RectTransform: - {fileID: 1361955494} - {fileID: 627412322} - {fileID: 1580833477} - - {fileID: 1284986499} m_Father: {fileID: 1098219117} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2099,92 +1834,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1 &1758781746 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1758781748} - - component: {fileID: 1758781747} - m_Layer: 0 - m_Name: Virtual Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1758781747 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1758781746} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - Priority: - Enabled: 1 - m_Value: 10 - OutputChannel: 1 - StandbyUpdate: 2 - m_StreamingVersion: 20241001 - m_LegacyPriority: 0 - m_LookAt: {fileID: 1259932647} - m_Follow: {fileID: 1259932647} - m_Lens: - FieldOfView: 60.000004 - OrthographicSize: 5 - NearClipPlane: 0.1 - FarClipPlane: 100 - Dutch: 0 - ModeOverride: 0 - GateFit: 2 - m_SensorSize: {x: 1, y: 1} - LensShift: {x: 0, y: 0} - FocusDistance: 10 - Iso: 200 - ShutterSpeed: 0.005 - Aperture: 16 - BladeCount: 5 - Curvature: {x: 2, y: 11} - BarrelClipping: 0.25 - Anamorphism: 0 - BlendHint: 0 - m_OnCameraLiveEvent: - m_PersistentCalls: - m_Calls: [] - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_LegacyTransitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_ComponentOwner: {fileID: 1916631401} ---- !u!4 &1758781748 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1758781746} - serializedVersion: 2 - m_LocalRotation: {x: 0.3826835, y: 0.000000022481231, z: -0.000000009312033, w: 0.9238795} - m_LocalPosition: {x: 29.11, y: 5, z: -5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1916631401} - m_Father: {fileID: 1976674304} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1832846572 GameObject: m_ObjectHideFlags: 0 @@ -2262,50 +1911,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1916631400 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1916631401} - - component: {fileID: 1916631402} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1916631401 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1916631400} - serializedVersion: 2 - m_LocalRotation: {x: -0.3826835, y: -0.000000022481231, z: 0.000000009312033, w: 0.9238795} - m_LocalPosition: {x: -29.110003, y: 35.63111, z: 42.70217} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1758781748} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1916631402 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1916631400} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1976674303 GameObject: m_ObjectHideFlags: 0 @@ -2337,7 +1942,6 @@ Transform: m_Children: - {fileID: 580921797} - {fileID: 182040538} - - {fileID: 1758781748} - {fileID: 1259932647} - {fileID: 314976162} m_Father: {fileID: 1098219117} diff --git a/Assets/3dAssets/Textures/CalendarIcon.png b/Assets/Textures/CalendarIcon.png similarity index 100% rename from Assets/3dAssets/Textures/CalendarIcon.png rename to Assets/Textures/CalendarIcon.png diff --git a/Assets/3dAssets/Textures/CalendarIcon.png.meta b/Assets/Textures/CalendarIcon.png.meta similarity index 100% rename from Assets/3dAssets/Textures/CalendarIcon.png.meta rename to Assets/Textures/CalendarIcon.png.meta diff --git a/Assets/3dAssets/Textures/Icons/Cola.png b/Assets/Textures/Cola.png similarity index 100% rename from Assets/3dAssets/Textures/Icons/Cola.png rename to Assets/Textures/Cola.png diff --git a/Assets/3dAssets/Textures/Icons/Cola.png.meta b/Assets/Textures/Cola.png.meta similarity index 100% rename from Assets/3dAssets/Textures/Icons/Cola.png.meta rename to Assets/Textures/Cola.png.meta diff --git a/Assets/3dAssets/Textures/DialogBackground.png b/Assets/Textures/DialogBackground.png similarity index 100% rename from Assets/3dAssets/Textures/DialogBackground.png rename to Assets/Textures/DialogBackground.png diff --git a/Assets/3dAssets/Textures/DialogBackground.png.meta b/Assets/Textures/DialogBackground.png.meta similarity index 100% rename from Assets/3dAssets/Textures/DialogBackground.png.meta rename to Assets/Textures/DialogBackground.png.meta diff --git a/Assets/3dAssets/Textures/EnergyIcon.png b/Assets/Textures/EnergyIcon.png similarity index 100% rename from Assets/3dAssets/Textures/EnergyIcon.png rename to Assets/Textures/EnergyIcon.png diff --git a/Assets/3dAssets/Textures/EnergyIcon.png.meta b/Assets/Textures/EnergyIcon.png.meta similarity index 100% rename from Assets/3dAssets/Textures/EnergyIcon.png.meta rename to Assets/Textures/EnergyIcon.png.meta diff --git a/Assets/3dAssets/Textures/FoodIcon.png b/Assets/Textures/FoodIcon.png similarity index 100% rename from Assets/3dAssets/Textures/FoodIcon.png rename to Assets/Textures/FoodIcon.png diff --git a/Assets/3dAssets/Textures/FoodIcon.png.meta b/Assets/Textures/FoodIcon.png.meta similarity index 100% rename from Assets/3dAssets/Textures/FoodIcon.png.meta rename to Assets/Textures/FoodIcon.png.meta diff --git a/Assets/3dAssets/Textures/Icons.meta b/Assets/Textures/Icons.meta similarity index 100% rename from Assets/3dAssets/Textures/Icons.meta rename to Assets/Textures/Icons.meta diff --git a/Assets/3dAssets/Textures/Icons/Mathematics_0.png b/Assets/Textures/Icons/Mathematics_0.png similarity index 100% rename from Assets/3dAssets/Textures/Icons/Mathematics_0.png rename to Assets/Textures/Icons/Mathematics_0.png diff --git a/Assets/3dAssets/Textures/Icons/Mathematics_0.png.meta b/Assets/Textures/Icons/Mathematics_0.png.meta similarity index 100% rename from Assets/3dAssets/Textures/Icons/Mathematics_0.png.meta rename to Assets/Textures/Icons/Mathematics_0.png.meta diff --git a/Assets/3dAssets/Textures/Icons/school-icon.jpg b/Assets/Textures/Icons/school-icon.jpg similarity index 100% rename from Assets/3dAssets/Textures/Icons/school-icon.jpg rename to Assets/Textures/Icons/school-icon.jpg diff --git a/Assets/3dAssets/Textures/Icons/school-icon.jpg.meta b/Assets/Textures/Icons/school-icon.jpg.meta similarity index 100% rename from Assets/3dAssets/Textures/Icons/school-icon.jpg.meta rename to Assets/Textures/Icons/school-icon.jpg.meta diff --git a/Assets/3dAssets/Textures/MinimapRenderTexture.renderTexture b/Assets/Textures/MinimapRenderTexture.renderTexture similarity index 96% rename from Assets/3dAssets/Textures/MinimapRenderTexture.renderTexture rename to Assets/Textures/MinimapRenderTexture.renderTexture index 741b2e98..071a5b9e 100644 --- a/Assets/3dAssets/Textures/MinimapRenderTexture.renderTexture +++ b/Assets/Textures/MinimapRenderTexture.renderTexture @@ -16,7 +16,7 @@ RenderTexture: m_Height: 256 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 92 + m_DepthStencilFormat: 93 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 diff --git a/Assets/3dAssets/Textures/MinimapRenderTexture.renderTexture.meta b/Assets/Textures/MinimapRenderTexture.renderTexture.meta similarity index 100% rename from Assets/3dAssets/Textures/MinimapRenderTexture.renderTexture.meta rename to Assets/Textures/MinimapRenderTexture.renderTexture.meta diff --git a/Assets/3dAssets/Textures/MoneyIcon.png b/Assets/Textures/MoneyIcon.png similarity index 100% rename from Assets/3dAssets/Textures/MoneyIcon.png rename to Assets/Textures/MoneyIcon.png diff --git a/Assets/3dAssets/Textures/MoneyIcon.png.meta b/Assets/Textures/MoneyIcon.png.meta similarity index 100% rename from Assets/3dAssets/Textures/MoneyIcon.png.meta rename to Assets/Textures/MoneyIcon.png.meta diff --git a/Assets/3dAssets/Textures/UI.meta b/Assets/Textures/UI.meta similarity index 100% rename from Assets/3dAssets/Textures/UI.meta rename to Assets/Textures/UI.meta diff --git a/Assets/3dAssets/Textures/UI/Moodpage.png b/Assets/Textures/UI/Moodpage.png similarity index 100% rename from Assets/3dAssets/Textures/UI/Moodpage.png rename to Assets/Textures/UI/Moodpage.png diff --git a/Assets/3dAssets/Textures/UI/Moodpage.png.meta b/Assets/Textures/UI/Moodpage.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/Moodpage.png.meta rename to Assets/Textures/UI/Moodpage.png.meta diff --git a/Assets/3dAssets/Textures/UI/Popup UI.pdn b/Assets/Textures/UI/Popup UI.pdn similarity index 100% rename from Assets/3dAssets/Textures/UI/Popup UI.pdn rename to Assets/Textures/UI/Popup UI.pdn diff --git a/Assets/3dAssets/Textures/UI/Popup UI.pdn.meta b/Assets/Textures/UI/Popup UI.pdn.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/Popup UI.pdn.meta rename to Assets/Textures/UI/Popup UI.pdn.meta diff --git a/Assets/3dAssets/Textures/UI/Popup UI.png b/Assets/Textures/UI/Popup UI.png similarity index 100% rename from Assets/3dAssets/Textures/UI/Popup UI.png rename to Assets/Textures/UI/Popup UI.png diff --git a/Assets/3dAssets/Textures/UI/Popup UI.png.meta b/Assets/Textures/UI/Popup UI.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/Popup UI.png.meta rename to Assets/Textures/UI/Popup UI.png.meta diff --git a/Assets/3dAssets/Textures/UI/PopupBackGround.png b/Assets/Textures/UI/PopupBackGround.png similarity index 100% rename from Assets/3dAssets/Textures/UI/PopupBackGround.png rename to Assets/Textures/UI/PopupBackGround.png diff --git a/Assets/3dAssets/Textures/UI/PopupBackGround.png.meta b/Assets/Textures/UI/PopupBackGround.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/PopupBackGround.png.meta rename to Assets/Textures/UI/PopupBackGround.png.meta diff --git a/Assets/3dAssets/Textures/UI/SupermarketIcon.png b/Assets/Textures/UI/SupermarketIcon.png similarity index 100% rename from Assets/3dAssets/Textures/UI/SupermarketIcon.png rename to Assets/Textures/UI/SupermarketIcon.png diff --git a/Assets/3dAssets/Textures/UI/SupermarketIcon.png.meta b/Assets/Textures/UI/SupermarketIcon.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/SupermarketIcon.png.meta rename to Assets/Textures/UI/SupermarketIcon.png.meta diff --git a/Assets/3dAssets/Textures/UI/TabCategory.png b/Assets/Textures/UI/TabCategory.png similarity index 100% rename from Assets/3dAssets/Textures/UI/TabCategory.png rename to Assets/Textures/UI/TabCategory.png diff --git a/Assets/3dAssets/Textures/UI/TabCategory.png.meta b/Assets/Textures/UI/TabCategory.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/TabCategory.png.meta rename to Assets/Textures/UI/TabCategory.png.meta diff --git a/Assets/3dAssets/Textures/UI/TabItemBackground.png b/Assets/Textures/UI/TabItemBackground.png similarity index 100% rename from Assets/3dAssets/Textures/UI/TabItemBackground.png rename to Assets/Textures/UI/TabItemBackground.png diff --git a/Assets/3dAssets/Textures/UI/TabItemBackground.png.meta b/Assets/Textures/UI/TabItemBackground.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/TabItemBackground.png.meta rename to Assets/Textures/UI/TabItemBackground.png.meta diff --git a/Assets/3dAssets/Textures/UI/cashier.png b/Assets/Textures/UI/cashier.png similarity index 100% rename from Assets/3dAssets/Textures/UI/cashier.png rename to Assets/Textures/UI/cashier.png diff --git a/Assets/3dAssets/Textures/UI/cashier.png.meta b/Assets/Textures/UI/cashier.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/cashier.png.meta rename to Assets/Textures/UI/cashier.png.meta diff --git a/Assets/3dAssets/Textures/UI/remove-icon.png b/Assets/Textures/UI/remove-icon.png similarity index 100% rename from Assets/3dAssets/Textures/UI/remove-icon.png rename to Assets/Textures/UI/remove-icon.png diff --git a/Assets/3dAssets/Textures/UI/remove-icon.png.meta b/Assets/Textures/UI/remove-icon.png.meta similarity index 100% rename from Assets/3dAssets/Textures/UI/remove-icon.png.meta rename to Assets/Textures/UI/remove-icon.png.meta