路线产生逻辑微调

Assets/Scripts/App.cs

@@ -24,5 +24,6 @@ public static class App
     /// </summary>
     public static System.Collections.Generic.Dictionary<string, string> MainSceneParam = new Dictionary<string, string>();
     public static IDictionary<string,Texture> TextureCache = new Dictionary<string, Texture>();
+    public static Texture CurrentUserHeadTexture;
     public static SelectParamModel selectParam;
 }

Assets/Scripts/UI/Control/PfUIButton.cs

@@ -10,7 +10,7 @@ using UnityEngine.EventSystems;
 namespace Assets.Scripts.UI.Control
 {
     [RequireComponent(typeof(Button))]
-    public class PFUIButton : PFUIComponentBase
+    public class PfUIButton : PFUIComponentBase
     {
         public enum Type
         {

Assets/Scripts/UI/Prefab/BigMap/Tips.cs

@@ -20,7 +20,7 @@ public class Tips : MonoBehaviour
     private Text Count;
     private Text Distance;
     private Text TotalClimb;
-    private PFUIButton pFUIButton;
+    private PfUIButton pFUIButton;
     private void Awake()
     {
         var material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));
@@ -34,7 +34,7 @@ public class Tips : MonoBehaviour
         Distance = this.transform.Find("Distance").GetComponent<Text>();
         TotalClimb = this.transform.Find("TotalClimb").GetComponent<Text>();
 
-        pFUIButton = this.transform.Find("Ride").GetComponent<PFUIButton>();
+        pFUIButton = this.transform.Find("Ride").GetComponent<PfUIButton>();
         UIManager.AddEvent(pFUIButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) => {
             App.RouteIdParam = _model.Id;
             SceneManager.LoadScene("Ride");

Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs

@@ -27,7 +27,7 @@ public class ConnectDeviceModal : PFUIPanel
     private Image Logo;
     private UnityEngine.Object deviceItem;
     private VerticalLayoutGroup content;
-    private PFUIButton connectBtn;
+    private PfUIButton connectBtn;
     private Dictionary<ushort, DeviceItem> deviceList;
 
     protected override void Awake()
@@ -60,7 +60,7 @@ public class ConnectDeviceModal : PFUIPanel
 
         deviceItem = Resources.Load("UI/Prefab/Device/DeviceItem");
 
-        connectBtn = container.Find("ConnectBtn").GetComponent<PFUIButton>();
+        connectBtn = container.Find("ConnectBtn").GetComponent<PfUIButton>();
 
         UIManager.AddEvent(connectBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
         {

Assets/Scripts/UI/Prefab/Panel/DeviceController.cs

@@ -37,7 +37,8 @@ public class DeviceController : PFUIPanel
         UIManager.AddEvent(mReturnBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
         {
             //UIManager.ShowHomePanel();
-            UIManager.CloseModal();
+            //UIManager.CloseModal();
+            this.Close();
         }));
 
         var bg = this.transform.Find("Status").Find("Bg");

Assets/Scripts/UI/Prefab/Panel/MapListController.cs

@@ -247,7 +247,7 @@ public class MapListController : PFUIPanel
                 var obj = Instantiate(map);
                 obj.GetComponent<MapItem>().Initial(item);
                 //obj.SendMessage("Initial", );
-                obj.transform.parent = content.transform;
+                obj.transform.SetParent(content.transform);
                 obj.transform.localScale = new Vector3(1, 1, 1);
             }
         }

Assets/Scripts/Utils/Utils.cs

@@ -47,7 +47,7 @@ namespace Assets.Scripts
 
                 if (isPlaying)
                 {
-                    child.parent = null;
+                    child.SetParent(null);
                     UnityEngine.Object.Destroy(child.gameObject);
                 }
                 else UnityEngine.Object.DestroyImmediate(child.gameObject);