Jidongchen 3 سال پیش
والد
کامیت
cae6bb7c25
26فایلهای تغییر یافته به همراه918 افزوده شده و 77 حذف شده
  1. BIN
      Assets/GameMain/DataTables/CustomBody.txt
  2. 12 0
      Assets/GameMain/Scripts/UI/UIColorData.cs
  3. 11 0
      Assets/GameMain/Scripts/UI/UIColorData.cs.meta
  4. 101 21
      Assets/GameMain/Scripts/UI/UICustom.cs
  5. 15 2
      Assets/GameMain/Scripts/UI/UICustomBtn.cs
  6. 8 0
      Assets/GameMain/Scripts/UIBaseComponent.meta
  7. 679 54
      Assets/GameMain/UI/UIForms/CustomRole.prefab
  8. BIN
      Assets/GameMain/UI/UISprites/CustomRole/datuishangthick.png
  9. BIN
      Assets/GameMain/UI/UISprites/CustomRole/datuishangwide.png
  10. BIN
      Assets/GameMain/UI/UISprites/CustomRole/datuixiathick.png
  11. BIN
      Assets/GameMain/UI/UISprites/CustomRole/datuixiawide.png
  12. BIN
      Assets/GameMain/UI/UISprites/CustomRole/jiaobubig.png
  13. BIN
      Assets/GameMain/UI/UISprites/CustomRole/jiaowanthick.png
  14. BIN
      Assets/GameMain/UI/UISprites/CustomRole/jiaowanwide.png
  15. BIN
      Assets/GameMain/UI/UISprites/CustomRole/tuibu.png
  16. 92 0
      Assets/GameMain/UI/UISprites/CustomRole/tuibu.png.meta
  17. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiaotuiwide.png
  18. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xigaithick.png
  19. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xigaiwide.png
  20. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiongbuangle.png
  21. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiongbuopen.png
  22. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiongbushape.png
  23. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiongbusize.png
  24. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiongbuthcik.png
  25. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiongbuup.png
  26. BIN
      Assets/GameMain/UI/UISprites/CustomRole/xiongbuwide.png

BIN
Assets/GameMain/DataTables/CustomBody.txt


+ 12 - 0
Assets/GameMain/Scripts/UI/UIColorData.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace MetaClient
+{
+    public class UIColorData {
+        public ECustomStyple eCustomStyple;
+        public int id;
+        public Vector3 v3;
+    }
+}

+ 11 - 0
Assets/GameMain/Scripts/UI/UIColorData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f32dea0d0084e814c9738df99cc412da
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 101 - 21
Assets/GameMain/Scripts/UI/UICustom.cs

@@ -73,8 +73,8 @@ namespace MetaClient
         public float tween_rightMin = 0;
         public float tween_rightMax = 223;
 
-        private float tween_saveBtnMax = 119;
-        private float tween_saveBtnMin = -108;
+        //private float tween_saveBtnMax = 119;
+        //private float tween_saveBtnMin = -108;
 
         private float tweenTime = 0.5f;
         //private float tweenTime = 10;
@@ -138,12 +138,17 @@ namespace MetaClient
 
         }
 
-
+        /// <summary>
+        /// 调色界面打开
+        /// </summary>
         public void TiaoSeViewOpenFun() {
             rightView.SetActive(false);
             colorView.SetActive(true);
 
         }
+        /// <summary>
+        /// 调色板的调色板打开或关闭
+        /// </summary>
         public void TiaoSeBanOpenStyple(bool _bo)
         {
             colorView.SetActive(_bo);
@@ -151,9 +156,19 @@ namespace MetaClient
             
         }
 
-        //private void 
-
+        /// <summary>
+        /// 调色板确认按钮
+        /// </summary>
+        public void TiaoSeSure()
+        {
+            TiaoSeBanOpenStyple(false);
+        }
+        /// <summary>
+        /// 自定义调色板
+        /// </summary>
+        public void TiaoSeBanCustom() {
 
+        }
 
 
 
@@ -187,7 +202,7 @@ namespace MetaClient
             GameEntry.Event.Fire(this, CustomRoleBodyEventArgs.Create(part, new Vector3(scrollbar.value, 0, 0)));
         }
 
-        public void BackBtnFun()
+        public void BackBtn_Fun()
         {
             if (histroyextra)
             {
@@ -219,6 +234,42 @@ namespace MetaClient
 
             }
         }
+
+        public void BackBtnFun()
+        {
+            if (isTween)
+            {
+                return;
+            }
+            isTween = true;
+            leftView.transform.DOLocalMoveX(tween_leftMin, tweenTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                //whitebg.SetActive(bg);
+
+                BackBtn_Fun();
+                leftView.transform.DOLocalMoveX(0, tweenTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                    isTween = false;
+                    Debug.Log("222");
+                });
+            });
+            Debug.Log("333");
+            rightView.transform.DOLocalMoveX(tween_rightMax, tweenTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                rightView.transform.DOLocalMoveX(0, tweenTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                });
+            });
+
+        }
+
+
+
+
+
+
+
+
+
+        /// <summary>
+        /// 返回的方法一
+        /// </summary>
         void Back_OneFun() {
             ViewSetFalse();
             toolView.SetActive(true);
@@ -227,12 +278,17 @@ namespace MetaClient
             //nieLianView.SetActive(false);
             //clothView.SetActive(false);
         }
-
+        /// <summary>
+        /// 返回的方法extra
+        /// </summary>
         void BackExtraFun()
         {
             rightView.SetActive(true);
             scrollbar.gameObject.SetActive(false);
         }
+        /// <summary>
+        /// 面板全部隐藏
+        /// </summary>
         void ViewSetFalse()
         {
             toolView.SetActive(false);
@@ -253,10 +309,14 @@ namespace MetaClient
             _obj.transform.GetChild(0).gameObject.SetActive(_bo);
             _obj.transform.GetChild(2).gameObject.SetActive(!_bo);
         }
+        /// <summary>
+        /// 返回的方法二
+        /// </summary>
         void Back_TwoFun(bool _bo)
         {
-           // int _choose = int.Parse(histroy[1]);
-           // switch ((ECustomStyple)_choose)
+            // int _choose = int.Parse(histroy[1]);
+            // switch ((ECustomStyple)_choose)
+            whitebg.SetActive(false);
            switch(eCustomStyple)
             {
                 case ECustomStyple.Body:
@@ -276,6 +336,9 @@ namespace MetaClient
             //nieLianView.SetActive(false);
             //clothView.SetActive(false);
         }
+        /// <summary>
+        /// 返回的方法三
+        /// </summary>
         void Back_ThreeFun()
         {
             string[] _strArrary = histroy[histroy.Count - 1].Split(',');
@@ -311,13 +374,15 @@ namespace MetaClient
             {
               
                 nowPickOnImg = _nowPickOnImg;
+                id = _id;
                 nowPickOnImg.SetActive(true);
             }
             else
             {
-                nowPickOnImg.SetActive(false);
+               
                 if (_id != id)
                 {
+                    nowPickOnImg.SetActive(false);
                     id = _id;
                     nowPickOnImg = _nowPickOnImg;
                     _nowPickOnImg.SetActive(true);
@@ -349,7 +414,16 @@ namespace MetaClient
         {
             return scrollbar.value;
         }
+        /// <summary>
+        /// 修改颜色
+        /// </summary>
+        public void SetColor(int _part, ECustomStyple eCustomStyple)
+        {
 
+            //scrollbar.value = _value;
+            part = _part;
+           
+        }
         /// <summary>
         /// 按钮点击事件
         /// </summary>
@@ -468,8 +542,8 @@ namespace MetaClient
             //等有捏脸表时改为捏脸
             IDataTable<DRCustomBody> _data = GameEntry.DataTable.GetDataTable<DRCustomBody>();
             _bodydata = GameEntry.DataTable.GetDataTable<DRCustomBody>();
-            int cengji = ziDingYi ?1:0;
-            if (!ziDingYi)
+            int cengji = ziDingYi ? 0 : 1;
+            if (ziDingYi)
             {
 
                 CreateZDYFun(parentid, _objPar);
@@ -491,7 +565,7 @@ namespace MetaClient
                 Debug.Log(dRCustomBodies[i].Id);
                 if (dRCustomBodies[i].ParentStyple == parentid&&dRCustomBodies[i].Cengji==cengji)
                 {
-                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body, dRCustomBodies[i].IsActive);
                 }
             }
           
@@ -505,8 +579,8 @@ namespace MetaClient
             //等有服装时改为服装
             IDataTable<DRCustomBody> _data = GameEntry.DataTable.GetDataTable<DRCustomBody>();
             _bodydata = GameEntry.DataTable.GetDataTable<DRCustomBody>();
-            int cengji = ziDingYi ?1:0;
-            if (!ziDingYi)
+            int cengji = ziDingYi ? 0 : 1;
+            if (ziDingYi)
             {
 
                 CreateZDYFun(parentid, _objPar);
@@ -528,7 +602,7 @@ namespace MetaClient
                 Debug.Log(dRCustomBodies[i].Id);
                 if (dRCustomBodies[i].ParentStyple == parentid && dRCustomBodies[i].Cengji == cengji)
                 {
-                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body, dRCustomBodies[i].IsActive);
                 }
             }
             ChangeListBotton(_objPar);
@@ -561,8 +635,8 @@ namespace MetaClient
             RemoveAllChildren(_objPar);
             IDataTable<DRCustomBody> _data = GameEntry.DataTable.GetDataTable<DRCustomBody>();
             _bodydata = GameEntry.DataTable.GetDataTable<DRCustomBody>();
-            int cengji = ziDingYi ?1:0;
-            if (!ziDingYi)
+            int cengji = ziDingYi ?0:1;
+            if (ziDingYi)
             {
 
                 CreateZDYFun(parentid, _objPar);
@@ -585,7 +659,7 @@ namespace MetaClient
                 Debug.Log(dRCustomBodies[i].Id);
                 if (dRCustomBodies[i].ParentStyple == parentid && dRCustomBodies[i].Cengji == cengji)
                 {
-                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body);
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Part, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body, dRCustomBodies[i].IsActive);
                 }
             }
              ChangeListBotton(_objPar);
@@ -671,7 +745,7 @@ namespace MetaClient
 
 
 
-        private void CreateButtonFun(string path,int _part,string _name, GameObject _parent,int _id,int buttonstyple,ECustomStyple eCustomStyple) {
+        private void CreateButtonFun(string path,int _part,string _name, GameObject _parent,int _id,int buttonstyple,ECustomStyple eCustomStyple,int _isactive) {
             //Debug.Log(path);
            // Debug.Log(_parent);
             path = "CustomRole/" + path;
@@ -689,6 +763,11 @@ namespace MetaClient
                     _objImg.sprite = sprite;
                     _obj.name = part+"";
                     _obj.transform.SetParent(_parent.transform);
+                    if (_isactive != 1)
+                    {
+                        _obj.SetActive(false);
+                    }
+
                     UICustomBtn uICustomBtn = _obj.GetComponent<UICustomBtn>();
                     uICustomBtn.id = _id;
                     uICustomBtn.eButtonStyple = (EButtonStyple)buttonstyple;
@@ -757,7 +836,8 @@ namespace MetaClient
     ViewOpen,
     Close,
     Sure,
-    Open
+    Open,
+    Button
 
     }
 

+ 15 - 2
Assets/GameMain/Scripts/UI/UICustomBtn.cs

@@ -26,7 +26,8 @@ namespace MetaClient
 
         public bool isZDYPart = false;
 
-        public GameObject tiaoSeObj;
+        public bool isColor = false;
+        //public GameObject tiaoSeObj;
         private float value = 0;
         // Start is called before the first frame update
         void Awake()
@@ -87,10 +88,15 @@ namespace MetaClient
                    uICustom.TiaoSeBanOpenStyple(false);
                     break;
                 case ETSStyple.Sure:
+                    uICustom.TiaoSeSure();
                     //uICustom.
                     break;
                 case ETSStyple.Open:
-                   // uICustom.TiaoSeBanOpenStyple(true);
+                    uICustom.TiaoSeBanOpenStyple(true);
+                    // uICustom.TiaoSeBanOpenStyple(true);
+                    break;
+                case ETSStyple.Button:
+                    uICustom.SetColor(id, eCustomStyple);
                     break;
             }
         }
@@ -114,6 +120,13 @@ namespace MetaClient
             }
             else
             {
+                //var a = new PartData();
+                //var str =JsonUtility.ToJson(a);
+                //var obj = JsonUtility.FromJson<PartData>(str);
+                //GameEntry.Setting.SetString("savecolor",str);
+                //GameEntry.Setting.Save();
+                //GameEntry.Setting.HasSetting("savecolor");
+                //GameEntry.Setting.GetString("");
                 uICustom.HistoryAdd("ziDingyi" + "," + id + "");
                  //object[] _objects = new object[]{ eCustomStyple, id };
                 // uICustom.ClickBotton(_objects);

+ 8 - 0
Assets/GameMain/Scripts/UIBaseComponent.meta

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

+ 679 - 54
Assets/GameMain/UI/UIForms/CustomRole.prefab

@@ -62,8 +62,8 @@ MonoBehaviour:
   whitebg: {fileID: 8602108025138452691}
   buttonItem: {fileID: 1663957051}
   scrollbar: {fileID: 6113850133271156823}
-  colorView: {fileID: 0}
-  tiaoSeBanView: {fileID: 0}
+  colorView: {fileID: 3208672400358542704}
+  tiaoSeBanView: {fileID: 986032741}
   colItem: {fileID: 1941601955}
   tween_leftMax: 0
   tween_leftMin: -250
@@ -312,13 +312,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 4
+  id: 5
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &969039801
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1074,13 +1073,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 0
+  id: 1
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &1617011046
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1755,13 +1753,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 2
+  id: 3
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &378539199
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1944,7 +1941,6 @@ MonoBehaviour:
   eTSStyple: 0
   isCreate: 0
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!1 &788056142
 GameObject:
   m_ObjectHideFlags: 0
@@ -2031,8 +2027,10 @@ GameObject:
   - component: {fileID: 823962342}
   - component: {fileID: 823962344}
   - component: {fileID: 823962343}
+  - component: {fileID: 6301323245290118048}
+  - component: {fileID: 5916772096251899638}
   m_Layer: 5
-  m_Name: Image
+  m_Name: SureBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2094,6 +2092,69 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6301323245290118048
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 823962341}
+  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: 823962343}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &5916772096251899638
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 823962341}
+  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
+  eTSStyple: 3
+  isCreate: 0
+  isZDYPart: 0
 --- !u!1 &840522405
 GameObject:
   m_ObjectHideFlags: 0
@@ -2827,13 +2888,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 3
+  id: 4
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &817393583
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2987,7 +3047,7 @@ RectTransform:
   - {fileID: 1399077090}
   - {fileID: 1191658825}
   m_Father: {fileID: 2921542304032736362}
-  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: 0}
@@ -3759,7 +3819,7 @@ RectTransform:
   - {fileID: 723150304825286416}
   - {fileID: 1551334337}
   m_Father: {fileID: 2921542304032736362}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3851,8 +3911,10 @@ GameObject:
   - component: {fileID: 1399077090}
   - component: {fileID: 1399077092}
   - component: {fileID: 1399077091}
+  - component: {fileID: 1469475613719935288}
+  - component: {fileID: 7242391424395582099}
   m_Layer: 5
-  m_Name: Image (1)
+  m_Name: CancelBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3914,6 +3976,69 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1469475613719935288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1399077089}
+  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: 1399077091}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &7242391424395582099
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1399077089}
+  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
+  eTSStyple: 2
+  isCreate: 0
+  isZDYPart: 0
 --- !u!1 &1441241190
 GameObject:
   m_ObjectHideFlags: 0
@@ -4275,7 +4400,6 @@ MonoBehaviour:
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 1
-  tiaoSeObj: {fileID: 0}
 --- !u!1 &1596525556
 GameObject:
   m_ObjectHideFlags: 0
@@ -4476,7 +4600,6 @@ MonoBehaviour:
   eTSStyple: 0
   isCreate: 0
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!1 &1669219676
 GameObject:
   m_ObjectHideFlags: 0
@@ -4785,8 +4908,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -25}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1854935389
 MonoBehaviour:
@@ -4976,13 +5099,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 5
+  id: 6
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &25729863
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5272,7 +5394,6 @@ MonoBehaviour:
   eTSStyple: 0
   isCreate: 0
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &1812341214
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5406,13 +5527,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 1
+  id: 2
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &1841796866
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5546,13 +5666,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 6
+  id: 7
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
 --- !u!114 &15492327
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5626,7 +5745,7 @@ RectTransform:
   - {fileID: 1935163379261594772}
   - {fileID: 7742362321348794451}
   m_Father: {fileID: 2921542304032736362}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5800,7 +5919,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3401525469733486441
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6329,6 +6448,42 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3208672400358542704
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4287760994855644235}
+  m_Layer: 5
+  m_Name: Color
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4287760994855644235
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3208672400358542704}
+  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:
+  - {fileID: 1937983574150838761}
+  m_Father: {fileID: 2921542304032736362}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &3447988733459671993
 GameObject:
   m_ObjectHideFlags: 0
@@ -6626,6 +6781,67 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &4285689382573299052
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 457680986257639304}
+  - component: {fileID: 7765375707020122801}
+  m_Layer: 5
+  m_Name: ColorList
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &457680986257639304
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4285689382573299052}
+  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:
+  - {fileID: 2746862158431819875}
+  m_Father: {fileID: 1937983574150838761}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -89.4}
+  m_SizeDelta: {x: 0, y: 178.86353}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7765375707020122801
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4285689382573299052}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 100, y: 145}
+  m_Spacing: {x: 0, y: 30.4}
+  m_Constraint: 1
+  m_ConstraintCount: 1
 --- !u!1 &4538404593018685582
 GameObject:
   m_ObjectHideFlags: 0
@@ -6729,6 +6945,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 4287760994855644235}
   - {fileID: 2120691760}
   - {fileID: 1331787699}
   - {fileID: 986032742}
@@ -7431,8 +7648,7 @@ MonoBehaviour:
   eTSStyple: 0
   isCreate: 0
   isZDYPart: 0
-  tiaoSeObj: {fileID: 0}
---- !u!1 &6074353506794593167
+--- !u!1 &6035115271371984216
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -7440,45 +7656,165 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1935163379261594772}
-  - component: {fileID: 2072297358299207875}
-  - component: {fileID: 313089734730998423}
-  - component: {fileID: 8899511649281131650}
+  - component: {fileID: 1937983574150838761}
+  - component: {fileID: 3358856205597050410}
+  - component: {fileID: 8693053313928642850}
+  - component: {fileID: 2309029824458300313}
+  - component: {fileID: 6464298485949346300}
   m_Layer: 5
-  m_Name: SaveBtn
+  m_Name: ColorScrollView
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &1935163379261594772
+--- !u!224 &1937983574150838761
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6074353506794593167}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_GameObject: {fileID: 6035115271371984216}
+  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: 2120691760}
+  m_Children:
+  - {fileID: 457680986257639304}
+  m_Father: {fileID: 4287760994855644235}
   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: 119, y: 140}
-  m_SizeDelta: {x: 209, y: 85}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2072297358299207875
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6074353506794593167}
-  m_CullTransparentMesh: 0
---- !u!114 &313089734730998423
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 154.12, y: 1313.7485}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!114 &3358856205597050410
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6035115271371984216}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 457680986257639304}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 1937983574150838761}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!222 &8693053313928642850
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6035115271371984216}
+  m_CullTransparentMesh: 0
+--- !u!114 &2309029824458300313
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6035115271371984216}
+  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.05882353}
+  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!114 &6464298485949346300
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6035115271371984216}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
+--- !u!1 &6074353506794593167
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1935163379261594772}
+  - component: {fileID: 2072297358299207875}
+  - component: {fileID: 313089734730998423}
+  - component: {fileID: 8899511649281131650}
+  m_Layer: 5
+  m_Name: SaveBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1935163379261594772
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6074353506794593167}
+  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: 2120691760}
+  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: 119, y: 140}
+  m_SizeDelta: {x: 209, y: 85}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2072297358299207875
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6074353506794593167}
+  m_CullTransparentMesh: 0
+--- !u!114 &313089734730998423
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -7668,6 +8004,154 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7582375393325546160
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1710631629569762163}
+  - component: {fileID: 7430791464356482654}
+  - component: {fileID: 8947502906472323249}
+  m_Layer: 5
+  m_Name: Item (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1710631629569762163
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7582375393325546160}
+  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: 2746862158431819875}
+  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: 51.5, y: 1.6000061}
+  m_SizeDelta: {x: 96, y: 4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7430791464356482654
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7582375393325546160}
+  m_CullTransparentMesh: 0
+--- !u!114 &8947502906472323249
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7582375393325546160}
+  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: fde5b205d6058344d9ef82ec8fc96d3e, 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 &7852599864412727460
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1446650139723996614}
+  - component: {fileID: 1156831810720100874}
+  - component: {fileID: 2164321447037362761}
+  m_Layer: 5
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1446650139723996614
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852599864412727460}
+  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: 2746862158431819875}
+  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: 45.9, y: 23.4}
+  m_SizeDelta: {x: 39, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1156831810720100874
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852599864412727460}
+  m_CullTransparentMesh: 0
+--- !u!114 &2164321447037362761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852599864412727460}
+  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: 8ae6bcd1f9d85514d8c4780cfc0e4e00, 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 &8058751135546230701
 GameObject:
   m_ObjectHideFlags: 0
@@ -8043,6 +8527,147 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8359233319713028392
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2746862158431819875}
+  - component: {fileID: 1982569713687701767}
+  - component: {fileID: 6235043719338938377}
+  - component: {fileID: 7330569747061633657}
+  - component: {fileID: 7108929925837307999}
+  m_Layer: 5
+  m_Name: TiaoSe
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2746862158431819875
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8359233319713028392}
+  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:
+  - {fileID: 1446650139723996614}
+  - {fileID: 1710631629569762163}
+  m_Father: {fileID: 457680986257639304}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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 &1982569713687701767
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8359233319713028392}
+  m_CullTransparentMesh: 0
+--- !u!114 &6235043719338938377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8359233319713028392}
+  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: d0ca39b623336474d8f76d3a147cf0c5, 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 &7330569747061633657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8359233319713028392}
+  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
+  eTSStyple: 4
+  isCreate: 0
+  isZDYPart: 0
+--- !u!114 &7108929925837307999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8359233319713028392}
+  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: 6235043719338938377}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8482992957111588468
 GameObject:
   m_ObjectHideFlags: 0

BIN
Assets/GameMain/UI/UISprites/CustomRole/datuishangthick.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/datuishangwide.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/datuixiathick.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/datuixiawide.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/jiaobubig.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/jiaowanthick.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/jiaowanwide.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/tuibu.png


+ 92 - 0
Assets/GameMain/UI/UISprites/CustomRole/tuibu.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: a200bb85daa0ce84b859efc7d424d88a
+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: 

BIN
Assets/GameMain/UI/UISprites/CustomRole/xiaotuiwide.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xigaithick.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xigaiwide.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xiongbuangle.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xiongbuopen.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xiongbushape.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xiongbusize.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xiongbuthcik.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xiongbuup.png


BIN
Assets/GameMain/UI/UISprites/CustomRole/xiongbuwide.png