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

Assets/Scripts/Scenes/LoginController.cs

@@ -859,7 +859,7 @@ public class LoginController : MonoBehaviour
         {
             userResult.Nickname = userResult.Phone;
         }
-        var r = ConfigHelper.userApi.Update(userResult);
+        var r = ConfigHelper.userApi.Update(userResult,out string cookie,"");
         return r.result;
         //userResult.Birthday.v
     }