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

Compare commits

base: JiNan:489c23d9fbafcd8e71de5ef2d379b7f2e378042b
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:8fbecb31bce56f3fefbef38fe1356e40996c577b
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. "489c23d9fbafcd8e71de5ef2d379b7f2e378042b" and "8fbecb31bce56f3fefbef38fe1356e40996c577b" have entirely different histories.
489c23d9fb ... 8fbecb31bc

1 changed files with 6 additions and 21 deletions
Show Stats Expand all files Collapse all files

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

@ -64,7 +64,6 @@ public class TimeLineAction : IAction
{
play.Stop();
play.time = curEndFrame / 24;
play.Evaluate();
}
if (play.state != PlayState.Playing)
{
@ -110,31 +109,17 @@ public class TimeLineAction : IAction
{
curSpeed = 1;
}
if (!play.playableGraph.IsValid())
{
play.RebuildGraph();
}
play.playableGraph.GetRootPlayable(0).SetSpeed(curSpeed);
play.Play();
if (string.IsNullOrEmpty(endFrame) == false)
{
float.TryParse(endFrame, out curEndFrame);
}
if (!play.playableGraph.IsValid())
{
play.RebuildGraph();
}
if (curFrame == curEndFrame)
{
play.time = curEndFrame / 24;
play.Evaluate();
Finished();
}
else
{
play.playableGraph.GetRootPlayable(0).SetSpeed(curSpeed);
play.Play();
}
bool iswait = true;
bool.TryParse(isWait, out iswait);
if (iswait == false)