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
@@ -178,6 +178,7 @@ GameObject:
|
||||
- component: {fileID: 7672791435969097068}
|
||||
- component: {fileID: 740803332586528087}
|
||||
- component: {fileID: 913971118869806231}
|
||||
- component: {fileID: 3736854379713315744}
|
||||
m_Layer: 5
|
||||
m_Name: NoDevice
|
||||
m_TagString: Untagged
|
||||
@@ -245,6 +246,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: NO DEVICE
|
||||
--- !u!114 &3736854379713315744
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3184548043826394215}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &3878003491430181822
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -330,6 +344,7 @@ GameObject:
|
||||
- component: {fileID: 4797266230727174615}
|
||||
- component: {fileID: 3255011571667659685}
|
||||
- component: {fileID: 955857876120831234}
|
||||
- component: {fileID: 2376164354960099470}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
@@ -397,6 +412,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Smart Trainer
|
||||
--- !u!114 &2376164354960099470
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4034021024603993323}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &4065489808915999925
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -239,6 +239,7 @@ GameObject:
|
||||
- component: {fileID: 4347642619387382541}
|
||||
- component: {fileID: 7318458415531256946}
|
||||
- component: {fileID: 4835322734402073931}
|
||||
- component: {fileID: 8406468213399406539}
|
||||
m_Layer: 5
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
@@ -306,6 +307,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: New Text
|
||||
--- !u!114 &8406468213399406539
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6417040487747213529}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &6790451822861370522
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -284,6 +284,7 @@ GameObject:
|
||||
- component: {fileID: 7414013380646078914}
|
||||
- component: {fileID: 615180660641507081}
|
||||
- component: {fileID: 2265782484987110779}
|
||||
- component: {fileID: 8704052850641533299}
|
||||
m_Layer: 5
|
||||
m_Name: NoDevice
|
||||
m_TagString: Untagged
|
||||
@@ -351,6 +352,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: NO DEVICE
|
||||
--- !u!114 &8704052850641533299
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5772803864504489695}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &6268110712645026277
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -480,6 +494,7 @@ GameObject:
|
||||
- component: {fileID: 9182849809646276971}
|
||||
- component: {fileID: 4802001834133674637}
|
||||
- component: {fileID: 7509276603553944008}
|
||||
- component: {fileID: 5292081527696608468}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
@@ -547,6 +562,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Power Meter
|
||||
--- !u!114 &5292081527696608468
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7553741504171086864}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &7871587976291415414
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -828,6 +856,7 @@ GameObject:
|
||||
- component: {fileID: 9180225337925263917}
|
||||
- component: {fileID: 4675676810215989600}
|
||||
- component: {fileID: 4527791653199611421}
|
||||
- component: {fileID: 3403787043050863694}
|
||||
m_Layer: 5
|
||||
m_Name: SearchState
|
||||
m_TagString: Untagged
|
||||
@@ -895,6 +924,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Searching...
|
||||
--- !u!114 &3403787043050863694
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9035556119014129239}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1001 &1782903961702437631
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -178,6 +178,7 @@ GameObject:
|
||||
- component: {fileID: 7672791435969097068}
|
||||
- component: {fileID: 740803332586528087}
|
||||
- component: {fileID: 913971118869806231}
|
||||
- component: {fileID: 1218967365527938946}
|
||||
m_Layer: 5
|
||||
m_Name: NoDevice
|
||||
m_TagString: Untagged
|
||||
@@ -245,6 +246,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: NO DEVICE
|
||||
--- !u!114 &1218967365527938946
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3184548043826394215}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &3878003491430181822
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -330,6 +344,7 @@ GameObject:
|
||||
- component: {fileID: 4797266230727174615}
|
||||
- component: {fileID: 3255011571667659685}
|
||||
- component: {fileID: 955857876120831234}
|
||||
- component: {fileID: 3003252341395391391}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
@@ -397,6 +412,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Smart Trainer
|
||||
--- !u!114 &3003252341395391391
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4034021024603993323}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &4065489808915999925
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -284,6 +284,7 @@ GameObject:
|
||||
- component: {fileID: 7414013380646078914}
|
||||
- component: {fileID: 615180660641507081}
|
||||
- component: {fileID: 2265782484987110779}
|
||||
- component: {fileID: 1016162604717684795}
|
||||
m_Layer: 5
|
||||
m_Name: NoDevice
|
||||
m_TagString: Untagged
|
||||
@@ -351,6 +352,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: NO DEVICE
|
||||
--- !u!114 &1016162604717684795
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5772803864504489695}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &6268110712645026277
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -480,6 +494,7 @@ GameObject:
|
||||
- component: {fileID: 9182849809646276971}
|
||||
- component: {fileID: 4802001834133674637}
|
||||
- component: {fileID: 7509276603553944008}
|
||||
- component: {fileID: 274922557647376645}
|
||||
m_Layer: 5
|
||||
m_Name: Title
|
||||
m_TagString: Untagged
|
||||
@@ -547,6 +562,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Power Meter
|
||||
--- !u!114 &274922557647376645
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7553741504171086864}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &7871587976291415414
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -828,6 +856,7 @@ GameObject:
|
||||
- component: {fileID: 9180225337925263917}
|
||||
- component: {fileID: 4675676810215989600}
|
||||
- component: {fileID: 4527791653199611421}
|
||||
- component: {fileID: 6325989474163739324}
|
||||
m_Layer: 5
|
||||
m_Name: SearchState
|
||||
m_TagString: Untagged
|
||||
@@ -895,6 +924,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Searching...
|
||||
--- !u!114 &6325989474163739324
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9035556119014129239}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1001 &1782903961702437631
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -57,6 +57,7 @@ GameObject:
|
||||
- component: {fileID: 7039018314083617416}
|
||||
- component: {fileID: 7039018314083617414}
|
||||
- component: {fileID: 7039018314083617415}
|
||||
- component: {fileID: 2011065193744442032}
|
||||
m_Layer: 5
|
||||
m_Name: TimeText
|
||||
m_TagString: Untagged
|
||||
@@ -124,6 +125,19 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!114 &2011065193744442032
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7039018314083617417}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
--- !u!1 &7039018314322138461
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -135,6 +149,7 @@ GameObject:
|
||||
- component: {fileID: 7039018314322138460}
|
||||
- component: {fileID: 7039018314322138458}
|
||||
- component: {fileID: 7039018314322138459}
|
||||
- component: {fileID: 136450673101367840}
|
||||
m_Layer: 5
|
||||
m_Name: BatteryText
|
||||
m_TagString: Untagged
|
||||
@@ -202,3 +217,16 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
--- !u!114 &136450673101367840
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7039018314322138461}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
key:
|
||||
Reference in new issue
Block a user