From 6e6fcd6ee8fe0189fdf093b489d12e2d10c8f799 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 27 Apr 2021 21:02:02 +0100 Subject: [PATCH] fix material imports --- game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat | 4 ++-- .../3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta | 7 ++++++- .../3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta | 7 ++++++- .../3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta | 7 ++++++- .../3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta | 7 ++++++- .../3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta | 7 ++++++- .../TRIM 1/Meshes/WallPiece_B.fbx.meta | 7 ++++++- .../3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta | 7 ++++++- .../Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta | 17 ++++++++++++++++- 9 files changed, 60 insertions(+), 10 deletions(-) diff --git a/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat b/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat index 117b25d..57abd63 100644 --- a/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat +++ b/game/Assets/3D Assets/TRIM 1/M_TrimSheet1.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_TrimSheet1 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _SPECULAR_SETUP + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP _PARALLAXMAP _SPECULAR_SETUP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -57,7 +57,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 011afa5d5d2b862499f741807466bfa1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta index 618783f..4c9b970 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_A.fbx.meta @@ -3,7 +3,12 @@ guid: fc2b5b7551ec86542b748c3a88b39485 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta index 543bcd2..74bad2a 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Floor_D.fbx.meta @@ -3,7 +3,12 @@ guid: e2ba213e3a7832f409428e2817b1fcf7 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta index c464cf8..ef5877e 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_B.fbx.meta @@ -3,7 +3,12 @@ guid: 7b6c80936da89a0488c79b8f1ca951e7 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta index e74eeb3..65d5fec 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Pillar_D.fbx.meta @@ -3,7 +3,12 @@ guid: 4a31c57c3ca869448a5849436b526efa ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta index 6c358bb..a85b30a 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Railing_A.fbx.meta @@ -3,7 +3,12 @@ guid: e73358a549de9664fa0a48ccdea07e1c ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta index 408a497..797ffc8 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/WallPiece_B.fbx.meta @@ -3,7 +3,12 @@ guid: a3943167b6b50f34294c6a0efd56b89d ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta index 7b4af6c..171a811 100644 --- a/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta +++ b/game/Assets/3D Assets/TRIM 1/Meshes/Wall_A.fbx.meta @@ -3,7 +3,12 @@ guid: e20114b5c13a067488940c5cc8e13b60 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: blinn2 + second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta b/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta index b911428..d70633f 100644 --- a/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta +++ b/game/Assets/BLOCKOUT/DOUBLE_JUMP_Temple.fbx.meta @@ -3,7 +3,22 @@ guid: 4477ff34c18408448b17cab051fbb946 ModelImporter: serializedVersion: 20200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_UE4Man_Body + second: {fileID: 2100000, guid: 0dc7ff29bade3924ebd3c8b5c275f932, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_UE4Man_ChestLogo + second: {fileID: 2100000, guid: 0dc7ff29bade3924ebd3c8b5c275f932, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert1 + second: {fileID: 2100000, guid: 0dc7ff29bade3924ebd3c8b5c275f932, type: 2} materials: materialImportMode: 2 materialName: 0