Fix the bug that, branch not work for gcomponent.

Author: xiaoguzhu

Assets/Scripts/UI/AsyncCreationHelper.cs

@@ -36,7 +36,6 @@ static IEnumerator _CreateObject(PackageItem item, UIPackage.CreateObjectCallbac
                 if (di.packageItem != null)
                 {
                     obj = UIObjectFactory.NewObject(di.packageItem);
-                    obj.packageItem = di.packageItem;
                     objectPool.Add(obj);
 
                     UIPackage._constructing++;

Assets/Scripts/UI/GComponent.cs

@@ -1295,13 +1295,15 @@ internal void ConstructFromResource(List<GObject> objectPool, int poolIndex)
         {
             this.gameObjectName = packageItem.name;
 
-            if (!packageItem.translated)
+            PackageItem contentItem = packageItem.getBranch();
+
+            if (!contentItem.translated)
             {
-                packageItem.translated = true;
-                TranslationHelper.TranslateComponent(packageItem);
+                contentItem.translated = true;
+                TranslationHelper.TranslateComponent(contentItem);
             }
 
-            ByteBuffer buffer = packageItem.rawData;
+            ByteBuffer buffer = contentItem.rawData;
             buffer.Seek(0, 0);
 
             underConstruct = true;
@@ -1398,15 +1400,14 @@ internal void ConstructFromResource(List<GObject> objectPool, int poolIndex)
                         if (pkgId != null)
                             pkg = UIPackage.GetById(pkgId);
                         else
-                            pkg = packageItem.owner;
+                            pkg = contentItem.owner;
 
                         pi = pkg != null ? pkg.GetItem(src) : null;
                     }
 
                     if (pi != null)
                     {
                         child = UIObjectFactory.NewObject(pi);
-                        child.packageItem = pi;
                         child.ConstructFromResource();
                     }
                     else
@@ -1473,7 +1474,7 @@ internal void ConstructFromResource(List<GObject> objectPool, int poolIndex)
                 int i2 = buffer.ReadInt();
                 if (hitTestId != null)
                 {
-                    PackageItem pi = packageItem.owner.GetItem(hitTestId);
+                    PackageItem pi = contentItem.owner.GetItem(hitTestId);
                     if (pi != null && pi.pixelHitTestData != null)
                         rootContainer.hitArea = new PixelHitTest(pi.pixelHitTestData, i1, i2, sourceWidth, sourceHeight);
                 }
@@ -1512,7 +1513,7 @@ internal void ConstructFromResource(List<GObject> objectPool, int poolIndex)
             BuildNativeDisplayList();
             SetBoundsChangedFlag();
 
-            if (packageItem.objectType != ObjectType.Component)
+            if (contentItem.objectType != ObjectType.Component)
                 ConstructExtension(buffer);
 
             ConstructFromXML(null);

Assets/Scripts/UI/UIObjectFactory.cs

@@ -97,16 +97,33 @@ public static void Clear()
         /// 
         /// </summary>
         /// <param name="pi"></param>
+        /// <param name="userClass"></param>
         /// <returns></returns>
-        public static GObject NewObject(PackageItem pi)
+        public static GObject NewObject(PackageItem pi, System.Type userClass = null)
         {
-            if (pi.extensionCreator != null)
+            GObject obj;
+            if (pi.type == PackageItemType.Component)
             {
-                Stats.LatestObjectCreation++;
-                return pi.extensionCreator();
+                if (userClass != null)
+                {
+                    Stats.LatestObjectCreation++;
+                    obj = (GComponent)Activator.CreateInstance(userClass);
+                }
+                else if (pi.extensionCreator != null)
+                {
+                    Stats.LatestObjectCreation++;
+                    obj = pi.extensionCreator();
+                }
+                else
+                    obj = NewObject(pi.objectType);
             }
             else
-                return NewObject(pi.objectType);
+                obj = NewObject(pi.objectType);
+
+            if (obj != null)
+                obj.packageItem = pi;
+
+            return obj;
         }
 
         /// <summary>

Assets/Scripts/UI/UIPackage.cs

@@ -1081,24 +1081,14 @@ GObject CreateObject(PackageItem item, System.Type userClass)
 
             GetItemAsset(item);
 
-            GObject g = null;
-            if (item.type == PackageItemType.Component)
-            {
-                if (userClass != null)
-                    g = (GComponent)Activator.CreateInstance(userClass);
-                else
-                    g = UIObjectFactory.NewObject(item);
-            }
-            else
-                g = UIObjectFactory.NewObject(item);
-
+            GObject g = UIObjectFactory.NewObject(item, userClass);
             if (g == null)
                 return null;
 
             _constructing++;
-            g.packageItem = item;
             g.ConstructFromResource();
             _constructing--;
+
             return g;
         }