lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移动动效和界面调整

Browse Source
This commit is contained in:
lishuo 2021-04-25 13:33:43 +08:00
parent 11fdcff7c3
commit 9ac7c86ca6
12 changed files with 4926 additions and 3498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

341
Assets/Resources/UI/Prefab/Ride/SelectPlayerItem.prefab
View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &8411558192216138181 --- !u!1 &7990214423672361643
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,53 +8,53 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8411558192216138180} - component: {fileID: 7990214423672361556}
- component: {fileID: 8411558192216138186} - component: {fileID: 7990214423672361558}
- component: {fileID: 8411558192216138187} - component: {fileID: 7990214423672361557}
m_Layer: 5 m_Layer: 5
m_Name: Head m_Name: Timer
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &8411558192216138180 --- !u!224 &7990214423672361556
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192216138181} m_GameObject: {fileID: 7990214423672361643}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8411558192340730122} m_Father: {fileID: 7990214424076100056}
m_RootOrder: 0 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 28, y: 0} m_AnchoredPosition: {x: 235.5, y: 35}
m_SizeDelta: {x: 36, y: 36} m_SizeDelta: {x: 81, y: 22}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8411558192216138186 --- !u!222 &7990214423672361558
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192216138181} m_GameObject: {fileID: 7990214423672361643}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &8411558192216138187 --- !u!114 &7990214423672361557
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192216138181} m_GameObject: {fileID: 7990214423672361643}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -64,14 +64,21 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Texture: {fileID: 0} m_FontData:
m_UVRect: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
serializedVersion: 2 m_FontSize: 16
x: 0 m_FontStyle: 0
y: 0 m_BestFit: 0
width: 1 m_MinSize: 1
height: 1 m_MaxSize: 40
--- !u!1 &8411558192340730123 m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00:00
--- !u!1 &7990214424076100063
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -79,12 +86,12 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8411558192340730122} - component: {fileID: 7990214424076100056}
- component: {fileID: 8411558192340730127} - component: {fileID: 7990214424076100059}
- component: {fileID: 8411558192340730120} - component: {fileID: 7990214424076100058}
- component: {fileID: 8411558192340730121} - component: {fileID: 7990214424076100057}
- component: {fileID: 8411558192340730126} - component: {fileID: 7990214424076100036}
- component: {fileID: 8226293288482667654} - component: {fileID: 6761916324276017367}
m_Layer: 5 m_Layer: 5
m_Name: SelectPlayerItem m_Name: SelectPlayerItem
m_TagString: Untagged m_TagString: Untagged
@ -92,56 +99,57 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &8411558192340730122 --- !u!224 &7990214424076100056
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192340730123} m_GameObject: {fileID: 7990214424076100063}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8411558192216138180} - {fileID: 7990214424895452142}
- {fileID: 8411558193619762830} - {fileID: 7990214424621459012}
- {fileID: 8411558194076291262} - {fileID: 7990214424681335412}
- {fileID: 7990214423672361556}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 175, y: 128}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 296, y: 56}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8411558192340730127 --- !u!222 &7990214424076100059
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192340730123} m_GameObject: {fileID: 7990214424076100063}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &8411558192340730120 --- !u!114 &7990214424076100058
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192340730123} m_GameObject: {fileID: 7990214424076100063}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.6509804} m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.6}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 0} m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -151,26 +159,39 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!114 &8411558192340730121 --- !u!114 &7990214424076100057
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192340730123} m_GameObject: {fileID: 7990214424076100063}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
radius: 20 radius: 20
--- !u!114 &8411558192340730126 --- !u!114 &7990214424076100036
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192340730123} m_GameObject: {fileID: 7990214424076100063}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a77881c6394b0947b40b398dcdcc7db, type: 3}
m_Name:
m_EditorClassIdentifier:
isSelected: 0
--- !u!114 &6761916324276017367
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7990214424076100063}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@ -203,24 +224,11 @@ MonoBehaviour:
m_SelectedTrigger: Selected m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 8411558192340730120} m_TargetGraphic: {fileID: 7990214424076100058}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!114 &8226293288482667654 --- !u!1 &7990214424621459035
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558192340730123}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a77881c6394b0947b40b398dcdcc7db, type: 3}
m_Name:
m_EditorClassIdentifier:
isSelected: 0
--- !u!1 &8411558193619762831
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -228,9 +236,11 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8411558193619762830} - component: {fileID: 7990214424621459012}
- component: {fileID: 8411558193619762828} - component: {fileID: 7990214424621459014}
- component: {fileID: 8411558193619762829} - component: {fileID: 7990214424621459013}
- component: {fileID: 222363145698110508}
- component: {fileID: 8705162608223795836}
m_Layer: 5 m_Layer: 5
m_Name: Name m_Name: Name
m_TagString: Untagged m_TagString: Untagged
@ -238,40 +248,40 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &8411558193619762830 --- !u!224 &7990214424621459012
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558193619762831} m_GameObject: {fileID: 7990214424621459035}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8411558192340730122} m_Father: {fileID: 7990214424076100056}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 105.5, y: -0.00000047683716} m_AnchoredPosition: {x: 116, y: -28.5}
m_SizeDelta: {x: 99, y: 17} m_SizeDelta: {x: 120, y: 17}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8411558193619762828 --- !u!222 &7990214424621459014
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558193619762831} m_GameObject: {fileID: 7990214424621459035}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &8411558193619762829 --- !u!114 &7990214424621459013
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558193619762831} m_GameObject: {fileID: 7990214424621459035}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@ -291,14 +301,40 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 1 m_MinSize: 1
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 3 m_Alignment: 0
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: New Text m_Text: Name
--- !u!1 &8411558194076291263 --- !u!114 &222363145698110508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7990214424621459035}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a77881c6394b0947b40b398dcdcc7db, type: 3}
m_Name:
m_EditorClassIdentifier:
isSelected: 0
--- !u!114 &8705162608223795836
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7990214424621459035}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 20
--- !u!1 &7990214424681335371
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -306,73 +342,158 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8411558194076291262} - component: {fileID: 7990214424681335412}
- component: {fileID: 8411558194076291260} - component: {fileID: 7990214424681335414}
- component: {fileID: 8411558194076291261} - component: {fileID: 7990214424681335413}
m_Layer: 5 m_Layer: 5
m_Name: Timer m_Name: WeightKg
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &8411558194076291262 --- !u!224 &7990214424681335412
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558194076291263} m_GameObject: {fileID: 7990214424681335371}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8411558192340730122} m_Father: {fileID: 7990214424076100056}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -55.5, y: 0} m_AnchoredPosition: {x: -60.5, y: 17.5}
m_SizeDelta: {x: 67, y: 22} m_SizeDelta: {x: 81, y: 15}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8411558194076291260 --- !u!222 &7990214424681335414
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558194076291263} m_GameObject: {fileID: 7990214424681335371}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &8411558194076291261 --- !u!114 &7990214424681335413
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8411558194076291263} m_GameObject: {fileID: 7990214424681335371}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 10
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 0W/KG
--- !u!1 &7990214424895452141
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7990214424895452142}
- component: {fileID: 7990214424895452137}
- component: {fileID: 7990214424895452136}
- component: {fileID: 7990214424895452143}
m_Layer: 5
m_Name: Head
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7990214424895452142
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7990214424895452141}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7990214424076100056}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 28, y: 28}
m_SizeDelta: {x: 36, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7990214424895452137
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7990214424895452141}
m_CullTransparentMesh: 0
--- !u!114 &7990214424895452136
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7990214424895452141}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_Texture: {fileID: 0}
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_UVRect:
m_FontSize: 16 serializedVersion: 2
m_FontStyle: 0 x: 0
m_BestFit: 0 y: 0
m_MinSize: 10 width: 1
m_MaxSize: 40 height: 1
m_Alignment: 5 --- !u!114 &7990214424895452143
m_AlignByGeometry: 0 MonoBehaviour:
m_RichText: 1 m_ObjectHideFlags: 0
m_HorizontalOverflow: 0 m_CorrespondingSourceObject: {fileID: 0}
m_VerticalOverflow: 0 m_PrefabInstance: {fileID: 0}
m_LineSpacing: 1 m_PrefabAsset: {fileID: 0}
m_Text: 01:08:99 m_GameObject: {fileID: 7990214424895452141}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 18

7910
Assets/Scenes/Ride/Ride.unity
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/Ride/Scripts/AbstractPlayer.cs
View File

@ -220,8 +220,13 @@ namespace Assets.Scenes.Ride.Scripts
nextSlopeDistance = sumDistance - totalDistance * 1000; nextSlopeDistance = sumDistance - totalDistance * 1000;
currentSlopeDistance = totalDistance * 1000 - (sumDistance - pointList[index].Distance); currentSlopeDistance = totalDistance * 1000 - (sumDistance - pointList[index].Distance);
//计算当前区间距离 //计算当前区间距离
CurrentDistance = pointList[CurrentIndex].Grade; CurrentDistance = pointList[CurrentIndex].Distance;
//计算上一个坡度
PreElevation = pointList[preIndex].Elevation;
PreSlope = pointList[preIndex].Grade;
} }
public double PreElevation;
public double PreSlope;
//根据距离计算坐标 //根据距离计算坐标
Vector2d Along(double endDistance) Vector2d Along(double endDistance)
{ {

21
Assets/Scenes/Ride/Scripts/ChartDataSourceScript.cs
View File

@ -24,6 +24,16 @@ namespace Assets.Scenes.Ride.Scripts
{ {
graph = GetComponent<GraphChartBase>(); graph = GetComponent<GraphChartBase>();
} }
public bool isEnd(int index)
{
return index - start == 51;
}
public bool isMid(int index)
{
return index - start == 26;
}
bool VerifySorted(List<DoubleVector2> data) bool VerifySorted(List<DoubleVector2> data)
{ {
if (data == null) if (data == null)
@ -119,7 +129,7 @@ namespace Assets.Scenes.Ride.Scripts
} }
} }
public int start, end;
void LoadPage(double pagePosition) void LoadPage(double pagePosition)
{ {
if (graph != null) if (graph != null)
@ -128,7 +138,7 @@ namespace Assets.Scenes.Ride.Scripts
Debug.Log("Loading page :" + pagePosition); Debug.Log("Loading page :" + pagePosition);
graph.DataSource.StartBatch(); // call start batch graph.DataSource.StartBatch(); // call start batch
graph.DataSource.HorizontalViewOrigin = 0; graph.DataSource.HorizontalViewOrigin = 0;
int start, end;
findPointsForPage(pagePosition, out start, out end); // get the page edges findPointsForPage(pagePosition, out start, out end); // get the page edges
graph.DataSource.ClearCategory("Player 2"); // clear the cateogry graph.DataSource.ClearCategory("Player 2"); // clear the cateogry
@ -174,14 +184,15 @@ namespace Assets.Scenes.Ride.Scripts
return 1; return 1;
return 0; return 0;
} }
public double pageStartThreshold;
public double pageEndThreshold;
public void Update() public void Update()
{ {
if (graph != null) if (graph != null)
{ {
//check the scrolling position of the graph. if we are past the view size , load a new page //check the scrolling position of the graph. if we are past the view size , load a new page
double pageStartThreshold = currentPagePosition - mCurrentPageSizeFactor; pageStartThreshold = currentPagePosition - mCurrentPageSizeFactor;
double pageEndThreshold = currentPagePosition + mCurrentPageSizeFactor - graph.DataSource.HorizontalViewSize; pageEndThreshold = currentPagePosition + mCurrentPageSizeFactor - graph.DataSource.HorizontalViewSize;
if (graph.HorizontalScrolling < pageStartThreshold || graph.HorizontalScrolling > pageEndThreshold || currentZoom >= graph.DataSource.HorizontalViewSize * 2f) if (graph.HorizontalScrolling < pageStartThreshold || graph.HorizontalScrolling > pageEndThreshold || currentZoom >= graph.DataSource.HorizontalViewSize * 2f)
{ {

10
Assets/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -148,7 +148,6 @@ public class CyclingController : DeviceServiceMonoBase
} }
//异步请求mapbox画出当前路书路线图 //异步请求mapbox画出当前路书路线图
loadingController.DrawMapRoute(mapData); loadingController.DrawMapRoute(mapData);
loadingController.AddProcess(10);
} }
//加载人物和地图以及UI界面 //加载人物和地图以及UI界面
private void InitGameObject() private void InitGameObject()
@ -173,6 +172,9 @@ public class CyclingController : DeviceServiceMonoBase
cyclingController = new SingleModel(route, selectParamModel); cyclingController = new SingleModel(route, selectParamModel);
break; break;
} }
//进入倒计时
var singleUIManager = UIObject.GetComponent<SingleUIManager>();
singleUIManager.StartRide(null);
} }
#region #region
@ -267,7 +269,9 @@ public class CyclingController : DeviceServiceMonoBase
cyclingController.recorderData.AntModelId = AntModelId; cyclingController.recorderData.AntModelId = AntModelId;
cyclingController.recorderData.ManufacturerId = ManufacturerId; cyclingController.recorderData.ManufacturerId = ManufacturerId;
cyclingController.recorderData.DeviceNumber = DeviceNumber; cyclingController.recorderData.DeviceNumber = DeviceNumber;
//cyclingController.recorderData.SaveData(cyclingModel, selectParamModel, imageFileName); #if !UNITY_EDITOR
cyclingController.recorderData.SaveData(cyclingModel, selectParamModel, imageFileName);
#endif
//显示骑行结果 //显示骑行结果
resultPanel.SetActive(true); resultPanel.SetActive(true);
var rs = resultPanel.GetComponent<ResultPanelScript>(); var rs = resultPanel.GetComponent<ResultPanelScript>();
@ -348,7 +352,7 @@ public class CyclingController : DeviceServiceMonoBase
var list = mapData.List.Select(c => (float)c.Elevation).ToArray(); var list = mapData.List.Select(c => (float)c.Elevation).ToArray();
return list; return list;
} }
#endregion #endregion
} }

8
Assets/Scenes/Ride/Scripts/LoadingController.cs
View File

@ -66,7 +66,13 @@ namespace Assets.Scenes.Ride.Scripts
public void DrawMapRoute(MapDataModel mapData) public void DrawMapRoute(MapDataModel mapData)
{ {
var url = Helper.GetMapboxApiUrl(mapData.List); var url = Helper.GetMapboxApiUrl(mapData.List);
Utils.DisplayImage(StartCoroutine, mapRouteImage, url); Utils.DisplayImageAysnc(StartCoroutine, mapRouteImage, url, dowloadCallBack);
mapRouteImage.gameObject.SetActive(false);
}
private void dowloadCallBack()
{
mapRouteImage.gameObject.SetActive(true);
this.AddProcess(10);
} }
//设定当前loading进度 //设定当前loading进度
public void AddProcess(float v) public void AddProcess(float v)

2
Assets/Scenes/Ride/Scripts/PlayerController.cs
View File

@ -34,7 +34,7 @@ namespace Assets.Scenes.Ride.Scripts
bicycleWeight = App.CurrentUser.BicycleWeight; bicycleWeight = App.CurrentUser.BicycleWeight;
#if UNITY_EDITOR #if UNITY_EDITOR
power = Random.Range(1,200);//测试功率 power = 2000;//测试功率
#endif #endif
mainController.TrackResistance(currentSlope);//TODO mainController.TrackResistance(currentSlope);//TODO
speed = Helper.CalculateSpeed(elevation, currentSlope, power, weight, bicycleWeight); speed = Helper.CalculateSpeed(elevation, currentSlope, power, weight, bicycleWeight);

15
Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
View File

@ -162,14 +162,22 @@ namespace Assets.Scenes.Ride.Scripts
{ {
var list = mapApi.GetRouteRanking(App.RouteIdParam, "1", pageIndex, pageSize, seachName); var list = mapApi.GetRouteRanking(App.RouteIdParam, "1", pageIndex, pageSize, seachName);
totalPages = list.data.TotalPages; totalPages = list.data.TotalPages;
var data = list.data.list.Where(c => c.WeightKg >= _startValue && c.WeightKg <= _endValue).ToList(); var data = list.data.list;//.Where(c => c.WeightKg >= _startValue && c.WeightKg <= _endValue).ToList();
if (_startValue > 0)
{
data = data.Where(c => c.WeightKg >= _startValue).ToList();
}
if (_endValue > 0)
{
data = data.Where(c => c.WeightKg <= _endValue).ToList();
}
if (sort == 0) if (sort == 0)
{ {
data = data.OrderBy(c => c.WeightKg).ToList(); data = data.OrderByDescending(c => c.WeightKg).ToList();
} }
else else
{ {
data = data.OrderByDescending(c => c.WeightKg).ToList(); data = data.OrderBy(c => c.WeightKg).ToList();
} }
CreateGameObject(data); CreateGameObject(data);
} }
@ -191,6 +199,7 @@ namespace Assets.Scenes.Ride.Scripts
selectPlayerItemScript.SetRankingId(item.Id.ToString()); selectPlayerItemScript.SetRankingId(item.Id.ToString());
selectPlayerItemScript.SetName(item.NickName); selectPlayerItemScript.SetName(item.NickName);
selectPlayerItemScript.SetTimer(item.TotalTime); selectPlayerItemScript.SetTimer(item.TotalTime);
selectPlayerItemScript.SetWeightKg(item.WeightKg.ToString());
selectPlayerItemScript.SetHeadImage(item.WxHeadImg); selectPlayerItemScript.SetHeadImage(item.WxHeadImg);
selectPlayerItemScripts.Add(selectPlayerItemScript); selectPlayerItemScripts.Add(selectPlayerItemScript);
UIManager.AddEvent(selectPlayerItemScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnSelectClick); UIManager.AddEvent(selectPlayerItemScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnSelectClick);

18
Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs
View File

@ -12,13 +12,15 @@ namespace Assets.Scenes.Ride.Scripts
private RawImage Head; private RawImage Head;
private Text Name; private Text Name;
private Text Timer; private Text Timer;
private Text WeightKg;
private Button selectbutton; private Button selectbutton;
public bool isSelected; public bool isSelected;
private void Awake() private void Awake()
{ {
Head = transform.Find("Head").GetComponent<RawImage>();
Name = transform.Find("Name").GetComponent<Text>();
Timer = transform.Find("Timer").GetComponent<Text>();
selectbutton = transform.GetComponent<Button>(); selectbutton = transform.GetComponent<Button>();
} }
private void Start() private void Start()
@ -31,6 +33,7 @@ namespace Assets.Scenes.Ride.Scripts
} }
public string GetName() public string GetName()
{ {
Name = transform.Find("Name").GetComponent<Text>();
return Name.text; return Name.text;
} }
public Texture GetImageTexture() public Texture GetImageTexture()
@ -47,14 +50,23 @@ namespace Assets.Scenes.Ride.Scripts
} }
public void SetName(string name) public void SetName(string name)
{ {
Name = transform.Find("Name").GetComponent<Text>();
Name.text = name; Name.text = name;
} }
public void SetTimer(string timer) public void SetTimer(string timer)
{ {
Timer = transform.Find("Timer").GetComponent<Text>();
Timer.text = timer; Timer.text = timer;
} }
public void SetWeightKg(string value)
{
WeightKg = transform.Find("WeightKg").GetComponent<Text>();
WeightKg.text = value+"W/KG";
}
public void SetHeadImage(string url) public void SetHeadImage(string url)
{ {
Head = transform.Find("Head").GetComponent<RawImage>();
Utils.DisplayImage(StartCoroutine, Head, url); Utils.DisplayImage(StartCoroutine, Head, url);
var rect = ((RectTransform)Head.transform).rect; var rect = ((RectTransform)Head.transform).rect;
Material material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial")); Material material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));

1
Assets/Scenes/Ride/Scripts/SeletedPlayerScript.cs
View File

@ -38,6 +38,7 @@ namespace Assets.Scenes.Ride.Scripts
public void SetName(string name) public void SetName(string name)
{ {
Name.text = name; Name.text = name;
Name.color = new Color(1, 1, 1, 1);
} }
public void SetRankingId(string id) public void SetRankingId(string id)
{ {

73
Assets/Scenes/Ride/Scripts/SingleUIManager.cs
View File

@ -81,6 +81,10 @@ namespace Assets.Scenes.Ride.Scripts
Image arrow; Image arrow;
AbstractMap map; AbstractMap map;
Transform t; Transform t;
GameObject alertPanel;
Button alertBtn;
Button alertCloseBtn;
Text preSlopeText;
void Awake() void Awake()
{ {
#region 控件获取与事件绑定 #region 控件获取与事件绑定
@ -114,7 +118,14 @@ namespace Assets.Scenes.Ride.Scripts
img = transform.Find("Panel/GraphChart/Head").GetComponent<RawImage>(); img = transform.Find("Panel/GraphChart/Head").GetComponent<RawImage>();
t = transform.Find("Panel/GraphChart/Button"); t = transform.Find("Panel/GraphChart/Button");
miniMap = transform.Find("Panel/MiniMap").GetComponent<RawImage>(); miniMap = transform.Find("Panel/MiniMap").GetComponent<RawImage>();
alertPanel = transform.Find("Panel/Alert").gameObject;
alertBtn = transform.Find("Panel/Alert/SaveButton").GetComponent<Button>();
alertCloseBtn = transform.Find("Panel/Alert/CloseButton").GetComponent<Button>();
UIManager.AddEvent(alertBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, AlertOk);
UIManager.AddEvent(alertCloseBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, AlertClose);
selectPanel = transform.Find("Panel/SelectPanel").gameObject; selectPanel = transform.Find("Panel/SelectPanel").gameObject;
selectPlayer = transform.Find("Panel/SelectPlayer").gameObject; selectPlayer = transform.Find("Panel/SelectPlayer").gameObject;
reviewPanel = transform.Find("Panel/ReviewPanel").gameObject; reviewPanel = transform.Find("Panel/ReviewPanel").gameObject;
@ -133,6 +144,8 @@ namespace Assets.Scenes.Ride.Scripts
viewButton =transform.Find("Panel/ViewButton").GetComponent<Button>(); viewButton =transform.Find("Panel/ViewButton").GetComponent<Button>();
altitudeGraph = transform.Find("Panel/TitlePanel/AltitudeGraph").GetComponent<RawImage>(); altitudeGraph = transform.Find("Panel/TitlePanel/AltitudeGraph").GetComponent<RawImage>();
preSlopeText = transform.Find("Panel/PreSlopePanel/PreSlopeText").GetComponent<Text>();
target = transform.parent.Find("Target").gameObject; target = transform.parent.Find("Target").gameObject;
UIManager.AddEvent(startBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, StartRide); UIManager.AddEvent(startBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, StartRide);
@ -153,19 +166,6 @@ namespace Assets.Scenes.Ride.Scripts
UIManager.AddEvent(singleButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit); UIManager.AddEvent(singleButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit); UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, OnPointExit);
//startBtn.onClick.AddListener(StartRide);
//simpleBtn.onClick.AddListener(ClearPanel);
//pauseButton.onClick.AddListener(PauseRide);
//settingButton.onClick.AddListener(ShowSettingPanel);
//deviceButton.onClick.AddListener(ShowDevicePanel);
//exitButton.onClick.AddListener(StopRide);
//singleButton.onClick.AddListener(SingleRide);
//shadowButton.onClick.AddListener(ShadowRide);
//addButton.onClick.AddListener(ShowSelectPlayer);
//saveButton.onClick.AddListener(SaveRide);
//cancelQuitButton.onClick.AddListener(CancelQuit);
//closeQuitButton.onClick.AddListener(CloseQuit);
#endregion #endregion
} }
@ -241,6 +241,7 @@ namespace Assets.Scenes.Ride.Scripts
ditance.text = Math.Round(playerController.TotalDistance, 1).ToString("f1"); ditance.text = Math.Round(playerController.TotalDistance, 1).ToString("f1");
heartRate.text = $"{Math.Round(playerController.HeartRate, 0)}"; heartRate.text = $"{Math.Round(playerController.HeartRate, 0)}";
candance.text = $"{Math.Round(playerController.Cadance, 0)}"; candance.text = $"{Math.Round(playerController.Cadance, 0)}";
preSlopeText.text = $"{Math.Round(playerController.PreSlope, 1)}%";
//倒计时 //倒计时
if (count > 0) if (count > 0)
{ {
@ -282,6 +283,14 @@ namespace Assets.Scenes.Ride.Scripts
} }
//控制照片移动 //控制照片移动
((RectTransform)arrow.transform).position = Camera.main.WorldToScreenPoint(target.transform.position); ((RectTransform)arrow.transform).position = Camera.main.WorldToScreenPoint(target.transform.position);
if (playerController.Distance > 0 && mainController.isStart)
{
arrow.transform.Find("bg").gameObject.SetActive(true);
}
else
{
arrow.transform.Find("bg").gameObject.SetActive(false);
}
} }
} }
@ -307,13 +316,24 @@ namespace Assets.Scenes.Ride.Scripts
{ {
selectPlayer.SetActive(true); selectPlayer.SetActive(true);
} }
private void StartRide(BaseEventData baseEventData) public void AlertOk(BaseEventData baseEventData)
{
alertPanel.SetActive(false);
UIManager.Show(UIManager.Instance.DevicePanel, transform.Find("Panel").GetComponent<PFUIPanel>());
}
public void AlertClose(BaseEventData baseEventData)
{
alertPanel.SetActive(false);
}
public void StartRide(BaseEventData baseEventData)
{ {
var antConnected = mainController.CheckAnt();//初始化ant+设备 var antConnected = mainController.CheckAnt();//初始化ant+设备
//if (!antConnected) #if !UNITY_EDITOR
//{ if (!antConnected)
// throw new Exception("请先连接设备"); {
//} alertPanel.SetActive(true);
}
#endif
//加个5秒钟倒计时 //加个5秒钟倒计时
count = 5; count = 5;
startBtn.gameObject.SetActive(false); startBtn.gameObject.SetActive(false);
@ -514,7 +534,7 @@ namespace Assets.Scenes.Ride.Scripts
void MoveChartMarkPoint() void MoveChartMarkPoint()
{ {
Vector3 prePosition = img.transform.position; Vector3 prePosition = img.transform.position;
int nextIndex = playerController.CurrentIndex; int nextIndex = playerController.CurrentIndex+1;
double ditance = playerController.Distance;//当前移动距离 double ditance = playerController.Distance;//当前移动距离
double currentDistance = playerController.CurrentDistance;//当前区间距离 double currentDistance = playerController.CurrentDistance;//当前区间距离
var t = currentDistance != 0 ? ditance*1000 / currentDistance : 0; var t = currentDistance != 0 ? ditance*1000 / currentDistance : 0;
@ -524,7 +544,14 @@ namespace Assets.Scenes.Ride.Scripts
var currentPos = Vector3.Lerp(prePosition, nextPosition, (float)t); var currentPos = Vector3.Lerp(prePosition, nextPosition, (float)t);
img.transform.DOMove(currentPos, 1); img.transform.DOMove(currentPos, 1);
var ss = graph.GetComponentInChildren<ChartDataSourceScript>();
var q = ss.pageStartThreshold;
var p = ss.pageEndThreshold;
var diff = currentPos.x - prePosition.x;
var s = graph.ScrollableData;
var sss = s.GetMaxValue(0, true);
Debug.Log(sss);
//graph.HorizontalScrolling += diff / graph.TotalWidth;
//人物移动到中间的时候，线开始向左边平滑移动 //人物移动到中间的时候，线开始向左边平滑移动
//int del = (int)Math.Round(graph.DataSource.HorizontalViewSize / 2, 0); //int del = (int)Math.Round(graph.DataSource.HorizontalViewSize / 2, 0);
//if (playerController.CurrentIndex % del == 0) //if (playerController.CurrentIndex % del == 0)
@ -532,7 +559,7 @@ namespace Assets.Scenes.Ride.Scripts
// graph.HorizontalScrolling += 1; // graph.HorizontalScrolling += 1;
//} //}
#region 注释 #region 注释
//var dataPoints = elevationChart.series.list[0].dataPoints.OrderBy(c => c.x).ToList(); //var dataPoints = elevationChart.series.list[0].dataPoints.OrderBy(c => c.x).ToList();
//if (dataPoints.Count > 0) //if (dataPoints.Count > 0)
//{ //{
@ -555,7 +582,7 @@ namespace Assets.Scenes.Ride.Scripts
// //testButton.transform.DOLocalMove(new Vector3(pointMap[playerController.CurrentIndex - 1].x-Screen.width/2, pointMap[playerController.CurrentIndex - 1].y, 0),0.5f); // //testButton.transform.DOLocalMove(new Vector3(pointMap[playerController.CurrentIndex - 1].x-Screen.width/2, pointMap[playerController.CurrentIndex - 1].y, 0),0.5f);
// //pointMap.Remove(playerController.CurrentIndex - 1); // //pointMap.Remove(playerController.CurrentIndex - 1);
//} //}
#endregion #endregion
} }
} }
} }

18
Assets/Scripts/Utils/Utils.cs
View File

@ -121,6 +121,11 @@ namespace Assets.Scripts
{ {
startCoroutine(DownloadImage(img, url)); startCoroutine(DownloadImage(img, url));
} }
public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action action)
{
startCoroutine(DownloadImageCallBack(img, url, action));
}
static IEnumerator DownloadImage(RawImage img,string MediaUrl) static IEnumerator DownloadImage(RawImage img,string MediaUrl)
{ {
UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl); UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl);
@ -130,6 +135,19 @@ namespace Assets.Scripts
else else
img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture; img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture;
} }
static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action action)
{
UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl);
yield return request.SendWebRequest();
if (request.isNetworkError || request.isHttpError)
Debug.Log(request.error);
else
{
img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture;
action.Invoke();
}
}
/*显示网络图片*/ /*显示网络图片*/
/*获取最顶层对象*/ /*获取最顶层对象*/