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

Compare commits

base: JiNan:962a009bd138d0bad39e6912cd8f8bfef2a61d98
Branches Tags
JiNan:NewMaster
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main
..
compare: JiNan:48530e8b47e0a26e20f6e5ed8829a5ea64abc1a5
Branches Tags
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:NewMaster
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main

No commits in common. "962a009bd138d0bad39e6912cd8f8bfef2a61d98" and "48530e8b47e0a26e20f6e5ed8829a5ea64abc1a5" have entirely different histories.
962a009bd1 ... 48530e8b47

2 changed files with 0 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

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

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

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