Merge branch 'MainWinAdjust'

client_Wu Xijin

2019-03-27 44b5b3201f08c119429f5ec6da982677e47569a2

 System/MainInterfacePanel/AnimationFadeOut.cs

@@ -26,7 +26,6 @@


        [SerializeField] CanvasGroup m_CanvasGroup;



        [SerializeField] GameObject m_ShadeObj;

        Dictionary<int, List<Transform>> AnimationFadeOutDic = new Dictionary<int, List<Transform>>();

        Dictionary<int, Transform> tranDic = new Dictionary<int, Transform>();



@@ -41,26 +40,26 @@
        {

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;

        }



        public void FadeOut()//淡出

        {

            m_Animator.Play("MainFadeIn");

            m_ShadeObj.SetActive(false);

        }

        public void FadeIn()//淡入

        {

            m_Animator.Play("MainFadeOut");

            m_ShadeObj.SetActive(true);

        }



        public void ImmediatelyAppear()//立刻出现

        {

            m_Animator.Play("ImmediatelyAppear", 0, 1);

            m_ShadeObj.SetActive(true);

        }



        public void FadeAtOnce()//立刻消失

        {

            m_Animator.Play("FadeAtOnce", 0, 1);

            m_ShadeObj.SetActive(false);

        }



        public bool GetIsFadeIn()//是否淡入

        {

            if (m_CanvasGroup.alpha < 0.5)

@@ -178,8 +177,6 @@
            switch (index)

            {

                case 0:





                    tran.SetParent(lineFadeOut.OneParent);

                    tran.localPosition = Vector3.zero;

                    break;

@@ -199,9 +196,6 @@
                default:

                    break;

            }







        }



        private void PositionReduction()//还原位置（把盒子中的位置全部重新拉出来）