0312 1. 小地图改成常显 需测试副本（联赛）和跨服显示 2. 切换时 首充改成左右移动 3. 优化小地图箭头坐标 4. 优化界面关闭时 依然显示...

hch

2019-09-27 f0ab0ddbc2633f5d8ebc96ed07de1bb2986e2e5d

 System/MainInterfacePanel/MainPositionTween.cs

@@ -24,6 +24,11 @@
        [SerializeField] Transform m_RightTopPosition1;

        [SerializeField] Transform m_RightTopPosition2;



        [Header("主界面顶部左右切换模块")]
        [SerializeField] Transform m_TRightFunction;

        [SerializeField] Transform m_RightTopPosition3;

        [SerializeField] Transform m_RightTopPosition4;



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

        public float rightBottomSwitchTime = 1.2f;

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

@@ -132,7 +137,7 @@
        public static bool isDefaultState { get; private set; }

        public static event Action<bool> switchFunctionStateEvent;



        static float resetToDefaultTimer = 0;

        public static float resetToDefaultTimer = 0;

        public static void SetRecoverToSkillTimer()

        {

            resetToDefaultTimer = 8f;

@@ -161,7 +166,10 @@
            if ((isDungeon || isNeutralMap || isBossArea || AdventureStage.Instance.IsInAdventureStage)

                && !isGuiding && switchParams.showDefault)

            {

                rightTopState = RightTopState.Boss;

                if (resetToDefaultTimer >0)

                { rightTopState = RightTopState.Function; }

                else

                    rightTopState = RightTopState.Boss;

            }

            else

            {

@@ -175,11 +183,13 @@
                    {

                        m_RightTopFunction.localPosition = m_RightTopPosition1.localPosition;

                        m_ContainerBossList.localPosition = m_RightTopPosition2.localPosition;

                        m_TRightFunction.localPosition = m_RightTopPosition3.localPosition;

                    }

                    else

                    {

                        m_RightTopFunction.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);

                        m_ContainerBossList.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);

                        m_TRightFunction.DOLocalMoveX(m_RightTopPosition3.localPosition.x, rightTopSwitchTime);

                    }

                    break;

                case RightTopState.Boss:

@@ -187,11 +197,13 @@
                    {

                        m_ContainerBossList.localPosition = m_RightTopPosition1.localPosition;

                        m_RightTopFunction.localPosition = m_RightTopPosition2.localPosition;

                        m_TRightFunction.localPosition = m_RightTopPosition4.localPosition;

                    }

                    else

                    {

                        m_ContainerBossList.DOLocalMoveY(m_RightTopPosition1.localPosition.y, rightTopSwitchTime);

                        m_RightTopFunction.DOLocalMoveY(m_RightTopPosition2.localPosition.y, rightTopSwitchTime);

                        m_TRightFunction.DOLocalMoveX(m_RightTopPosition4.localPosition.x, rightTopSwitchTime);

                    }

                    break;

            }