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 2021-09-28 11:31:11 +08:00
commit 8802676b98
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -457,16 +457,7 @@ public class CyclingController : DeviceServiceMonoBase
var currentIndex = currentPlayer.CurrentIndex; var currentIndex = currentPlayer.CurrentIndex;
graph.HorizontalScrolling = chartDataSourceScript.GetCurrentStart(currentIndex); graph.HorizontalScrolling = chartDataSourceScript.GetCurrentStart(currentIndex);
} }
public void ChangeRandomPlayer()
{
var coll = FindObjectsOfType<AbstractPlayer>();
var selectedPlayer = coll.FirstOrDefault();
if (selectedPlayer != null)
{
currentPlayer = selectedPlayer;
}
//如果是3d地图，显示3d小人
}
//初始化人物位置角度 //初始化人物位置角度
private void InitPlayer() private void InitPlayer()
{ {

11
Assets/Scripts/UI/Prefab/Panel/MapListController.cs
View File

@ -203,11 +203,12 @@ public class MapListController : PFUIPanel
searchInput = topContainer.Find("SearchInput"); searchInput = topContainer.Find("SearchInput");
if (searchInput != null) if (searchInput != null)
{ {
//searchInput.GetComponent<InputField>().onEndEdit.AddListener((s) => searchInput.GetComponent<InputField>().onEndEdit.AddListener((s) =>
//{ {
// Debug.Log(Input.GetKeyUp(KeyCode.A)); var t = searchInput.GetComponent<InputField>().text;
// //onEndEdit(s); ftname = t;
//}); });
UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) => UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
{ {
onEndEdit(); onEndEdit();

12
Assets/Scripts/UI/Prefab/Race/RaceListScript.cs
View File

@ -172,13 +172,15 @@ public class RaceListScript : RaceScript
Refresh(); Refresh();
}); });
} }
searchInput = transform.Find("SearchInput"); searchInput = transform.Find("Conditions/SearchInput");
if (searchInput != null) if (searchInput != null)
{ {
//UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) => UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
//{ {
// //onEndEdit(); var t = searchInput.GetComponent<InputField>().text;
//}); raceName = t;
//onEndEdit();
});
searchInput.GetComponent<InputField>().onEndEdit.AddListener((string s) => searchInput.GetComponent<InputField>().onEndEdit.AddListener((string s) =>
{ {
onEndEdit(); onEndEdit();

4
Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
View File

@ -172,7 +172,11 @@ public class RouteItem : MonoBehaviour
{ {
//btnDelete.gameObject.SetActive(false); //btnDelete.gameObject.SetActive(false);
//btnDelete.GetComponent<Button>().onClick.AddListener(Delete); //btnDelete.GetComponent<Button>().onClick.AddListener(Delete);
#if UNITY_ANDROID || UNITY_IOS
UIManager.AddEvent(btnDelete.gameObject, EventTriggerType.PointerClick, (b) => Detail()); UIManager.AddEvent(btnDelete.gameObject, EventTriggerType.PointerClick, (b) => Detail());
#else
UIManager.AddEvent(btnDelete.gameObject, EventTriggerType.PointerClick, (b) => Delete());
#endif
} }
SetButtonColor(false); SetButtonColor(false);
transform.Find("RightMatch").gameObject.SetActive(false); transform.Find("RightMatch").gameObject.SetActive(false);