两个页面接入完成
This commit is contained in:
@@ -2,6 +2,7 @@ using System.Threading;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using Stary.Evo;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public interface IGlobalConfigSystem : ISystem
|
||||
{
|
||||
@@ -12,7 +13,7 @@ public interface IGlobalConfigSystem : ISystem
|
||||
public string GetConnectionName();
|
||||
public void SetConnectionName(string connectionName);
|
||||
|
||||
public UniTaskVoid StartConnectionTime();
|
||||
public UniTaskVoid StartConnectionTime(Text updateText);
|
||||
public string GetConnectionTime();
|
||||
|
||||
public void StopConnectionTime();
|
||||
@@ -20,8 +21,8 @@ public interface IGlobalConfigSystem : ISystem
|
||||
public int GetConnectionTimeType();
|
||||
public void SetConnectionTimeType(int connectionTimeType);
|
||||
|
||||
public Texture2D GetConnectionTexture();
|
||||
public void SetConnectionTexture(Texture2D connectionTexture);
|
||||
public string GetConnectionTexture();
|
||||
public void SetConnectionTexture(string connectionTexture);
|
||||
|
||||
public string GetUserId();
|
||||
public void SetUserId(string userId);
|
||||
@@ -29,6 +30,11 @@ public interface IGlobalConfigSystem : ISystem
|
||||
|
||||
public class GlobalConfigSystem : AbstractSystem, IGlobalConfigSystem
|
||||
{
|
||||
/// <summary>
|
||||
/// 连接图标
|
||||
/// </summary>
|
||||
private string _connectionAvatar;
|
||||
|
||||
/// <summary>
|
||||
/// 连接ID
|
||||
/// </summary>
|
||||
@@ -39,11 +45,6 @@ public class GlobalConfigSystem : AbstractSystem, IGlobalConfigSystem
|
||||
/// </summary>
|
||||
private string _connectionName;
|
||||
|
||||
/// <summary>
|
||||
/// 连接图标
|
||||
/// </summary>
|
||||
private Texture2D _connectionTexture;
|
||||
|
||||
/// <summary>
|
||||
/// 连接时间
|
||||
/// </summary>
|
||||
@@ -68,7 +69,7 @@ public class GlobalConfigSystem : AbstractSystem, IGlobalConfigSystem
|
||||
}
|
||||
|
||||
|
||||
public string IP => "http://127.0.0.1:8080";
|
||||
public string IP => "https://192.168.31.16:8080";
|
||||
|
||||
public string GetConnectionId()
|
||||
{
|
||||
@@ -102,13 +103,14 @@ public class GlobalConfigSystem : AbstractSystem, IGlobalConfigSystem
|
||||
_connectionName = connectionName;
|
||||
}
|
||||
|
||||
public async UniTaskVoid StartConnectionTime()
|
||||
public async UniTaskVoid StartConnectionTime(Text updateText)
|
||||
{
|
||||
_cts = new CancellationTokenSource();
|
||||
_connectionTime = 0;
|
||||
while (!_cts.IsCancellationRequested)
|
||||
{
|
||||
_connectionTime += Time.deltaTime;
|
||||
updateText.text = GetConnectionTime();
|
||||
await UniTask.Yield(_cts.Token); // 等一帧,等价于 Update
|
||||
}
|
||||
}
|
||||
@@ -139,20 +141,15 @@ public class GlobalConfigSystem : AbstractSystem, IGlobalConfigSystem
|
||||
_connectionTimeType = connectionTimeType;
|
||||
}
|
||||
|
||||
public Texture2D GetConnectionTexture()
|
||||
public string GetConnectionTexture()
|
||||
{
|
||||
if (_connectionTexture == null)
|
||||
if (string.IsNullOrEmpty(_connectionAvatar))
|
||||
{
|
||||
Debug.LogWarning("GlobalConfigSystem: GetConnectionTexture not set");
|
||||
return null;
|
||||
}
|
||||
|
||||
return _connectionTexture;
|
||||
}
|
||||
|
||||
public void SetConnectionTexture(Texture2D connectionTexture)
|
||||
{
|
||||
_connectionTexture = connectionTexture;
|
||||
return _connectionAvatar;
|
||||
}
|
||||
|
||||
public string GetUserId()
|
||||
@@ -171,6 +168,11 @@ public class GlobalConfigSystem : AbstractSystem, IGlobalConfigSystem
|
||||
_userId = userId;
|
||||
}
|
||||
|
||||
public void SetConnectionTexture(string connectionTexture)
|
||||
{
|
||||
_connectionAvatar = connectionTexture;
|
||||
}
|
||||
|
||||
protected override void OnInit()
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user