From 9c11bde90925be7a0dd4f1acd89f41d69b7132be Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 24 六月 2025 21:18:09 +0800
Subject: [PATCH] 0312 优化界面的缩放动画功能按曲线播放；去除客服按钮；去除安全适配代码；后续需要直接改UIBase的根节点
---
Main/System/UIBase/UIBase.cs | 46 +++++++++++-----------
/dev/null | 11 -----
Main/System/Launch/LoadingWin.cs | 7 +--
Main/System/Launch/LaunchWin.cs | 17 +-------
4 files changed, 27 insertions(+), 54 deletions(-)
diff --git a/Main/System/Launch/LaunchWin.cs b/Main/System/Launch/LaunchWin.cs
index 2ad2b73..d677c70 100644
--- a/Main/System/Launch/LaunchWin.cs
+++ b/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();
}
diff --git a/Main/System/Launch/LoadingWin.cs b/Main/System/Launch/LoadingWin.cs
index 0a014b5..56b946d 100644
--- a/Main/System/Launch/LoadingWin.cs
+++ b/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();
}
diff --git a/Main/System/UIBase/UIBase.cs b/Main/System/UIBase/UIBase.cs
index d8b24c0..37c3a1d 100644
--- a/Main/System/UIBase/UIBase.cs
+++ b/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;
diff --git a/Main/Utility/SafeAreaUI.cs b/Main/Utility/SafeAreaUI.cs
deleted file mode 100644
index b58325f..0000000
--- a/Main/Utility/SafeAreaUI.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using UnityEngine;
-
-[ExecuteAlways]
-[RequireComponent(typeof(RectTransform))]
-public class SafeAreaUI : MonoBehaviour
-{
-
- public const int SafeWidth = 75;
- public const int SafeBottom = 15; //绔栧睆涓嬫柟闂撮殧
-
-
- RectTransform _Panel;
- Rect LastRect = new Rect(0, 0, 0, 0);
-
- RectTransform Panel
- {
- get
- {
- if (_Panel == null)
- _Panel = GetComponent<RectTransform>();
- return _Panel;
- }
- }
-
- void Awake()
- {
- Refresh();
- }
-
- void Update()
- {
- Refresh();
- }
-
- void Refresh()
- {
- if (LastRect != Panel.rect)
- ApplySafeArea();
- }
-
- public void ApplySafeArea()
- {
- Panel.anchorMin = Vector2.zero;
- Panel.anchorMax = Vector2.one;
- //绔栧睆
- if (Screen.height > Screen.width)
- {
- if (Screen.height / Screen.width > 1.8)//瀹藉睆闇�瑕侀�傞厤
- {
- //涓婁笅鍚勯棿闅擲afeWidth
- Panel.offsetMin = new Vector2(0, SafeBottom);
- Panel.offsetMax = new Vector2(0, -SafeWidth);
- }
- else
- {
- Panel.offsetMin = new Vector2(0, 0);
- Panel.offsetMax = new Vector2(0, 0);
- }
- }
- else
- {//妯睆
- if (Screen.width / Screen.height > 1.8)//瀹藉睆闇�瑕侀�傞厤
- {
- //涓よ竟鍚勯棿闅擲afeWidth
- Panel.offsetMin = new Vector2(SafeWidth, 0);
- Panel.offsetMax = new Vector2(-SafeWidth, 0);
- }
- else
- {
- Panel.offsetMin = new Vector2(0, 0);
- Panel.offsetMax = new Vector2(0, 0);
- }
- }
- LastRect = Panel.rect;
- }
-
-}
\ No newline at end of file
diff --git a/Main/Utility/SafeAreaUI.cs.meta b/Main/Utility/SafeAreaUI.cs.meta
deleted file mode 100644
index 5830315..0000000
--- a/Main/Utility/SafeAreaUI.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 97bb4ff2bfab6ac40abce2181e67aa6a
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
--
Gitblit v1.8.0