浏览代码

Merge branch 'master' of http://10.108.64.190:3000/gfg/client

zhaoyang 2 年之前
父节点
当前提交
0eb0bcf671

+ 5 - 1
GameClient/Assets/ThirdParty/Live2D/Cubism/Framework/MotionFade/CubismFadeStateObserver.cs

@@ -149,7 +149,7 @@ namespace Live2D.Cubism.Framework.MotionFade
 
             var animatorClipInfo = controller.GetNextAnimatorClipInfo(layerIndex);
 
-            _isDefaulState = (animatorClipInfo.Length == 0);
+            _isDefaulState = (animatorClipInfo == null || animatorClipInfo.Length == 0);
 
             if (_isDefaulState)
             {
@@ -220,6 +220,10 @@ namespace Live2D.Cubism.Framework.MotionFade
                 playingMotion.Speed = 1.0f;
                 playingMotion.StartTime = Time.time;
                 playingMotion.FadeInStartTime = Time.time;
+                if(playingMotion.Motion == null)
+                {
+                    continue;
+                }
                 playingMotion.EndTime = (playingMotion.Motion.MotionLength <= 0)
                                         ? -1
                                         : playingMotion.StartTime + playingMotion.Motion.MotionLength;