Merge branch 'dev_lishuo' into dev_cyp
# Conflicts: # Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab # Assets/Scenes/Login-Mobile.unity # Assets/Scenes/Login.unity # Assets/Scripts/App.cs # Assets/Scripts/Editor.meta # Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
This commit is contained in:
Caiyanpeng committed
commit
190a66bb68
89 files changed
+9195
-1628
No files matched your search
@@ -281,6 +281,7 @@ GameObject:
|
||||
- component: {fileID: 8344415755716207944}
|
||||
- component: {fileID: 8557832133597349620}
|
||||
- component: {fileID: 7756627206782382592}
|
||||
- component: {fileID: 3957683207677011357}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
@@ -348,6 +349,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: RACE
|
||||
--- !u!114 &3957683207677011357
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2805785350616967088}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &2854933764902026063
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -447,6 +461,7 @@ GameObject:
|
||||
- component: {fileID: 2878789241596981418}
|
||||
- component: {fileID: 2878789241596981416}
|
||||
- component: {fileID: 2878789241596981419}
|
||||
- component: {fileID: 4448697846108024587}
|
||||
m_Layer: 5
|
||||
m_Name: Calories
|
||||
m_TagString: Untagged
|
||||
@@ -514,6 +529,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Total Calories Burned
|
||||
--- !u!114 &4448697846108024587
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2878789241596989269}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &2878789241602269182
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -525,6 +553,7 @@ GameObject:
|
||||
- component: {fileID: 2878789241602269183}
|
||||
- component: {fileID: 2878789241602269181}
|
||||
- component: {fileID: 2878789241602269180}
|
||||
- component: {fileID: 3640576528503459761}
|
||||
m_Layer: 5
|
||||
m_Name: KM
|
||||
m_TagString: Untagged
|
||||
@@ -592,6 +621,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Total Distance
|
||||
--- !u!114 &3640576528503459761
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2878789241602269182}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &2878789241918611117
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -801,6 +843,7 @@ GameObject:
|
||||
- component: {fileID: 2878789242754722736}
|
||||
- component: {fileID: 2878789242754722742}
|
||||
- component: {fileID: 2878789242754722737}
|
||||
- component: {fileID: 537445586743321298}
|
||||
m_Layer: 5
|
||||
m_Name: Climb
|
||||
m_TagString: Untagged
|
||||
@@ -868,6 +911,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Total Climbed
|
||||
--- !u!114 &537445586743321298
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2878789242754722739}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &2878789242841953355
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1335,6 +1391,7 @@ GameObject:
|
||||
- component: {fileID: 3931130817687806827}
|
||||
- component: {fileID: 3931130817687806821}
|
||||
- component: {fileID: 3931130817687806826}
|
||||
- component: {fileID: 665173057057827394}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
@@ -1402,6 +1459,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: ROUTES
|
||||
--- !u!114 &665173057057827394
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3931130817687806824}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &3931130818032720429
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1959,6 +2029,7 @@ GameObject:
|
||||
- component: {fileID: 4277467338451912162}
|
||||
- component: {fileID: 4277467338451912160}
|
||||
- component: {fileID: 4277467338451912163}
|
||||
- component: {fileID: 677555783544010939}
|
||||
m_Layer: 5
|
||||
m_Name: Ftp
|
||||
m_TagString: Untagged
|
||||
@@ -2026,6 +2097,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: FTP
|
||||
--- !u!114 &677555783544010939
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4277467338451912165}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &4277467338606038296
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2037,6 +2121,7 @@ GameObject:
|
||||
- component: {fileID: 4277467338606038297}
|
||||
- component: {fileID: 4277467338606038279}
|
||||
- component: {fileID: 4277467338606038278}
|
||||
- component: {fileID: 1659918149749176810}
|
||||
m_Layer: 5
|
||||
m_Name: WKG
|
||||
m_TagString: Untagged
|
||||
@@ -2103,9 +2188,20 @@ MonoBehaviour:
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 'FTP/KG
|
||||
|
||||
'
|
||||
m_Text: FTP/KG
|
||||
--- !u!114 &1659918149749176810
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4277467338606038296}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &4277467338672161758
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2823,6 +2919,7 @@ GameObject:
|
||||
- component: {fileID: 4277467339516583035}
|
||||
- component: {fileID: 4277467339516583033}
|
||||
- component: {fileID: 4277467339516583032}
|
||||
- component: {fileID: 7551713313783218038}
|
||||
m_Layer: 5
|
||||
m_Name: Weight
|
||||
m_TagString: Untagged
|
||||
@@ -2890,6 +2987,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: WEIGHT
|
||||
--- !u!114 &7551713313783218038
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4277467339516583034}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &4277467339671949726
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3530,6 +3640,7 @@ GameObject:
|
||||
- component: {fileID: 9029656237557237746}
|
||||
- component: {fileID: 379167247127675585}
|
||||
- component: {fileID: 3461807895860038868}
|
||||
- component: {fileID: 1463075415295048936}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
@@ -3597,6 +3708,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: TRAINING
|
||||
--- !u!114 &1463075415295048936
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8058388555972429588}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &8432177435281415079
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in new issue
Block a user