From 39908ffa883fe613fe2a0a41f7bc5f103e5b4797 Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Sun, 21 Jan 2024 12:48:07 +0100 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20visualize=20the=20current=20tower?= =?UTF-8?q?=E2=80=99s=20target?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/_Game/Materials/Target.mat | 137 + .../Assets/_Game/Materials/Target.mat.meta | 8 + .../Assets/_Game/Prefabs/Targets.meta | 8 + .../Prefabs/Targets/TargetIndicator.prefab | 108 + .../Targets/TargetIndicator.prefab.meta | 7 + .../Weapons/Targeting/ICanTrackTarget.cs | 10 + .../Weapons/Targeting/ICanTrackTarget.cs.meta | 3 + .../SelectedWeaponTargetVisualizer.cs | 107 + .../SelectedWeaponTargetVisualizer.cs.meta | 3 + .../Runtime/Entities/Weapons/Weapon.cs | 14 +- .../_Game/Shaders/Ring_Shader.shadergraph | 2607 +++++++++++++++++ .../Shaders/Ring_Shader.shadergraph.meta | 10 + 12 files changed, 3021 insertions(+), 1 deletion(-) create mode 100644 FairyTaleDefender/Assets/_Game/Materials/Target.mat create mode 100644 FairyTaleDefender/Assets/_Game/Materials/Target.mat.meta create mode 100644 FairyTaleDefender/Assets/_Game/Prefabs/Targets.meta create mode 100644 FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab create mode 100644 FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab.meta create mode 100644 FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs create mode 100644 FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs.meta create mode 100644 FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs create mode 100644 FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs.meta create mode 100644 FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph create mode 100644 FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph.meta diff --git a/FairyTaleDefender/Assets/_Game/Materials/Target.mat b/FairyTaleDefender/Assets/_Game/Materials/Target.mat new file mode 100644 index 000000000..85d4d6edd --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Materials/Target.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2698000342545102559 +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: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Target + m_Shader: {fileID: -6465566751694194690, guid: dd4c000ba0e294d0591a10f6fb89fa66, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 4000 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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} + - _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} + - _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_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 1 + - _QueueOffset: 50 + - _Radius: 0.25 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _Thickness: 0.02 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.087086126, g: 0.9555352, b: 0.9716981, a: 1} + - _Emission: {r: 1, g: 0, b: 0.055834293, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/FairyTaleDefender/Assets/_Game/Materials/Target.mat.meta b/FairyTaleDefender/Assets/_Game/Materials/Target.mat.meta new file mode 100644 index 000000000..41337c0b2 --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Materials/Target.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d67ac06f02370410eb993e8ae83ecc15 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FairyTaleDefender/Assets/_Game/Prefabs/Targets.meta b/FairyTaleDefender/Assets/_Game/Prefabs/Targets.meta new file mode 100644 index 000000000..803a0fc80 --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Prefabs/Targets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90ac2474ebdff4dfebe612cdb7323bda +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab b/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab new file mode 100644 index 000000000..803a2c14a --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3949593316030231720 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6014485345876166067} + - component: {fileID: 1984820504121016342} + - component: {fileID: 7883231429546155381} + - component: {fileID: 1224370384995479385} + m_Layer: 0 + m_Name: TargetIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6014485345876166067 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3949593316030231720} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &1984820504121016342 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3949593316030231720} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7883231429546155381 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3949593316030231720} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d67ac06f02370410eb993e8ae83ecc15, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &1224370384995479385 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3949593316030231720} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab.meta b/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab.meta new file mode 100644 index 000000000..cd7aefd8d --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d440931cb03454699880c2ec92f844d3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs new file mode 100644 index 000000000..0c0d27738 --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs @@ -0,0 +1,10 @@ +using System; + +namespace BoundfoxStudios.FairyTaleDefender.Entities.Weapons.Targeting +{ + public interface ICanTrackTarget + { + event Action TargetChanged; + TargetPoint? Target { get; } + } +} diff --git a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs.meta b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs.meta new file mode 100644 index 000000000..3078bf351 --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/ICanTrackTarget.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c710c4b8bec54711931835f33d0afd58 +timeCreated: 1705827574 \ No newline at end of file diff --git a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs new file mode 100644 index 000000000..fc0d14b98 --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs @@ -0,0 +1,107 @@ +using System.Collections.Generic; +using System.Linq; +using BoundfoxStudios.FairyTaleDefender.Common; +using BoundfoxStudios.FairyTaleDefender.Extensions; +using BoundfoxStudios.FairyTaleDefender.Infrastructure.Events.ScriptableObjects; +using UnityEngine; + +namespace BoundfoxStudios.FairyTaleDefender.Entities.Weapons.Targeting +{ + [AddComponentMenu(Constants.MenuNames.Weapons + "/" + nameof(SelectedWeaponTargetVisualizer))] + public class SelectedWeaponTargetVisualizer : MonoBehaviour + { + [field: SerializeField] + private WeaponSelectedEventChannelSO WeaponSelectedEventChannel { get; set; } = default!; + + [field: SerializeField] + private VoidEventChannelSO WeaponDeselectedEventChannel { get; set; } = default!; + + [field: SerializeField] + private GameObject TargetVisualizationPrefab { get; set; } = default!; + + [field: SerializeField] + private Vector3 Offset { get; set; } = new (0, 0.001f, 0); + + private readonly List _visualizations = new(); + private ICanTrackTarget? _currentTrackableTarget; + + private void OnEnable() + { + WeaponSelectedEventChannel.Raised += TryToAttachToTrackableTarget; + WeaponDeselectedEventChannel.Raised += TryToDetachFromTrackableTarget; + } + + private void OnDisable() + { + WeaponSelectedEventChannel.Raised -= TryToAttachToTrackableTarget; + WeaponDeselectedEventChannel.Raised -= TryToDetachFromTrackableTarget; + } + + private void TryToAttachToTrackableTarget(WeaponSelectedEventChannelSO.EventArgs args) + { + // We always need to remove existing visualizations when attaching to a new trackable target. + // If we select one tower and then another tower, there won't be a deselected event, but only a selected one. + RemoveVisualizations(); + + var trackableTarget = args.Transform.GetComponentInChildren(); + + if (trackableTarget is null) + { + return; + } + + _currentTrackableTarget = trackableTarget; + _currentTrackableTarget.TargetChanged += TargetChanged; + + + if (trackableTarget.Target.Exists()) + { + AddVisualizations(trackableTarget.Target); + } + } + + private void TryToDetachFromTrackableTarget() + { + RemoveVisualizations(); + + if (_currentTrackableTarget != null) + { + _currentTrackableTarget.TargetChanged -= TargetChanged; + } + + _currentTrackableTarget = null; + } + + private void TargetChanged() + { + RemoveVisualizations(); + + // It could be that we're changing the target, but it was just destroyed. + if (_currentTrackableTarget != null && _currentTrackableTarget.Target.Exists()) + { + AddVisualizations(_currentTrackableTarget.Target); + } + } + + private void RemoveVisualizations() + { + var existingVisualizations = _visualizations.Where(v => v.Exists()).ToArray(); + + foreach (var visualization in existingVisualizations) + { + Destroy(visualization); + } + + _visualizations.Clear(); + } + + private void AddVisualizations(TargetPoint targetPoint) + { + var enemyTransform = targetPoint.Enemy.transform; + + var visualization = Instantiate(TargetVisualizationPrefab, enemyTransform); + visualization.transform.localPosition += Offset; + _visualizations.Add(visualization); + } + } +} diff --git a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs.meta b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs.meta new file mode 100644 index 000000000..c42461347 --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0c95244ab2fb4ef3b69c4b1a5f5319ad +timeCreated: 1705834902 \ No newline at end of file diff --git a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Weapon.cs b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Weapon.cs index 16a2e9aa5..9d188c666 100644 --- a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Weapon.cs +++ b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Weapon.cs @@ -14,7 +14,8 @@ namespace BoundfoxStudios.FairyTaleDefender.Entities.Weapons [SelectionBase] public abstract class Weapon : MonoBehaviour, ICanCalculateEffectiveWeaponDefinition, - ICanChangeTargetType + ICanChangeTargetType, + ICanTrackTarget where TWeaponSO : WeaponSO where TTargetLocatorSO : TargetLocatorSO where TEffectiveWeaponDefinition : EffectiveWeaponDefinition @@ -59,6 +60,9 @@ public abstract class Weapon protected abstract void TrackTarget(TargetPoint target); + public event Action? TargetChanged; + public TargetPoint? Target => _currentTarget; + private TEffectiveWeaponDefinition? _effectiveWeaponDefinition; private TargetPoint? _currentTarget; private Vector3 _towerForward; @@ -78,6 +82,8 @@ public EffectiveWeaponDefinition CalculateEffectiveWeaponDefinition(Vector3 posi protected virtual void Update() { + var previousTarget = _currentTarget; + if (!_currentTarget && !TryAcquireTarget(out _currentTarget)) { return; @@ -87,10 +93,16 @@ protected virtual void Update() if (!isTargetInRangeAndAlive) { + TargetChanged?.Invoke(); _currentTarget = null; return; } + if (previousTarget != _currentTarget) + { + TargetChanged?.Invoke(); + } + TrackTarget(_currentTarget!); } diff --git a/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph b/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph new file mode 100644 index 000000000..91d633f4a --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph @@ -0,0 +1,2607 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "c1861dfb38eb4b3f96c0d937a4c5b79b", + "m_Properties": [ + { + "m_Id": "8d21c8c1def54ababc386873caca44b8" + }, + { + "m_Id": "f4a8528d64634e229bf2e6eabd29d788" + }, + { + "m_Id": "c589d59c8d1c489a8f1eb837651ed3d5" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "a06d7f9818734a0ea28168790424706c" + } + ], + "m_Nodes": [ + { + "m_Id": "deb8b5dc46f54ef3992f4bed89c7bf3d" + }, + { + "m_Id": "f8738ce42c604cbd9159ca6bd8059ee5" + }, + { + "m_Id": "f537c91ae93c4f619a20d78e702b6855" + }, + { + "m_Id": "56c9b2e8eb99436a86c73cd7f66ca7e5" + }, + { + "m_Id": "bee81db26bab4bbdab5c34f39058fcdd" + }, + { + "m_Id": "1ddf486e48114975ba5d799ce07eb6c9" + }, + { + "m_Id": "f468af6e91424f8c9f09e8d41bb57fbc" + }, + { + "m_Id": "d1b1887c756b45ae8973f9055dc0e212" + }, + { + "m_Id": "b78b90ff8a9241d4a207e4dd17806158" + }, + { + "m_Id": "5d9a097e3a804375b563fcd6aadbeb31" + }, + { + "m_Id": "f4b9bc1cab834a0798685dbf0e55dbb1" + }, + { + "m_Id": "afef10d503944741ab8bfb3f774ed678" + }, + { + "m_Id": "681378ea5d7a47a78c3d65dc5f42bfdb" + }, + { + "m_Id": "af5c771cd43e4087ae24c215e33b1f59" + }, + { + "m_Id": "c7952b19d89e4de5b9adea7459723686" + }, + { + "m_Id": "bdd11c3eb0f5469f9a585e7e07f78f65" + }, + { + "m_Id": "5d18dc22323a43328e8e466a35d1a56a" + }, + { + "m_Id": "7daf9ed6d92748f69c1d46a3537bd5ea" + }, + { + "m_Id": "870711690c904fc9b2b10150cfb37ef6" + }, + { + "m_Id": "9b1330b5ea81494ba36d1f469dd4483f" + }, + { + "m_Id": "83fbb63d3819482a8c5239e56f7f4ee8" + }, + { + "m_Id": "b999389f4a374809a46650f806c1c83e" + }, + { + "m_Id": "892e7175cc814fa0b517c3f54a1c14c8" + }, + { + "m_Id": "dca38be6717744db9bb78d2a5ead1cd7" + }, + { + "m_Id": "0fca7cbd2b2a4f3c963a513ca7501e61" + }, + { + "m_Id": "33937cde39904be7bc6d227757b6eb37" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1ddf486e48114975ba5d799ce07eb6c9" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "681378ea5d7a47a78c3d65dc5f42bfdb" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5d18dc22323a43328e8e466a35d1a56a" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "bdd11c3eb0f5469f9a585e7e07f78f65" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "681378ea5d7a47a78c3d65dc5f42bfdb" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "870711690c904fc9b2b10150cfb37ef6" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "681378ea5d7a47a78c3d65dc5f42bfdb" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c7952b19d89e4de5b9adea7459723686" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7daf9ed6d92748f69c1d46a3537bd5ea" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b999389f4a374809a46650f806c1c83e" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "83fbb63d3819482a8c5239e56f7f4ee8" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9b1330b5ea81494ba36d1f469dd4483f" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "870711690c904fc9b2b10150cfb37ef6" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9b1330b5ea81494ba36d1f469dd4483f" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "892e7175cc814fa0b517c3f54a1c14c8" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "dca38be6717744db9bb78d2a5ead1cd7" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "9b1330b5ea81494ba36d1f469dd4483f" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "af5c771cd43e4087ae24c215e33b1f59" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "af5c771cd43e4087ae24c215e33b1f59" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "7daf9ed6d92748f69c1d46a3537bd5ea" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "afef10d503944741ab8bfb3f774ed678" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "681378ea5d7a47a78c3d65dc5f42bfdb" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b999389f4a374809a46650f806c1c83e" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0fca7cbd2b2a4f3c963a513ca7501e61" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b999389f4a374809a46650f806c1c83e" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "dca38be6717744db9bb78d2a5ead1cd7" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "bdd11c3eb0f5469f9a585e7e07f78f65" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "afef10d503944741ab8bfb3f774ed678" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "bee81db26bab4bbdab5c34f39058fcdd" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "bdd11c3eb0f5469f9a585e7e07f78f65" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c7952b19d89e4de5b9adea7459723686" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "af5c771cd43e4087ae24c215e33b1f59" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dca38be6717744db9bb78d2a5ead1cd7" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b78b90ff8a9241d4a207e4dd17806158" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 1379.9998779296875, + "y": 391.99993896484377 + }, + "m_Blocks": [ + { + "m_Id": "deb8b5dc46f54ef3992f4bed89c7bf3d" + }, + { + "m_Id": "f8738ce42c604cbd9159ca6bd8059ee5" + }, + { + "m_Id": "f537c91ae93c4f619a20d78e702b6855" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 1380.0, + "y": 601.0 + }, + "m_Blocks": [ + { + "m_Id": "56c9b2e8eb99436a86c73cd7f66ca7e5" + }, + { + "m_Id": "f468af6e91424f8c9f09e8d41bb57fbc" + }, + { + "m_Id": "d1b1887c756b45ae8973f9055dc0e212" + }, + { + "m_Id": "b78b90ff8a9241d4a207e4dd17806158" + }, + { + "m_Id": "5d9a097e3a804375b563fcd6aadbeb31" + }, + { + "m_Id": "f4b9bc1cab834a0798685dbf0e55dbb1" + }, + { + "m_Id": "0fca7cbd2b2a4f3c963a513ca7501e61" + }, + { + "m_Id": "33937cde39904be7bc6d227757b6eb37" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"fileID\":10210,\"guid\":\"0000000000000000e000000000000000\",\"type\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Boundfox Studios/Fairy Tale Defender", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_ActiveTargets": [ + { + "m_Id": "c52ba73fd4104ffb9b52845f3c20ba94" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "09f14d6d05cd407ea93e08fbeb250a7e", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "0c5386c188f64508b2ad496d63e8086c", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0fca7cbd2b2a4f3c963a513ca7501e61", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "97deafab7dff4f908875955757b005cb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "1ddf486e48114975ba5d799ce07eb6c9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -682.0, + "y": 365.0, + "width": 110.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "e582e74d792e4b41951bb1fb0b4b1568" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "8d21c8c1def54ababc386873caca44b8" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "2b07c23b6c3649298213b6eff4c1123b", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "2ebaac9c29064b11acb9df40d69c5407", + "m_Id": 2, + "m_DisplayName": "Max", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Max", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "33937cde39904be7bc6d227757b6eb37", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "bb840af4867c4303a5c37dab6ca2dabb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "345ee18fa9b045b7afed885259c5fc22", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "39c6d9e5ff784cd980d4b9e716057041", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3e65a3abb29c49cd932e06801b7c4408", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_Value": 0.5, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "44f4ff05ca7646af9454c8c4fe917ed3", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "46fefc5f131b4076b1dbfddb97dfa893", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "47ad39df4e38453a8e6b4ad50504a825", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "4c21179eeb8046879aa5ecc4b55ad870", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "4ca09381e9f94029ae02b406c145cafe", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "4d20765ba3554e9e97f6f0dde49dc450", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "5281a834b1cf48b3a6be235a5917b19e", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5459fa0c4e834ce58d1e16fb027d4fc4", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "54ce9ead5e204501aff13b1a34735cac", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "55622aa84a9d4995817c4d4ecbd4b6b8", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "55b7e8a9c4fa4637b9aab57def40c125", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "56c9b2e8eb99436a86c73cd7f66ca7e5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "54ce9ead5e204501aff13b1a34735cac" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "56f3142ea6c546918900b986745faeae", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2Node", + "m_ObjectId": "5d18dc22323a43328e8e466a35d1a56a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Vector 2", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1124.0, + "y": 472.0, + "width": 128.0, + "height": 101.0 + } + }, + "m_Slots": [ + { + "m_Id": "3e65a3abb29c49cd932e06801b7c4408" + }, + { + "m_Id": "9c65428f3c1c41ad9e91491b8d17d279" + }, + { + "m_Id": "cfe0f46243b84f7f9bfbdf379267a3a8" + } + ], + "synonyms": [ + "2", + "v2", + "vec2", + "float2" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": { + "x": 0.0, + "y": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5d9a097e3a804375b563fcd6aadbeb31", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "09f14d6d05cd407ea93e08fbeb250a7e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "60c789a3ec6e41688d2a751058e12f65", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "63ef00f367a7407c803d9f49e3a07740", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubtractNode", + "m_ObjectId": "681378ea5d7a47a78c3d65dc5f42bfdb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Subtract", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -460.0, + "y": 365.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "2b07c23b6c3649298213b6eff4c1123b" + }, + { + "m_Id": "4c21179eeb8046879aa5ecc4b55ad870" + }, + { + "m_Id": "ae60175c14ba491889bd457d083cf68b" + } + ], + "synonyms": [ + "subtraction", + "remove", + "minus", + "take away" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6af2542f03e14897bc7d08ae82f9a868", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "708fd8dbcae44ada812053399e4749e6", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "768a7f9e79c643aa8207ae63277a354d", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ClampNode", + "m_ObjectId": "7daf9ed6d92748f69c1d46a3537bd5ea", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Clamp", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 385.0, + "y": 601.0, + "width": 208.0, + "height": 326.0 + } + }, + "m_Slots": [ + { + "m_Id": "f898c262411748f2ae630c4df8f7b1fc" + }, + { + "m_Id": "b2989a1c6e0e4efbb9995a32292e4ca0" + }, + { + "m_Id": "2ebaac9c29064b11acb9df40d69c5407" + }, + { + "m_Id": "60c789a3ec6e41688d2a751058e12f65" + } + ], + "synonyms": [ + "limit" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "83fbb63d3819482a8c5239e56f7f4ee8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -303.0, + "y": 1120.0, + "width": 128.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "d66edb584db44df39c3dbe240a34295c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "f4a8528d64634e229bf2e6eabd29d788" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AbsoluteNode", + "m_ObjectId": "870711690c904fc9b2b10150cfb37ef6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Absolute", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -368.0, + "y": 755.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "5459fa0c4e834ce58d1e16fb027d4fc4" + }, + { + "m_Id": "46fefc5f131b4076b1dbfddb97dfa893" + } + ], + "synonyms": [ + "positive" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "892e7175cc814fa0b517c3f54a1c14c8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 694.0, + "y": 505.0, + "width": 105.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "47ad39df4e38453a8e6b4ad50504a825" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "c589d59c8d1c489a8f1eb837651ed3d5" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "8c361d763470472a815f763afb030e74", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "8d21c8c1def54ababc386873caca44b8", + "m_Guid": { + "m_GuidSerialized": "26bb6291-0114-47c9-ad5f-d2e23fc955e3" + }, + "m_Name": "Radius", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Radius", + "m_DefaultReferenceName": "_Radius", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.25, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 0.44999998807907107 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "961b57b809f440778a5ed549129731bf", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "97deafab7dff4f908875955757b005cb", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubtractNode", + "m_ObjectId": "9b1330b5ea81494ba36d1f469dd4483f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Subtract", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -95.0, + "y": 1062.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "0c5386c188f64508b2ad496d63e8086c" + }, + { + "m_Id": "345ee18fa9b045b7afed885259c5fc22" + }, + { + "m_Id": "6af2542f03e14897bc7d08ae82f9a868" + } + ], + "synonyms": [ + "subtraction", + "remove", + "minus", + "take away" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9c65428f3c1c41ad9e91491b8d17d279", + "m_Id": 2, + "m_DisplayName": "Y", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Y", + "m_StageCapability": 3, + "m_Value": 0.5, + "m_DefaultValue": 0.0, + "m_Labels": [ + "Y" + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "a06d7f9818734a0ea28168790424706c", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "8d21c8c1def54ababc386873caca44b8" + }, + { + "m_Id": "f4a8528d64634e229bf2e6eabd29d788" + }, + { + "m_Id": "c589d59c8d1c489a8f1eb837651ed3d5" + } + ] +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "a6e6215e0320447f8888e0b04e713a9f", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ae60175c14ba491889bd457d083cf68b", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "aed0382dd7524258913482021b69687b", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DivideNode", + "m_ObjectId": "af5c771cd43e4087ae24c215e33b1f59", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Divide", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 113.0, + "y": 731.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "768a7f9e79c643aa8207ae63277a354d" + }, + { + "m_Id": "d3866d8e72d04a038c13855fa1c4eefd" + }, + { + "m_Id": "8c361d763470472a815f763afb030e74" + } + ], + "synonyms": [ + "division", + "divided by" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.LengthNode", + "m_ObjectId": "afef10d503944741ab8bfb3f774ed678", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Length", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -492.0, + "y": 27.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "b11b672230434b8aabc902d3406ce003" + }, + { + "m_Id": "961b57b809f440778a5ed549129731bf" + } + ], + "synonyms": [ + "measure" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b11b672230434b8aabc902d3406ce003", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "b2989a1c6e0e4efbb9995a32292e4ca0", + "m_Id": 1, + "m_DisplayName": "Min", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Min", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "b78b90ff8a9241d4a207e4dd17806158", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "c19ff669e4ff45a28e6e6ddffbf102af" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", + "m_ObjectId": "b999389f4a374809a46650f806c1c83e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "One Minus", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 645.0, + "y": 601.0, + "width": 208.0, + "height": 278.0 + } + }, + "m_Slots": [ + { + "m_Id": "bd062d21113d41e6934429fa4ae5c001" + }, + { + "m_Id": "708fd8dbcae44ada812053399e4749e6" + } + ], + "synonyms": [ + "complement", + "invert", + "opposite" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "bb40b3b01dae4232836e95795aef1dbd", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "bb840af4867c4303a5c37dab6ca2dabb", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "bd062d21113d41e6934429fa4ae5c001", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubtractNode", + "m_ObjectId": "bdd11c3eb0f5469f9a585e7e07f78f65", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Subtract", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -933.0, + "y": 137.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "e039fecf2b6c48b69c62f93c4111258f" + }, + { + "m_Id": "aed0382dd7524258913482021b69687b" + }, + { + "m_Id": "55622aa84a9d4995817c4d4ecbd4b6b8" + } + ], + "synonyms": [ + "subtraction", + "remove", + "minus", + "take away" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "bee81db26bab4bbdab5c34f39058fcdd", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1255.0, + "y": 76.0, + "width": 208.0, + "height": 313.0 + } + }, + "m_Slots": [ + { + "m_Id": "56f3142ea6c546918900b986745faeae" + } + ], + "synonyms": [ + "texcoords", + "coords", + "coordinates" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputChannel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "c19ff669e4ff45a28e6e6ddffbf102af", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "c52ba73fd4104ffb9b52845f3c20ba94", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "a6e6215e0320447f8888e0b04e713a9f" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 1, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": true, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "c589d59c8d1c489a8f1eb837651ed3d5", + "m_Guid": { + "m_GuidSerialized": "ae0be4ed-d41e-4e5b-8ddb-b2a47f3285ae" + }, + "m_Name": "Emission", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Emission", + "m_DefaultReferenceName": "_Emission", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.08539513498544693, + "g": 0.6737404465675354, + "b": 0.9528301954269409, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DDXYNode", + "m_ObjectId": "c7952b19d89e4de5b9adea7459723686", + "m_Group": { + "m_Id": "" + }, + "m_Name": "DDXY", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -128.0, + "y": 632.0, + "width": 128.0, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "4d20765ba3554e9e97f6f0dde49dc450" + }, + { + "m_Id": "4ca09381e9f94029ae02b406c145cafe" + } + ], + "synonyms": [ + "derivative" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "cfe0f46243b84f7f9bfbdf379267a3a8", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "d1b1887c756b45ae8973f9055dc0e212", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e69abb22a58a4d54a12d7e692dddeb7a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "d3866d8e72d04a038c13855fa1c4eefd", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 2.0, + "y": 2.0, + "z": 2.0, + "w": 2.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d66edb584db44df39c3dbe240a34295c", + "m_Id": 0, + "m_DisplayName": "Thickness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "dca38be6717744db9bb78d2a5ead1cd7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 877.0, + "y": 515.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "63ef00f367a7407c803d9f49e3a07740" + }, + { + "m_Id": "5281a834b1cf48b3a6be235a5917b19e" + }, + { + "m_Id": "39c6d9e5ff784cd980d4b9e716057041" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "deb8b5dc46f54ef3992f4bed89c7bf3d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "f7d2b39a41cc446db9526b93287dcbd2" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "df5a7ec9e09c494e94b360bfe2303727", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e039fecf2b6c48b69c62f93c4111258f", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e582e74d792e4b41951bb1fb0b4b1568", + "m_Id": 0, + "m_DisplayName": "Radius", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "e69abb22a58a4d54a12d7e692dddeb7a", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "f468af6e91424f8c9f09e8d41bb57fbc", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "55b7e8a9c4fa4637b9aab57def40c125" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "f4a8528d64634e229bf2e6eabd29d788", + "m_Guid": { + "m_GuidSerialized": "bafd8957-032b-45ed-ad49-d88532d98f70" + }, + "m_Name": "Thickness", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Thickness", + "m_DefaultReferenceName": "_Thickness", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.019999999552965165, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 0.10000000149011612 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "f4b9bc1cab834a0798685dbf0e55dbb1", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "44f4ff05ca7646af9454c8c4fe917ed3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "f537c91ae93c4f619a20d78e702b6855", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "df5a7ec9e09c494e94b360bfe2303727" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "f7d2b39a41cc446db9526b93287dcbd2", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "f8738ce42c604cbd9159ca6bd8059ee5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "bb40b3b01dae4232836e95795aef1dbd" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "f898c262411748f2ae630c4df8f7b1fc", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + diff --git a/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph.meta b/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph.meta new file mode 100644 index 000000000..1303f1a0c --- /dev/null +++ b/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: dd4c000ba0e294d0591a10f6fb89fa66 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} From 927c925a91646fb31a8b73ab83d192841bbdd6ee Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Sun, 21 Jan 2024 12:48:23 +0100 Subject: [PATCH 2/8] feat: reduce WeaponPreviewAlpha #393 --- .../Assets/_Game/Materials/Weapons/WeaponRangePreview.mat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FairyTaleDefender/Assets/_Game/Materials/Weapons/WeaponRangePreview.mat b/FairyTaleDefender/Assets/_Game/Materials/Weapons/WeaponRangePreview.mat index c2431c1a2..cb5e04438 100644 --- a/FairyTaleDefender/Assets/_Game/Materials/Weapons/WeaponRangePreview.mat +++ b/FairyTaleDefender/Assets/_Game/Materials/Weapons/WeaponRangePreview.mat @@ -104,7 +104,7 @@ Material: m_Ints: [] m_Floats: - Normal_Blend: 0.5 - - _Alpha: 0.795 + - _Alpha: 0.6 - _AlphaClip: 0 - _AlphaToMask: 0 - _AttackAngle: 90 From dd51ace94249e02b7fccb185d994232c4808d5c8 Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Sun, 21 Jan 2024 13:55:42 +0100 Subject: [PATCH 3/8] feat: use a decal projector for target indication #393 --- .../Assets/_Game/Materials/Target.mat | 6 +- .../Prefabs/Targets/TargetIndicator.prefab | 90 +--- .../_Game/Shaders/Ring_Shader.shadergraph | 446 ++++-------------- 3 files changed, 109 insertions(+), 433 deletions(-) diff --git a/FairyTaleDefender/Assets/_Game/Materials/Target.mat b/FairyTaleDefender/Assets/_Game/Materials/Target.mat index 85d4d6edd..68cb93e4c 100644 --- a/FairyTaleDefender/Assets/_Game/Materials/Target.mat +++ b/FairyTaleDefender/Assets/_Game/Materials/Target.mat @@ -30,7 +30,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 4000 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: @@ -104,8 +104,12 @@ Material: - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DecalMeshBiasType: 0 + - _DecalMeshDepthBias: 0 + - _DecalMeshViewBias: 0 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DrawOrder: 0 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 diff --git a/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab b/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab index 803a2c14a..68d6ebbac 100644 --- a/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab +++ b/FairyTaleDefender/Assets/_Game/Prefabs/Targets/TargetIndicator.prefab @@ -9,9 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6014485345876166067} - - component: {fileID: 1984820504121016342} - - component: {fileID: 7883231429546155381} - - component: {fileID: 1224370384995479385} + - component: {fileID: 1177121223215039244} m_Layer: 0 m_Name: TargetIndicator m_TagString: Untagged @@ -28,81 +26,33 @@ Transform: m_GameObject: {fileID: 3949593316030231720} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!33 &1984820504121016342 -MeshFilter: +--- !u!114 &1177121223215039244 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3949593316030231720} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7883231429546155381 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3949593316030231720} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d67ac06f02370410eb993e8ae83ecc15, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &1224370384995479385 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3949593316030231720} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: d67ac06f02370410eb993e8ae83ecc15, type: 2} + m_DrawDistance: 1000 + m_FadeScale: 0.9 + m_StartAngleFade: 180 + m_EndAngleFade: 180 + m_UVScale: {x: 1, y: 1} + m_UVBias: {x: 0, y: 0} + m_DecalLayerMask: 1 + m_ScaleMode: 0 + m_Offset: {x: 0, y: 0, z: 0.5} + m_Size: {x: 1, y: 1, z: 1} + m_FadeFactor: 1 diff --git a/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph b/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph index 91d633f4a..af9ea26f1 100644 --- a/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph +++ b/FairyTaleDefender/Assets/_Game/Shaders/Ring_Shader.shadergraph @@ -39,21 +39,6 @@ { "m_Id": "1ddf486e48114975ba5d799ce07eb6c9" }, - { - "m_Id": "f468af6e91424f8c9f09e8d41bb57fbc" - }, - { - "m_Id": "d1b1887c756b45ae8973f9055dc0e212" - }, - { - "m_Id": "b78b90ff8a9241d4a207e4dd17806158" - }, - { - "m_Id": "5d9a097e3a804375b563fcd6aadbeb31" - }, - { - "m_Id": "f4b9bc1cab834a0798685dbf0e55dbb1" - }, { "m_Id": "afef10d503944741ab8bfb3f774ed678" }, @@ -97,7 +82,7 @@ "m_Id": "0fca7cbd2b2a4f3c963a513ca7501e61" }, { - "m_Id": "33937cde39904be7bc6d227757b6eb37" + "m_Id": "d6d917961dd14b68b58b17f1c0df1d6c" } ], "m_GroupDatas": [], @@ -336,7 +321,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "b78b90ff8a9241d4a207e4dd17806158" + "m_Id": "d6d917961dd14b68b58b17f1c0df1d6c" }, "m_SlotId": 0 } @@ -368,26 +353,11 @@ { "m_Id": "56c9b2e8eb99436a86c73cd7f66ca7e5" }, - { - "m_Id": "f468af6e91424f8c9f09e8d41bb57fbc" - }, - { - "m_Id": "d1b1887c756b45ae8973f9055dc0e212" - }, - { - "m_Id": "b78b90ff8a9241d4a207e4dd17806158" - }, - { - "m_Id": "5d9a097e3a804375b563fcd6aadbeb31" - }, - { - "m_Id": "f4b9bc1cab834a0798685dbf0e55dbb1" - }, { "m_Id": "0fca7cbd2b2a4f3c963a513ca7501e61" }, { - "m_Id": "33937cde39904be7bc6d227757b6eb37" + "m_Id": "d6d917961dd14b68b58b17f1c0df1d6c" } ] }, @@ -411,21 +381,6 @@ ] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "09f14d6d05cd407ea93e08fbeb250a7e", - "m_Id": 0, - "m_DisplayName": "Ambient Occlusion", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Occlusion", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -568,40 +523,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "33937cde39904be7bc6d227757b6eb37", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.AlphaClipThreshold", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "bb840af4867c4303a5c37dab6ca2dabb" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -689,21 +610,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "44f4ff05ca7646af9454c8c4fe917ed3", - "m_Id": 0, - "m_DisplayName": "Metallic", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Metallic", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -951,21 +857,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "55b7e8a9c4fa4637b9aab57def40c125", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Smoothness", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -1073,40 +964,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "5d9a097e3a804375b563fcd6aadbeb31", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Occlusion", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "09f14d6d05cd407ea93e08fbeb250a7e" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Occlusion" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1223,6 +1080,36 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "692e2324468d4f678ad5025fcac81b77", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1339,6 +1226,22 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalDecalSubTarget", + "m_ObjectId": "82a30f9922564340b3fcb31ed4665a68", + "m_DecalData": { + "affectsAlbedo": false, + "affectsNormalBlend": false, + "affectsNormal": false, + "affectsMAOS": false, + "affectsEmission": true, + "drawOrder": 0, + "supportLodCrossFade": false, + "angleFade": false + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -1610,16 +1513,6 @@ ] } -{ - "m_SGVersion": 2, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", - "m_ObjectId": "a6e6215e0320447f8888e0b04e713a9f", - "m_WorkflowMode": 1, - "m_NormalDropOffSpace": 0, - "m_ClearCoat": false, - "m_BlendModePreserveSpecular": true -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1796,40 +1689,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "b78b90ff8a9241d4a207e4dd17806158", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Emission", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "c19ff669e4ff45a28e6e6ddffbf102af" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Emission" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", @@ -1894,21 +1753,6 @@ "m_Space": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "bb840af4867c4303a5c37dab6ca2dabb", - "m_Id": 0, - "m_DisplayName": "Alpha Clip Threshold", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "AlphaClipThreshold", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2015,43 +1859,13 @@ "m_OutputChannel": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "c19ff669e4ff45a28e6e6ddffbf102af", - "m_Id": 0, - "m_DisplayName": "Emission", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Emission", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_ColorMode": 1, - "m_DefaultColor": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 1.0 - } -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", "m_ObjectId": "c52ba73fd4104ffb9b52845f3c20ba94", "m_Datas": [], "m_ActiveSubTarget": { - "m_Id": "a6e6215e0320447f8888e0b04e713a9f" + "m_Id": "82a30f9922564340b3fcb31ed4665a68" }, "m_AllowMaterialOverride": false, "m_SurfaceType": 1, @@ -2156,40 +1970,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "d1b1887c756b45ae8973f9055dc0e212", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.NormalTS", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "e69abb22a58a4d54a12d7e692dddeb7a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.NormalTS" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2229,6 +2009,40 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "d6d917961dd14b68b58b17f1c0df1d6c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "692e2324468d4f678ad5025fcac81b77" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -2369,64 +2183,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", - "m_ObjectId": "e69abb22a58a4d54a12d7e692dddeb7a", - "m_Id": 0, - "m_DisplayName": "Normal (Tangent Space)", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "NormalTS", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 3 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "f468af6e91424f8c9f09e8d41bb57fbc", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Smoothness", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "55b7e8a9c4fa4637b9aab57def40c125" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Smoothness" -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -2455,40 +2211,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "f4b9bc1cab834a0798685dbf0e55dbb1", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Metallic", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "44f4ff05ca7646af9454c8c4fe917ed3" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Metallic" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", From 8e8738d90eb6cf97d1817afc207e018c9310eb40 Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Sun, 21 Jan 2024 13:56:18 +0100 Subject: [PATCH 4/8] feat: enable decal layers so enemies are not receiving decals anymore #393 --- .../Assets/_Game/Prefabs/Characters/Animals/Wolf.prefab | 5 +++++ .../_Game/Settings/Rendering/URP-Balanced-Renderer.asset | 2 +- .../_Game/Settings/Rendering/URP-HighFidelity-Renderer.asset | 2 +- .../_Game/Settings/Rendering/URP-Performant-Renderer.asset | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/FairyTaleDefender/Assets/_Game/Prefabs/Characters/Animals/Wolf.prefab b/FairyTaleDefender/Assets/_Game/Prefabs/Characters/Animals/Wolf.prefab index fd9bdaf75..2ada6e5f1 100644 --- a/FairyTaleDefender/Assets/_Game/Prefabs/Characters/Animals/Wolf.prefab +++ b/FairyTaleDefender/Assets/_Game/Prefabs/Characters/Animals/Wolf.prefab @@ -146,6 +146,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -2144067065739796485, guid: 78456e604a8e5492dadde530f1a0ec19, + type: 3} + propertyPath: m_RenderingLayerMask + value: 2 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 78456e604a8e5492dadde530f1a0ec19, type: 3} propertyPath: m_Name diff --git a/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Balanced-Renderer.asset b/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Balanced-Renderer.asset index c1e43eddc..b692c8ebf 100644 --- a/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Balanced-Renderer.asset +++ b/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Balanced-Renderer.asset @@ -16,7 +16,7 @@ MonoBehaviour: m_Settings: technique: 2 maxDrawDistance: 1000 - decalLayers: 0 + decalLayers: 1 dBufferSettings: surfaceData: 2 screenSpaceSettings: diff --git a/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-HighFidelity-Renderer.asset b/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-HighFidelity-Renderer.asset index f55fc08b5..b7012bafb 100644 --- a/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-HighFidelity-Renderer.asset +++ b/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-HighFidelity-Renderer.asset @@ -16,7 +16,7 @@ MonoBehaviour: m_Settings: technique: 2 maxDrawDistance: 1000 - decalLayers: 0 + decalLayers: 1 dBufferSettings: surfaceData: 2 screenSpaceSettings: diff --git a/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Performant-Renderer.asset b/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Performant-Renderer.asset index 9d2ca31bc..b275cf794 100644 --- a/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Performant-Renderer.asset +++ b/FairyTaleDefender/Assets/_Game/Settings/Rendering/URP-Performant-Renderer.asset @@ -76,7 +76,7 @@ MonoBehaviour: m_Settings: technique: 2 maxDrawDistance: 1000 - decalLayers: 0 + decalLayers: 1 dBufferSettings: surfaceData: 2 screenSpaceSettings: From 42fd34dac7641091b2e93d2f00afaac27e01890c Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Sun, 21 Jan 2024 14:34:48 +0100 Subject: [PATCH 5/8] fix: re-add SelectedWeaponTargetVisualizer after rebasing #393 --- .../_Game/Scenes/Managers/Gameplay.unity | 56 ++++++++++++++++++- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity b/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity index 765047bcb..80d45a60a 100644 --- a/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity +++ b/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity @@ -1094,6 +1094,57 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &624011863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 624011865} + - component: {fileID: 624011864} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!114 &624011864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624011863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c95244ab2fb4ef3b69c4b1a5f5319ad, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 11400000, guid: 6bcda8772031e764ea22183523b7e9f7, + type: 2} + k__BackingField: {fileID: 11400000, guid: e80022fa2bdfeb845a9a735d96f15878, + type: 2} + k__BackingField: {fileID: 3949593316030231720, guid: d440931cb03454699880c2ec92f844d3, + type: 3} + k__BackingField: {x: 0, y: 0.001, z: 0} +--- !u!4 &624011865 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624011863} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &763099575 GameObject: m_ObjectHideFlags: 0 @@ -3701,7 +3752,7 @@ PrefabInstance: - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 190 objectReference: {fileID: 0} - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} @@ -4570,7 +4621,7 @@ PrefabInstance: - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 60 objectReference: {fileID: 0} - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} @@ -4718,6 +4769,7 @@ SceneRoots: - {fileID: 984792242} - {fileID: 777411585} - {fileID: 537284258} + - {fileID: 624011865} - {fileID: 1649223940} - {fileID: 1883199079} - {fileID: 763099576} From c8e6e78cbc66383d95115242f56fdaee654065be Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Sun, 21 Jan 2024 14:35:49 +0100 Subject: [PATCH 6/8] refactor: make some objects static #393 --- .../Assets/_Game/Prefabs/Enemies/LivingEnemyManager.prefab | 2 +- .../Assets/_Game/Prefabs/ObjectiveManager.prefab | 2 +- .../Assets/_Game/Scenes/Managers/Gameplay.unity | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FairyTaleDefender/Assets/_Game/Prefabs/Enemies/LivingEnemyManager.prefab b/FairyTaleDefender/Assets/_Game/Prefabs/Enemies/LivingEnemyManager.prefab index 5f64a5641..ff5c8e73e 100644 --- a/FairyTaleDefender/Assets/_Game/Prefabs/Enemies/LivingEnemyManager.prefab +++ b/FairyTaleDefender/Assets/_Game/Prefabs/Enemies/LivingEnemyManager.prefab @@ -15,7 +15,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &5407407745839056902 Transform: diff --git a/FairyTaleDefender/Assets/_Game/Prefabs/ObjectiveManager.prefab b/FairyTaleDefender/Assets/_Game/Prefabs/ObjectiveManager.prefab index 673cd4ec3..1104bc0e0 100644 --- a/FairyTaleDefender/Assets/_Game/Prefabs/ObjectiveManager.prefab +++ b/FairyTaleDefender/Assets/_Game/Prefabs/ObjectiveManager.prefab @@ -15,7 +15,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &982611642237741412 Transform: diff --git a/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity b/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity index 80d45a60a..32537da31 100644 --- a/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity +++ b/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity @@ -998,7 +998,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!114 &537284257 MonoBehaviour: @@ -1105,7 +1105,7 @@ GameObject: - component: {fileID: 624011865} - component: {fileID: 624011864} m_Layer: 0 - m_Name: GameObject + m_Name: SelectedWeaponTargetVisualizer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2419,7 +2419,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!114 &1593510015 MonoBehaviour: From 2626c235afc43513878c7d26cba4efe5b14d0a43 Mon Sep 17 00:00:00 2001 From: Manuel Rauber Date: Sun, 21 Jan 2024 14:36:30 +0100 Subject: [PATCH 7/8] refactor: remove unused Offset #393 --- .../Assets/_Game/Scenes/Managers/Gameplay.unity | 5 ++--- .../Weapons/Targeting/SelectedWeaponTargetVisualizer.cs | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity b/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity index 32537da31..160207c28 100644 --- a/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity +++ b/FairyTaleDefender/Assets/_Game/Scenes/Managers/Gameplay.unity @@ -1129,7 +1129,6 @@ MonoBehaviour: type: 2} k__BackingField: {fileID: 3949593316030231720, guid: d440931cb03454699880c2ec92f844d3, type: 3} - k__BackingField: {x: 0, y: 0.001, z: 0} --- !u!4 &624011865 Transform: m_ObjectHideFlags: 0 @@ -3752,7 +3751,7 @@ PrefabInstance: - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} propertyPath: m_AnchoredPosition.x - value: 190 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} @@ -4621,7 +4620,7 @@ PrefabInstance: - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} propertyPath: m_AnchoredPosition.x - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2829109754266862566, guid: 7051bfaff63334617b6ba6fcc9e7316f, type: 3} diff --git a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs index fc0d14b98..3bd276fed 100644 --- a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs +++ b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs @@ -19,9 +19,6 @@ public class SelectedWeaponTargetVisualizer : MonoBehaviour [field: SerializeField] private GameObject TargetVisualizationPrefab { get; set; } = default!; - [field: SerializeField] - private Vector3 Offset { get; set; } = new (0, 0.001f, 0); - private readonly List _visualizations = new(); private ICanTrackTarget? _currentTrackableTarget; @@ -100,7 +97,6 @@ private void AddVisualizations(TargetPoint targetPoint) var enemyTransform = targetPoint.Enemy.transform; var visualization = Instantiate(TargetVisualizationPrefab, enemyTransform); - visualization.transform.localPosition += Offset; _visualizations.Add(visualization); } } From 130c21a05efcd5368c15c08c5b2368457e43287d Mon Sep 17 00:00:00 2001 From: M4lph Date: Sun, 21 Jan 2024 17:32:47 +0100 Subject: [PATCH 8/8] refactor: (TargetVisualizer) rename trackableTarget -> targetTracker --- .../SelectedWeaponTargetVisualizer.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs index 3bd276fed..c8c998750 100644 --- a/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs +++ b/FairyTaleDefender/Assets/_Game/Scripts/Runtime/Entities/Weapons/Targeting/SelectedWeaponTargetVisualizer.cs @@ -20,7 +20,7 @@ public class SelectedWeaponTargetVisualizer : MonoBehaviour private GameObject TargetVisualizationPrefab { get; set; } = default!; private readonly List _visualizations = new(); - private ICanTrackTarget? _currentTrackableTarget; + private ICanTrackTarget? _currentTargetTracker; private void OnEnable() { @@ -40,20 +40,20 @@ private void TryToAttachToTrackableTarget(WeaponSelectedEventChannelSO.EventArgs // If we select one tower and then another tower, there won't be a deselected event, but only a selected one. RemoveVisualizations(); - var trackableTarget = args.Transform.GetComponentInChildren(); + var targetTracker = args.Transform.GetComponentInChildren(); - if (trackableTarget is null) + if (targetTracker is null) { return; } - _currentTrackableTarget = trackableTarget; - _currentTrackableTarget.TargetChanged += TargetChanged; + _currentTargetTracker = targetTracker; + _currentTargetTracker.TargetChanged += TargetChanged; - if (trackableTarget.Target.Exists()) + if (targetTracker.Target.Exists()) { - AddVisualizations(trackableTarget.Target); + AddVisualizations(targetTracker.Target); } } @@ -61,12 +61,12 @@ private void TryToDetachFromTrackableTarget() { RemoveVisualizations(); - if (_currentTrackableTarget != null) + if (_currentTargetTracker != null) { - _currentTrackableTarget.TargetChanged -= TargetChanged; + _currentTargetTracker.TargetChanged -= TargetChanged; } - _currentTrackableTarget = null; + _currentTargetTracker = null; } private void TargetChanged() @@ -74,9 +74,9 @@ private void TargetChanged() RemoveVisualizations(); // It could be that we're changing the target, but it was just destroyed. - if (_currentTrackableTarget != null && _currentTrackableTarget.Target.Exists()) + if (_currentTargetTracker != null && _currentTargetTracker.Target.Exists()) { - AddVisualizations(_currentTrackableTarget.Target); + AddVisualizations(_currentTargetTracker.Target); } }