diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs index 17c96bef..fe72080c 100644 --- a/Assets/Scripts/Actions/ActionHelper.cs +++ b/Assets/Scripts/Actions/ActionHelper.cs @@ -156,6 +156,11 @@ public class ActionHelper var strAction = (XMLTool.StringListAction)act; return VideoAction.Allocate(act.Value, strAction.args[0], strAction.args[1], strAction.args[2], strAction.args[3]); } + case "HighLight": + { + var strAction = (XMLTool.StringListAction)act; + return HighLightAction.Allocate(act.Value, strAction.args[0], strAction.args[1]); + } } break; case XMLTool.Condition condition: diff --git a/Assets/Scripts/Actions/HighLightAction.cs b/Assets/Scripts/Actions/HighLightAction.cs new file mode 100644 index 00000000..94ae7fdd --- /dev/null +++ b/Assets/Scripts/Actions/HighLightAction.cs @@ -0,0 +1,102 @@ +using HighlightPlus; +using System; +using Unity.VisualScripting; +using UnityEditor; +using UnityEngine; + +namespace QFramework +{ + internal class HighLightAction : IAction + { + + + public System.Action OnFinished { get; set; } + + + private HighLightAction() + { + } + + private static readonly SimpleObjectPool mPool = + new SimpleObjectPool(() => new HighLightAction(), null, 10); + + string path; + Color color = Color.green; + bool isHigh = true; + public static HighLightAction Allocate(string path, string isHigh, string color, System.Action OnFinished = null) + { + var retNode = mPool.Allocate(); + retNode.ActionID = ActionKit.ID_GENERATOR++; + retNode.Deinited = false; + retNode.Reset(); + retNode.path = path; + if (string.IsNullOrEmpty(color) == false) + { + retNode.color = Utility.ToColor(color); + } + bool.TryParse(isHigh, out retNode.isHigh); + retNode.OnFinished = OnFinished; + return retNode; + } + + + public ulong ActionID { get; set; } + public ActionStatus Status { get; set; } + + public void OnStart() + { + GameObject obj = Utility.FindObj(path); + if (obj != null) + { + if (isHigh) + { + var effect = obj.GetOrAddComponent(); + obj.GetOrAddComponent(); + effect.outlineColor = color; + effect.highlighted = true; + } + else + { + var effect = obj.GetComponent(); + if (effect) + { + effect.highlighted = false; + } + } + + } + } + + public void OnExecute(float dt) + { + this.Finish(); + OnFinished?.Invoke(); + } + + public void OnFinish() + { + } + + public void Reset() + { + Status = ActionStatus.NotStart; + Paused = false; + } + + public bool Paused { get; set; } + + public void Deinit() + { + if (!Deinited) + { + OnFinished = null; + Deinited = true; + mPool.Recycle(this); + } + } + + public bool Deinited { get; set; } + } + + +} \ No newline at end of file diff --git a/Assets/Scripts/Actions/HighLightAction.cs.meta b/Assets/Scripts/Actions/HighLightAction.cs.meta new file mode 100644 index 00000000..ab798898 --- /dev/null +++ b/Assets/Scripts/Actions/HighLightAction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 491e5e519156b5e4f9591a0221d5b824 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Xml/XmlParser.cs b/Assets/Scripts/Xml/XmlParser.cs index eb047213..fa521ddf 100644 --- a/Assets/Scripts/Xml/XmlParser.cs +++ b/Assets/Scripts/Xml/XmlParser.cs @@ -633,6 +633,30 @@ namespace XMLTool newAction = act; } break; + case "HighLight": + { + var act = new StringListAction(); + XAttribute isHigh = action.Attribute("isHigh"); + if (isHigh != null) + { + act.args.Add(isHigh.Value); + } + else + { + act.args.Add("true"); + } + XAttribute color = action.Attribute("color"); + if (color != null) + { + act.args.Add(color.Value); + } + else + { + act.args.Add(""); + } + newAction = act; + } + break; default: newAction = new Action(); break; diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml index 911bd881..5e6e2834 100644 --- a/Doc/Xml配置文档.xml +++ b/Doc/Xml配置文档.xml @@ -49,7 +49,10 @@ - + + + +