From 6181a7d50c6b900f45608c1755a2c8dd18d6faca Mon Sep 17 00:00:00 2001 From: henriquenakashima Date: Sat, 26 Sep 2020 22:23:52 -0400 Subject: [PATCH] Use glow effect to target --- Assets/Battle/BattleParticipantSprite.cs | 6 +- Assets/Battle/BattleScene.unity | 81 +++++++++++++++++++ Assets/Battle/Graphics/HitEffectMaterial.mat | 4 +- .../Resources/MonsterImages/BatSprite.prefab | 2 +- .../MonsterImages/GolemSprite.prefab | 2 +- 5 files changed, 87 insertions(+), 8 deletions(-) diff --git a/Assets/Battle/BattleParticipantSprite.cs b/Assets/Battle/BattleParticipantSprite.cs index 66ae56d..7b5220d 100644 --- a/Assets/Battle/BattleParticipantSprite.cs +++ b/Assets/Battle/BattleParticipantSprite.cs @@ -42,14 +42,12 @@ public class BattleParticipantSprite : MonoBehaviour } } - private Color savedColor; private bool colorChanged; void OnMouseEnter() { if (!this.removedFromBattle && this.playerControls.CouldTarget(participant)) { SpriteRenderer sprite = GetComponent(); - this.savedColor = sprite.color; - sprite.color = Color.Lerp(this.savedColor, Color.white, .5f); + sprite.material.SetFloat("_Glow", 1f); this.colorChanged = true; } } @@ -57,7 +55,7 @@ public class BattleParticipantSprite : MonoBehaviour void OnMouseExit() { if (this.colorChanged) { SpriteRenderer sprite = GetComponent(); - sprite.color = this.savedColor; + sprite.material.SetFloat("_Glow", 0f); this.colorChanged = false; } } diff --git a/Assets/Battle/BattleScene.unity b/Assets/Battle/BattleScene.unity index ff84679..ee5fc70 100644 --- a/Assets/Battle/BattleScene.unity +++ b/Assets/Battle/BattleScene.unity @@ -537,6 +537,87 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 527589753} m_CullTransparentMesh: 0 +--- !u!1 &810366537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 810366539} + - component: {fileID: 810366538} + m_Layer: 0 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &810366538 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810366537} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 765b2e275927a4443a27e0deb8b15900, type: 3} + m_Color: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.8, y: 7.2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &810366539 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 810366537} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0042, y: -0.0075, z: 10} + m_LocalScale: {x: 1.3900115, y: 1.3913027, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1189144791 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Battle/Graphics/HitEffectMaterial.mat b/Assets/Battle/Graphics/HitEffectMaterial.mat index e42347b..bc5d606 100644 --- a/Assets/Battle/Graphics/HitEffectMaterial.mat +++ b/Assets/Battle/Graphics/HitEffectMaterial.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: HitEffectMaterial m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} - m_ShaderKeywords: ETC1_EXTERNAL_ALPHA HITEFFECT_ON + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA GLOW_ON HITEFFECT_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -132,7 +132,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _Glow: 10 + - _Glow: 0 - _GlowTexUsed: 0 - _GradBlend: 1 - _GrassManualAnim: 1 diff --git a/Assets/Resources/MonsterImages/BatSprite.prefab b/Assets/Resources/MonsterImages/BatSprite.prefab index 9a5e71f..aa10337 100644 --- a/Assets/Resources/MonsterImages/BatSprite.prefab +++ b/Assets/Resources/MonsterImages/BatSprite.prefab @@ -71,7 +71,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: b52da05eea8e9134fb86dce80d39d9a6, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.5471698, g: 0.19390796, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/Resources/MonsterImages/GolemSprite.prefab b/Assets/Resources/MonsterImages/GolemSprite.prefab index fe2bdd3..6655e4b 100644 --- a/Assets/Resources/MonsterImages/GolemSprite.prefab +++ b/Assets/Resources/MonsterImages/GolemSprite.prefab @@ -71,7 +71,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 4ecc0aa99746257449080b80a78f91ba, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.14070842, g: 0.14671429, b: 0.5849056, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0