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

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

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-09-28 11:31:11 +08:00
2 parents 5bd1c3b1ca 486b385c84
commit 8802676b98
4 files changed
+18 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Panel/MapListController.cs
+6 -5
View File
@@ -203,11 +203,12 @@ public class MapListController : PFUIPanel
searchInput = topContainer.Find("SearchInput");
if (searchInput != null)
{
//searchInput.GetComponent<InputField>().onEndEdit.AddListener((s) =>
//{
// Debug.Log(Input.GetKeyUp(KeyCode.A));
// //onEndEdit(s);
//});
searchInput.GetComponent<InputField>().onEndEdit.AddListener((s) =>
{
var t = searchInput.GetComponent<InputField>().text;
ftname = t;
});
UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
{
onEndEdit();
Assets/Scripts/UI/Prefab/Race/RaceListScript.cs
+7 -5
View File
@@ -172,13 +172,15 @@ public class RaceListScript : RaceScript
Refresh();
});
}
searchInput = transform.Find("SearchInput");
searchInput = transform.Find("Conditions/SearchInput");
if (searchInput != null)
{
//UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
//{
// //onEndEdit();
//});
UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
{
var t = searchInput.GetComponent<InputField>().text;
raceName = t;
//onEndEdit();
});
searchInput.GetComponent<InputField>().onEndEdit.AddListener((string s) =>
{
onEndEdit();
Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
+4
View File
@@ -172,7 +172,11 @@ public class RouteItem : MonoBehaviour
{
//btnDelete.gameObject.SetActive(false);
//btnDelete.GetComponent<Button>().onClick.AddListener(Delete);
#if UNITY_ANDROID || UNITY_IOS
UIManager.AddEvent(btnDelete.gameObject, EventTriggerType.PointerClick, (b) => Detail());
#else
UIManager.AddEvent(btnDelete.gameObject, EventTriggerType.PointerClick, (b) => Delete());
#endif
}
SetButtonColor(false);
transform.Find("RightMatch").gameObject.SetActive(false);