合并ant速度计修改和界面微调

This commit is contained in:
lishuo committed 2021-09-17 11:37:42 +08:00
1 parent a67602b00b
commit b89322c59b
20 files changed
+1398 -407

No files matched your search

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 01041e0a0b17c5744a2c567ec3c715d3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -119,14 +119,6 @@ namespace Assets.Scripts.Devices.Ble.Win
status,
});
}
public void StopGattThreads()
{
Debug.Log("停止thread");
foreach (var item in this.gattClients.Values)
{
item.Stop();
}
}
public void StopGattThreads()
{
+8 -4
View File
@@ -169,7 +169,11 @@ namespace Assets.Scripts
var loading = parent.Find("Loading");
if (loading == null)
{
#if UNITY_IOS || UNITY_ANDROID
var newLoading = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/Common/Mobile/Loading"));
#else
var newLoading = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/Common/Loading"));
#endif
newLoading.name = "Loading";
newLoading.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
newLoading.transform.parent = parent;
@@ -184,16 +188,16 @@ namespace Assets.Scripts
var loading = game.transform.Find("Loading");
if (loading == null)
{
#if UNITY_IOS || UNITY_ANDROID
var newLoading = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/Common/Mobile/Loading"));
#else
var newLoading = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/Common/Loading"));
#endif
newLoading.name = "Loading";
newLoading.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
newLoading.transform.SetParent(game.transform);
loading = newLoading.transform;
#if UNITY_IOS || UNITY_ANDROID
loading.localScale = new Vector3(2, 2, 2);
#else
loading.localScale = new Vector3(1, 1, 1);
#endif
}
loading.GetComponent<LoadingPf>().Show();
}