diff --git a/Guardian of Silverkeep/Assets/Scenes/Levente - Test.unity b/Guardian of Silverkeep/Assets/Scenes/Levente - Test.unity index f5411be..2a0cf2b 100644 --- a/Guardian of Silverkeep/Assets/Scenes/Levente - Test.unity +++ b/Guardian of Silverkeep/Assets/Scenes/Levente - Test.unity @@ -1923,7 +1923,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &180735686 Transform: m_ObjectHideFlags: 0 @@ -1941,7 +1941,7 @@ Light: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 180735685} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 3 m_Type: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -4319,7 +4319,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -4946,7 +4946,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -8199,7 +8199,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -8282,7 +8282,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -10314,7 +10314,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -12279,7 +12279,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -13299,7 +13299,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -13621,7 +13621,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -14425,7 +14425,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -15262,7 +15262,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -15483,7 +15483,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -15579,7 +15579,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -15973,6 +15973,14 @@ Prefab: propertyPath: m_LocalRotation.w value: .913545489 objectReference: {fileID: 0} + - target: {fileID: 2300002, guid: 8a5386b094a67ea4fa2fa9ab865947b4, type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} + - target: {fileID: 2300000, guid: 8a5386b094a67ea4fa2fa9ab865947b4, type: 2} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8a5386b094a67ea4fa2fa9ab865947b4, type: 2} m_RootGameObject: {fileID: 1736878227} @@ -21085,7 +21093,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 09ae2167ec9f03d42ab910fb186414bb, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -21513,7 +21521,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -22099,7 +22107,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6f38f2e36968d0e4c87aff7b42c897a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db b/Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db index 376328b..a5e9c3d 100644 Binary files a/Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db and b/Guardian of Silverkeep/Assets/Texture/Materials/Thumbs.db differ diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/wood 1.mat b/Guardian of Silverkeep/Assets/Texture/Materials/wood 1.mat new file mode 100644 index 0000000..58d40bd --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/wood 1.mat @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: wood 1 + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 4baf59b6b70632b40b59868ee7059e3d, type: 3} + m_Scale: {x: 15, y: 5} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: .742647052, g: .638894916, b: .638894916, a: 1} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/wood 1.mat.meta b/Guardian of Silverkeep/Assets/Texture/Materials/wood 1.mat.meta new file mode 100644 index 0000000..baca281 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/wood 1.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 09ae2167ec9f03d42ab910fb186414bb +NativeFormatImporter: + userData: diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/wood.mat b/Guardian of Silverkeep/Assets/Texture/Materials/wood.mat new file mode 100644 index 0000000..335ea0a --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/wood.mat @@ -0,0 +1,27 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: wood + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 4baf59b6b70632b40b59868ee7059e3d, type: 3} + m_Scale: {x: 15, y: 5} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/wood.mat.meta b/Guardian of Silverkeep/Assets/Texture/Materials/wood.mat.meta new file mode 100644 index 0000000..560daf7 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/wood.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 6f38f2e36968d0e4c87aff7b42c897a7 +NativeFormatImporter: + userData: diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/woodwall.png b/Guardian of Silverkeep/Assets/Texture/Materials/woodwall.png new file mode 100644 index 0000000..f557f25 Binary files /dev/null and b/Guardian of Silverkeep/Assets/Texture/Materials/woodwall.png differ diff --git a/Guardian of Silverkeep/Assets/Texture/Materials/woodwall.png.meta b/Guardian of Silverkeep/Assets/Texture/Materials/woodwall.png.meta new file mode 100644 index 0000000..7ccb0e6 --- /dev/null +++ b/Guardian of Silverkeep/Assets/Texture/Materials/woodwall.png.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 4baf59b6b70632b40b59868ee7059e3d +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + userData: