add CustomButton

Assets/GameMain/DataTables/CustomBody.txt

@@ -2,7 +2,7 @@
 #	Id	Name	Cengji	ParentStyple	IsActive	Icon	ButtonStyple	IsSendContent	SendContent	Receive	Part	IsKeepChildrenScale	IsMirror	ScaleRangeMin	ScaleRangeMax	ModifyType
 #	int	string	int	int	int	string	int	int	int	int	int	bool	bool	float	float	int
 #	id	名称	层级	对应的图片类别	是否显示	图片Icon	按钮类型	是否传输内容	传输对应类型	接收到的对应数据	对应身体部位	是否保持子物体缩放	是否左右一样	缩放最小值	缩放最大值	缩放类型
-	1	身高	1	1	1	height	0	0	0	0	6	TRUE	TRUE	0	1	0
+	1	身高	1	1	1	height	1	0	0	0	6	TRUE	TRUE	0	1	0
 	2	全身缩放	1	1	1	bodysize	1	0	0	0	6	TRUE	TRUE	4	5	3
 	3	头身比	1	1	1	headbody	1	0	0	0	19	TRUE	TRUE	5	6	3
 	4	皮肤	1	1	1	skin	1	0	0	0	6	TRUE	TRUE	6	7	0

Assets/GameMain/Scripts/DataTable/DRCustomBody.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成，请勿直接修改。
-// 生成时间：2022-01-20 15:19:53.166
+// 生成时间：2022-01-20 17:12:25.100
 //------------------------------------------------------------
 
 using GameFramework;

Assets/GameMain/Scripts/UI/UICustom.cs

@@ -33,7 +33,8 @@ namespace MetaClient
         [Header("身体界面")]
         public GameObject bodyView;
 
-
+        [Header("自定义")]
+        public GameObject ziDingYiBtn;
         [Header("衣服界面")]
         public GameObject clothView;
 
@@ -45,14 +46,17 @@ namespace MetaClient
 
         //[Header("点击后生成的按钮列表")]
         //public GameObject buttonList;
-
+        [Header("白底背景")]
+        public GameObject whitebg;
         [Header("按钮预制体")]
         public GameObject buttonItem;
 
         [Header("滑块")]
         public Scrollbar scrollbar;
 
-
+       // [Header("顺序")]
+        private EButtonShunXu eButtonShunXu = EButtonShunXu.None;
+        
         [Header("颜色演示预制体")]
         public GameObject colItem;
 
@@ -66,7 +70,7 @@ namespace MetaClient
         private float tween_saveBtnMax = 119;
         private float tween_saveBtnMin = -108;
 
-
+       
         //private float tweenTime = 10;
         //private float tweenLeastTime = 0;
 
@@ -100,7 +104,7 @@ namespace MetaClient
         }
 
 
-        public void ClickBotton(ECustomStyple eCustomStyple,int id)
+        public void ClickBotton(ECustomStyple eCustomStyple,int id,bool ziDingYi)
         {
             if (isTween)
             {
@@ -108,7 +112,9 @@ namespace MetaClient
             }
             isTween = true;
             leftView.transform.DOLocalMoveX(tween_leftMin, 2f).SetEase(Ease.InOutBack).OnComplete(()=> {
-                 ClickBtnFun(eCustomStyple,id);
+                //whitebg.SetActive(bg);
+               
+                 ClickBtnFun(eCustomStyple,id,ziDingYi);
                 leftView.transform.DOLocalMoveX(0, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
                     isTween = false;
                     Debug.Log("222");
@@ -150,17 +156,17 @@ namespace MetaClient
         /// <summary>
         /// 按钮点击事件
         /// </summary>
-        public void ClickBtnFun(ECustomStyple eCustomStyple,int id) {
+        public void ClickBtnFun(ECustomStyple eCustomStyple,int id,bool zidingyi) {
             //if (isTween)
             //{
             //    return;
             //}
+            whitebg.SetActive(true);
+ 
 
 
-
-
-
-        //ECustomStyple _eCustomStyple = (ECustomStyple)int.Parse(_objects[0].ToString());
+         
+            //ECustomStyple _eCustomStyple = (ECustomStyple)int.Parse(_objects[0].ToString());
             switch (eCustomStyple)
             {
                 case ECustomStyple.None:
@@ -170,21 +176,36 @@ namespace MetaClient
                     _nieLianList.SetActive(false);
                     GameObject _nieLianXX = nieLianView.transform.GetChild(2).gameObject;
                     _nieLianXX.SetActive(true);
-                    CreateBodyImg(id);
+                    if (!zidingyi)
+                    {
+                        ZiDingYiNeiLian(eCustomStyple, id, _nieLianXX.transform.GetChild(0).gameObject);
+                        return;
+                    }
+                    CreateNieLianImg(id);
                     break;
                 case ECustomStyple.Body:
                     GameObject _bodyList = bodyView.transform.GetChild(0).gameObject;
                     _bodyList.SetActive(false);
                     GameObject _bodyListXX =bodyView.transform.GetChild(2).gameObject;
                     _bodyListXX.SetActive(true);
-                     CreateBodyImg(id);
+                    if (!zidingyi)
+                    {
+                        ZiDingYiBody(eCustomStyple, id, _bodyListXX.transform.GetChild(0).gameObject);
+                        return;
+                    }
+                    CreateBodyImg(id);
                     break;
                 case ECustomStyple.Cloth:
                     GameObject _clothList = clothView.transform.GetChild(0).gameObject;
                     _clothList.SetActive(false);
                     GameObject _clothListXX = clothView.transform.GetChild(2).gameObject;
                     _clothListXX.SetActive(true);
-                    CreateBodyImg(id);
+                    if (!zidingyi)
+                    {
+                        ZiDingYiCloth(eCustomStyple, id, _clothListXX.transform.GetChild(0).gameObject);
+                        return;
+                    }
+                    CreateClothImg(id);
                     break;
             }
         }
@@ -203,8 +224,86 @@ namespace MetaClient
             }
         }
 
+        public void ZiDingYiNeiLian(ECustomStyple eCustomStyple, int id,GameObject _objPar) {
+            RemoveAllChildren(bodyView.transform.GetChild(2).GetChild(0).gameObject);
+            GameObject _obj = GameObject.Instantiate(ziDingYiBtn);
+            _obj.transform.SetParent(_objPar.transform);
+            UICustomBtn _uICustomBtn = _obj.GetComponent<UICustomBtn>();
+            _uICustomBtn.id = id;
+            _uICustomBtn.eCustomStyple = eCustomStyple;
+            _obj.SetActive(true);
+
+        }
+        public void ZiDingYiBody(ECustomStyple eCustomStyple, int id, GameObject _objPar)
+        {
+            RemoveAllChildren(bodyView.transform.GetChild(2).GetChild(0).gameObject);
+            GameObject _obj = GameObject.Instantiate(ziDingYiBtn);
+            _obj.transform.SetParent(_objPar.transform);
+            UICustomBtn _uICustomBtn = _obj.GetComponent<UICustomBtn>();
+            _uICustomBtn.id = id;
+            _uICustomBtn.eCustomStyple = eCustomStyple;
+            _obj.SetActive(true);
+
+
+        }
+        public void ZiDingYiCloth(ECustomStyple eCustomStyple, int id, GameObject _objPar)
+        {
+            RemoveAllChildren(bodyView.transform.GetChild(2).GetChild(0).gameObject);
+            GameObject _obj = GameObject.Instantiate(ziDingYiBtn);
+            _obj.transform.SetParent(_objPar.transform);
+            UICustomBtn _uICustomBtn = _obj.GetComponent<UICustomBtn>();
+            _uICustomBtn.id = id;
+            _uICustomBtn.eCustomStyple = eCustomStyple;
+            _obj.SetActive(true);
+
+
+        }
+
+
+        public void CreateNieLianImg(int parentid)
+        {
+
+
+
+
+
+
+            RemoveAllChildren(bodyView.transform.GetChild(2).GetChild(0).gameObject);
+            Debug.Log("子对象" + bodyView.transform.GetChild(2).GetChild(0).gameObject.transform.childCount + "");
+            //等有捏脸表时改为捏脸
+            IDataTable<DRCustomBody> _data = GameEntry.DataTable.GetDataTable<DRCustomBody>();
+            _bodydata = GameEntry.DataTable.GetDataTable<DRCustomBody>();
+
+            DRCustomBody[] dRCustomBodies = _bodydata.GetAllDataRows();
+            for (int i = 0; i < dRCustomBodies.Length; i++)
+            {
+                Debug.Log(dRCustomBodies[i].Id);
+                if (dRCustomBodies[i].ParentStyple == parentid)
+                {
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, bodyView.transform.GetChild(2).GetChild(0).gameObject, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
+                }
+            }
+        }
+        public void CreateClothImg(int parentid)
+        {
+            RemoveAllChildren(bodyView.transform.GetChild(2).GetChild(0).gameObject);
+            //等有服装时改为服装
+            IDataTable<DRCustomBody> _data = GameEntry.DataTable.GetDataTable<DRCustomBody>();
+            _bodydata = GameEntry.DataTable.GetDataTable<DRCustomBody>();
+
+            DRCustomBody[] dRCustomBodies = _bodydata.GetAllDataRows();
+            for (int i = 0; i < dRCustomBodies.Length; i++)
+            {
+                Debug.Log(dRCustomBodies[i].Id);
+                if (dRCustomBodies[i].ParentStyple == parentid)
+                {
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, bodyView.transform.GetChild(2).GetChild(0).gameObject, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
+                }
+            }
+        }
         public void CreateBodyImg(int parentid) {
             RemoveAllChildren(bodyView.transform.GetChild(2).GetChild(0).gameObject);
+            Debug.Log("子对象" + bodyView.transform.GetChild(2).GetChild(0).gameObject.transform.childCount + "");
             IDataTable<DRCustomBody> _data = GameEntry.DataTable.GetDataTable<DRCustomBody>();
             _bodydata = GameEntry.DataTable.GetDataTable<DRCustomBody>();
 
@@ -212,10 +311,10 @@ namespace MetaClient
             for (int i = 0; i < dRCustomBodies.Length; i++)
             {
                 Debug.Log(dRCustomBodies[i].Id);
-                //if (dRCustomBodies[i].ParentStyple == parentid)
-                //{
-                //    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, bodyView.transform.GetChild(2).GetChild(0).gameObject, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
-                //}
+                if (dRCustomBodies[i].ParentStyple == parentid)
+                {
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, bodyView.transform.GetChild(2).GetChild(0).gameObject, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
+                }
             }
         } 
 
@@ -357,7 +456,14 @@ namespace MetaClient
         zuiba,
         fuse
     }
+    public enum EButtonShunXu {
+    
+        None,
+        First,
+        Second,
+        Third
 
+    }
 
 
 

Assets/GameMain/Scripts/UI/UICustomBtn.cs

@@ -17,12 +17,13 @@ namespace MetaClient
         [Header("对应部位part")]
         public int part=0;
 
-
         //[Header("点击分支")]
         //public ENieLianStyple eNieLianStyple = ENieLianStyple.None;
         [Header("是否重新生成列表")]
         public bool isCreate = false;
 
+        public bool isZDYPart = false;
+
         private float value = 0;
         // Start is called before the first frame update
         void Awake()
@@ -79,7 +80,7 @@ namespace MetaClient
             {
                  //object[] _objects = new object[]{ eCustomStyple, id };
                 // uICustom.ClickBotton(_objects);
-                uICustom.ClickBotton(eCustomStyple, id);
+                uICustom.ClickBotton(eCustomStyple, id,isZDYPart);
             }
         }
         // Update is called once per frame

Assets/GameMain/Scripts/UI/UICustomNor.cs

@@ -18,6 +18,7 @@ namespace MetaClient
         public List<GameObject> objAppear;
         [Header("消失对象")]
         public List<GameObject> objDisAppear;
+
         // Start is called before the first frame update
         void Start()
         {

Assets/GameMain/UI/UIForms/CustomRole.prefab

@@ -55,9 +55,11 @@ MonoBehaviour:
   saveBtn: {fileID: 6074353506794593167}
   nieLianView: {fileID: 3447988733459671993}
   bodyView: {fileID: 24594465}
+  ziDingYiBtn: {fileID: 1551334336}
   clothView: {fileID: 33151859}
   leftView: {fileID: 2120691759}
   rightView: {fileID: 1331787698}
+  whitebg: {fileID: 8602108025138452691}
   buttonItem: {fileID: 1663957051}
   scrollbar: {fileID: 6113850133271156823}
   colItem: {fileID: 1941601955}
@@ -173,11 +175,11 @@ RectTransform:
   - {fileID: 961123731}
   - {fileID: 1216488298}
   m_Father: {fileID: 1331787699}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 375, y: -16.099976}
+  m_AnchoredPosition: {x: 358.99997, y: -16.099976}
   m_SizeDelta: {x: 154.12, y: -122.22351}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &33151859
@@ -211,11 +213,11 @@ RectTransform:
   - {fileID: 536075217}
   - {fileID: 898375066}
   m_Father: {fileID: 1331787699}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 375, y: -16.099976}
+  m_AnchoredPosition: {x: 358.99997, y: -16.099976}
   m_SizeDelta: {x: 154.12, y: -122.22351}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &35753078
@@ -312,6 +314,7 @@ MonoBehaviour:
   eButtonStyple: 3
   part: 0
   isCreate: 1
+  isZDYPart: 0
 --- !u!114 &969039801
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1071,6 +1074,7 @@ MonoBehaviour:
   eButtonStyple: 3
   part: 0
   isCreate: 1
+  isZDYPart: 0
 --- !u!114 &1617011046
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1749,6 +1753,7 @@ MonoBehaviour:
   eButtonStyple: 3
   part: 0
   isCreate: 1
+  isZDYPart: 0
 --- !u!114 &378539199
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1929,6 +1934,7 @@ MonoBehaviour:
   eButtonStyple: 0
   part: 0
   isCreate: 0
+  isZDYPart: 0
 --- !u!1 &788056142
 GameObject:
   m_ObjectHideFlags: 0
@@ -2699,7 +2705,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &961123731
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2815,6 +2821,7 @@ MonoBehaviour:
   eButtonStyple: 3
   part: 0
   isCreate: 1
+  isZDYPart: 0
 --- !u!114 &817393583
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3730,6 +3737,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 1518800962681781517}
   - {fileID: 1008530018602769499}
   - {fileID: 1053620320367826271}
   - {fileID: 24594466}
@@ -3737,6 +3745,7 @@ RectTransform:
   - {fileID: 1663957052}
   - {fileID: 1941601956}
   - {fileID: 723150304825286416}
+  - {fileID: 1551334337}
   m_Father: {fileID: 2921542304032736362}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4115,6 +4124,144 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1551334336
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1551334337}
+  - component: {fileID: 1551334339}
+  - component: {fileID: 1551334338}
+  - component: {fileID: 1551334341}
+  - component: {fileID: 1551334340}
+  m_Layer: 5
+  m_Name: ziDingYi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1551334337
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1551334336}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1331787699}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -24, y: 29}
+  m_SizeDelta: {x: 96, y: 125}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &1551334339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1551334336}
+  m_CullTransparentMesh: 0
+--- !u!114 &1551334338
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1551334336}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 7972cafe925c18f4fa70ba3cb6d7bd87, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1551334341
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1551334336}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1551334338}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1551334340
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1551334336}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 92ed2ccb4917d65479290cf63dbc1d3f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uICustom: {fileID: 1633349417}
+  eCustomStyple: 0
+  id: 0
+  eButtonStyple: 0
+  part: 0
+  isCreate: 1
+  isZDYPart: 1
 --- !u!1 &1596525556
 GameObject:
   m_ObjectHideFlags: 0
@@ -4207,7 +4354,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1331787699}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4312,6 +4459,7 @@ MonoBehaviour:
   eButtonStyple: 0
   part: 0
   isCreate: 0
+  isZDYPart: 0
 --- !u!1 &1669219676
 GameObject:
   m_ObjectHideFlags: 0
@@ -4815,6 +4963,7 @@ MonoBehaviour:
   eButtonStyple: 3
   part: 0
   isCreate: 1
+  isZDYPart: 0
 --- !u!114 &25729863
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5017,6 +5166,8 @@ GameObject:
   - component: {fileID: 1941601956}
   - component: {fileID: 1941601958}
   - component: {fileID: 1941601957}
+  - component: {fileID: 1812341212}
+  - component: {fileID: 1812341214}
   m_Layer: 5
   m_Name: TiaoSe
   m_TagString: Untagged
@@ -5038,7 +5189,7 @@ RectTransform:
   - {fileID: 1441241191}
   - {fileID: 327028027}
   m_Father: {fileID: 1331787699}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5082,6 +5233,68 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1812341212
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1941601955}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 92ed2ccb4917d65479290cf63dbc1d3f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uICustom: {fileID: 1633349417}
+  eCustomStyple: 0
+  id: 0
+  eButtonStyple: 2
+  part: 0
+  isCreate: 0
+  isZDYPart: 0
+--- !u!114 &1812341214
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1941601955}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1941601957}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2061839038
 GameObject:
   m_ObjectHideFlags: 0
@@ -5176,6 +5389,7 @@ MonoBehaviour:
   eButtonStyple: 3
   part: 0
   isCreate: 1
+  isZDYPart: 0
 --- !u!114 &1841796866
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5313,6 +5527,7 @@ MonoBehaviour:
   eButtonStyple: 3
   part: 0
   isCreate: 1
+  isZDYPart: 0
 --- !u!114 &15492327
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6046,11 +6261,11 @@ RectTransform:
   - {fileID: 1194618045}
   - {fileID: 864700927}
   m_Father: {fileID: 1331787699}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 375, y: -16.099976}
+  m_AnchoredPosition: {x: 358.99997, y: -16.099976}
   m_SizeDelta: {x: 154.12, y: -122.22351}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &3483724307061912639
@@ -6571,7 +6786,7 @@ RectTransform:
   m_Children:
   - {fileID: 1638280820790640025}
   m_Father: {fileID: 1331787699}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -7140,6 +7355,28 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 8602108025138452691}
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 4888218369558669397}
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &6074353506794593167
 GameObject:
   m_ObjectHideFlags: 0
@@ -7857,13 +8094,87 @@ RectTransform:
   - {fileID: 9050258014423924380}
   - {fileID: 7514919224378702156}
   m_Father: {fileID: 1331787699}
-  m_RootOrder: 0
+  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: 375.00003, y: 0}
+  m_AnchoredPosition: {x: 359, y: 0}
   m_SizeDelta: {x: 154.12, y: 1334}
   m_Pivot: {x: 1, y: 0.5}
+--- !u!1 &8602108025138452691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1518800962681781517}
+  - component: {fileID: 5235263282945642864}
+  - component: {fileID: 6227782410668215182}
+  m_Layer: 5
+  m_Name: rightbg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1518800962681781517
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8602108025138452691}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1331787699}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 11.924988, y: 0}
+  m_SizeDelta: {x: 177.97, y: 1611.7765}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &5235263282945642864
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8602108025138452691}
+  m_CullTransparentMesh: 0
+--- !u!114 &6227782410668215182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8602108025138452691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.7529412}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8673557905041964223
 GameObject:
   m_ObjectHideFlags: 0

Assets/GameMain/UI/UISprites/CustomRole/kuabuthick.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,49 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: