Merge branch 'master' of http://git.xwxgame.com/qianzhuqing/metaClient

Assets/GameMain/Scripts/UI/UICustom.cs

@@ -713,6 +713,7 @@ namespace MetaClient
             {
                 CreateColFun(parentid, _objPar,colItem);
             }
+            GridLayoutGroupChange(_objPar);
             DRCustomFace[] dRCustomBodies = _facedata.GetAllDataRows();
             for (int i = 0; i < dRCustomBodies.Length; i++)
             {
@@ -759,6 +760,7 @@ namespace MetaClient
                 CreateColFun(parentid, _objPar, colItem);
            
             }
+            GridLayoutGroupChange(_objPar);
             DRCustomBody[] dRCustomBodies = _bodydata.GetAllDataRows();
             for (int i = 0; i < dRCustomBodies.Length; i++)
             {
@@ -804,6 +806,7 @@ namespace MetaClient
             //    CreateColFun(parentid, _objPar, colItem);
 
             //}
+            GridLayoutGroupChange(_objPar);
             DRCustomBody[] dRCustomBodies = _bodydata.GetAllDataRows();
             for (int i = 0; i < dRCustomBodies.Length; i++)
             {
@@ -819,6 +822,7 @@ namespace MetaClient
         {
             GameObject _obj = GameObject.Instantiate(_clone);
             _obj.transform.SetParent(_objPar.transform);
+            _obj.transform.localScale = new Vector3(1, 1, 1);
             UICustomBtn _uICustomBtn = _obj.GetComponent<UICustomBtn>();
             ChangeUICustom(_uICustomBtn, parentid, eCustomStyple);
         }
@@ -826,6 +830,7 @@ namespace MetaClient
         {
             GameObject _obj = GameObject.Instantiate(_clone);
             _obj.transform.SetParent(_objPar.transform);
+            _obj.transform.localScale = new Vector3(1, 1, 1);
             UICustomBtn _uICustomBtn = _obj.GetComponent<UICustomBtn>();
             ChangeUICustom(_uICustomBtn, parentid, eCustomStyple);
             nowChooseColorObj = _obj;
@@ -878,10 +883,11 @@ namespace MetaClient
             {
                 CreateColFun(parentid, _objPar, colItem);
             }
+            GridLayoutGroupChange(_objPar);
             DRCustomBody[] dRCustomBodies = _bodydata.GetAllDataRows();
             for (int i = 0; i < dRCustomBodies.Length; i++)
             {
-                Debug.Log(dRCustomBodies[i].Id);
+                //Debug.Log(dRCustomBodies[i].Id);
                 if (dRCustomBodies[i].ParentStyple == parentid && dRCustomBodies[i].Cengji == cengji)
                 {
                     CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body, dRCustomBodies[i].IsActive);
@@ -889,7 +895,18 @@ namespace MetaClient
             }
              ChangeListBotton(_objPar);
         }
-
+        private void GridLayoutGroupChange(GameObject _objPar)
+        {
+          
+            GridLayoutGroup gridLayoutGroup = _objPar.GetComponent<GridLayoutGroup>();
+            RectTransform _objParRect = _objPar.GetComponent<RectTransform>();
+            LayoutRebuilder.ForceRebuildLayoutImmediate(_objParRect);
+            //float _x = _objParRect.rect.width;
+            //gridLayoutGroup.cellSize = new Vector2(_x, _x / 100 * 144);
+            gridLayoutGroup.spacing = new Vector2(0, 0);
+            Debug.Log(gridLayoutGroup.spacing.y);
+            LayoutRebuilder.ForceRebuildLayoutImmediate(_objParRect);
+        }
 
         /// <summary>
         /// 改变列表长短
@@ -991,13 +1008,21 @@ namespace MetaClient
                     Image _objImg = _obj.transform.GetComponent<Image>();
                     _obj.SetActive(true);
                     _objImg.sprite = sprite;
+                    //_objImg.SetNativeSize();
+         
                     _obj.name = _name+"";
                     _obj.transform.SetParent(_parent.transform);
+                    _obj.transform.localScale = new Vector3(1, 1, 1);
                     if (_isactive != 1)
                     {
                         _obj.SetActive(false);
                     }
-
+                    //RectTransform rect = _parent.GetComponent<RectTransform>();
+                    //LayoutRebuilder.ForceRebuildLayoutImmediate(rect);
+                    //Vector3 vecScale = rect.localScale;
+                    //float width = rect.rect.width;
+                    //float height = rect.rect.height;
+                    //LayoutRebuilder.ForceRebuildLayoutImmediate(rect);
                     UICustomBtn uICustomBtn = _obj.GetComponent<UICustomBtn>();
                     uICustomBtn.id = _id;
                     uICustomBtn.eButtonStyple = (EButtonStyple)buttonstyple;

Assets/GameMain/UI/UIForms/CustomRole.prefab

@@ -992,7 +992,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 51.5, y: 1.5999985}
+  m_AnchoredPosition: {x: 51.5, y: 1.6000061}
   m_SizeDelta: {x: 96, y: 4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &327028029
@@ -4365,9 +4365,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 297.94006, y: -16.099976}
+  m_AnchoredPosition: {x: 297.94006, y: 56.400024}
   m_SizeDelta: {x: 101, y: 145}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1663957054
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -5258,9 +5258,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 297.94006, y: -16.099976}
+  m_AnchoredPosition: {x: 297.94006, y: 56.400024}
   m_SizeDelta: {x: 100, y: 145}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1941601958
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -6284,7 +6284,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3401525469733486441
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10930,10 +10930,10 @@ RectTransform:
   m_Father: {fileID: 1331787699}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 359, y: 0}
-  m_SizeDelta: {x: 154.12, y: 1334}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 154.12, y: 0}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &8602108025138452691
 GameObject:
@@ -11397,7 +11397,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -76, y: -120}
+  m_AnchoredPosition: {x: -76, y: -76}
   m_SizeDelta: {x: 76, y: 77}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4489252167837075736