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

Assets/GameMain/Model.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b6dcc671de1083a49976dcc2678867e9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/GameMain/Scripts/UI/UICustom.cs

@@ -57,9 +57,10 @@ namespace MetaClient
 
         [Header("颜色选择界面")]
         public GameObject colorView;
+        [Header("调色版界面")]
+        public GameObject tiaoSeBanView;
 
-
-       // [Header("顺序")]
+        // [Header("顺序")]
         private EButtonShunXu eButtonShunXu = EButtonShunXu.None;
         
         [Header("颜色演示预制体")]
@@ -91,8 +92,8 @@ namespace MetaClient
         private bool histroyextra;
 
         private int part = 0;
-
-
+        private int id = -1;
+        private GameObject nowPickOnImg=null;
 
 
         //[Header("接受到的数据")]
@@ -136,6 +137,29 @@ namespace MetaClient
             });
 
         }
+
+
+        public void TiaoSeViewOpenFun() {
+            rightView.SetActive(false);
+            colorView.SetActive(true);
+
+        }
+        public void TiaoSeBanOpenStyple(bool _bo)
+        {
+            colorView.SetActive(_bo);
+            tiaoSeBanView.SetActive(!_bo);
+            
+        }
+
+        //private void 
+
+
+
+
+
+
+
+
         /// <summary>
         /// 设置是否已在缓动
         /// </summary>
@@ -275,6 +299,39 @@ namespace MetaClient
             //clothView.SetActive(false);
         }
 
+
+        public void PickOnButton(GameObject _obj,int _id) {
+            if (_obj.transform.childCount <= 0)
+            {
+                return;
+            }
+            GameObject _nowPickOnImg = _obj.transform.GetChild(0).gameObject;
+            
+            if (nowPickOnImg==null)
+            {
+              
+                nowPickOnImg = _nowPickOnImg;
+                nowPickOnImg.SetActive(true);
+            }
+            else
+            {
+                nowPickOnImg.SetActive(false);
+                if (_id != id)
+                {
+                    id = _id;
+                    nowPickOnImg = _nowPickOnImg;
+                    _nowPickOnImg.SetActive(true);
+                }
+                else
+                {
+                    nowPickOnImg = _nowPickOnImg;
+                    _nowPickOnImg.SetActive(!_nowPickOnImg.activeSelf);
+                }
+            }
+            scrollbar.gameObject.SetActive(nowPickOnImg.activeSelf);
+        }
+
+
         /// <summary>
         /// 修改滑块
         /// </summary>
@@ -437,7 +494,8 @@ namespace MetaClient
                     CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
                 }
             }
-           // ChangeListBotton(_objPar);
+          
+             ChangeListBotton(_objPar);
         }
         public void CreateClothImg(int parentid,bool ziDingYi)
         {
@@ -473,7 +531,7 @@ namespace MetaClient
                     CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
                 }
             }
-          //  ChangeListBotton(_objPar);
+            ChangeListBotton(_objPar);
         }
 
         private void CreateZDYFun(int parentid,GameObject _objPar)
@@ -530,7 +588,7 @@ namespace MetaClient
                     CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
                 }
             }
-           // ChangeListBotton(_objPar);
+             ChangeListBotton(_objPar);
         }
 
 
@@ -542,7 +600,8 @@ namespace MetaClient
             
             float _x = _obj.GetComponent<RectTransform>().offsetMin.x;
             int _childNum = _obj.transform.childCount;
-            float _y = _childNum > 8 ? -240 * (_childNum - 8) : 0;
+            float _y = _childNum > 7 ? -240 * (_childNum - 7) : 0;
+            _obj.GetComponent<RectTransform>().offsetMax = new Vector2(_x, 0);
             _obj.GetComponent<RectTransform>().offsetMin = new Vector2(_x, _y);
         }
 
@@ -693,7 +752,14 @@ namespace MetaClient
         Third
 
     }
+    public enum ETSStyple {
+    None,
+    ViewOpen,
+    Close,
+    Sure,
+    Open
 
+    }
 
 
 

Assets/GameMain/Scripts/UI/UICustomBtn.cs

@@ -17,6 +17,8 @@ namespace MetaClient
         [Header("对应部位part")]
         public int part=0;
 
+        [Header("对应调色")]
+        public ETSStyple eTSStyple = ETSStyple.None;
         //[Header("点击分支")]
         //public ENieLianStyple eNieLianStyple = ENieLianStyple.None;
         [Header("是否重新生成列表")]
@@ -24,6 +26,7 @@ namespace MetaClient
 
         public bool isZDYPart = false;
 
+        public GameObject tiaoSeObj;
         private float value = 0;
         // Start is called before the first frame update
         void Awake()
@@ -49,27 +52,56 @@ namespace MetaClient
                     }
                     break;
                 case EButtonStyple.Scroll:
-                    if (!uICustom.scrollbar.gameObject.activeSelf)
-                    {
-                        uICustom.scrollbar.gameObject.SetActive(true);
-                    }
+                    //if (!uICustom.scrollbar.gameObject.activeSelf)
+                    //{
+                    //    uICustom.scrollbar.gameObject.SetActive(true);
+                    //}
                     // uICustom.scrollbar.value = GetValue();
                     uICustom.SetValue(id, eCustomStyple);
-                    
+                    uICustom.PickOnButton(this.gameObject,id);
                     break;
                 case EButtonStyple.TiaoSe:
+                    TiaoSeFun();
                     break;
                 case EButtonStyple.NorButton:
                     CreatImgListFun();
                     break;
                 case EButtonStyple.Back:
-
+                    uICustom.BackBtnFun();
                     break;
             }
 
 
 
         }
+        void TiaoSeFun() {
+            switch (this.eTSStyple)
+            {
+                case ETSStyple.None:
+                    uICustom.BackBtnFun();
+                    break;
+                case ETSStyple.ViewOpen:
+                   uICustom.TiaoSeViewOpenFun();
+                    break;
+                case ETSStyple.Close:
+                   uICustom.TiaoSeBanOpenStyple(false);
+                    break;
+                case ETSStyple.Sure:
+                    //uICustom.
+                    break;
+                case ETSStyple.Open:
+                   // uICustom.TiaoSeBanOpenStyple(true);
+                    break;
+            }
+        }
+
+
+
+
+
+
+
+
 
         //float GetVale()
         //{

Assets/GameMain/UI/UIForms/CustomRole.prefab

@@ -63,6 +63,7 @@ MonoBehaviour:
   buttonItem: {fileID: 1663957051}
   scrollbar: {fileID: 6113850133271156823}
   colorView: {fileID: 0}
+  tiaoSeBanView: {fileID: 0}
   colItem: {fileID: 1941601955}
   tween_leftMax: 0
   tween_leftMin: -250
@@ -314,8 +315,10 @@ MonoBehaviour:
   id: 4
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &969039801
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1074,8 +1077,10 @@ MonoBehaviour:
   id: 0
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &1617011046
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1753,8 +1758,10 @@ MonoBehaviour:
   id: 2
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &378539199
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1934,8 +1941,10 @@ MonoBehaviour:
   id: 0
   eButtonStyple: 0
   part: 0
+  eTSStyple: 0
   isCreate: 0
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!1 &788056142
 GameObject:
   m_ObjectHideFlags: 0
@@ -2045,8 +2054,8 @@ 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: -305, y: 187}
-  m_SizeDelta: {x: 27, y: 27}
+  m_AnchoredPosition: {x: -175, y: -208}
+  m_SizeDelta: {x: 72, y: 34}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &823962344
 CanvasRenderer:
@@ -2075,7 +2084,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4ba80fe04815e5343ad2f7a48da87f42, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d44465fb030f600428c72e6afae00808, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2632,7 +2641,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &932746273
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2821,8 +2830,10 @@ MonoBehaviour:
   id: 3
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &817393583
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3863,8 +3874,8 @@ 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: 295, y: 182}
-  m_SizeDelta: {x: 34, y: 22}
+  m_AnchoredPosition: {x: 144, y: -209}
+  m_SizeDelta: {x: 72, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1399077092
 CanvasRenderer:
@@ -3893,7 +3904,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f3d9f1d06db0a1649b39b8e9ee3fddda, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0fe8ebaa3d34f0643b972786ad0755b7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3920,7 +3931,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1441241191
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4191,7 +4202,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7972cafe925c18f4fa70ba3cb6d7bd87, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8e7d6207828228c41b60713198cd7925, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4261,8 +4272,10 @@ MonoBehaviour:
   id: 0
   eButtonStyple: 0
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 1
+  tiaoSeObj: {fileID: 0}
 --- !u!1 &1596525556
 GameObject:
   m_ObjectHideFlags: 0
@@ -4353,7 +4366,8 @@ RectTransform:
   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_Children:
+  - {fileID: 5772393511634880110}
   m_Father: {fileID: 1331787699}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4459,8 +4473,10 @@ MonoBehaviour:
   id: 0
   eButtonStyple: 0
   part: 0
+  eTSStyple: 0
   isCreate: 0
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!1 &1669219676
 GameObject:
   m_ObjectHideFlags: 0
@@ -4963,8 +4979,10 @@ MonoBehaviour:
   id: 5
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &25729863
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5251,8 +5269,10 @@ MonoBehaviour:
   id: 0
   eButtonStyple: 2
   part: 0
+  eTSStyple: 0
   isCreate: 0
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &1812341214
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5389,8 +5409,10 @@ MonoBehaviour:
   id: 1
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &1841796866
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5527,8 +5549,10 @@ MonoBehaviour:
   id: 6
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &15492327
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5877,6 +5901,80 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
+--- !u!1 &2099159762103889428
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5772393511634880110}
+  - component: {fileID: 3224581311699338844}
+  - component: {fileID: 6660740302137360086}
+  m_Layer: 5
+  m_Name: PickOn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5772393511634880110
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2099159762103889428}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.2104, y: 1.2104, z: 1.2104}
+  m_Children: []
+  m_Father: {fileID: 1663957052}
+  m_RootOrder: 0
+  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: -9.1, y: 23.3}
+  m_SizeDelta: {x: 94, y: 81}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3224581311699338844
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2099159762103889428}
+  m_CullTransparentMesh: 0
+--- !u!114 &6660740302137360086
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2099159762103889428}
+  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: c4b5766b8e896cb449ee7c2435feff48, 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!1 &2593306161924020123
 GameObject:
   m_ObjectHideFlags: 0
@@ -5910,10 +6008,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -598.7}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5515995241951263415
 CanvasRenderer:
@@ -6028,10 +6126,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -72.5}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4096192320265652467
 CanvasRenderer:
@@ -6991,10 +7089,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -423.3}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5323221619069775855
 CanvasRenderer:
@@ -7109,10 +7207,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -949.5}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5512637743675136088
 CanvasRenderer:
@@ -7206,6 +7304,7 @@ GameObject:
   - component: {fileID: 5060035576153973995}
   - component: {fileID: 3763921944273726534}
   - component: {fileID: 8277595390017390570}
+  - component: {fileID: 5489715076308096139}
   m_Layer: 5
   m_Name: BackBtn
   m_TagString: Untagged
@@ -7311,73 +7410,28 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3763921944273726534}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 8547929675184166449}
-        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: 1
-        m_CallState: 2
-      - m_Target: {fileID: 3447988733459671993}
-        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: 24594465}
-        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: 33151859}
-        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: 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
+      m_Calls: []
+--- !u!114 &5489715076308096139
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6003126087330071885}
+  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: 4
+  part: 0
+  eTSStyple: 0
+  isCreate: 0
+  isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!1 &6074353506794593167
 GameObject:
   m_ObjectHideFlags: 0
@@ -7529,10 +7583,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -774.1}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1886375772645356070
 CanvasRenderer:
@@ -7786,10 +7840,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -247.9}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6880615389303931001
 CanvasRenderer:
@@ -7904,10 +7958,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -1124.9}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5118124123372598279
 CanvasRenderer:
@@ -8422,10 +8476,10 @@ RectTransform:
   m_Father: {fileID: 1084066626783479643}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.06, y: -1300.3}
+  m_SizeDelta: {x: 100, y: 145}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5029799429571585495
 CanvasRenderer:

Assets/GameMain/UI/UISprites/Color/concel.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 0fe8ebaa3d34f0643b972786ad0755b7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: 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: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GameMain/UI/UISprites/Color/sure.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: d44465fb030f600428c72e6afae00808
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: 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: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 05c40c8d2412b1f4ba033e6f1cc8c73c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: a9bede77aa4f31048871613dca683321
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 1be83576f4195314e97dd52e3fbfd00e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: