附近的人区域处理,骑行结果页面标题大小写问题
This commit is contained in:
parent
5ec6f4caca
commit
abd35810bc
@ -1320,7 +1320,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Total riding time
|
m_Text: Total Riding Time
|
||||||
--- !u!1 &4080633421470452234
|
--- !u!1 &4080633421470452234
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -3474,7 +3474,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Max heart rate
|
m_Text: Max Heart Rate
|
||||||
--- !u!1 &7462604566789801356
|
--- !u!1 &7462604566789801356
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -3708,7 +3708,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Bike weight
|
m_Text: Bike Weight
|
||||||
--- !u!1 &7462604567111632052
|
--- !u!1 &7462604567111632052
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -5430,6 +5430,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: RideResultList
|
value: RideResultList
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1441145903752631099, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 300
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7974311519597661726, guid: ed226fe096f17a0459f856db5fc494af,
|
- target: {fileID: 7974311519597661726, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
@ -5470,17 +5475,37 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8884056308248339237, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 261.7354
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8884056308248339243, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Text
|
||||||
|
value: TRAINING DIARY
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8884056308248339243, guid: ed226fe096f17a0459f856db5fc494af,
|
- target: {fileID: 8884056308248339243, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_FontData.m_Font
|
propertyPath: m_FontData.m_Font
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
|
objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
- target: {fileID: 8884056308248339243, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_FontData.m_Alignment
|
||||||
|
value: 6
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8884056308736538996, guid: ed226fe096f17a0459f856db5fc494af,
|
- target: {fileID: 8884056308736538996, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8884056309303262656, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 295
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8884056309303262662, guid: ed226fe096f17a0459f856db5fc494af,
|
- target: {fileID: 8884056309303262662, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Text
|
propertyPath: m_Text
|
||||||
@ -5492,6 +5517,11 @@ PrefabInstance:
|
|||||||
value:
|
value:
|
||||||
objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
|
objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
- target: {fileID: 8884056309303262662, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_FontData.m_Alignment
|
||||||
|
value: 7
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8884056309872452861, guid: ed226fe096f17a0459f856db5fc494af,
|
- target: {fileID: 8884056309872452861, guid: ed226fe096f17a0459f856db5fc494af,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Material
|
propertyPath: m_Material
|
||||||
|
|||||||
@ -241,7 +241,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: <color=#5c5c6e>Cycling equipment:</color>Dynastream
|
m_Text: <color=#5c5c6e>Cycling Equipment:</color>Dynastream
|
||||||
--- !u!1 &331225471740520315
|
--- !u!1 &331225471740520315
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1582,7 +1582,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: <color=#5c5c6e>Riding time:</color>00:18:52
|
m_Text: <color=#5c5c6e>Riding Time:</color>00:18:52
|
||||||
--- !u!1 &5077901321725402009
|
--- !u!1 &5077901321725402009
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -241,7 +241,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: <color=#5c5c6e>Cycling equipment:</color>Dynastream
|
m_Text: <color=#5c5c6e>Cycling Equipment:</color>Dynastream
|
||||||
--- !u!1 &331225471740520315
|
--- !u!1 &331225471740520315
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1396,7 +1396,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: <color=#5c5c6e>Riding time:</color>00:18:52
|
m_Text: <color=#5c5c6e>Riding Time:</color>00:18:52
|
||||||
--- !u!1 &5077901321725402009
|
--- !u!1 &5077901321725402009
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
using GeoJSON.Net.Geometry;
|
using GeoJSON.Net.Geometry;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@ -394,16 +395,16 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
|||||||
{
|
{
|
||||||
return new ReceiveMsgModel
|
return new ReceiveMsgModel
|
||||||
{
|
{
|
||||||
RouteId = Convert.ToInt32(list[0]),
|
RouteId = Convert.ToInt32(list[0],CultureInfo.InvariantCulture),
|
||||||
MemberId = Convert.ToInt32(list[1]),
|
MemberId = Convert.ToInt32(list[1], CultureInfo.InvariantCulture),
|
||||||
Point = new double[] { double.Parse(list[2].Split(':')[0]), double.Parse(list[2].Split(':')[1]) },
|
Point = new double[] { double.Parse(list[2].Split(':')[0], CultureInfo.InvariantCulture), double.Parse(list[2].Split(':')[1], CultureInfo.InvariantCulture) },
|
||||||
IsCompleted = ToBoolean(list[3]),
|
IsCompleted = ToBoolean(list[3]),
|
||||||
//exit = ToBoolean(list[4]),
|
//exit = ToBoolean(list[4]),
|
||||||
Speed = Convert.ToDouble(list[4]),
|
Speed = Convert.ToDouble(list[4], CultureInfo.InvariantCulture),
|
||||||
PreDistance = Convert.ToDouble(list[5]),
|
PreDistance = Convert.ToDouble(list[5], CultureInfo.InvariantCulture),
|
||||||
EndDistance = Convert.ToDouble(list[6]),
|
EndDistance = Convert.ToDouble(list[6], CultureInfo.InvariantCulture),
|
||||||
WeightKg = Convert.ToDouble(list[7]),
|
WeightKg = Convert.ToDouble(list[7], CultureInfo.InvariantCulture),
|
||||||
Competitionid = Convert.ToInt32(list[8]),
|
Competitionid = Convert.ToInt32(list[8], CultureInfo.InvariantCulture),
|
||||||
Saved = ToBoolean(list[9])
|
Saved = ToBoolean(list[9])
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,7 +39,7 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
|
|||||||
|
|
||||||
left.Find("Main").Find("Name").GetComponent<Text>().text = result.RouteName;
|
left.Find("Main").Find("Name").GetComponent<Text>().text = result.RouteName;
|
||||||
left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
|
left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding time:</color>{result.TrainingTime}";
|
row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding Time:</color>{result.TrainingTime}";
|
||||||
row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
|
row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
|
||||||
row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";
|
row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";
|
||||||
if (index == 0)
|
if (index == 0)
|
||||||
@ -52,7 +52,7 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
|
|||||||
}
|
}
|
||||||
left.Find("Progress").Find("Image").GetComponent<Image>().fillAmount = (float)result.Progress;
|
left.Find("Progress").Find("Image").GetComponent<Image>().fillAmount = (float)result.Progress;
|
||||||
left.Find("Progress").Find("Value").GetComponent<Text>().text = (result.Progress * 100).ToString("#0");
|
left.Find("Progress").Find("Value").GetComponent<Text>().text = (result.Progress * 100).ToString("#0");
|
||||||
row2.Find("Device").GetComponent<Text>().text = $"<color={titleColor}>Cycling equipment:</color>{result.ManufacturerName}";
|
row2.Find("Device").GetComponent<Text>().text = $"<color={titleColor}>Cycling Equipment:</color>{result.ManufacturerName}";
|
||||||
if (index == 0)
|
if (index == 0)
|
||||||
{
|
{
|
||||||
right = transform.Find("Right");
|
right = transform.Find("Right");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user