工具栏问题修改,中文
This commit is contained in:
1 parent
0458a23c20
commit
45b3ee5bbc
9 files changed
+97
-18
No files matched your search
@@ -205,8 +205,8 @@ public static class App
|
||||
#else
|
||||
//Host = "http://pf.juze.pro/";
|
||||
//Host = "http://192.168.0.101:5087/";
|
||||
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
|
||||
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
|
||||
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
|
||||
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
|
||||
//UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
|
||||
//TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
|
||||
#endif
|
||||
|
||||
@@ -391,11 +391,20 @@ public class MainController : BaseScene
|
||||
float emptyt = 0;//用于无消息计时
|
||||
float t = 1f;
|
||||
float scanTicks = 0;
|
||||
float clearcachet = 30;
|
||||
// Update is called once per frame
|
||||
protected override void Update()
|
||||
{
|
||||
base.Update();
|
||||
|
||||
|
||||
clearcachet -= Time.deltaTime;
|
||||
if (clearcachet <= 0)
|
||||
{
|
||||
Debug.Log("清一次");
|
||||
Resources.UnloadUnusedAssets();
|
||||
GC.Collect();
|
||||
clearcachet = 30;
|
||||
}
|
||||
if (App.canvasWidth != transform.GetComponent<RectTransform>().sizeDelta.x)
|
||||
{
|
||||
App.canvasWidth = transform.GetComponent<RectTransform>().sizeDelta.x;
|
||||
|
||||
@@ -10,6 +10,8 @@ using UnityEngine.Events;
|
||||
using DG.Tweening;
|
||||
using System.Timers;
|
||||
using System.Collections;
|
||||
using DG.Tweening.Core;
|
||||
using DG.Tweening.Plugins.Options;
|
||||
|
||||
namespace Assets.Scripts.UI.Control
|
||||
{
|
||||
@@ -33,6 +35,9 @@ namespace Assets.Scripts.UI.Control
|
||||
private Outline outline;
|
||||
private Button mButton;
|
||||
private Sequence se = null;
|
||||
private Sequence a;
|
||||
private TweenerCore<float, float, FloatOptions> b;
|
||||
private TweenerCore<float, float, FloatOptions> c;
|
||||
|
||||
protected void Awake()
|
||||
{
|
||||
@@ -146,7 +151,7 @@ namespace Assets.Scripts.UI.Control
|
||||
if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
|
||||
{
|
||||
#endif
|
||||
|
||||
|
||||
//tooltips.SetActive(true);
|
||||
//tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
|
||||
|
||||
@@ -157,12 +162,13 @@ namespace Assets.Scripts.UI.Control
|
||||
se.SetDelay(1);
|
||||
se.AppendCallback(() =>
|
||||
{
|
||||
DOTween.Complete(tooltips,true);
|
||||
if(a!=null) a.Complete(true);
|
||||
if (b != null) b.Complete(true);
|
||||
tooltips.SetActive(true);
|
||||
tooltips.GetComponent<CanvasGroup>().alpha = 0f;
|
||||
tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
|
||||
c = tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
|
||||
});
|
||||
se.Play();
|
||||
a = se.Play();
|
||||
//StartCoroutine(DelayShowTooltip());
|
||||
//timer.Start();
|
||||
}
|
||||
@@ -200,9 +206,11 @@ namespace Assets.Scripts.UI.Control
|
||||
#else
|
||||
if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
|
||||
{
|
||||
#endif
|
||||
DOTween.Complete(tooltips,true);
|
||||
group.DOFade(0, 1f).onComplete += () => {
|
||||
#endif
|
||||
if (a != null) a.Complete(true);
|
||||
if (c != null) c.Complete(true);
|
||||
b = group.DOFade(0, 1f);
|
||||
b.onComplete += () => {
|
||||
tooltips.SetActive(false);
|
||||
};
|
||||
}
|
||||
@@ -234,8 +242,11 @@ namespace Assets.Scripts.UI.Control
|
||||
UIManager.AddEvent(this.gameObject, EventTriggerType.PointerDown, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
|
||||
{
|
||||
if (!this.isActiveAndEnabled) return;
|
||||
DOTween.Complete(tooltips,true);
|
||||
if (a != null) a.Complete(true);
|
||||
if (b != null) b.Complete(true);
|
||||
if (c != null) c.Complete(true);
|
||||
tooltips.SetActive(false);
|
||||
|
||||
//else
|
||||
//{
|
||||
// DOTween.CompleteAll(true);
|
||||
|
||||
Reference in new issue
Block a user