修改细节
This commit is contained in:
parent
9f4e446850
commit
af34243c28
@ -5517,6 +5517,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: input
|
value: input
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_ContentType
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_KeyboardType
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_CharacterValidation
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||||
--- !u!224 &1707200373055839941 stripped
|
--- !u!224 &1707200373055839941 stripped
|
||||||
@ -6082,6 +6097,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: input
|
value: input
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_ContentType
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_KeyboardType
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_CharacterValidation
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||||
--- !u!224 &8698039831671925482 stripped
|
--- !u!224 &8698039831671925482 stripped
|
||||||
@ -6222,6 +6252,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: input
|
value: input
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_ContentType
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_KeyboardType
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_CharacterValidation
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||||
--- !u!224 &8698039833564966881 stripped
|
--- !u!224 &8698039833564966881 stripped
|
||||||
@ -6362,6 +6407,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: input
|
value: input
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_ContentType
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_KeyboardType
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_CharacterValidation
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||||
--- !u!224 &8698039833552491262 stripped
|
--- !u!224 &8698039833552491262 stripped
|
||||||
@ -6692,6 +6752,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: input
|
value: input
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_ContentType
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_KeyboardType
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_CharacterValidation
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||||
--- !u!224 &8698039832972322733 stripped
|
--- !u!224 &8698039832972322733 stripped
|
||||||
@ -6832,6 +6907,21 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: input
|
value: input
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_ContentType
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_KeyboardType
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_CharacterValidation
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||||
--- !u!224 &8698039832891251293 stripped
|
--- !u!224 &8698039832891251293 stripped
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -117,10 +117,9 @@ namespace Assets.Scripts.Apis
|
|||||||
/// 获取个人中心的统计信息
|
/// 获取个人中心的统计信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public JsonResult<SummaryResultModel> GetSummary()
|
public async Task<JsonResult<SummaryResultModel>> GetSummary()
|
||||||
{
|
{
|
||||||
var result = Get<JsonResult<SummaryResultModel>>("User/GetSummary");
|
var result = await GetAsync<JsonResult<SummaryResultModel>>("User/GetSummary");
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@ using System.Net;
|
|||||||
|
|
||||||
public static class App
|
public static class App
|
||||||
{
|
{
|
||||||
public static string Host = "http://192.168.0.97:5082/";
|
public static string Host = "http://192.168.0.101:5083/";
|
||||||
|
|
||||||
public static string AppVersion = "1.0.0";
|
public static string AppVersion = "1.0.0";
|
||||||
|
|
||||||
|
|||||||
@ -383,6 +383,8 @@ public class LoginController : MonoBehaviour
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
signContainer.gameObject.SetActive(true);
|
signContainer.gameObject.SetActive(true);
|
||||||
|
wxLogin1.gameObject.SetActive(false);
|
||||||
|
wxLogin1.GetComponent<RectTransform>().localPosition = new Vector3(0, -573, 0);
|
||||||
pageNums = 4;
|
pageNums = 4;
|
||||||
//wxLogin3.gameObject.SetActive(false);
|
//wxLogin3.gameObject.SetActive(false);
|
||||||
StartScrollPanel(1);
|
StartScrollPanel(1);
|
||||||
@ -872,7 +874,7 @@ public class LoginController : MonoBehaviour
|
|||||||
userResult.Sex = _genders.SelectedIndex + 1;
|
userResult.Sex = _genders.SelectedIndex + 1;
|
||||||
userResult.Country = UIManager.Instance.loginRegOptions.GetCountryName(_countrys.SelectedIndex);
|
userResult.Country = UIManager.Instance.loginRegOptions.GetCountryName(_countrys.SelectedIndex);
|
||||||
userResult.Unit = _units.SelectedIndex;
|
userResult.Unit = _units.SelectedIndex;
|
||||||
userResult.Weight = int.Parse(_weight.Text);
|
userResult.Weight = double.Parse(_weight.Text);
|
||||||
userResult.Height = int.Parse(_height.Text);
|
userResult.Height = int.Parse(_height.Text);
|
||||||
if (string.IsNullOrEmpty(userResult.Nickname))
|
if (string.IsNullOrEmpty(userResult.Nickname))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -316,9 +316,9 @@ public class EditUserController : PFUIPanel
|
|||||||
}
|
}
|
||||||
user.FTP = int.Parse(mFTP.Text);
|
user.FTP = int.Parse(mFTP.Text);
|
||||||
user.Height = int.Parse(mHeight.Text);
|
user.Height = int.Parse(mHeight.Text);
|
||||||
user.Weight = int.Parse(mWeight.Text);
|
user.Weight = double.Parse(mWeight.Text);
|
||||||
user.MaxHeartRate = int.Parse(mMHR.Text);
|
user.MaxHeartRate = int.Parse(mMHR.Text);
|
||||||
user.BicycleWeight = int.Parse(mBW.Text);
|
user.BicycleWeight = double.Parse(mBW.Text);
|
||||||
user.WheelDiameter = int.Parse(mWD.Text);
|
user.WheelDiameter = int.Parse(mWD.Text);
|
||||||
user.Unit = mUnitDropdown.SelectedIndex;
|
user.Unit = mUnitDropdown.SelectedIndex;
|
||||||
user.Contact = mName.Text;
|
user.Contact = mName.Text;
|
||||||
@ -334,7 +334,7 @@ public class EditUserController : PFUIPanel
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
App.CurrentUser = user;
|
App.CurrentUser = JObject.FromObject(result.data).ToObject<UserResultModel>();
|
||||||
var userinfos = UIManager.Instance.userInfos;
|
var userinfos = UIManager.Instance.userInfos;
|
||||||
var i = userinfos.FindIndex(x => x.Id == App.CurrentUser.Id);
|
var i = userinfos.FindIndex(x => x.Id == App.CurrentUser.Id);
|
||||||
if (i != -1)
|
if (i != -1)
|
||||||
|
|||||||
@ -170,9 +170,9 @@ public class HomeController : PFUIPanel
|
|||||||
? App.CurrentUser.LastUpdateFtpTime.ToString("yyyy.MM.dd")
|
? App.CurrentUser.LastUpdateFtpTime.ToString("yyyy.MM.dd")
|
||||||
: App.CurrentUser.LastUpdateWeightTime.ToString("yyyy.MM.dd");
|
: App.CurrentUser.LastUpdateWeightTime.ToString("yyyy.MM.dd");
|
||||||
}
|
}
|
||||||
void GetSummary()
|
async void GetSummary()
|
||||||
{
|
{
|
||||||
var res = ConfigHelper.userApi.GetSummary();
|
var res = await ConfigHelper.userApi.GetSummary();
|
||||||
if (res.result)
|
if (res.result)
|
||||||
{
|
{
|
||||||
//App.CurrentUser.Distance = res.data.TotalDistance;
|
//App.CurrentUser.Distance = res.data.TotalDistance;
|
||||||
|
|||||||
@ -66,14 +66,14 @@ public class UserInfoController : PFUIPanel
|
|||||||
summaryPanel.Find("Panel").Find("RideResultList").GetComponent<ResultListController>().Load();
|
summaryPanel.Find("Panel").Find("RideResultList").GetComponent<ResultListController>().Load();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void Load()
|
async void Load()
|
||||||
{
|
{
|
||||||
//if (!App.FromLogin)
|
//if (!App.FromLogin)
|
||||||
//{
|
//{
|
||||||
// var result = await userApi.Login("15651831367", "123456", "");
|
// var result = await userApi.Login("15651831367", "123456", "");
|
||||||
// App.CurrentUser = result.data;
|
// App.CurrentUser = result.data;
|
||||||
//}
|
//}
|
||||||
var r = ConfigHelper.userApi.GetSummary();
|
var r = await ConfigHelper.userApi.GetSummary();
|
||||||
if (r.result)
|
if (r.result)
|
||||||
{
|
{
|
||||||
var summary = r.data;
|
var summary = r.data;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user