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-15 19:56:38 +08:00
2 parents b5c78aba4f 7d4617eca6
commit 6640780c93
24 files changed
+570 -76
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/App.cs
+10 -8
View File
@@ -85,13 +85,15 @@ public static class App
public readonly static bool isFullScreen = width/height>1.8;
static App()
{
//#if !UNITY_EDITOR
// //Host = "http://pf.juze.pro/";
// //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
// //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
// Host = "https://wx.powerfun.com.cn/";
// UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
// TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
//#endif
#if !UNITY_EDITOR
//Host = "http://pf.juze.pro/";
//UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
//TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
Host = "https://wx.powerfun.com.cn/";
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
#endif
Screen.sleepTimeout = SleepTimeout.NeverSleep;
}
}
Assets/Scripts/Scenes/LoginController.cs
+2
View File
@@ -126,6 +126,8 @@ public class LoginController : BaseScene
if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageRead))
Permission.RequestUserPermission(Permission.ExternalStorageRead);
#elif UNITY_IOS
Input.location.Start();
#endif
Init();
if (loginScrollView != null)
Assets/Scripts/Scenes/MainController.cs
+1 -1
View File
@@ -65,7 +65,7 @@ public class MainController : BaseScene
//});
if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
{
UIManager.PushHome();
UIManager.ShowHomePanel();
if (App.MainSceneParam["Name"] == "MapListPanel")
{
UIManager.ShowMapListPanel();
Assets/Scripts/UI/Prefab/Panel/MapListController.cs
+4 -1
View File
@@ -65,7 +65,10 @@ public class MapListController : PFUIPanel
{
App.topRectStartX = topRect.localPosition.x;
}
if (App.isFullScreen)
{
topRect.sizeDelta = new Vector2(topRect.sizeDelta.x + 20, topRect.sizeDelta.y);
}
var mc = transform.Find("MC");
UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b =>
{
Assets/Scripts/UI/Prefab/Race/RaceListScript.cs
+5
View File
@@ -217,6 +217,11 @@ public class RaceListScript : RaceScript
{
App.topRectStartX = topRect.localPosition.x;
}
if (App.isFullScreen)
{
topRect.sizeDelta = new Vector2(topRect.sizeDelta.x + 20, topRect.sizeDelta.y);
}
var mc = transform.Find("MC");
UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b =>
Assets/Scripts/Utils/Utils.cs
+4
View File
@@ -132,7 +132,11 @@ namespace Assets.Scripts
{
MonoBehaviour.DestroyImmediate(toast.gameObject);
}
#if UNITY_IOS || UNITY_ANDROID
var newToast = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer-mobile"));
#else
var newToast = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer"));
#endif
newToast.name = "ToastContainer";
newToast.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
newToast.transform.parent = parent.transform;