Merge remote-tracking branch 'origin/dev' into dev_lishuo

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/Scenes/LoginController.cs

@@ -293,7 +293,10 @@ public class LoginController : MonoBehaviour
         {
             UIManager.AddEvent(exit.gameObject, EventTriggerType.PointerClick, (b) =>
             {
-                Application.Quit();
+                UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", () =>
+                {
+                    Application.Quit();
+                });
             });
         }
 
@@ -644,7 +647,7 @@ public class LoginController : MonoBehaviour
         var CPassword = signForm.cpassword;
         if (Password.text != CPassword.text)
         {
-            Utils.showToast(gameObject, "两次密码输入不一致");
+            Utils.showToast(gameObject, "Two password entries are inconsistent");//两次密码输入不一致
             return;
         }
         //JsonConvert
@@ -713,13 +716,13 @@ public class LoginController : MonoBehaviour
         var CPassword = signForm.cpassword;
         if (Password.text != CPassword.text)
         {
-            Utils.showToast(gameObject, "两次密码输入不一致");
+            Utils.showToast(gameObject, "Two password entries are inconsistent");//两次密码输入不一致
             return;
         }
         var r = await ConfigHelper.userApi.ResetPassword(Email.text, Captcha.text, Password.text);
         if (r.result)
         {
-            Utils.showToast(gameObject, "修改成功",type:1);
+            Utils.showToast(gameObject, "Success",type:1);
             goLoginReturn2();
         }
         else 
@@ -804,7 +807,7 @@ public class LoginController : MonoBehaviour
                 new { Field = "Months", ErrMsg = "" },
                 new { Field = "Days", ErrMsg = "" }
             }));
-            Utils.showToast(gameObject, "请选择生日");
+            Utils.showToast(gameObject, "Please select birthday");//请选择生日
             return false;
         }
         userResult.Sex = _genders.SelectedIndex + 1;
@@ -998,6 +1001,7 @@ public class LoginController : MonoBehaviour
             UIManager.Instance.userInfoIndex = 0;
         }
         App.CurrentUser = data;
+        App.rideSetting.sensitivity = data.Sensitivity;
         SceneManager.LoadScene("MainScene");
     }
     /// <summary>