0312 优化界面的缩放动画功能按曲线播放；去除客服按钮；去除安全适配代码；后续需要直接改UIBase的根节点

hch

7 天以前 9c11bde90925be7a0dd4f1acd89f41d69b7132be

0312 优化界面的缩放动画功能按曲线播放；去除客服按钮；去除安全适配代码；后续需要直接改UIBase的根节点

 Main/System/Launch/LaunchWin.cs

@@ -24,7 +24,6 @@
        [SerializeField] Text m_IosProgressTip;
        [SerializeField] Text m_BuildTime;
        [SerializeField] Text m_Version;
        [SerializeField] Button m_UserHelp;

        bool assetBuildTimeShowed = false;

@@ -64,11 +63,6 @@
            }


            // AddListener
            if (m_UserHelp)
            {
                m_UserHelp.SetListener(OpenUserHelp);
            }
        }

        protected override void OnPreOpen()
@@ -85,13 +79,6 @@

            m_BuildTime.text = VersionConfig.Get().debugVersion ? VersionConfig.Get().buildTime : "";

            if (m_UserHelp)
            {
                var appId = VersionConfig.Get().appId;
                var branch = VersionConfig.Get().branch;
                //m_UserHelp.SetActive(ContactConfig.GetConfig(appId, branch) != null);
                m_UserHelp.SetActive(false);
            }
            if (m_NetworkContainer != null)
            {
                m_NetworkContainer.SetActive(false);
@@ -118,8 +105,8 @@
            else
            {
                m_AndroidProgressContainer.SetActive(true);
                m_IosProgressContainer.SetActive(false);

                //打包版本 + 功能版本 + 语言ID

                m_IosProgressContainer.SetActive(false);
                //打包版本 + 功能版本 + 语言ID
                m_Version.text = LoginManager.Instance.GetVersionStr();
            }


 Main/System/Launch/LoadingWin.cs

@@ -11,12 +11,9 @@

    // [SerializeField] UIAlphaTween m_AlphaTween;
    [SerializeField] Image m_BackGround;
    [SerializeField] RectTransform m_AndroidProgressContainer;
    [SerializeField] RectTransform m_NetworkContainer;
    [SerializeField] SmoothSlider m_PartProgressSlider;
    [SerializeField] SmoothSlider m_TotalProgressSlider;
    [SerializeField] Text m_StageDescription;
    [SerializeField] Text m_BuildTime;
    [SerializeField] Text m_Version;
    // [SerializeField] Button m_UserHelp;

@@ -59,8 +56,8 @@
    {
        base.OnPreOpen();
        currentProgress = targetProgress = 0;
        Refresh();

        //打包版本 + 功能版本 + 语言ID

        Refresh();
        //打包版本 + 功能版本 + 语言ID
        m_Version.text = LoginManager.Instance.GetVersionStr();
    }


 Main/System/UIBase/UIBase.cs

@@ -25,7 +25,7 @@
    SlideFromBottom, // 从底部滑入
    SlideFromLeft, // 从左侧滑入
    SlideFromRight, // 从右侧滑入
    ScaleOverInOut,// 缩放（超过）之后再返回
    ScaleOverInOut,// 缩放根据曲线

}

@@ -401,9 +401,9 @@
                    canvasGroup.alpha = 0f;
                    canvasGroup.blocksRaycasts = false;
                }
                if (canvasScaler != null)
                if (_rectTransform != null)
                {
                    canvasScaler.scaleFactor = 1f;
                    _rectTransform.localScale = Vector3.one;
                }
                break;

@@ -413,9 +413,9 @@
                    canvasGroup.alpha = 1f;
                    canvasGroup.blocksRaycasts = false;
                }
                if (canvasScaler != null)
                if (_rectTransform != null)
                {
                    canvasScaler.scaleFactor = 0.3f;
                    _rectTransform.localScale = Vector3.one * 0.3f;
                }
                break;

@@ -464,9 +464,9 @@
                    canvasGroup.alpha = 1f;
                    canvasGroup.blocksRaycasts = false;
                }
                if (canvasScaler != null)
                if (_rectTransform != null)
                {
                    canvasScaler.scaleFactor = 0.3f;
                    _rectTransform.localScale = Vector3.one * 0.3f;
                }
                break;
        }
@@ -489,7 +489,7 @@
                case UIAnimationType.ScaleInOut:
                    if (_rectTransform != null)
                    {
                        currentAnimation.Append(DOVirtual.Float(0.3f, 1f, animeDuration, (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
                        currentAnimation.Append(DOVirtual.Float(0.3f, 1f, animeDuration, (value) => {_rectTransform.localScale = Vector3.one * value;}).SetEase(animationEase));
                    }
                    break;

@@ -505,19 +505,19 @@
                case UIAnimationType.ScaleOverInOut:
                    if (_rectTransform != null)
                    {
                        if (null == scaleOverInOutCurve)
                        {
                            currentAnimation.Append(DOVirtual.Float(0.3f, 1.2f, animeDuration, 
                            (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
                        }
                        else
                        {
                            currentAnimation.Append(DOVirtual.Float(0.3f, 1.2f, animeDuration, 
                                (value) => {canvasScaler.scaleFactor = value;}).SetEase(scaleOverInOutCurve.curve));
                        }
                        float startScale = scaleOverInOutCurve.curve.Evaluate(0f);
                        _rectTransform.localScale = Vector3.one * startScale;
                        currentAnimation.Append(
                            DOTween.To(
                                () => _rectTransform.localScale.x,
                                (value) => _rectTransform.localScale = Vector3.one * value,
                                1f, 
                                animeDuration
                            )
                            .SetEase(scaleOverInOutCurve.curve)
                            .OnComplete(() => _rectTransform.localScale = Vector3.one) // 确保最终值1正确
                        );
                        

                        // currentAnimation.Append(DOVirtual.Float(1.2f, 1f, 0.1f, (value) => {canvasScaler.scaleFactor = value;}).SetEase(scaleOverInOutCurve));
                    }
                    break;
            }
@@ -567,9 +567,9 @@
            canvasGroup.alpha = 1f;
            canvasGroup.blocksRaycasts = true;
        }
        if (canvasScaler != null)
        if (_rectTransform != null)
        {
            canvasScaler.scaleFactor = 1f;
            _rectTransform.localScale = Vector3.one;
        }

        if (_rectTransform != null)
@@ -613,7 +613,7 @@
                case UIAnimationType.ScaleOverInOut:
                    if (_rectTransform != null)
                    {
                        currentAnimation.Append(DOVirtual.Float(1f, 0.3f, animeDuration, (value) => {canvasScaler.scaleFactor = value;}).SetEase(animationEase));
                        currentAnimation.Append(DOVirtual.Float(1f, 0.3f, animeDuration, (value) => {_rectTransform.localScale = Vector3.one * value;}).SetEase(animationEase));
                    }
                    break;


 Main/Utility/SafeAreaUI.cs

File was deleted

 Main/Utility/SafeAreaUI.cs.meta

File was deleted