gjcampbell/Magical-Jumping-Bean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more textures and materials and then added the appropriate material to its corresponding object

Browse Source
This commit is contained in:
Gregory Campbell
2020-01-21 22:36:27 -05:00
parent 458aafee0e
commit a434a1a3a5
59 changed files with 719 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/Floors/Basic Floor.prefab
+1 -1
View File
@@ -59,7 +59,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Cross Med.prefab
+2 -2
View File
@@ -59,7 +59,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -152,7 +152,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Cross Thick.prefab
+3 -3
View File
@@ -59,7 +59,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -106,7 +106,7 @@ GameObject:
- component: {fileID: 5047875936729039912}
- component: {fileID: 6602159693822888992}
m_Layer: 0
m_Name: Cross
m_Name: Cross Thick
m_TagString: Environment
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -247,7 +247,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Cross Thin.prefab
+2 -2
View File
@@ -154,7 +154,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -247,7 +247,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Diagonal Cross Med.prefab
+2 -2
View File
@@ -154,7 +154,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -247,7 +247,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Diagonal Cross Thick.prefab
+3 -3
View File
@@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 9127152547802437111}
- component: {fileID: 338128983634010367}
m_Layer: 0
m_Name: Diagonal Cross
m_Name: Diagonal Cross Thick
m_TagString: Environment
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -154,7 +154,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -247,7 +247,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Diagonal Cross Thin.prefab
+2 -2
View File
@@ -59,7 +59,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -152,7 +152,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Seperated Cross Diagonal.prefab
+5 -5
View File
@@ -59,7 +59,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -152,7 +152,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -245,7 +245,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -436,7 +436,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -529,7 +529,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Seperated Cross.prefab
+5 -5
View File
@@ -59,7 +59,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -152,7 +152,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -245,7 +245,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -436,7 +436,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -529,7 +529,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Prefabs/Floors/Singular Big Cube.prefab
+1 -1
View File
@@ -59,7 +59,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: fedab3a2f2e0e9c4d9445475f1954beb, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0