From a1c495cf9277ca60b2a651b0d52dcbcb987aea6c Mon Sep 17 00:00:00 2001 From: mxssw Date: Fri, 29 Aug 2025 16:29:09 +0300 Subject: [PATCH] added card readers to doors --- Assets/Materials/Lit Variant.mat | 3 +- .../Prefabs/Doors/Indoor Door Right.prefab | 97 ++++++++++++++++++- .../Doors}/card reader Variant.mat | 0 .../Doors}/card reader Variant.mat.meta | 0 .../Doors}/card reader Variant.prefab | 0 .../Doors}/card reader Variant.prefab.meta | 0 .../Doors}/card reader.fbx | 0 .../Doors}/card reader.fbx.meta | 0 .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- 9 files changed, 100 insertions(+), 4 deletions(-) rename Assets/_PROJECT/{Models/Furniture/Ranno Samuel Adson => Prefabs/Doors}/card reader Variant.mat (100%) rename Assets/_PROJECT/{Models/Furniture/Ranno Samuel Adson => Prefabs/Doors}/card reader Variant.mat.meta (100%) rename Assets/_PROJECT/{Models/Furniture/Ranno Samuel Adson => Prefabs/Doors}/card reader Variant.prefab (100%) rename Assets/_PROJECT/{Models/Furniture/Ranno Samuel Adson => Prefabs/Doors}/card reader Variant.prefab.meta (100%) rename Assets/_PROJECT/{Models/Furniture/Ranno Samuel Adson => Prefabs/Doors}/card reader.fbx (100%) rename Assets/_PROJECT/{Models/Furniture/Ranno Samuel Adson => Prefabs/Doors}/card reader.fbx.meta (100%) diff --git a/Assets/Materials/Lit Variant.mat b/Assets/Materials/Lit Variant.mat index ed4aba47..f93527c8 100644 --- a/Assets/Materials/Lit Variant.mat +++ b/Assets/Materials/Lit Variant.mat @@ -27,7 +27,8 @@ Material: m_TexEnvs: [] m_Ints: [] m_Floats: [] - m_Colors: [] + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] --- !u!114 &6311866733530308580 MonoBehaviour: diff --git a/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab b/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab index dfad75f9..46f1dada 100644 --- a/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab +++ b/Assets/_PROJECT/Prefabs/Doors/Indoor Door Right.prefab @@ -173,7 +173,8 @@ Transform: m_LocalPosition: {x: 0.66000384, y: 0.17899981, z: 0} m_LocalScale: {x: 0.4, y: 2.3500001, z: 0.30000004} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8852838724920125608} m_Father: {fileID: 6585262094497446843} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -990,3 +991,97 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &6455717503727900637 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7891889436999084938} + m_Modifications: + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalScale.x + value: 0.010638297 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalScale.y + value: 0.08333332 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalScale.z + value: 0.0625 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.1078 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.484 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 2884302241037477327, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + propertyPath: m_Name + value: card reader Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, type: 3} +--- !u!4 &8852838724920125608 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2543629131364876149, guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7, + type: 3} + m_PrefabInstance: {fileID: 6455717503727900637} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.mat b/Assets/_PROJECT/Prefabs/Doors/card reader Variant.mat similarity index 100% rename from Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.mat rename to Assets/_PROJECT/Prefabs/Doors/card reader Variant.mat diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.mat.meta b/Assets/_PROJECT/Prefabs/Doors/card reader Variant.mat.meta similarity index 100% rename from Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.mat.meta rename to Assets/_PROJECT/Prefabs/Doors/card reader Variant.mat.meta diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.prefab b/Assets/_PROJECT/Prefabs/Doors/card reader Variant.prefab similarity index 100% rename from Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.prefab rename to Assets/_PROJECT/Prefabs/Doors/card reader Variant.prefab diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.prefab.meta b/Assets/_PROJECT/Prefabs/Doors/card reader Variant.prefab.meta similarity index 100% rename from Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.prefab.meta rename to Assets/_PROJECT/Prefabs/Doors/card reader Variant.prefab.meta diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader.fbx b/Assets/_PROJECT/Prefabs/Doors/card reader.fbx similarity index 100% rename from Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader.fbx rename to Assets/_PROJECT/Prefabs/Doors/card reader.fbx diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader.fbx.meta b/Assets/_PROJECT/Prefabs/Doors/card reader.fbx.meta similarity index 100% rename from Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader.fbx.meta rename to Assets/_PROJECT/Prefabs/Doors/card reader.fbx.meta diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 937974da..61e1240b 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8168b75a59e36deeabfd86bf4a7d7c0cbca619448ec71df331585d3d6e0a0ea -size 59228756 +oid sha256:2098a27a0a7442c4038be6663fb080dffad268bd5f537794f20140949c55d482 +size 62794244