change GButton.pageOption->GButton.relatedPageId

Author: xiaoguzhu

Assets/Scripts/UI/Controller.cs

@@ -183,6 +183,17 @@ public string GetPageName(int index)
             return _pageNames[index];
         }
 
+        /// <summary>
+        /// Get page id by an index.
+        /// 通过页面索引获得页面id。
+        /// </summary>
+        /// <param name="index">Page index</param>
+        /// <returns>Page Id</returns>
+        public string GetPageId(int index)
+        {
+            return _pageIds[index];
+        }
+
         /// <summary>
         /// Get page id by name
         /// </summary>
@@ -298,11 +309,6 @@ internal string GetPageNameById(string aId)
                 return null;
         }
 
-        internal string GetPageId(int index)
-        {
-            return _pageIds[index];
-        }
-
         internal string selectedPageId
         {
             get

Assets/Scripts/UI/GButton.cs

@@ -8,11 +8,6 @@ namespace FairyGUI
     /// </summary>
     public class GButton : GComponent, IColorGear
     {
-        /// <summary>
-        /// The button will be in down status in these pages.
-        /// </summary>
-        public PageOption pageOption { get; private set; }
-
         /// <summary>
         /// Play sound when button is clicked.
         /// </summary>
@@ -38,6 +33,7 @@ public class GButton : GComponent, IColorGear
         protected GObject _titleObject;
         protected GObject _iconObject;
         protected Controller _relatedController;
+        protected string _relatedPageId;
 
         ButtonMode _mode;
         bool _selected;
@@ -64,8 +60,6 @@ public class GButton : GComponent, IColorGear
 
         public GButton()
         {
-            pageOption = new PageOption();
-
             sound = UIConfig.buttonSound;
             soundVolumeScale = UIConfig.buttonSoundVolumeScale;
             changeStateOnClick = true;
@@ -254,12 +248,12 @@ public bool selected
                     {
                         if (_selected)
                         {
-                            _relatedController.selectedPageId = pageOption.id;
+                            _relatedController.selectedPageId = _relatedPageId;
                             if (_relatedController.autoRadioGroupDepth)
                                 parent.AdjustRadioGroupDepth(this, _relatedController);
                         }
-                        else if (_mode == ButtonMode.Check && _relatedController.selectedPageId == pageOption.id)
-                            _relatedController.oppositePageId = pageOption.id;
+                        else if (_mode == ButtonMode.Check && _relatedController.selectedPageId == _relatedPageId)
+                            _relatedController.oppositePageId = _relatedPageId;
                     }
                 }
 
@@ -302,12 +296,26 @@ public Controller relatedController
                 if (value != _relatedController)
                 {
                     _relatedController = value;
-                    pageOption.controller = value;
-                    pageOption.Clear();
+                    _relatedPageId = null;
                 }
             }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public string relatedPageId
+        {
+            get
+            {
+                return _relatedPageId;
+            }
+            set
+            {
+                _relatedPageId = value;
+            }
+        }
+
         /// <summary>
         /// Simulates a click on this button.
         /// 模拟点击这个按钮。
@@ -429,7 +437,7 @@ override public void HandleControllerChanged(Controller c)
             base.HandleControllerChanged(c);
 
             if (_relatedController == c)
-                this.selected = pageOption.id == c.selectedPageId;
+                this.selected = _relatedPageId == c.selectedPageId;
         }
 
         override protected void HandleGrayedChanged()
@@ -520,7 +528,7 @@ override public void Setup_AfterAdd(ByteBuffer buffer, int beginPos)
             iv = buffer.ReadShort();
             if (iv >= 0)
                 _relatedController = parent.GetControllerAt(iv);
-            pageOption.id = buffer.ReadS();
+            _relatedPageId = buffer.ReadS();
 
             str = buffer.ReadS();
             if (str != null)
@@ -642,7 +650,7 @@ private void __click()
             else
             {
                 if (_relatedController != null)
-                    _relatedController.selectedPageId = pageOption.id;
+                    _relatedController.selectedPageId = _relatedPageId;
             }
         }
     }

Assets/Scripts/UI/PageOption.cs

@@ -151,7 +151,7 @@ public class UIConfig : MonoBehaviour
         public static float frameTimeForAsyncUIConstruction = 0.002f;
 
         /// <summary>
-        /// if RenderTexture using in paiting mode has depth support.
+        /// if RenderTexture using in painting mode has depth support.
         /// </summary>
         public static bool depthSupportForPaintingMode = false;
 

Assets/Scripts/UI/PageOption.cs.meta

@@ -356,7 +356,6 @@ public static UIPackage AddPackage(byte[] descData, string assetNamePrefix, Load
         /// Remove a package. All resources in this package will be disposed.
         /// </summary>
         /// <param name="packageIdOrName"></param>
-        /// <param name="allowDestroyingAssets"></param>
         public static void RemovePackage(string packageIdOrName)
         {
             UIPackage pkg = null;