Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

# Conflicts:
#	Assets/Resources/UI/language.json

Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab

@@ -327,7 +327,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Resources/UI/language.json

@@ -312,7 +312,8 @@
     "Power King": "功率王",
     "Climbing King": "爬坡王",
     "WAIT": "稍后",
-    "RIDERS": "骑行人数"
+    "RIDERS": "骑行人数",
+    "Current ride distance too short to save.": "当前骑行距离过短无法保存"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -619,6 +620,7 @@
     "Power King": "Power King",
     "Climbing King": "Climbing King",
     "WAIT": "WAIT",
-    "RIDERS": "RIDERS"
+    "RIDERS": "RIDERS",
+    "Current ride distance too short to save.": "Current ride distance too short to save."
   }
 }

Assets/Scenes/Ride.unity

@@ -1972,7 +1972,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &286379890
 GameObject:
   m_ObjectHideFlags: 0
@@ -4630,6 +4630,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &878222276
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4894,12 +4895,14 @@ MonoBehaviour:
   map: {fileID: 159634025}
   player: {fileID: 286379776}
   UIObject: {fileID: 1554806540}
-  preticks: 0
+  minicamera: {fileID: 0}
   isQuit: 0
   isPause: 0
+  RotateLock: 1
   singleUIManager: {fileID: 0}
   map3d: {fileID: 0}
   Is3dView: 0
+  RankingId: 0
 --- !u!1 &1525557491
 GameObject:
   m_ObjectHideFlags: 0
@@ -5220,6 +5223,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &1900532202
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -5246,7 +5250,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2145970966
 Transform:
   m_ObjectHideFlags: 0

Assets/Scripts/Scenes/MainController.cs

@@ -453,7 +453,7 @@ public class MainController : BaseScene
                     }
                 }
                 //距离50
-                if (item.EndDistance >= 50)
+                if (item.EndDistance >= 50 && item.EndDistance < 100)
                 {
                     var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color> in <color=#f93086>{item.RouteName}</color>!";
                     EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM");

Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs

@@ -27,6 +27,7 @@ namespace Assets.Scenes.Ride.Scripts
         protected GameObject reviewPanel;
         protected GameObject titlePanel;
         protected GameObject quitPanel;//退出界面
+        protected GameObject cancelPanel;//退出(骑行里程较短不给保存)
 
         protected Text nextSlopeText;//下一个坡度
         protected Text nextSlopeDistanceText;//下一个坡度距离
@@ -120,6 +121,9 @@ namespace Assets.Scenes.Ride.Scripts
         Text totalDistanceCompetition { get; set; }
         GameObject distanceIconCompetition { get; set; }
         GameObject totalDistanceIcon { get; set; }
+
+        GameObject QuitButton;
+        GameObject CancelButton;
         private void InitGameObject()
         {
             #region 控件获取与事件绑定
@@ -173,6 +177,9 @@ namespace Assets.Scenes.Ride.Scripts
             selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject;
             reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject;
             quitPanel = uipanel.transform.Find("QuitPanel").gameObject;
+            cancelPanel = uipanel.transform.Find("CancelPanel").gameObject;
+            QuitButton = uipanel.transform.Find("CancelPanel/QuitButton").gameObject;
+            CancelButton = uipanel.transform.Find("CancelPanel/CancelButton").gameObject;
 
             pauseButton = uipanel.transform.Find("ToolBarPanel/StartOrPauseButton").GetComponent<Button>();
             settingButton = uipanel.transform.Find("ToolBarPanel/SettingButton").GetComponent<Button>();
@@ -239,7 +246,10 @@ namespace Assets.Scenes.Ride.Scripts
             UIManager.AddEvent(singleButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
             UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
 
-#endregion
+            UIManager.AddEvent(QuitButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, StopShortRide);
+            UIManager.AddEvent(CancelButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, CancelStopShortRide);
+
+            #endregion
         }
         protected virtual void Update()
         {
@@ -513,17 +523,26 @@ namespace Assets.Scenes.Ride.Scripts
                 mainController.ChangeMapImageStyle(arrow.gameObject);
             }
         }
+        protected virtual void StopShortRide(BaseEventData baseEventData)
+        {
+            SceneManager.LoadScene("MainScene");
+        }
+        protected virtual void CancelStopShortRide(BaseEventData baseEventData)
+        {
+            cancelPanel.SetActive(false);
+        }
         //结束游戏
         protected virtual void StopRide(BaseEventData baseEventData)
         {
-            if (playerController?.TotalTicks > 0)
+            if (playerController?.TotalTicks > 0 && playerController ?.TotalDistance > 0.1f)
             {
                 quitPanel.SetActive(true);
                 quitPanel.transform.SetAsLastSibling();
             }
             else
             {
-                SceneManager.LoadScene("MainScene");
+                cancelPanel.SetActive(true);
+                cancelPanel.transform.SetAsLastSibling();
             }
         }
         //显示设备连接

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -325,8 +325,10 @@ public class CyclingController : DeviceServiceMonoBase
                 if (cameraList == null)
                 {
                     cameraList = new List<Vector3>();
+                    cameraList.Add(neareast);
                     cameraList.Add(near);
                     cameraList.Add(plane);
+                    cameraList.Add(medium);
                     cameraList.Add(far);
                 }
                 var prePos = Camera.main.transform.localPosition;
@@ -413,9 +415,11 @@ public class CyclingController : DeviceServiceMonoBase
     public bool isWatch { get; set; }
     private Vector3 currentCameraPos { get; set; }
 
-    Vector3 far = new Vector3(-18, 50, -48);
+    Vector3 far = new Vector3(-17, 52, -48);
-    Vector3 plane = new Vector3(-15.1f, 42, -40);
+    Vector3 medium = new Vector3(-14.5f, 45, -40);
-    Vector3 near = new Vector3(-11.4f, 31, -30);
+    Vector3 plane = new Vector3(-10.5f, 35, -30); //new Vector3(-11.4f, 31, -30);
+    Vector3 near = new Vector3(-7.3f, 24, -20);
+    Vector3 neareast = new Vector3(-5.4f, 18, -15);
     List<Vector3> cameraList { get; set; }
 
     /// <summary>
@@ -430,8 +434,10 @@ public class CyclingController : DeviceServiceMonoBase
         if (cameraList == null)
         {
             cameraList = new List<Vector3>();
+            cameraList.Add(neareast);
             cameraList.Add(near);
             cameraList.Add(plane);
+            cameraList.Add(medium);
             cameraList.Add(far);
         }
         var prePos = Camera.main.transform.localPosition;
@@ -785,7 +791,7 @@ public class CyclingController : DeviceServiceMonoBase
 public BaseUIManager singleUIManager;
     public void GameStart()
     {
-        Camera.main.transform.DOLocalMove(near, 1.5f);
+        Camera.main.transform.DOLocalMove(neareast, 1f);
         //StartCoroutine(MoveCamera(far, near));//初始摄像头
         var check = CheckAnt();
 #if UNITY_EDITOR