修复perfab导出bug

layabox · Jul 4, 2023 · c800c36 · c800c36
1 parent d93f77c
commit c800c36
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 13 deletions.
diff --git a/Export/filter/PerfabFile.cs b/Export/filter/PerfabFile.cs
@@ -7,14 +7,11 @@ internal class PerfabFile :FileData
 {
     private static bool isPerfabAsset(GameObject gameObject)
     {
-        var isprefab = PrefabUtility.GetPrefabType(gameObject);//物体的PrefabType
-        if (isprefab != PrefabType.PrefabInstance)//不是Prefab实例
-            return false;
+        PrefabAssetType type = PrefabUtility.GetPrefabAssetType(gameObject);//物体的PrefabType
+        if (type == PrefabAssetType.Regular|| type == PrefabAssetType.Variant)//不是Prefab实例
+            return true;
 
-        var prefab = PrefabUtility.GetCorrespondingObjectFromSource(gameObject);
-        if (prefab == null)
-            return false;
-        return true;
+        return false;
     }
     /**
      *获得对象所在perfab资源的路径  

diff --git a/Export/resoure/NodeMap.cs b/Export/resoure/NodeMap.cs
@@ -130,7 +130,7 @@ private void createRootPartner(GameObject gameObject)
         }
     }
 
-    private List<string> getRefectIndex(GameObject gameObject)
+    private List<string> getRefectIndex(GameObject gameObject,bool contentRoot = false)
     {
         GameObject root = PerfabFile.getPrefabInstanceRoot(gameObject);
         List<OriderIndex> nodeList = new List<OriderIndex>();
@@ -141,6 +141,10 @@ private List<string> getRefectIndex(GameObject gameObject)
             foundObject = foundObject.transform.parent.gameObject;
         }
         List<string> outIndex = new List<string>();
+        if (contentRoot)
+        {
+            outIndex.Add(this.getGameObjectId(root));
+        }
         if (this.refMap.ContainsKey(root))
         {
             OriderIndex oriderIndex = new OriderIndex();
@@ -202,7 +206,20 @@ public string getGameObjectId(GameObject gameObject)
     public  JSONObject getRefNodeIdObjet(GameObject gameObject)
     {
         JSONObject data = new JSONObject(JSONObject.Type.OBJECT);
-        data.AddField("_$ref",this.getGameObjectId(gameObject));
+        if (this.nodeIdMaps.ContainsKey(gameObject)){
+            data.AddField("_$ref", this.getGameObjectId(gameObject));
+        }
+        else
+        {
+            List<string> outIndex = this.getRefectIndex(gameObject,true);
+            JSONObject overrideIndex = new JSONObject(JSONObject.Type.ARRAY);
+            foreach (var index in outIndex)
+            {
+                overrideIndex.Add(index);
+            }
+            data.AddField("_$ref", overrideIndex);
+        }
+
         return data;
     }
 
@@ -254,11 +271,11 @@ public JSONObject getJsonObject(GameObject gameObject)
     private JSONObject getOverrideObject(GameObject gameObject,GameObject root)
     {
         JSONObject childdata;
-        if (!this.overrideMaps.TryGetValue(gameObject, out childdata))
+        if (gameObject != root)
         {
-            childdata = new JSONObject(JSONObject.Type.OBJECT);
-            if(gameObject != root)
+            if (!this.overrideMaps.TryGetValue(gameObject, out childdata))
             {
+                childdata = new JSONObject(JSONObject.Type.OBJECT);
                 List<string> outIndex = this.getRefectIndex(gameObject);
                 JSONObject overrideIndex = new JSONObject(JSONObject.Type.ARRAY);
                 foreach (var index in outIndex)
@@ -270,6 +287,11 @@ private JSONObject getOverrideObject(GameObject gameObject,GameObject root)
                 this.addChildToPartner(childdata, this.getJsonObject(root));
             }
         }
+        else
+        {
+            childdata = this.getJsonObject(gameObject);
+        }
+
 
         return childdata;
     }
@@ -289,7 +311,12 @@ public void writeCompoent()
     {
         foreach (var node in this.nodeMaps)
         {
-            this._resoureMap.getComponentsData(node.Key, node.Value, this);
+            GameObject gameObject = node.Key;
+            if(gameObject != PerfabFile.getPerfabObject(gameObject))
+            {
+                this._resoureMap.getComponentsData(node.Key, node.Value, this);
+            }
+
         }
 
         foreach (var remap in this.refMap)