fixed the bug of animation Data

Author: jsjgameer

Editor/Export/utils/AnimationCurveGroup.cs

@@ -277,7 +277,7 @@ public AnimationCurveGroup(string path, GameObject gameObject, Type type, string
         this._conpomentType = conpomentType;
         this._propnames = new List<string>();
         this._type = type;
-        this._propertyName = propertyName;
+        this._propertyName = propertyName.Split(".")[0];
         this._timeLists = new Dictionary<uint, float>();
         this.datas = new Dictionary<float, FrameData>();
     }
@@ -307,18 +307,19 @@ public KeyFrameValueType keyType
 
     public bool pushCurve(AnimationClipCurveData curveData)
     {
-        if (this._path != AnimationCurveGroup.getCurvePath(curveData))
+        if (this._path != curveData.path)
         {
             return false;
         }
+        string[] propertyNames = curveData.propertyName.Split('.');
+        if (propertyNames[0] != this._propertyName) return false;
         string endKey = null;
         if (this._keyType == KeyFrameValueType.Float)
         {
             endKey = "x";
         }
         else
         {
-            string[] propertyNames = curveData.propertyName.Split('.');
             endKey = propertyNames[propertyNames.Length - 1];
         }
 
@@ -431,7 +432,7 @@ public void getAnimaFameData(ref AniNodeData aniNodeData, ref Dictionary<uint, F
         }
         aniNodeData.type = (Byte)this._keyType;
         List<UInt16> pathIndex = new List<UInt16>();
-        String nodePath = this._path.Split('.')[0];
+        String nodePath = this._path;
         string[] strArr = nodePath.Split('/');
         for (int m = 0; m < strArr.Length; m++)
         {

Editor/Export/utils/GameObjectUitls.cs

@@ -69,7 +69,8 @@ public static bool isCameraOrLight(GameObject gameObject)
         if (gameObject.GetComponent<Camera>() != null)
         {
             return true;
-        }else if (gameObject.GetComponent<Light>() != null)
+        }
+        else if (gameObject.GetComponent<Light>() != null)
         {
             return true;
         }
@@ -78,7 +79,7 @@ public static bool isCameraOrLight(GameObject gameObject)
             return false;
         }
     }
-   
+
 
     private const byte k_MaxByteForOverexposedColor = 191;
     public static void DecomposeHdrColor(Color linearColorHdr, out Color baseLinearColor, out float exposure)
@@ -120,27 +121,27 @@ public static string cleanIllegalChar(string str, bool heightLevel)
         }
         return str;
     }
-
-    private static AnimationCurveGroup readTransfromAnimation(EditorCurveBinding binding, GameObject gameObject, object targetObject, string path)
+    private static AnimationCurveGroup readTransfromAnimation(EditorCurveBinding binding, GameObject gameObject, object targetObject, string path, string propertyName)
     {
         KeyFrameValueType keyType;
-        string propNames = binding.propertyName.Split('.')[0];
-        if (propNames == "m_LocalPosition")
+        string propNames = "";
+        string property = propertyName.Split(".")[0];
+        if (property == "m_LocalPosition")
         {
             propNames = "localPosition";
             keyType = KeyFrameValueType.Position;
         }
-        else if (propNames == "m_LocalRotation")
+        else if (property == "m_LocalRotation")
         {
             propNames = "localRotation";
             keyType = KeyFrameValueType.Rotation;
         }
-        else if (propNames == "m_LocalScale")
+        else if (property == "m_LocalScale")
         {
             propNames = "localScale";
             keyType = KeyFrameValueType.Scale;
         }
-        else if (propNames == "localEulerAnglesRaw")
+        else if (property == "localEulerAnglesRaw")
         {
             propNames = "localRotationEuler";
             keyType = KeyFrameValueType.RotationEuler;
@@ -150,13 +151,11 @@ private static AnimationCurveGroup readTransfromAnimation(EditorCurveBinding bin
             return null;
         }
         string conpomentType = searchCompoment[binding.type.ToString()];
-        string propertyName = binding.propertyName;
-        propertyName = propertyName.Substring(0, propertyName.LastIndexOf("."));
         AnimationCurveGroup curveGroup = new AnimationCurveGroup(path, gameObject, binding.type, conpomentType, propertyName, keyType);
         curveGroup.propnames.Add(propNames);
         return curveGroup;
     }
-    private static AnimationCurveGroup readMaterAnimation(EditorCurveBinding binding, GameObject gameObject, object targetObject, string path)
+    private static AnimationCurveGroup readMaterAnimation(EditorCurveBinding binding, GameObject gameObject, object targetObject, string path, string propertyName)
     {
         PropertyInfo info = targetObject.GetType().GetProperty("material");
         Material material = (Material)info.GetValue(targetObject);
@@ -166,7 +165,7 @@ private static AnimationCurveGroup readMaterAnimation(EditorCurveBinding binding
         {
             return null;
         }
-        string propNames = binding.propertyName.Split('.')[1];
+        string propNames = binding.propertyName;
         KeyFrameValueType keyType;
         if (propsData.floatLists.ContainsKey(propNames))
         {
@@ -188,15 +187,12 @@ private static AnimationCurveGroup readMaterAnimation(EditorCurveBinding binding
             return null;
         }
         string conpomentType = searchCompoment[binding.type.ToString()];
-        string propertyName = binding.propertyName;
-        propertyName = propertyName.Substring(0, propertyName.LastIndexOf("."));
         AnimationCurveGroup curveGroup = new AnimationCurveGroup(path, gameObject, binding.type, conpomentType, propertyName, keyType);
         curveGroup.propnames.Add("sharedMaterials");
         curveGroup.propnames.Add("0");
         curveGroup.propnames.Add(propNames);
         return curveGroup;
     }
-
     public static void writeClip(AnimationClip aniclip, FileStream fs, GameObject gameObject, string clipName)
     {
 
@@ -259,15 +255,15 @@ public static void writeClip(AnimationClip aniclip, FileStream fs, GameObject ga
                 EditorCurveBinding binding = editorCurveBindings[j];
                 if (binding.type == typeof(Transform))
                 {
-                    curveGroup = readTransfromAnimation(binding, child, targetObject, path);
+                    curveGroup = readTransfromAnimation(binding, child, targetObject, curveData.path, curveData.propertyName);
                 }
                 else if (binding.type == typeof(RectTransform))
                 {
-                    curveGroup = readTransfromAnimation(binding, child, targetObject, path);
+                    curveGroup = readTransfromAnimation(binding, child, targetObject, curveData.path, curveData.propertyName);
                 }
                 else if (typeof(Renderer).IsAssignableFrom(binding.type))
                 {
-                    curveGroup = readMaterAnimation(binding, child, targetObject, path);
+                    curveGroup = readMaterAnimation(binding, child, targetObject, curveData.path, curveData.propertyName);
                 }
                 if (curveGroup != null)
                 {
@@ -361,21 +357,21 @@ public static void writeClip(AnimationClip aniclip, FileStream fs, GameObject ga
         for (int j = 0; j < startTimeList.Count; j++)
         {
             Util.FileUtil.WriteData(fs, (float)startTimeList[j]);
-        } 
+        }
 
         Util.FileUtil.WriteData(fs, (UInt16)stringDatas.IndexOf(clipName));//动画名字符索引
 
         float aniTotalTime = startTimeList.Count == 0 ? 0.0f : (float)startTimeList[startTimeList.Count - 1];
         Util.FileUtil.WriteData(fs, aniTotalTime);///动画总时长
-        if(aniclip.wrapMode == WrapMode.Loop)
+        if (aniclip.wrapMode == WrapMode.Loop)
         {
             Util.FileUtil.WriteData(fs, true);
         }
         else
         {
             Util.FileUtil.WriteData(fs, aniclip.isLooping);//动画是否循环
         }
-       
+
 
         Util.FileUtil.WriteData(fs, (UInt16)clipFrameRate);//frameRate