JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into LouDi_Quan

Browse Source
This commit is contained in:
shenjianxing 2025-02-27 15:48:54 +08:00
commit 962a009bd1
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Scripts/Actions/TimeLineAction.cs
View File

@ -22,6 +22,7 @@ public class TimeLineAction : IAction
string frame;
string endFrame;
float curEndFrame = -1;
string speed = "1";
GameObject obj = null;
PlayableDirector play = null;
float fps = 24;
@ -38,6 +39,7 @@ public class TimeLineAction : IAction
retNode.isWait = datas.ContainsKey("isWait") ? datas["isWait"] : "true";
retNode.frame = datas.ContainsKey("frame") ? datas["frame"] : string.Empty;
retNode.endFrame = datas.ContainsKey("endFrame") ? datas["endFrame"] : string.Empty;
retNode.speed = datas.ContainsKey("speed") ? datas["speed"] : string.Empty;
retNode.curEndFrame = -1;
retNode.play = null;
return retNode;
@ -102,6 +104,12 @@ public class TimeLineAction : IAction
float.TryParse(frame, out curFrame);
}
play.time = curFrame / fps;
float curSpeed = 1;
if (float.TryParse(speed, out curSpeed) == false)
{
curSpeed = 1;
}
play.playableGraph.GetRootPlayable(0).SetSpeed(curSpeed);
play.Play();
if (string.IsNullOrEmpty(endFrame) == false)

5
Assets/Scripts/Xml/XmlParser.cs
View File

@ -1230,6 +1230,11 @@ namespace XMLTool
{
act.args.Add("endFrame", endFrame.Value);
}
XAttribute speed = action.Attribute("speed");
if (speed != null)
{
act.args.Add("speed", speed.Value);
}
newAction = act;
}
break;