diff --git a/Assets/Scripts/Framework/ScriptableObject.cs b/Assets/Scripts/Framework/ScriptableObject.cs index f6d1f62..e8459a1 100644 --- a/Assets/Scripts/Framework/ScriptableObject.cs +++ b/Assets/Scripts/Framework/ScriptableObject.cs @@ -527,8 +527,6 @@ namespace Demo /// /// 将无初始化创建的脚本对象确认完全加载并设置为最后添加的脚本对象 /// - /// - /// /// [Convention.RScript.Variable.Attr.Method] public ScriptableObject ApplyLoad() diff --git a/Assets/Scripts/MoreSpline/BasicSplineRenderer.cs b/Assets/Scripts/MoreSpline/BasicSplineRenderer.cs index f0390fd..6d164fa 100644 --- a/Assets/Scripts/MoreSpline/BasicSplineRenderer.cs +++ b/Assets/Scripts/MoreSpline/BasicSplineRenderer.cs @@ -73,9 +73,9 @@ namespace Demo.Game /// /// 可取值为30种缓动曲线 [Convention.RScript.Variable.Attr.Method] - public void Add(string time, string from, string to, string curveType) + public void Add(string time, float from, float to, string curveType) { - ManualAddEntry(time, new(float.Parse(from), float.Parse(to)), Enum.Parse(curveType)); + ManualAddEntry(time, new(from, to), Enum.Parse(curveType)); } [Convention.RScript.Variable.Attr.Method] @@ -85,6 +85,12 @@ namespace Demo.Game } + [Convention.RScript.Variable.Attr.Method] + public void LoadSpline(SplineCore spline) + { + this.MySplineCore = spline; + } + /// /// 加载对应ab包并加载指定材质 /// diff --git a/Assets/Scripts/MoreSpline/SplineCore.cs b/Assets/Scripts/MoreSpline/SplineCore.cs index 5a61570..3f1bd20 100644 --- a/Assets/Scripts/MoreSpline/SplineCore.cs +++ b/Assets/Scripts/MoreSpline/SplineCore.cs @@ -145,7 +145,7 @@ namespace Demo.Game { if (node is SplineNode _node) { - MySplineNodes.Add(_node ); + MySplineNodes.Add(_node); } else { @@ -154,6 +154,15 @@ namespace Demo.Game }); } + /// + /// 加入节点脚本对象 + /// + [Convention.RScript.Variable.Attr.Method] + public void AddNode(ScriptableObject node) + { + MySplineNodes.Add(node.GetOrAddComponent()); + } + /// /// 加入已加载的节点,如果目标脚本不是SplineNode, /// 那么为其添加SplineNode组件 @@ -165,7 +174,7 @@ namespace Demo.Game var node = FindWithPath(path); if (node != null) { - MySplineNodes.Add(node.GetOrAddComponent()); + AddNode(node); } } }