From 0a66ac2d11788d91feab6d5f359eb3f8bcd066a5 Mon Sep 17 00:00:00 2001 From: Mikkel Bybjerg Date: Sun, 28 Apr 2019 09:39:14 +0200 Subject: basic dragon color --- nGJ2019/Assets/Textures/dragon_body.mat | 77 ++++++++++++++++++++++++++ nGJ2019/Assets/Textures/dragon_body.mat.meta | 8 +++ nGJ2019/Assets/Textures/dragon_detail.mat | 77 ++++++++++++++++++++++++++ nGJ2019/Assets/Textures/dragon_detail.mat.meta | 8 +++ 4 files changed, 170 insertions(+) create mode 100644 nGJ2019/Assets/Textures/dragon_body.mat create mode 100644 nGJ2019/Assets/Textures/dragon_body.mat.meta create mode 100644 nGJ2019/Assets/Textures/dragon_detail.mat create mode 100644 nGJ2019/Assets/Textures/dragon_detail.mat.meta diff --git a/nGJ2019/Assets/Textures/dragon_body.mat b/nGJ2019/Assets/Textures/dragon_body.mat new file mode 100644 index 0000000..360176f --- /dev/null +++ b/nGJ2019/Assets/Textures/dragon_body.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: dragon_body + 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: 0.504717, g: 0.9683408, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/nGJ2019/Assets/Textures/dragon_body.mat.meta b/nGJ2019/Assets/Textures/dragon_body.mat.meta new file mode 100644 index 0000000..c22617a --- /dev/null +++ b/nGJ2019/Assets/Textures/dragon_body.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 74ee3c10b63fcc140bed436c051aec5c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nGJ2019/Assets/Textures/dragon_detail.mat b/nGJ2019/Assets/Textures/dragon_detail.mat new file mode 100644 index 0000000..6d6fdbc --- /dev/null +++ b/nGJ2019/Assets/Textures/dragon_detail.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: dragon_detail + 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: 0.0074759563, g: 0.094486326, b: 0.5283019, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/nGJ2019/Assets/Textures/dragon_detail.mat.meta b/nGJ2019/Assets/Textures/dragon_detail.mat.meta new file mode 100644 index 0000000..8e545bd --- /dev/null +++ b/nGJ2019/Assets/Textures/dragon_detail.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd5f3c7936bddc04aafe0220f7b19503 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.2.3 From 8dfb13aaeb6757ddc7db848d1d8cd0cf8476d273 Mon Sep 17 00:00:00 2001 From: Mikkel Bybjerg Date: Sun, 28 Apr 2019 09:39:42 +0200 Subject: bigger lives --- nGJ2019/Assets/Prefabs/health_crystal.prefab | 2 +- nGJ2019/Assets/Scripts/HealthBar.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nGJ2019/Assets/Prefabs/health_crystal.prefab b/nGJ2019/Assets/Prefabs/health_crystal.prefab index 8b52814..1191b32 100644 --- a/nGJ2019/Assets/Prefabs/health_crystal.prefab +++ b/nGJ2019/Assets/Prefabs/health_crystal.prefab @@ -25,7 +25,7 @@ Transform: m_GameObject: {fileID: 6136547117420934535} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.1396179, y: -0.6755286, z: 2.9882812} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.53254, y: 1.53254, z: 1.53254} m_Children: - {fileID: 7434249188869609042} m_Father: {fileID: 0} diff --git a/nGJ2019/Assets/Scripts/HealthBar.cs b/nGJ2019/Assets/Scripts/HealthBar.cs index 4c30b42..b5d0427 100644 --- a/nGJ2019/Assets/Scripts/HealthBar.cs +++ b/nGJ2019/Assets/Scripts/HealthBar.cs @@ -38,7 +38,7 @@ public class HealthBar : MonoBehaviour { for(int i=0; i()); } -- cgit v1.2.3 From 3dd1f885948be23a6c440868e6539b97b95ec73f Mon Sep 17 00:00:00 2001 From: Mikkel Bybjerg Date: Sun, 28 Apr 2019 09:42:18 +0200 Subject: dragon color --- nGJ2019/Assets/Prefabs/Dragon.prefab | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nGJ2019/Assets/Prefabs/Dragon.prefab b/nGJ2019/Assets/Prefabs/Dragon.prefab index 7163a3e..1ddf9d3 100644 --- a/nGJ2019/Assets/Prefabs/Dragon.prefab +++ b/nGJ2019/Assets/Prefabs/Dragon.prefab @@ -252,6 +252,26 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.27564865 objectReference: {fileID: 0} + - target: {fileID: -3776077622187685775, guid: 89a9598fd81fa654db8c1fe9e3842481, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 74ee3c10b63fcc140bed436c051aec5c, type: 2} + - target: {fileID: 5444894743097917619, guid: 89a9598fd81fa654db8c1fe9e3842481, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dd5f3c7936bddc04aafe0220f7b19503, type: 2} + - target: {fileID: -2174884462299768658, guid: 89a9598fd81fa654db8c1fe9e3842481, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dd5f3c7936bddc04aafe0220f7b19503, type: 2} + - target: {fileID: -1389157037694621049, guid: 89a9598fd81fa654db8c1fe9e3842481, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dd5f3c7936bddc04aafe0220f7b19503, type: 2} - target: {fileID: 8962655216809570878, guid: 89a9598fd81fa654db8c1fe9e3842481, type: 3} propertyPath: m_LocalScale.x -- cgit v1.2.3 From fff33006ed16702479b9e2a8e218b77aa1578942 Mon Sep 17 00:00:00 2001 From: Mikkel Bybjerg Date: Sun, 28 Apr 2019 10:10:08 +0200 Subject: <3 --- nGJ2019/Assets/Models/health_crystal.fbx | Bin 15436 -> 16732 bytes nGJ2019/Assets/Prefabs/health_crystal.prefab | 12 ++++++------ nGJ2019/Assets/Scripts/HealthBar.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nGJ2019/Assets/Models/health_crystal.fbx b/nGJ2019/Assets/Models/health_crystal.fbx index 6698220..38df526 100644 Binary files a/nGJ2019/Assets/Models/health_crystal.fbx and b/nGJ2019/Assets/Models/health_crystal.fbx differ diff --git a/nGJ2019/Assets/Prefabs/health_crystal.prefab b/nGJ2019/Assets/Prefabs/health_crystal.prefab index 1191b32..2bbae32 100644 --- a/nGJ2019/Assets/Prefabs/health_crystal.prefab +++ b/nGJ2019/Assets/Prefabs/health_crystal.prefab @@ -61,22 +61,22 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: -0.49991274 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.50008726 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0.49991274 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.50008726 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} @@ -86,12 +86,12 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -89.98 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: fe4f2cdeb6d4d7e41809b08237be2025, type: 3} diff --git a/nGJ2019/Assets/Scripts/HealthBar.cs b/nGJ2019/Assets/Scripts/HealthBar.cs index b5d0427..685e297 100644 --- a/nGJ2019/Assets/Scripts/HealthBar.cs +++ b/nGJ2019/Assets/Scripts/HealthBar.cs @@ -38,7 +38,7 @@ public class HealthBar : MonoBehaviour { for(int i=0; i()); } -- cgit v1.2.3