From b3ab51725afcae7cbc25c6d56c15896bf5df3b73 Mon Sep 17 00:00:00 2001 From: Kotrba Filip Date: Sun, 2 Feb 2020 12:32:53 +0100 Subject: [PATCH] Edit colors on weapon and amo --- Assets/Materials/White.mat | 77 +++++++++++++++++++++++ Assets/Materials/White.mat.meta | 8 +++ Assets/Prefabs/Part_Shoot_Weapon.prefab | 2 +- Assets/Prefabs/Part_Shoot_Weapon_3.prefab | 4 +- Assets/Prefabs/Weapon_3.prefab | 10 +++ Assets/Scenes/PlayScene.unity | 20 ++++++ 6 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 Assets/Materials/White.mat create mode 100644 Assets/Materials/White.mat.meta diff --git a/Assets/Materials/White.mat b/Assets/Materials/White.mat new file mode 100644 index 0000000..2a5ecf4 --- /dev/null +++ b/Assets/Materials/White.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: White + 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.49 + - _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.7075472, g: 0.7075472, b: 0.7075472, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/White.mat.meta b/Assets/Materials/White.mat.meta new file mode 100644 index 0000000..84e371d --- /dev/null +++ b/Assets/Materials/White.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 362f55bd6cc53b74dbd4f875ded5b5f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Part_Shoot_Weapon.prefab b/Assets/Prefabs/Part_Shoot_Weapon.prefab index 28e011c..35f750c 100644 --- a/Assets/Prefabs/Part_Shoot_Weapon.prefab +++ b/Assets/Prefabs/Part_Shoot_Weapon.prefab @@ -51,7 +51,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 diff --git a/Assets/Prefabs/Part_Shoot_Weapon_3.prefab b/Assets/Prefabs/Part_Shoot_Weapon_3.prefab index 3cbfb16..cc7bb6a 100644 --- a/Assets/Prefabs/Part_Shoot_Weapon_3.prefab +++ b/Assets/Prefabs/Part_Shoot_Weapon_3.prefab @@ -51,7 +51,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 @@ -286,7 +286,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Prefabs/Weapon_3.prefab b/Assets/Prefabs/Weapon_3.prefab index dc4462f..87df254 100644 --- a/Assets/Prefabs/Weapon_3.prefab +++ b/Assets/Prefabs/Weapon_3.prefab @@ -286,6 +286,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3983516630253985952} m_Modifications: + - target: {fileID: -6054058774237248251, guid: cbc33a01620116b4297cb35d378f0242, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} - target: {fileID: -4216859302048453862, guid: cbc33a01620116b4297cb35d378f0242, type: 3} propertyPath: m_LocalPosition.x @@ -356,6 +361,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.08 objectReference: {fileID: 0} + - target: {fileID: -2397996973257786244, guid: cbc33a01620116b4297cb35d378f0242, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} - target: {fileID: -927199367670048503, guid: cbc33a01620116b4297cb35d378f0242, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/PlayScene.unity b/Assets/Scenes/PlayScene.unity index bf974b3..75cf888 100644 --- a/Assets/Scenes/PlayScene.unity +++ b/Assets/Scenes/PlayScene.unity @@ -8005,6 +8005,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7843994914498914666, guid: d946f9dd565b97e49919fc8bd91aae4e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 362f55bd6cc53b74dbd4f875ded5b5f1, type: 2} - target: {fileID: 8423879596285337014, guid: d946f9dd565b97e49919fc8bd91aae4e, type: 3} propertyPath: m_Name @@ -8571,6 +8576,21 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 3224351627309651277, guid: 5322794fa1699704b8e50a14cef106b1, + type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3224351627309651277, guid: 5322794fa1699704b8e50a14cef106b1, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 427c5d2662e5f764484aeb5e62dd64ab, type: 2} + - target: {fileID: 3224351627309651277, guid: 5322794fa1699704b8e50a14cef106b1, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 427c5d2662e5f764484aeb5e62dd64ab, type: 2} - target: {fileID: 3259529005183415338, guid: 5322794fa1699704b8e50a14cef106b1, type: 3} propertyPath: audioSource