Jidongchen 3 лет назад
Родитель
Сommit
8e997cc5cc

+ 86 - 10
Assets/GameMain/Scripts/UI/UICustom.cs

@@ -54,7 +54,8 @@ namespace MetaClient
         [Header("滑块")]
         public Scrollbar scrollbar;
 
-
+        [Header("颜色选择界面")]
+        public GameObject tiaoSeBanView;
         [Header("颜色选择界面")]
         public GameObject colorView;
 
@@ -64,7 +65,8 @@ namespace MetaClient
         
         [Header("颜色演示预制体")]
         public GameObject colItem;
-
+        [Header("缓动时间")]
+        public float slowUIMoveTime = 2f;
 
         public float tween_leftMax = 0;
         public float tween_leftMin = -250;
@@ -120,18 +122,16 @@ namespace MetaClient
                 return;
             }
             isTween = true;
-            leftView.transform.DOLocalMoveX(tween_leftMin, 2f).SetEase(Ease.InOutBack).OnComplete(()=> {
+            leftView.transform.DOLocalMoveX(tween_leftMin, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(()=> {
                 //whitebg.SetActive(bg);
                
                  ClickBtnFun(eCustomStyple,id,ziDingYi);
-                leftView.transform.DOLocalMoveX(0, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
+                leftView.transform.DOLocalMoveX(0, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
                     isTween = false;
-                    Debug.Log("222");
                 });
             });
-            Debug.Log("333");
-            rightView.transform.DOLocalMoveX(tween_rightMax, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
-                rightView.transform.DOLocalMoveX(0, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
+            rightView.transform.DOLocalMoveX(tween_rightMax, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                rightView.transform.DOLocalMoveX(0, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
                 });
             });
 
@@ -162,7 +162,74 @@ namespace MetaClient
             Debug.Log(scrollbar.value);
         }
 
-        public void BackBtnFun()
+        public void BackBtnFun() {
+            if (isTween)
+            {
+                return;
+            }
+            isTween = true;
+            leftView.transform.DOLocalMoveX(tween_leftMin, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                //whitebg.SetActive(bg);
+
+                BackWayFun();
+                leftView.transform.DOLocalMoveX(0, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                    isTween = false;
+                });
+            });
+            rightView.transform.DOLocalMoveX(tween_rightMax, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                rightView.transform.DOLocalMoveX(0, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                });
+            });
+        }
+        public void TiaoSeViewOpenFun() {
+            if (isTween)
+            {
+                return;
+            }
+            isTween = true;
+            leftView.transform.DOLocalMoveX(tween_leftMin, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                //whitebg.SetActive(bg);
+
+                TiaoSeViewShow();
+                leftView.transform.DOLocalMoveX(0, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                    isTween = false;
+                });
+            });
+            rightView.transform.DOLocalMoveX(tween_rightMax, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                rightView.transform.DOLocalMoveX(0, slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                });
+            });
+        }
+
+        public void TiaoSeBanOpenStyple(bool _bo)
+        {
+            colorView.SetActive(!_bo);
+            tiaoSeBanView.SetActive(_bo);
+            if (!_bo)
+            {
+                RefeshColorView();    
+            }
+        }
+        public void RefeshColorView()
+        {
+            
+        }
+
+
+
+        public void TiaoSeViewShow() {
+            rightView.SetActive(false);
+            colorView.SetActive(true);
+            histroyextra = true;
+            ColorViewRefesh();
+          
+        }
+        public void ColorViewRefesh() {
+        }
+
+
+
+        public void BackWayFun()
         {
             if (histroyextra)
             {
@@ -669,7 +736,16 @@ namespace MetaClient
         Scroll,
         TiaoSe,
         NorButton,
-        Back
+        Back,
+        Color,
+    }
+    public enum ETSStyple
+    {
+        None,
+        Open,
+        Close,
+        Sure,
+        ViewOpen,
     }
     public enum ENieLianStyple {
         None,

+ 33 - 1
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()
@@ -58,18 +61,47 @@ namespace MetaClient
                     
                     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()
         //{

+ 4 - 4
Assets/GameMain/Scripts/UI/UICustomNor.cs

@@ -32,19 +32,19 @@ namespace MetaClient
                 return;
             }
             uICustom.isTween = true;
-            uICustom.leftView.transform.DOLocalMoveX(uICustom.tween_leftMin, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
+            uICustom.leftView.transform.DOLocalMoveX(uICustom.tween_leftMin,uICustom.slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
                 //  ClickBtnFun(_objects);
                 objDisAppear.ForEach(i => i.SetActive(false));
                 objAppear.ForEach(i => i.SetActive(true));
-                uICustom.leftView.transform.DOLocalMoveX(0, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
+                uICustom.leftView.transform.DOLocalMoveX(0, uICustom.slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
                     uICustom.isTween = false;
                     uICustom.HistoryAdd("firstpush");
                     Debug.Log("222");
                 });
             });
             Debug.Log("333");
-            uICustom.rightView.transform.DOLocalMoveX(uICustom.tween_rightMax, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
-                uICustom.rightView.transform.DOLocalMoveX(0, 2f).SetEase(Ease.InOutBack).OnComplete(() => {
+            uICustom.rightView.transform.DOLocalMoveX(uICustom.tween_rightMax, uICustom.slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
+                uICustom.rightView.transform.DOLocalMoveX(0, uICustom.slowUIMoveTime).SetEase(Ease.InOutBack).OnComplete(() => {
                 });
             });
 

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

@@ -64,6 +64,7 @@ MonoBehaviour:
   scrollbar: {fileID: 6113850133271156823}
   colorView: {fileID: 0}
   colItem: {fileID: 1941601955}
+  slowUIMoveTime: 2
   tween_leftMax: 0
   tween_leftMin: -250
   tween_rightMin: 0
@@ -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
@@ -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
@@ -4459,8 +4472,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 +4978,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 +5268,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 +5408,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 +5548,10 @@ MonoBehaviour:
   id: 6
   eButtonStyple: 3
   part: 0
+  eTSStyple: 0
   isCreate: 1
   isZDYPart: 0
+  tiaoSeObj: {fileID: 0}
 --- !u!114 &15492327
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7206,6 +7229,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 +7335,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