From c10c5e1f4f1d7751cb2d2ca40f1f6054259ae42d Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 15:28:41 +0100 Subject: [PATCH] glove wip --- game/Assets/Materials/Glitch/Gauntlet_Mat.mat | 166 ++++++++++++++++++ .../Materials/Glitch/Gauntlet_Mat.mat.meta | 8 + game/Assets/Prefabs/Character/Gauntlet.prefab | 127 +++++++++++--- game/Assets/Prefabs/Player.prefab | 4 +- game/Assets/Scripts/Character/Glove.cs | 21 ++- 5 files changed, 297 insertions(+), 29 deletions(-) create mode 100644 game/Assets/Materials/Glitch/Gauntlet_Mat.mat create mode 100644 game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta diff --git a/game/Assets/Materials/Glitch/Gauntlet_Mat.mat b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat new file mode 100644 index 0000000..41ef5cc --- /dev/null +++ b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat @@ -0,0 +1,166 @@ +%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: Gauntler_Mat + m_Shader: {fileID: 4800000, guid: 91517451bf5416c44a73fd65d42c122a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 9790e688a544b39469364dfdde573e23, type: 3} + m_Scale: {x: 0.1, y: 0.05} + m_Offset: {x: 0, y: 0} + - _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} + - _GlitchMap: + m_Texture: {fileID: 8400000, guid: 643f93434e571d744a700fb58c7fd2c2, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlitchTex: + m_Texture: {fileID: 8400000, guid: 36a2435496603f54cb0ed075dccd1146, type: 2} + 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} + - _NoiseMap: + m_Texture: {fileID: 2800000, guid: 3ec50f13c4e07da41b9ad1784c4c36a7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseMap1: + m_Texture: {fileID: 2800000, guid: 3b377918b96ea6846ba47ed9f551c386, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseMap2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseMap3: + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Alpha: 1 + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _C: 0 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _Distortion: 4.41 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _HorizontalScale: 0.1 + - _Intensity: 0.1 + - _M: 0.5 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _PulseIntensity: 1 + - _QueueOffset: 0 + - _RadiusWithDistance: 0.003 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SpeedMultiplier: 2 + - _SrcBlend: 1 + - _Surface: 0 + - _TrackWidth: 20 + - _TrailScatter: 0.1 + - _VertFloat: 0 + - _VertShake: 0.005 + - _VerticalScale: 10 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1.0556064, g: 1.0556064, b: 1.0556064, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FarColor: {r: 1, g: 1, b: 1, a: 1} + - _GlitchColor: {r: 3.685864, g: 3.685864, b: 3.685864, a: 1} + - _NoiseColor: {r: 0.8861179, g: 1.2256676, b: 1.7270256, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &3508380654290378483 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta new file mode 100644 index 0000000..0683e14 --- /dev/null +++ b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf03fd6edc7ad60479bd07675e34fc18 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Character/Gauntlet.prefab b/game/Assets/Prefabs/Character/Gauntlet.prefab index 8301c92..9f8d105 100644 --- a/game/Assets/Prefabs/Character/Gauntlet.prefab +++ b/game/Assets/Prefabs/Character/Gauntlet.prefab @@ -31,6 +31,7 @@ Transform: - {fileID: 3693105673816541005} - {fileID: 8265753883645492107} - {fileID: 8151955929027432223} + - {fileID: 5095892781068191346} m_Father: {fileID: 2207546215893829416} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -61,13 +62,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2107647899858447059} - m_LocalRotation: {x: -0.000000029802319, y: 0.136777, z: -0.000000059604638, w: 0.99060184} - m_LocalPosition: {x: 0.070109, y: 0.22814, z: -0.019955} - m_LocalScale: {x: 0.03, y: 0.03, z: 0.03} + m_LocalRotation: {x: -0.01785308, y: 0.13560684, z: -0.1293001, w: 0.98212713} + m_LocalPosition: {x: 0.048407983, y: 0.1391711, z: -0.013962097} + m_LocalScale: {x: 0.0211272, y: 0.07702745, z: 0.0211272} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: -15} --- !u!33 &9149161017774705606 MeshFilter: m_ObjectHideFlags: 0 @@ -95,7 +96,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -256,7 +257,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5067301821623896547 Transform: m_ObjectHideFlags: 0 @@ -265,8 +266,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3185822280257012079} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.1848982, z: 0} - m_LocalScale: {x: 0.11265, y: 0.11265, z: 0.11265} + m_LocalPosition: {x: 0, y: 0.027, z: -0} + m_LocalScale: {x: 0.094819754, y: 0.051408164, z: 0.094819754} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 0 @@ -298,7 +299,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 5d5260a94884a404ca29f832ae73dc0f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -361,13 +362,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3723072566711940830} - m_LocalRotation: {x: -0.000000029802319, y: 0.136777, z: -0.000000059604638, w: 0.99060184} - m_LocalPosition: {x: -0.04747, y: 0.22814, z: -0.05863} - m_LocalScale: {x: 0.03, y: 0.03, z: 0.03} + m_LocalRotation: {x: -0.12929936, y: 0.1356068, z: 0.017852873, w: 0.98212725} + m_LocalPosition: {x: -0.034398675, y: 0.13916875, z: -0.041199625} + m_LocalScale: {x: 0.0211272, y: 0.07702745, z: 0.0211272} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} + m_LocalEulerAnglesHint: {x: -15, y: 15.723, z: 0} --- !u!33 &7505306022685131981 MeshFilter: m_ObjectHideFlags: 0 @@ -395,7 +396,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -565,13 +566,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5907375344130546907} - m_LocalRotation: {x: -0.000000029802319, y: 0.136777, z: -0.000000059604638, w: 0.99060184} - m_LocalPosition: {x: -0.024515, y: 0.22814, z: 0.071295} - m_LocalScale: {x: 0.03, y: 0.03, z: 0.03} + m_LocalRotation: {x: 0.14589304, y: 0.11756973, z: 0.11049293, w: 0.9760553} + m_LocalPosition: {x: -0.018238256, y: 0.13920811, z: 0.050300192} + m_LocalScale: {x: 0.0211272, y: 0.07702745, z: 0.0211272} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} + m_LocalEulerAnglesHint: {x: 15, y: 15.723, z: 15} --- !u!33 &8509043419303805045 MeshFilter: m_ObjectHideFlags: 0 @@ -599,7 +600,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -796,7 +797,7 @@ MonoBehaviour: _baseTrailTime: 0.01 _blinkTrailTime: 0.5 _pulseTime: 0.5 - _trailMat: {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + _trailMat: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} _emissionScale: 1.7 _rotationSpeed: 10 _scaleFactor: 2 @@ -856,3 +857,89 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1001 &5095892781068066034 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8247244653362830090} + m_Modifications: + - target: {fileID: 100000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Name + value: Whiskey + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalScale.x + value: 5.8992977 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalScale.y + value: 5.8992977 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalScale.z + value: 3.8111777 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalPosition.y + value: 0.086 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalPosition.z + value: 0.007 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071066 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710707 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0000000037252903 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5d5260a94884a404ca29f832ae73dc0f, type: 2} + - target: {fileID: 2300000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + - target: {fileID: 2300000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} +--- !u!4 &5095892781068191346 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + m_PrefabInstance: {fileID: 5095892781068066034} + m_PrefabAsset: {fileID: 0} diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 79dad97..d025d18 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -2970,7 +2970,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063781060970015022, guid: a9c8794e9c88400488714f588a740912, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} propertyPath: m_RootOrder @@ -3098,7 +3098,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063781060970015022, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} propertyPath: m_RootOrder diff --git a/game/Assets/Scripts/Character/Glove.cs b/game/Assets/Scripts/Character/Glove.cs index 402f98b..8517779 100644 --- a/game/Assets/Scripts/Character/Glove.cs +++ b/game/Assets/Scripts/Character/Glove.cs @@ -22,6 +22,9 @@ public class Glove : MonoBehaviour [SerializeField] private float _emissionScale; [SerializeField] private float _rotationSpeed; [SerializeField] private float _scaleFactor; + + [SerializeField] private Light _light; + [SerializeField] private float _lightIntensity; private const string EMISSION_COLOR = "_EmissionColor"; @@ -34,6 +37,8 @@ public class Glove : MonoBehaviour { trail.time = _baseTrailTime; } + + _lightIntensity = 0; } private void LateUpdate() @@ -52,12 +57,14 @@ public class Glove : MonoBehaviour trail.DOTime(_baseTrailTime, _pulseTime); } - var baseEmission = _trailMat.GetColor(EMISSION_COLOR); - var pulseEmission = baseEmission * _emissionScale; - foreach (var renderer in _renderers) - { - renderer.material.SetColor(EMISSION_COLOR, pulseEmission); - renderer.material.DOColor(baseEmission, _pulseTime); - } + _light.intensity = + + // var baseEmission = _trailMat.GetColor(EMISSION_COLOR); + // var pulseEmission = baseEmission * _emissionScale; + // foreach (var renderer in _renderers) + // { + // renderer.material.SetColor(EMISSION_COLOR, pulseEmission); + // renderer.material.DOColor(baseEmission, _pulseTime); + // } } }