lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接入原生地球暂存

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-12-01 10:38:43 +08:00
1 parent aa0c8d4fb6
commit 27c438aa3f
13 files changed
+57 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Devices/Ant/FitDevice.cs
+2
View File
@@ -126,6 +126,7 @@ namespace Assets.Scripts.Devices.Ant
if (response.responseID == (byte)ANT_Managed_Library.ANT_ReferenceLibrary.ANTMessageID.BROADCAST_DATA_0x4E)
{
var pageNumber = response.messageContents[1];
switch (pageNumber)
{
case 16: //Page 16 - General Page
@@ -223,6 +224,7 @@ namespace Assets.Scripts.Devices.Ant
private void HandleTrainerDataPage(byte[] dataPayload)
{
Debug.Log("ant+数据" + string.Join(",", dataPayload));
//if (response.messageContents.Length < 11) break;
//double value = 0;
//for (int i = 0; i < response.messageContents.Length; i++)
Assets/Scripts/Mobile/LoginControllerMobile.cs
+1
View File
@@ -29,6 +29,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
UIManager.AddEvent(loginScrollView.content.Find("FormContainer-Login/Mask/FormContainer-third/otherContainer/Wechat").gameObject,
UnityEngine.EventSystems.EventTriggerType.PointerClick,
(b) => goWxLogin());
}
Assets/Scripts/UIManager.cs
+19 -16
View File
@@ -837,23 +837,26 @@ public class UIManager : MonoBehaviour
static GameObject earthPanel = null;
public static void ShowEarthPanel(double lat = 0, double lon = 0)
{
if (UIManager.Instance.MainPanel != null)
{
UIManager.Instance.MainPanel.gameObject.SetActive(false);
}
if (earthPanel == null)
{
#if (UNITY_ANDROID || UNITY_IOS)
var obj = Resources.Load("UI/Prefab/Panel/Mobile/EarthPanel");
#else
var obj = Resources.Load("UI/Prefab/Panel/EarthPanel");
//if (UIManager.Instance.MainPanel != null)
//{
// UIManager.Instance.MainPanel.gameObject.SetActive(false);
//}
#if UNITY_ANDROID
Utils.CallAndroidMethod("OpenGlobe");
#endif
//var root = UIManager.Instance.MainPanel.transform.parent.parent;
earthPanel = (GameObject)Instantiate(obj, UIManager.Instance.Root.transform);
}
stack.Push(null);
App.pageName = "earth";
earthPanel.GetComponent<EarthController>().Show(lat, lon);
// if (earthPanel == null)
// {
//#if (UNITY_ANDROID || UNITY_IOS)
// var obj = Resources.Load("UI/Prefab/Panel/Mobile/EarthPanel");
//#else
// var obj = Resources.Load("UI/Prefab/Panel/EarthPanel");
//#endif
// //var root = UIManager.Instance.MainPanel.transform.parent.parent;
// earthPanel = (GameObject)Instantiate(obj, UIManager.Instance.Root.transform);
// }
// stack.Push(null);
// App.pageName = "earth";
// earthPanel.GetComponent<EarthController>().Show(lat, lon);
}
static Texture2D cursor;
Assets/Scripts/Utils/Utils.cs
+6 -1
View File
@@ -225,15 +225,20 @@ namespace Assets.Scripts
var a = currentVersion.Split('.');
var b = realVersion.Split('.');
if (a.Length != 3 || b.Length != 3) return false;
//2.1.0 2.0.8
for (int i = 0; i < 3; i++)
{
var f1 = int.TryParse(a[i], out int ai);
var f2 = int.TryParse(b[i], out int bi);
if (!f1 || !f2) return false;
if (ai < bi)
if (ai < bi)
{
return true;
}
else if (ai > bi)
{
return false;
}
}
return false;
}