From 587c8e7c1669860985080f46dcfeb3f71fc63ad6 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 27 三月 2019 17:38:45 +0800
Subject: [PATCH] 3335 调整主界面.

---
 System/MainInterfacePanel/MainPositionTween.cs |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/System/MainInterfacePanel/MainPositionTween.cs b/System/MainInterfacePanel/MainPositionTween.cs
index 06c81c4..988f06d 100644
--- a/System/MainInterfacePanel/MainPositionTween.cs
+++ b/System/MainInterfacePanel/MainPositionTween.cs
@@ -17,30 +17,30 @@
         [SerializeField] Transform m_ImageRotation;//鍒囨崲婊氬姩
 
         [Header("涓荤晫闈㈤《閮ㄤ笂涓嬪垏鎹㈡ā鍧�")]
-        public float CopyOfThePanelSpeed = 1f;//鍓湰闈㈡澘绉诲姩閫熷害
-        [SerializeField] Transform m_CopyOfThePanel;
+        public float rightTopSwitchTime = 1f;
+        [SerializeField] Transform m_RightTopFunction;
         [SerializeField] Transform m_ContainerBossList;
-        [SerializeField] Transform m_CopyOfThePosition1;
-        [SerializeField] Transform m_CopyOfThePosition2;
+        [SerializeField] Transform m_RightTopPosition1;
+        [SerializeField] Transform m_RightTopPosition2;
 
         [Header("涓荤晫闈㈡妧鑳介潰鏉垮垏鎹㈡ā鍧�")]
-        public float SwitchSkillTipAndButtonTipSpeed = 1.2f;//鎶�鑳介潰鏉垮拰鎸夐挳闈㈡澘鐨勭Щ鍔ㄩ�熷害
-        [SerializeField] Transform m_CastSkillTip;//鎶�鑳介潰鏉�
-        [SerializeField] Transform m_position1_S;
-        [SerializeField] Transform m_position2_S;
+        public float rightBottomSwitchTime = 1.2f;
+        [SerializeField] Transform m_ContainerSkill;//鎶�鑳介潰鏉�
+        [SerializeField] Transform m_SkillPosition1;
+        [SerializeField] Transform m_SkillPosition2;
         [SerializeField] AnimationFadeOut m_AnimationFadeOut;//鍙充笅瑙掓寜閽粍
 
         [Header("涓荤晫闈换鍔℃ā鍧�")]
-        public float TaskSpeed = 0.2f;//浠诲姟闈㈡澘绉诲姩鐨勯�熷害
-        [SerializeField] Transform m_TaskAndTeamPanel;
-        [SerializeField] Transform m_TaskListTipAnchor1;
-        [SerializeField] Transform m_TaskListTipAnchor2;
+        public float leftMiddleSwitchTime = 0.5f;//浠诲姟闈㈡澘绉诲姩鐨勯�熷害
+        [SerializeField] Transform m_ContainerLeftMiddle;
+        [SerializeField] Transform m_LeftMiddlePosition1;
+        [SerializeField] Transform m_LeftMiddlePosition2;
         [SerializeField] GameObject m_LeftImage;
         [SerializeField] GameObject m_RightImg;
 
         public bool IsSetCopyOfThePanelShow {
             get {
-                return (m_CopyOfThePanel.position - m_CopyOfThePosition1.position).sqrMagnitude < (2.5 * 2.5);
+                return (m_RightTopFunction.localPosition - m_RightTopPosition1.localPosition).sqrMagnitude < (2.5 * 2.5);
             }
         }
 
@@ -48,11 +48,11 @@
         {
             if (_bool)
             {
-                m_CopyOfThePanel.position = m_CopyOfThePosition1.position;
+                m_RightTopFunction.localPosition = m_RightTopPosition1.localPosition;
             }
             else
             {
-                m_CopyOfThePanel.position = m_CopyOfThePosition2.position;
+                m_RightTopFunction.localPosition = m_RightTopPosition2.localPosition;
             }
         }
 
@@ -60,11 +60,11 @@
         {
             if (_bool)
             {
-                m_CopyOfThePanel.DOMoveY(m_CopyOfThePosition1.position.y, CopyOfThePanelSpeed);
+                m_RightTopFunction.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);
             }
             else
             {
-                m_CopyOfThePanel.DOMoveY(m_CopyOfThePosition2.position.y, CopyOfThePanelSpeed);
+                m_RightTopFunction.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);
             }
         }
 
@@ -72,11 +72,11 @@
         {
             if (_bool)
             {
-                m_ContainerBossList.position = m_CopyOfThePosition1.position;
+                m_ContainerBossList.localPosition = m_RightTopPosition1.localPosition;
             }
             else
             {
-                m_ContainerBossList.position = m_CopyOfThePosition2.position;
+                m_ContainerBossList.localPosition = m_RightTopPosition2.localPosition;
             }
         }
 
@@ -84,11 +84,11 @@
         {
             if (_bool)
             {
-                m_ContainerBossList.DOMoveY(m_CopyOfThePosition1.position.y, CopyOfThePanelSpeed);
+                m_ContainerBossList.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);
             }
             else
             {
-                m_ContainerBossList.DOMoveY(m_CopyOfThePosition2.position.y, CopyOfThePanelSpeed);
+                m_ContainerBossList.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);
             }
         }
 
@@ -122,7 +122,7 @@
 
         public bool IsRightTipPanelShow {
             get {
-                return (m_CastSkillTip.position - m_position1_S.position).sqrMagnitude < 1;
+                return (m_ContainerSkill.localPosition - m_SkillPosition1.localPosition).sqrMagnitude < 1;
             }
         }
 
@@ -131,12 +131,12 @@
             if (_bool)
             {
                 m_AnimationFadeOut.FadeAtOnce();
-                m_CastSkillTip.position = m_position1_S.position;
+                m_ContainerSkill.localPosition = m_SkillPosition1.localPosition;
             }
             else
             {
                 m_AnimationFadeOut.ImmediatelyAppear();
-                m_CastSkillTip.position = m_position2_S.position;
+                m_ContainerSkill.localPosition = m_SkillPosition2.localPosition;
             }
         }
 
@@ -145,18 +145,18 @@
             if (_bool)
             {
                 m_AnimationFadeOut.FadeOut();
-                m_CastSkillTip.DOMoveX(m_position1_S.position.x, SwitchSkillTipAndButtonTipSpeed);
+                m_ContainerSkill.DOLocalMoveX(m_SkillPosition1.localPosition.x, rightBottomSwitchTime);
             }
             else
             {
                 m_AnimationFadeOut.FadeIn();
-                m_CastSkillTip.DOMoveX(m_position2_S.position.x, SwitchSkillTipAndButtonTipSpeed);
+                m_ContainerSkill.DOLocalMoveX(m_SkillPosition2.localPosition.x, rightBottomSwitchTime);
             }
         }
 
         public bool IsTaskAndPanelShow {
             get {
-                return (m_TaskAndTeamPanel.position - m_TaskListTipAnchor1.position).sqrMagnitude < 3 * 3;
+                return (m_ContainerLeftMiddle.localPosition - m_LeftMiddlePosition1.localPosition).sqrMagnitude < 3 * 3;
             }
         }
 
@@ -164,11 +164,11 @@
         {
             if (_bool)
             {
-                m_TaskAndTeamPanel.position = m_TaskListTipAnchor1.position;
+                m_ContainerLeftMiddle.localPosition = m_LeftMiddlePosition1.localPosition;
             }
             else
             {
-                m_TaskAndTeamPanel.position = m_TaskListTipAnchor2.position;
+                m_ContainerLeftMiddle.localPosition = m_LeftMiddlePosition2.localPosition;
             }
         }
 
@@ -176,13 +176,13 @@
         {
             if (_bool)
             {
-                m_TaskAndTeamPanel.DOMoveX(m_TaskListTipAnchor1.position.x, TaskSpeed);
+                m_ContainerLeftMiddle.DOLocalMoveX(m_LeftMiddlePosition1.localPosition.x, leftMiddleSwitchTime);
                 m_LeftImage.SetActive(true);
                 m_RightImg.SetActive(false);
             }
             else
             {
-                m_TaskAndTeamPanel.DOMoveX(m_TaskListTipAnchor2.position.x, TaskSpeed);
+                m_ContainerLeftMiddle.DOLocalMoveX(m_LeftMiddlePosition2.localPosition.x, leftMiddleSwitchTime);
                 m_LeftImage.SetActive(false);
                 m_RightImg.SetActive(true);
             }
@@ -192,11 +192,11 @@
         {
             if (_bool)
             {
-                m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);
+                m_ImageRotation.DOLocalRotate(Vec3, rightBottomSwitchTime);
             }
             else
             {
-                m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);
+                m_ImageRotation.DOLocalRotate(Vector3.zero, rightBottomSwitchTime);
             }
         }
     }

--
Gitblit v1.8.0