3335 代码修改

client_Zxw

2019-02-20 0235acfe784345d2034d27d38924974986578edb

3335 代码修改

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -24,7 +24,6 @@
        [SerializeField] HighSettingTip m_HighSettingTip;

        [SerializeField] TaskListTip m_TaskListTip;//任务

        [SerializeField] TopRightTip m_TopRightTip;



        [SerializeField] FunctionForecastTip m_FunctionForecastTip;//功能预告

        [SerializeField] IsShowXpButton m_IsShowXp;//XP 技能常显                                                

        [SerializeField] SkillButtonEffects m_SkillButtonEffects;

@@ -42,32 +41,19 @@
        public float _Delaytime = 0.1f;//延迟时间





        [Header("任务面板的移动速度")]

        public float Speed = 0.2f;

        [Header("技能面板和按钮面板的移动速度")]

        public float SwitchSkillTipAndButtonTipSpeed = 0.2f;

        public float DoFade = 0.2f;

        [SerializeField] Transform m_LowSettingTipGroup;//按钮面板

        [SerializeField] Transform m_CastSkillTip;//技能面板

        [SerializeField] Transform m_position1_S;

        [SerializeField] Transform m_position2_S;

        public static bool recordPositionBool = true;



        [Header("策划要的角度")]

        [Header("切换按钮旋转角度")]

        public Vector3 Vec3 = new Vector3(0f, 0f, 225f);

        [SerializeField] Transform m_ImageRotation;//切换滚动



        [SerializeField] GameObject m_TaskAndTeamTip;

        [SerializeField] GameObject LeftImage;

        [SerializeField] GameObject RightImg;

        [SerializeField] Transform m_TaskAndTeamPanel;

        [SerializeField] Transform TaskListTipAnchor1;

        [SerializeField] Transform TaskListTipAnchor2;



        [SerializeField] Button m_TaskSwithButton;//关于功能预告

        [SerializeField] Transform FunctionForecastPanel;

        [SerializeField] Transform unctionForecastPosition1;

        [SerializeField] Transform unctionForecastPosition2;



        [SerializeField] FairyLeagueRemindBehaviour m_FairyLeagueRemind;



@@ -116,13 +102,11 @@
        {

            m_MapSwitchingBehaviour.InitAwake();

            recordPositionBool = true;

            m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;

            m_CastSkillTip.localPosition = m_position1_S.localPosition;

            m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);

            m_MainPositionTween.SetTaskPos(true);

            m_MainPositionTween.SetFunctionForecastPos(true);

            m_MailObj.SetActive(true);

            var inst = BossShowModel.Instance;

            TaskSwithBool = true;

            FunctionForecastPanel.localPosition = unctionForecastPosition1.localPosition;

            LeftImage.SetActive(true);

            RightImg.SetActive(false);

            ListBossMapId.Clear();

@@ -153,7 +137,6 @@
            }

            IsUpdateBool = true;

            SliderOpen = true;

            horseRidBool = false;

            m_InGamePusher.Init();

            m_SkillContainer.Init();

            m_FunctionForecastTip.Init();

@@ -215,7 +198,7 @@
            if (onMainModel.IsDead || (onMainModel.IsBossAreaTask && !IsBossBool))

            {



                if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 3)

                if (!m_MainPositionTween.IsTaskAndPanelShow)

                {

                    TaskSwithButton();

                }

@@ -239,10 +222,8 @@
                }

                if (m_AnimationFadeOut.GetIsFadeIn() && mapId != PlayerDatas.Instance.baseData.MapID)

                {

                    m_AnimationFadeOut.FadeAtOnce();

                    m_MailObj.SetActive(true);

                    m_CastSkillTip.localPosition = m_position1_S.localPosition;

                    m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);

                    m_MainPositionTween.SetSkillTipOrRightTipPos(true);

                    recordPositionBool = true;

                }

            }

@@ -314,7 +295,6 @@
            m_FairyCallBehaviour.UnInit();

            m_FairyLeagueRemind.UnInit();

            m_MainButtonMisc.Unit();

            horseRidBool = false;



            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;

            FunctionUnlockFlyObject.functionUnLockShowBeginEvent -= UnFlodFunctionArea;

@@ -354,7 +334,7 @@
        }

        private void OnGuideBegin()//引导开始

        {

            if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 5)

            if (!m_MainPositionTween.IsTaskAndPanelShow)

            {

                TaskSwithButton();

            }

@@ -392,7 +372,7 @@


            if (_areaType == MapArea.E_Type.Boss && _enter)

            {

                if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) < 2 && ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID))

                if (m_MainPositionTween.IsTaskAndPanelShow && ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID))

                {

                    TaskSwithButton();

                    onMainModel.IsBossAreaTask = true;

@@ -484,10 +464,6 @@
        protected override void OnAfterClose()

        {

        }



        private Vector2 startPosition;

        private Vector2 endPosition;

        private bool horseRidBool = false;

        protected override void LateUpdate()

        {

            base.LateUpdate();

@@ -539,11 +515,9 @@
                    }

                }

                m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);

                m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);

                m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, DoFade);

                m_MailObj.SetActive(true);

                m_AnimationFadeOut.FadeOut();

                recordPositionBool = true;

                m_MainPositionTween.SetSkillTipOrRightTipPosTween(true);

            }

        }

        void DownButton(GameObject go)

@@ -563,11 +537,10 @@
            }

            if (TaskSwithBool)//隐藏

            {

                m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor2.localPosition.x, Speed);

                m_MainPositionTween.SetTaskPosTween(false);

                if (m_FunctionForecastTip.gameObject.activeSelf)

                {

                    FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition2.localPosition.x, Speed);



                    m_MainPositionTween.SetFunctionForecastPosTween(false);

                }

                LeftImage.SetActive(false);

                RightImg.SetActive(true);

@@ -578,10 +551,10 @@
            }

            else//显示

            {

                m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor1.localPosition.x, Speed);

                m_MainPositionTween.SetTaskPosTween(true);

                if (m_FunctionForecastTip.gameObject.activeSelf)

                {

                    FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition1.localPosition.x, Speed);

                    m_MainPositionTween.SetFunctionForecastPosTween(true);

                }

                LeftImage.SetActive(true);

                RightImg.SetActive(false);

@@ -609,11 +582,9 @@
                    }

                }

                m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);

                m_CastSkillTip.DOLocalMoveX(m_position2_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);

                m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(0, DoFade);

                m_MailObj.SetActive(false);

                m_AnimationFadeOut.FadeIn();

                _MarkRay.gameObject.SetActive(true);

                m_MainPositionTween.SetSkillTipOrRightTipPosTween(false);

            }

            else//显示默认

            {

@@ -629,11 +600,9 @@
                    }                

                }

                m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);

                m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);

                m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, DoFade);

                m_MailObj.SetActive(true);

                m_AnimationFadeOut.FadeOut();

                _MarkRay.gameObject.SetActive(false);

                m_MainPositionTween.SetSkillTipOrRightTipPosTween(true);

            }

            recordPositionBool = !recordPositionBool;

        }

@@ -645,7 +614,7 @@
            {

                onMainModel.IsBossAreaTask = false;

            }

            m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;

            m_MainPositionTween.SetTaskPos(true);

            TaskSwithBool = !TaskSwithBool;

        }



@@ -715,8 +684,6 @@
                IsCrossServerOneVsOne();

            }

        }





        #endregion



        private bool IsDungeon()

@@ -730,11 +697,11 @@
        {

            if (_unflod)

            {

                if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)//技能面板展开状态

                if (m_MainPositionTween.IsRightTipPanelShow)//技能面板展开状态

                {

                    ShowBtnGroup();//显示按钮组隐藏技能组(强制切换)

                }

                if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) > 5)//任务面板

                if (!m_MainPositionTween.IsTaskAndPanelShow)//任务面板

                {

                    TaskSwithButton();

                    onMainModel.IsBossAreaTask = false;

@@ -747,7 +714,7 @@
            }

            else

            {

                if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//技能面板收起状态

                if (m_MainPositionTween.IsRightTipPanelShow)//技能面板收起状态

                {

                    ShowCastSkill();//显示技能组,隐藏按钮组(强制切换)

                }

@@ -763,7 +730,7 @@
        {

            if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)

            {

                if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//技能面板收起状态

                if (m_MainPositionTween.IsRightTipPanelShow)//技能面板收起状态

                {

                    ShowCastSkill();//显示技能组隐藏按钮组(强制切换)

                }

@@ -813,7 +780,7 @@


        public void IsShowButtonGroup()

        {

            if (Vector3.Distance(m_CastSkillTip.localPosition, m_position1_S.localPosition) <= 1)//技能面板展示

            if (m_MainPositionTween.IsRightTipPanelShow)//技能面板展示

            {

                ShowBtnGroup();//显示按钮组隐藏技能组(强制切换)

            }

@@ -821,8 +788,7 @@


        private void ShowBtnGroup()//显示按钮组,隐藏技能组(强制切换)

        {

            m_AnimationFadeOut.ImmediatelyAppear();//按钮组立即出现

            m_CastSkillTip.localPosition = m_position2_S.localPosition;//技能面板切出

            m_MainPositionTween.SetSkillTipOrRightTipPos(false);

            m_MailObj.SetActive(false);

            m_ImageRotation.DOLocalRotate(Vec3, SwitchSkillTipAndButtonTipSpeed);

            recordPositionBool = false;

@@ -830,10 +796,8 @@
        }

        private void ShowCastSkill()//显示技能组,隐藏按钮组(强制切换)

        {

            m_AnimationFadeOut.FadeAtOnce();//功能面板立刻隐藏

            m_CastSkillTip.localPosition = m_position1_S.localPosition;//技能面板立即出现

            m_MainPositionTween.SetSkillTipOrRightTipPos(true);

            m_MailObj.SetActive(true);

            m_CastSkillTip.GetComponent<CanvasGroup>().DOFade(1, 0);

            m_ImageRotation.DOLocalRotate(Vector3.zero, SwitchSkillTipAndButtonTipSpeed);

            recordPositionBool = true;

            _MarkRay.gameObject.SetActive(false);

@@ -873,7 +837,7 @@
                m_TaskSwithButton.gameObject.SetActive(false);

                m_InGamePusher.gameObject.SetActive(false);

                IsShowTaskPanel();

                if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//技能面板收起状态

                if (m_MainPositionTween.IsRightTipPanelShow)//技能面板收起状态

                {

                    ShowCastSkill();//显示技能组,隐藏按钮组(强制切换)

                }


 System/MainInterfacePanel/MainPositionTween.cs

@@ -12,13 +12,27 @@

    public class MainPositionTween : MonoBehaviour

    {

        [Header("主界面顶部上下切换按钮组")]

        [Header("主界面顶部上下切换模块")]

        public float CopyOfThePanelSpeed = 1f;//副本面板移动速度
        [SerializeField] Transform m_CopyOfThePanel;
        [SerializeField] Transform m_CopyOfThePosition1;

        [SerializeField] Transform m_CopyOfThePosition2;

        [SerializeField] Transform m_ContainerBossList;



        [Header("主界面技能面板切换模块")]

        public float SwitchSkillTipAndButtonTipSpeed = 1.2f;//技能面板和按钮面板的移动速度

        [SerializeField] Transform m_CastSkillTip;//技能面板

        [SerializeField] Transform m_position1_S;

        [SerializeField] Transform m_position2_S;

        [SerializeField] AnimationFadeOut m_AnimationFadeOut;//右下角按钮组

        [Header("主界面任务模块")]

        public float TaskSpeed = 0.2f;//任务面板移动的速度

        [SerializeField] Transform m_TaskAndTeamPanel;

        [SerializeField] Transform TaskListTipAnchor1;

        [SerializeField] Transform TaskListTipAnchor2;

        [Header("功能预告模块")]

        [SerializeField] Transform FunctionForecastPanel;

        [SerializeField] Transform unctionForecastPosition1;

        [SerializeField] Transform unctionForecastPosition2;

        public bool IsSetCopyOfThePanelShow

        {

            get

@@ -95,8 +109,94 @@
                SetCopyOfThePanelTweenPos(false);

                SetBossListTweenPos(true);

            }

        }

        //-----------------------------

        public bool IsRightTipPanelShow

        {

            get

            {

                return (m_CastSkillTip.position - m_position1_S.position).sqrMagnitude < 1;

            }

        }

        public void SetSkillTipOrRightTipPos(bool _bool)

        {

            if (_bool)

            {

                m_AnimationFadeOut.FadeAtOnce();

                m_CastSkillTip.localPosition = m_position1_S.localPosition;

            }

            else

            {

                m_AnimationFadeOut.ImmediatelyAppear();

                m_CastSkillTip.localPosition = m_position2_S.localPosition;

            }

        }

        public void SetSkillTipOrRightTipPosTween(bool _bool)

        {

            if (_bool)

            {

                m_AnimationFadeOut.FadeOut();

                m_CastSkillTip.DOLocalMoveX(m_position1_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);

            }

            else

            {

                m_AnimationFadeOut.FadeIn();

                m_CastSkillTip.DOLocalMoveX(m_position2_S.localPosition.x, SwitchSkillTipAndButtonTipSpeed);

            }

        }

        //----------------------------

        public bool IsTaskAndPanelShow

        {

            get

            {

                return (m_TaskAndTeamPanel.localPosition - TaskListTipAnchor1.localPosition).sqrMagnitude < 3*3;

            }

        }

        public void SetTaskPos(bool _bool)

        {

            if (_bool)

            {

                m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;

            }

            else

            {

                m_TaskAndTeamPanel.localPosition = TaskListTipAnchor2.localPosition;

            }

        }
        public void SetTaskPosTween(bool _bool)

        {

            if (_bool)

            {

                m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor1.localPosition.x, TaskSpeed);

            }

            else

            {

                m_TaskAndTeamPanel.DOLocalMoveX(TaskListTipAnchor2.localPosition.x, TaskSpeed);

            }

        }

        //-----------------------------

        public void SetFunctionForecastPos(bool _bool)

        {

            if (_bool)

            {

                FunctionForecastPanel.localPosition = unctionForecastPosition1.localPosition;

            }

            else

            {

                FunctionForecastPanel.localPosition = unctionForecastPosition2.localPosition;

            }

        }
        public void SetFunctionForecastPosTween(bool _bool)

        {

            if (_bool)

            {

                FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition1.localPosition.x, TaskSpeed);

            }

            else

            {

                FunctionForecastPanel.DOLocalMoveX(unctionForecastPosition2.localPosition.x, TaskSpeed);

            }

        }
    }

}