3335 调整主界面.

client_Wu Xijin

2019-03-27 587c8e7c1669860985080f46dcfeb3f71fc63ad6

3335 调整主界面.

 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()//还原位置（把盒子中的位置全部重新拉出来）


 System/MainInterfacePanel/HighSettingTip.cs

@@ -20,7 +20,6 @@
        [SerializeField] Button _ShoppingBtn;//商城按钮

        [SerializeField] Button _RechargeBtn;//充值按钮

        [SerializeField] Button _WelfareBtn;//福利按钮

        [SerializeField] Button _TreasureBtn;//寻宝按钮

        [SerializeField] Button m_OpenService;//开服活动按钮

        [SerializeField] Button _RuneTaBtn;//符印按钮



@@ -77,7 +76,6 @@
            m_LootPrecious.AddListener(LootPreciousButton);

            _MarketBtn.AddListener(MarketButton);

            _ShoppingBtn.AddListener(ShoppingButton);

            _TreasureBtn.AddListener(TreasureButton);

            _WelfareBtn.AddListener(WelfareButton);

            _DaTreasureBtn.AddListener(DaTreasureButton);

            _RechargeBtn.AddListener(RechargeButton);

@@ -136,7 +134,6 @@
            m_LootPrecious.RemoveAllListeners();

            _MarketBtn.RemoveAllListeners();

            _ShoppingBtn.RemoveAllListeners();

            _TreasureBtn.RemoveAllListeners();

            _WelfareBtn.RemoveAllListeners();

            _DaTreasureBtn.RemoveAllListeners();

            _RechargeBtn.RemoveAllListeners();

@@ -238,10 +235,6 @@
            }

        }



        void TreasureButton()//寻宝按钮

        {



        }

        void WelfareButton()//福利按钮

        {

            WelfareCenter.Instance.OpenWelfare();


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -808,7 +808,7 @@
                }

                if (Event_Duplicates != null && inDungeon)

                {

                    Event_Duplicates(true, m_MainPositionTween.CopyOfThePanelSpeed);

                    Event_Duplicates(true, m_MainPositionTween.rightTopSwitchTime);

                }

                onMainModel.MainTopPanelShow = true;

                if (_isTween)

@@ -828,7 +828,7 @@
                }

                if (Event_Duplicates != null && inDungeon)

                {

                    Event_Duplicates(false, m_MainPositionTween.CopyOfThePanelSpeed);

                    Event_Duplicates(false, m_MainPositionTween.rightTopSwitchTime);

                }

                onMainModel.MainTopPanelShow = false;

                if (_isTween)


 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);

            }

        }
    }

 System/MainWin/RealmEntranceBehaviour.cs

@@ -14,20 +14,34 @@
        [SerializeField] Button m_OpenRealm;
        [SerializeField] Image m_Realm;

        Window m_Parent;
        Window parent { get { return m_Parent ?? (m_Parent = this.GetComponentInParent<Window>()); } }

        private void Awake()
        {
            WindowCenter.Instance.windowBeforeOpenEvent += OnWindowPreOpen;
            PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefresh;
        }

        private void OnDestroy()
        {
            WindowCenter.Instance.windowBeforeOpenEvent -= OnWindowPreOpen;
            PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefresh;
        }

        private void Start()
        {
            DisplayRealm();
            m_OpenRealm.SetListener(OpenRealmWin);
        }

        private void OnWindowPreOpen(Window _window)
        {
            if (_window != parent)
            {
                return;
            }

            DisplayRealm();
        }

        private void OnPlayerDataRefresh(PlayerDataType type)
@@ -46,7 +60,7 @@
            var config = RealmConfig.Get(realm);
            if (config != null)
            {
                m_Realm.SetSprite(config.equipNameIcon);
                m_Realm.SetSprite(config.Img);
            }
        }