diff --git a/Assets/Materials/Selected.mat b/Assets/Materials/Selected.mat index d4e41922..821db31a 100644 --- a/Assets/Materials/Selected.mat +++ b/Assets/Materials/Selected.mat @@ -78,6 +78,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.8584906, g: 0.7977483, b: 0.7977483, a: 0.13333334} + - _Color: {r: 1, g: 1, b: 1, a: 0.078431375} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/TestRoom.unity b/Assets/Scenes/TestRoom.unity index de9e5280..1e11cfdd 100644 --- a/Assets/Scenes/TestRoom.unity +++ b/Assets/Scenes/TestRoom.unity @@ -745,6 +745,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 869775877} + - {fileID: 1367711699} + - {fileID: 1460429304} + - {fileID: 2074665157} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} @@ -1018,6 +1021,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _toolTip: {fileID: 3676872} +--- !u!1 &336022786 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7334539273898789907, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_PrefabInstance: {fileID: 897986090} + m_PrefabAsset: {fileID: 0} --- !u!1 &399571087 GameObject: m_ObjectHideFlags: 0 @@ -1083,6 +1091,11 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &438497497 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5341955133804256074, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_PrefabInstance: {fileID: 897986090} + m_PrefabAsset: {fileID: 0} --- !u!1 &443940494 GameObject: m_ObjectHideFlags: 0 @@ -1427,7 +1440,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 90d55fcea99d3d14db40fb1ce5deca37, type: 3} m_Name: m_EditorClassIdentifier: - Player: {fileID: 0} + Player: {fileID: 871823188} --- !u!1 &548419713 GameObject: m_ObjectHideFlags: 0 @@ -1504,6 +1517,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 548419713} m_CullTransparentMesh: 1 +--- !u!1 &584791090 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 721189090810596389, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_PrefabInstance: {fileID: 897986090} + m_PrefabAsset: {fileID: 0} --- !u!1 &630928162 GameObject: m_ObjectHideFlags: 0 @@ -1868,6 +1886,58 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 0 +--- !u!1 &697239596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 697239597} + - component: {fileID: 697239598} + m_Layer: 0 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &697239597 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697239596} + 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: 897986091} + m_Father: {fileID: 1402372336} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &697239598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697239596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c67621cbedb3453428fcc7207806f507, type: 3} + m_Name: + m_EditorClassIdentifier: + _selectedObject: {fileID: 1951493909} + visualGameObjectArray: + - {fileID: 1079434354} + - {fileID: 438497497} + - {fileID: 336022786} + - {fileID: 584791090} + - {fileID: 1777566789} --- !u!1 &701546107 GameObject: m_ObjectHideFlags: 0 @@ -2210,7 +2280,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &869775877 Transform: m_ObjectHideFlags: 0 @@ -2349,7 +2419,7 @@ Transform: m_Children: - {fileID: 1476341267} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!195 &871823190 NavMeshAgent: @@ -3089,6 +3159,304 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1476341268} m_SourcePrefab: {fileID: 100100000, guid: 32790d47acc86814982f18993097a759, type: 3} +--- !u!1001 &897986090 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 697239597} + m_Modifications: + - target: {fileID: 89230748661207779, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 258688186108507887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 490327908599317277, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 679769156345600598, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2} + - target: {fileID: 721189090810596389, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721189090810596389, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1073981064842182943, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1327287540930258838, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1756597517149559716, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1967997499412994781, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2073930477501986949, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2178007643501695888, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2193743408285456710, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2450840229917342595, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2742448817807987534, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2934656224513259530, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3125761486870820617, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2} + - target: {fileID: 3224912872851930775, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalScale.x + value: 0.8000001 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalScale.y + value: 0.81 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalScale.z + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3640577521678332844, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3745543722370508642, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3848330353900505536, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4142751530299969736, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2} + - target: {fileID: 4270458382938451909, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5281440928392613452, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5295632918667706843, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5341955133804256074, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5341955133804256074, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5546461896257945204, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5743441568381836945, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5761629645478741081, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5999052097307758745, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2} + - target: {fileID: 6049992317567785248, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6174620754445256656, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6542011035591151471, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6577801139579829542, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6689570259145339448, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6705101972515955208, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6945522698875533853, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7116317129268428653, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7303564233138112143, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7334539273898789907, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7334539273898789907, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7409767690702518049, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2} + - target: {fileID: 7630520031127733399, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8108280843827582508, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8108280843827582508, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8466069046134305813, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8527229569682851311, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Name + value: Fridge + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_TagString + value: Selectable + objectReference: {fileID: 0} + - target: {fileID: 9078991195225517887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 9163871765420732743, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7499448721086782842, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + - {fileID: 8206757368427996315, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_RemovedGameObjects: + - {fileID: 6945522698875533853, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + - {fileID: 3848330353900505536, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + - {fileID: 2742448817807987534, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + - {fileID: 5295632918667706843, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + - {fileID: 5743441568381836945, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + - {fileID: 6542011035591151471, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b9f258a086096d24aa7861fa20deed65, type: 3} +--- !u!4 &897986091 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_PrefabInstance: {fileID: 897986090} + m_PrefabAsset: {fileID: 0} --- !u!1 &898537618 GameObject: m_ObjectHideFlags: 0 @@ -4244,6 +4612,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054444889} m_CullTransparentMesh: 1 +--- !u!1 &1079434354 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_PrefabInstance: {fileID: 897986090} + m_PrefabAsset: {fileID: 0} --- !u!1 &1152324440 GameObject: m_ObjectHideFlags: 0 @@ -10128,13 +10501,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1367711693} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5, y: 0, z: 9} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -5, y: 9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 274182514} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1382752552 GameObject: @@ -10183,6 +10556,39 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} m_PrefabInstance: {fileID: 2116074414} m_PrefabAsset: {fileID: 0} +--- !u!1 &1402372335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1402372336} + m_Layer: 6 + m_Name: Fridge + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1402372336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402372335} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 8.06} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1951493909} + - {fileID: 697239597} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &1429085338 GameObject: m_ObjectHideFlags: 0 @@ -11095,13 +11501,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1460429298} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.035, y: 0, z: -0.513} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -5.035, y: -0.5130001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 + m_Father: {fileID: 274182514} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1476341266 stripped GameObject: @@ -11927,6 +12333,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682316605} m_CullTransparentMesh: 1 +--- !u!1 &1689632236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1689632238} + - component: {fileID: 1689632237} + m_Layer: 0 + m_Name: MouseSelector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1689632237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1689632236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3ae2c077e8e7c041b87a85a0ff8dd4c, type: 3} + m_Name: + m_EditorClassIdentifier: + _selectableLayerMask: + serializedVersion: 2 + m_Bits: 64 +--- !u!4 &1689632238 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1689632236} + 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: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!850595691 &1709286000 LightingSettings: m_ObjectHideFlags: 0 @@ -12278,6 +12731,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1764865641} m_CullTransparentMesh: 1 +--- !u!1 &1777566789 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8108280843827582508, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_PrefabInstance: {fileID: 897986090} + m_PrefabAsset: {fileID: 0} --- !u!1 &1791787532 GameObject: m_ObjectHideFlags: 0 @@ -12315,7 +12773,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-98708 + m_Name: pb_Mesh63396 serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 @@ -12642,6 +13100,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!4 &1951493909 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + m_PrefabInstance: {fileID: 2046465131} + m_PrefabAsset: {fileID: 0} --- !u!1 &1985043054 GameObject: m_ObjectHideFlags: 0 @@ -12799,6 +13262,247 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1997986294} m_CullTransparentMesh: 1 +--- !u!1001 &2046465131 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1402372336} + m_Modifications: + - target: {fileID: 89230748661207779, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 258688186108507887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 490327908599317277, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 721189090810596389, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1073981064842182943, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1327287540930258838, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1756597517149559716, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1967997499412994781, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2073930477501986949, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2178007643501695888, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2193743408285456710, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2450840229917342595, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2742448817807987534, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2934656224513259530, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3224912872851930775, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalScale.x + value: 0.79 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3640577521678332844, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3745543722370508642, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3848330353900505536, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4270458382938451909, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5281440928392613452, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5295632918667706843, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5341955133804256074, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5546461896257945204, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5743441568381836945, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5761629645478741081, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049992317567785248, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6174620754445256656, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6542011035591151471, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6577801139579829542, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689570259145339448, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6705101972515955208, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6945522698875533853, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7116317129268428653, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7303564233138112143, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7334539273898789907, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7630520031127733399, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8108280843827582508, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8466069046134305813, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8527229569682851311, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Name + value: Fridge_visual + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_TagString + value: Selectable + objectReference: {fileID: 0} + - target: {fileID: 9078991195225517887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9163871765420732743, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b9f258a086096d24aa7861fa20deed65, type: 3} --- !u!1 &2047049764 GameObject: m_ObjectHideFlags: 0 @@ -12818,7 +13522,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2047049765 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15208,13 +15912,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2074665151} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.035, y: 0, z: -0.513} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -5.035, y: -0.5130001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 + m_Father: {fileID: 274182514} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2075350863 GameObject: diff --git a/Assets/Scripts/MouseSelection.cs b/Assets/Scripts/MouseSelection.cs new file mode 100644 index 00000000..5c8f6a8d --- /dev/null +++ b/Assets/Scripts/MouseSelection.cs @@ -0,0 +1,59 @@ +using System; +using UnityEngine; +using UnityEngine.EventSystems; + +public class MouseSelection : MonoBehaviour +{ + [SerializeField] + private LayerMask _selectableLayerMask; + private Transform _selection; + private RaycastHit _raycastHit; + public event EventHandler OnSelectedObjectChanged; + public class OnSelectedObjectChangedEventArgs : EventArgs + { + public Transform SelectedObject; + } + + public static MouseSelection Instance { get; private set; } + + private void Awake() + { + if (Instance != null) + { + Debug.Log("There's more than one player instance"); + } + Instance = this; + } + void Update() + { + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); + if (!EventSystem.current.IsPointerOverGameObject() && Physics.Raycast(ray, out _raycastHit, 100f, _selectableLayerMask)) + { + OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = _raycastHit.transform }); + // _hightlight = _raycastHit.transform; + // if (_hightlight.CompareTag("Selectable") && _hightlight != _selection) + // { + // if (_hightlight.gameObject.GetComponent() != null) + // { + // _hightlight.gameObject.GetComponent().enabled = true; + // } + // else + // { + // var outline = _hightlight.gameObject.AddComponent(); + // outline.enabled = true; + // _hightlight.gameObject.GetComponent().OutlineColor = Color.yellow; + // _hightlight.gameObject.GetComponent().OutlineWidth = 7f; + // } + // } + // else + // { + // _hightlight = null; + // } + + } + else + { + OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null }); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/OutlineSelection.cs.meta b/Assets/Scripts/MouseSelection.cs.meta similarity index 100% rename from Assets/Scripts/OutlineSelection.cs.meta rename to Assets/Scripts/MouseSelection.cs.meta diff --git a/Assets/Scripts/OutlineSelection.cs b/Assets/Scripts/OutlineSelection.cs deleted file mode 100644 index eb46ba91..00000000 --- a/Assets/Scripts/OutlineSelection.cs +++ /dev/null @@ -1,41 +0,0 @@ -using UnityEngine; - -public class OutlineSelection : MonoBehaviour -{ - private Transform _hightlight; - private Transform _selection; - private RaycastHit _raycastHit; - - void Update() - { - //if (_hightlight != null) - //{ - // _hightlight.gameObject.GetComponent().enabled = false; - // _hightlight = null; - //} - - //var ray = Camera.main.ScreenPointToRay(Input.mousePosition); - //if (!EventSystem.current.IsPointerOverGameObject() && Physics.Raycast(ray, out _raycastHit)) - //{ - // _hightlight = _raycastHit.transform; - // if (_hightlight.CompareTag("Selectable") && _hightlight != _selection) - // { - // if (_hightlight.gameObject.GetComponent() != null) - // { - // _hightlight.gameObject.GetComponent().enabled = true; - // } - // else - // { - // var outline = _hightlight.gameObject.AddComponent(); - // outline.enabled = true; - // _hightlight.gameObject.GetComponent().OutlineColor = Color.yellow; - // _hightlight.gameObject.GetComponent().OutlineWidth = 7f; - // } - // } - // else - // { - // _hightlight = null; - // } - //} - } -} diff --git a/Assets/Scripts/SelectedVisual.cs b/Assets/Scripts/SelectedVisual.cs new file mode 100644 index 00000000..34c4b8ea --- /dev/null +++ b/Assets/Scripts/SelectedVisual.cs @@ -0,0 +1,41 @@ +using UnityEngine; + +public class SelectedVisual : MonoBehaviour +{ + [SerializeField] private Transform _selectedObject; + [SerializeField] private GameObject[] visualGameObjectArray; + + + private void Start() + { + MouseSelection.Instance.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged; + } + + private void OnDestroy() + { + MouseSelection.Instance.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged; + } + + private void Mouse_OnSelectedObjectChanged(object sender, MouseSelection.OnSelectedObjectChangedEventArgs e) + { + if (e.SelectedObject == _selectedObject) + { + Show(); + } + else + { + Hide(); + } + } + + private void Show() + { + foreach (var visualGameObject in visualGameObjectArray) + visualGameObject.SetActive(true); + } + private void Hide() + { + foreach (var visualGameObject in visualGameObjectArray) + visualGameObject.SetActive(false); + } +} diff --git a/Assets/Scripts/SelectedVisual.cs.meta b/Assets/Scripts/SelectedVisual.cs.meta new file mode 100644 index 00000000..3ecdc4b0 --- /dev/null +++ b/Assets/Scripts/SelectedVisual.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c67621cbedb3453428fcc7207806f507 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index c36b28b1..b02e53d0 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -4,7 +4,7 @@ TagManager: serializedVersion: 2 tags: - - Building + - Selectable layers: - Default - TransparentFX