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

Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble

Browse Source
This commit is contained in:
lishuo committed 2021-09-14 11:18:35 +08:00
2 parents 7bd058004d e84f14250b
commit 0b1247249d
11 files changed
+66 -90
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Apis/ApiBase.cs
+4 -2
View File
@@ -107,9 +107,11 @@ namespace Assets.Scripts.Apis
private static void HandleHeaders(HttpRequestHeaders defaultRequestHeaders)
{
#if UNITY_ANDROID
defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity-Android", ConfigHelper.AppVersion));
defaultRequestHeaders.Add("User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} Android");
defaultRequestHeaders.Add("Pf-User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} Android");
#elif UNITY_IOS
defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity-ios", ConfigHelper.AppVersion));
defaultRequestHeaders.Add("User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} ios");
defaultRequestHeaders.Add("Pf-User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} ios");
#else
defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion));
#endif
Assets/Scripts/App.cs
+1 -1
View File
@@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
public static class App
{
public static string Host = "http://192.168.0.101:5087/";
public static string Host = "http://192.168.0.101:5085/";
public static string AppVersion = Application.version;
Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs
+3 -4
View File
@@ -52,14 +52,13 @@ public class QuickLoginUser : MonoBehaviour
}
async void goMain()
{
#if (UNITY_ANDROID || UNITY_IOS)
StartCoroutine("Loading");
#endif
ApiBase.SetCookie(user.Cookie);
var r = await ConfigHelper.userApi.QuickLogin();
if (r.result)
{
#if (UNITY_ANDROID || UNITY_IOS)
StartCoroutine("Loading");
#endif
top.GetComponent<LoginController>().SaveInfo(r.data);
App.CurrentUser = r.data;
App.RideSetting.Sensitivity = App.CurrentUser.Sensitivity;
Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
+8 -8
View File
@@ -282,18 +282,18 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
#else
public void OnPointerExit(PointerEventData eventData)
{
if (_from == "list")
{
transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(0, 0.3f);
}
//if (_from == "list")
//{
// transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(0, 0.3f);
//}
}
public void OnPointerEnter(PointerEventData eventData)
{
if (_from == "list")
{
transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(1, 0.3f);
}
//if (_from == "list")
//{
// transform.Find("Masking").GetComponent<CanvasGroup>().DOFade(1, 0.3f);
//}
}
public void OnPointerUp(PointerEventData eventData)