From d7d7c7bfcd51c718be5a2f802c4abea0561d3bbb Mon Sep 17 00:00:00 2001 From: NickFowler Date: Sat, 1 Feb 2020 21:59:48 +1100 Subject: [PATCH] Preliminary horse colours --- Assets/Materials/HorseMat1.mat | 77 +++++++++++++++++++++++++ Assets/Materials/HorseMat1.mat.meta | 8 +++ Assets/Materials/HorseMat2.mat | 77 +++++++++++++++++++++++++ Assets/Materials/HorseMat2.mat.meta | 8 +++ Assets/WorldAssets/Prefabs/Horse.prefab | 37 ++++++++++++ 5 files changed, 207 insertions(+) create mode 100644 Assets/Materials/HorseMat1.mat create mode 100644 Assets/Materials/HorseMat1.mat.meta create mode 100644 Assets/Materials/HorseMat2.mat create mode 100644 Assets/Materials/HorseMat2.mat.meta diff --git a/Assets/Materials/HorseMat1.mat b/Assets/Materials/HorseMat1.mat new file mode 100644 index 0000000..1c3d901 --- /dev/null +++ b/Assets/Materials/HorseMat1.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HorseMat1 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/HorseMat1.mat.meta b/Assets/Materials/HorseMat1.mat.meta new file mode 100644 index 0000000..a3abc60 --- /dev/null +++ b/Assets/Materials/HorseMat1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eee921fd2d1ce93438460adae9268cb4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/HorseMat2.mat b/Assets/Materials/HorseMat2.mat new file mode 100644 index 0000000..4be5d20 --- /dev/null +++ b/Assets/Materials/HorseMat2.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HorseMat2 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/HorseMat2.mat.meta b/Assets/Materials/HorseMat2.mat.meta new file mode 100644 index 0000000..6685a0d --- /dev/null +++ b/Assets/Materials/HorseMat2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d996401058d89c44ab4f3e217d66d8b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorldAssets/Prefabs/Horse.prefab b/Assets/WorldAssets/Prefabs/Horse.prefab index cb1e419..e2aab60 100644 --- a/Assets/WorldAssets/Prefabs/Horse.prefab +++ b/Assets/WorldAssets/Prefabs/Horse.prefab @@ -81,6 +81,8 @@ MonoBehaviour: gravity: 35 model: {fileID: 760734042007802935} cController: {fileID: 0} + cam: {fileID: 0} + herd: {fileID: 0} speedMulitplier: 0 --- !u!143 &7371939184051845555 CharacterController: @@ -107,6 +109,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8730422608073699851} m_Modifications: + - target: {fileID: -5295224123996708082, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} + propertyPath: m_TagString + value: Colour + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 707f698da07e87f4ab470faa7ed70d74, type: 3} propertyPath: m_LocalPosition.x @@ -162,11 +169,41 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -2621413714742118295, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2d996401058d89c44ab4f3e217d66d8b, type: 2} - target: {fileID: -927199367670048503, guid: 707f698da07e87f4ab470faa7ed70d74, type: 3} propertyPath: m_Name value: HorseModel objectReference: {fileID: 0} + - target: {fileID: 265432533396819574, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2d996401058d89c44ab4f3e217d66d8b, type: 2} + - target: {fileID: 3469718763401864225, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: eee921fd2d1ce93438460adae9268cb4, type: 2} + - target: {fileID: 3469718763401864225, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 2d996401058d89c44ab4f3e217d66d8b, type: 2} + - target: {fileID: 5295643174949690378, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} + propertyPath: m_TagString + value: Colour + objectReference: {fileID: 0} + - target: {fileID: 7826935620241149985, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} + propertyPath: m_TagString + value: Colour + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 707f698da07e87f4ab470faa7ed70d74, type: 3} --- !u!4 &7665367118571749467 stripped