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

加入合集后的跳转问题

Browse Source
This commit is contained in:
CaiYanPeng 2021-12-15 11:08:18 +08:00
parent ec4a28cd2a
commit 6ed3895fcd
13 changed files with 292 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Assets/Resources/UI/Prefab/NewRoute/Mobile/RouteItem.prefab
View File

@ -91,6 +91,7 @@ GameObject:
- component: {fileID: 3257946120518485719}
- component: {fileID: 3257946120518485717}
- component: {fileID: 85956595176844515}
- component: {fileID: 997815762582756343}
m_Layer: 5
m_Name: RouteItem
m_TagString: Untagged
@ -177,6 +178,49 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ede6683b9fc33934aae08dee1363e667, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &997815762582756343
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3257946120518485715}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3257946120518485717}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &3257946120601053364
GameObject:
m_ObjectHideFlags: 0

44
Assets/Resources/UI/Prefab/NewRoute/RouteItem.prefab
View File

@ -91,6 +91,7 @@ GameObject:
- component: {fileID: 3257946120518485719}
- component: {fileID: 3257946120518485717}
- component: {fileID: 8623729275797918568}
- component: {fileID: 3514413622330463918}
m_Layer: 5
m_Name: RouteItem
m_TagString: Untagged
@ -177,6 +178,49 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ede6683b9fc33934aae08dee1363e667, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3514413622330463918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3257946120518485715}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 3257946120518485717}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &3257946120601053364
GameObject:
m_ObjectHideFlags: 0

285
Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab
View File

@ -108,8 +108,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612271950846019}
- component: {fileID: 5526612271950846046}
- component: {fileID: 5526612271950846017}
- component: {fileID: 5526612271950846016}
m_Layer: 5
m_Name: SlopeContainer
m_TagString: Untagged
@ -133,10 +131,10 @@ RectTransform:
m_Father: {fileID: 5526612272165583874}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 145, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 135.72769, y: 0}
m_SizeDelta: {x: 53, y: 14}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5526612271950846046
CanvasRenderer:
@ -146,45 +144,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612271950846018}
m_CullTransparentMesh: 0
--- !u!114 &5526612271950846017
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612271950846018}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612271950846016
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612271950846018}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 4
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612271979363594
GameObject:
m_ObjectHideFlags: 0
@ -272,7 +231,6 @@ GameObject:
- component: {fileID: 5526612272056919338}
- component: {fileID: 5526612272056919337}
- component: {fileID: 5526612272056919336}
- component: {fileID: 5526612272056919339}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -294,10 +252,10 @@ RectTransform:
m_Father: {fileID: 5526612271950846019}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 31.5, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34.5, y: -7}
m_SizeDelta: {x: 37, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272056919337
CanvasRenderer:
@ -339,21 +297,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 3.67%
--- !u!114 &5526612272056919339
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272056919341}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
m_Text:
--- !u!1 &5526612272165583877
GameObject:
m_ObjectHideFlags: 0
@ -364,8 +308,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612272165583874}
- component: {fileID: 5526612272165583873}
- component: {fileID: 5526612272165583872}
- component: {fileID: 5526612272165583875}
m_Layer: 5
m_Name: Infos
m_TagString: Untagged
@ -393,7 +335,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 18, y: 78}
m_SizeDelta: {x: 0, y: 14}
m_SizeDelta: {x: 191, y: 14}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5526612272165583873
CanvasRenderer:
@ -403,45 +345,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272165583877}
m_CullTransparentMesh: 0
--- !u!114 &5526612272165583872
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272165583877}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612272165583875
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272165583877}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 20
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612272278939588
GameObject:
m_ObjectHideFlags: 0
@ -474,9 +377,9 @@ RectTransform:
m_Father: {fileID: 5526612273137644949}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: -7}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272278939587
@ -524,7 +427,6 @@ GameObject:
- component: {fileID: 5526612272284308391}
- component: {fileID: 5526612272284308386}
- component: {fileID: 5526612272284308389}
- component: {fileID: 5526612272284308388}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -546,10 +448,10 @@ RectTransform:
m_Father: {fileID: 5526612272485525649}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 34.5, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 8, y: 0}
m_SizeDelta: {x: -16, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272284308386
CanvasRenderer:
@ -591,21 +493,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 36.8KM
--- !u!114 &5526612272284308388
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272284308390}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
m_Text:
--- !u!1 &5526612272308430555
GameObject:
m_ObjectHideFlags: 0
@ -617,7 +505,6 @@ GameObject:
- component: {fileID: 5526612272308430552}
- component: {fileID: 5526612272308430551}
- component: {fileID: 5526612272308430550}
- component: {fileID: 5526612272308430553}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -639,10 +526,10 @@ RectTransform:
m_Father: {fileID: 5526612273137644949}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 34, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 8, y: 0}
m_SizeDelta: {x: -16, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272308430551
CanvasRenderer:
@ -684,21 +571,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 20.00M
--- !u!114 &5526612272308430553
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272308430555}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
m_Text:
--- !u!1 &5526612272378935000
GameObject:
m_ObjectHideFlags: 0
@ -784,8 +657,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612272485525649}
- component: {fileID: 5526612272485525676}
- component: {fileID: 5526612272485525679}
- component: {fileID: 5526612272485525678}
m_Layer: 5
m_Name: DistanceContainer
m_TagString: Untagged
@ -809,10 +680,10 @@ RectTransform:
m_Father: {fileID: 5526612272165583874}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_SizeDelta: {x: 63.908386, y: 14}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5526612272485525676
CanvasRenderer:
@ -822,45 +693,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272485525648}
m_CullTransparentMesh: 0
--- !u!114 &5526612272485525679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272485525648}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612272485525678
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272485525648}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 4
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612272606031885
GameObject:
m_ObjectHideFlags: 0
@ -1077,9 +909,9 @@ RectTransform:
m_Father: {fileID: 5526612272485525649}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: -7}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272623978840
@ -1337,8 +1169,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612273137644949}
- component: {fileID: 5526612273137644944}
- component: {fileID: 5526612273137644947}
- component: {fileID: 5526612273137644946}
m_Layer: 5
m_Name: EleContainer
m_TagString: Untagged
@ -1362,10 +1192,10 @@ RectTransform:
m_Father: {fileID: 5526612272165583874}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 73, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 71.180695, y: 0}
m_SizeDelta: {x: 57.27469, y: 14}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5526612273137644944
CanvasRenderer:
@ -1375,45 +1205,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612273137644948}
m_CullTransparentMesh: 0
--- !u!114 &5526612273137644947
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612273137644948}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612273137644946
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612273137644948}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 4
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612273367387535
GameObject:
m_ObjectHideFlags: 0
@ -1446,9 +1237,9 @@ RectTransform:
m_Father: {fileID: 5526612271950846019}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: -7}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612273367387530
@ -1767,7 +1558,7 @@ RectTransform:
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: 0}
m_AnchoredPosition: {x: 31, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612273925040420
@ -1810,7 +1601,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 4612
m_Text: 46120
--- !u!114 &5526612273925040421
MonoBehaviour:
m_ObjectHideFlags: 0

281
Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab
View File

@ -10,8 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612271950846019}
- component: {fileID: 5526612271950846046}
- component: {fileID: 5526612271950846017}
- component: {fileID: 5526612271950846016}
m_Layer: 5
m_Name: SlopeContainer
m_TagString: Untagged
@ -35,10 +33,10 @@ RectTransform:
m_Father: {fileID: 5526612272165583874}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 145, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 153.7, y: 0}
m_SizeDelta: {x: 47, y: 14}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5526612271950846046
CanvasRenderer:
@ -48,45 +46,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612271950846018}
m_CullTransparentMesh: 0
--- !u!114 &5526612271950846017
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612271950846018}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612271950846016
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612271950846018}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 4
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612271979363594
GameObject:
m_ObjectHideFlags: 0
@ -174,7 +133,6 @@ GameObject:
- component: {fileID: 5526612272056919338}
- component: {fileID: 5526612272056919337}
- component: {fileID: 5526612272056919336}
- component: {fileID: 5526612272056919339}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -196,10 +154,10 @@ RectTransform:
m_Father: {fileID: 5526612271950846019}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 31.5, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 31.5, y: -7}
m_SizeDelta: {x: 31, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272056919337
CanvasRenderer:
@ -241,21 +199,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 3.67%
--- !u!114 &5526612272056919339
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272056919341}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
m_Text:
--- !u!1 &5526612272165583877
GameObject:
m_ObjectHideFlags: 0
@ -266,8 +210,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612272165583874}
- component: {fileID: 5526612272165583873}
- component: {fileID: 5526612272165583872}
- component: {fileID: 5526612272165583875}
m_Layer: 5
m_Name: Infos
m_TagString: Untagged
@ -295,7 +237,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 30, y: -634}
m_SizeDelta: {x: 0, y: 14}
m_SizeDelta: {x: 207.07605, y: 14}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5526612272165583873
CanvasRenderer:
@ -305,45 +247,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272165583877}
m_CullTransparentMesh: 0
--- !u!114 &5526612272165583872
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272165583877}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612272165583875
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272165583877}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 20
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612272278939588
GameObject:
m_ObjectHideFlags: 0
@ -376,9 +279,9 @@ RectTransform:
m_Father: {fileID: 5526612273137644949}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: -7}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272278939587
@ -426,7 +329,6 @@ GameObject:
- component: {fileID: 5526612272284308391}
- component: {fileID: 5526612272284308386}
- component: {fileID: 5526612272284308389}
- component: {fileID: 5526612272284308388}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -448,10 +350,10 @@ RectTransform:
m_Father: {fileID: 5526612272485525649}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 34.5, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 39, y: -7}
m_SizeDelta: {x: 46, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272284308386
CanvasRenderer:
@ -493,21 +395,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 36.8KM
--- !u!114 &5526612272284308388
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272284308390}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
m_Text:
--- !u!1 &5526612272308430555
GameObject:
m_ObjectHideFlags: 0
@ -519,7 +407,6 @@ GameObject:
- component: {fileID: 5526612272308430552}
- component: {fileID: 5526612272308430551}
- component: {fileID: 5526612272308430550}
- component: {fileID: 5526612272308430553}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
@ -541,10 +428,10 @@ RectTransform:
m_Father: {fileID: 5526612273137644949}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 34, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 35.5, y: -7}
m_SizeDelta: {x: 39, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272308430551
CanvasRenderer:
@ -586,21 +473,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 20.00M
--- !u!114 &5526612272308430553
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272308430555}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
m_Text:
--- !u!1 &5526612272378935000
GameObject:
m_ObjectHideFlags: 0
@ -687,8 +560,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612272485525649}
- component: {fileID: 5526612272485525676}
- component: {fileID: 5526612272485525679}
- component: {fileID: 5526612272485525678}
m_Layer: 5
m_Name: DistanceContainer
m_TagString: Untagged
@ -712,10 +583,10 @@ RectTransform:
m_Father: {fileID: 5526612272165583874}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_SizeDelta: {x: 65.07605, y: 14}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5526612272485525676
CanvasRenderer:
@ -725,45 +596,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272485525648}
m_CullTransparentMesh: 0
--- !u!114 &5526612272485525679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272485525648}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612272485525678
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612272485525648}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 4
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612272547339880
GameObject:
m_ObjectHideFlags: 0
@ -1038,9 +870,9 @@ RectTransform:
m_Father: {fileID: 5526612272485525649}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: -7}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612272623978840
@ -1344,8 +1176,6 @@ GameObject:
m_Component:
- component: {fileID: 5526612273137644949}
- component: {fileID: 5526612273137644944}
- component: {fileID: 5526612273137644947}
- component: {fileID: 5526612273137644946}
m_Layer: 5
m_Name: EleContainer
m_TagString: Untagged
@ -1369,10 +1199,10 @@ RectTransform:
m_Father: {fileID: 5526612272165583874}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 73, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 79.1, y: 0}
m_SizeDelta: {x: 55, y: 14}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5526612273137644944
CanvasRenderer:
@ -1382,45 +1212,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612273137644948}
m_CullTransparentMesh: 0
--- !u!114 &5526612273137644947
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612273137644948}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &5526612273137644946
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5526612273137644948}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 4
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!1 &5526612273367387535
GameObject:
m_ObjectHideFlags: 0
@ -1453,9 +1244,9 @@ RectTransform:
m_Father: {fileID: 5526612271950846019}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 6, y: -7}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526612273367387530

8
Assets/Scripts/Apis/MapApi.cs
View File

@ -167,10 +167,16 @@ namespace Assets.Scripts.Apis
return result;
}
public async Task<JsonResult<List<MapRoute>>> GetMapRouteAreaDetail(int id, int pageIndex, int pageSize)
public async Task<JsonResult<List<MapRoute>>> GetMapRouteAreaDetailList(int id, int pageIndex, int pageSize)
{
var result = await GetAsync<JsonResult<List<MapRoute>>>($"MapRouteArea/GetRouteList?areaId={id}&pageSize={pageSize}&pageIndex={pageIndex}");
return result;
}
public async Task<JsonResult<MapRouteAreaDetail>> GetMapRouteAreaDetail(int id)
{
var result = await GetAsync<JsonResult<MapRouteAreaDetail>>($"MapRouteArea/GetDetail?areaId={id}");
return result;
}
}
}

44
Assets/Scripts/Apis/Models/MapRouteArea.cs
View File

@ -93,4 +93,48 @@ namespace Assets.Scripts.Apis.Models
/// </summary>
public int? ParentId { get; set; }
}
public class MapRouteAreaDetail
{
/// <summary>
///
/// </summary>
public double TotalClimb { get; set; }
/// <summary>
///
/// </summary>
public double TotalDistance { get; set; }
/// <summary>
///
/// </summary>
public double AverageGrade { get; set; }
/// <summary>
///
/// </summary>
public int RideCount { get; set; }
/// <summary>
/// 环徐州
/// </summary>
public string Name { get; set; }
/// <summary>
///
/// </summary>
public string Description { get; set; }
/// <summary>
///
/// </summary>
public string BannerImage { get; set; }
/// <summary>
///
/// </summary>
public string CoverImage { get; set; }
/// <summary>
///
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
///
/// </summary>
public DateTime UpdateTime { get; set; }
}
}

4
Assets/Scripts/App.cs
View File

@ -72,7 +72,7 @@ public static class App
public static int CompetionId { get; set; }//比赛id
//public static string AppDownloadUrl { get; internal set; }
//public static string AppVersionCode { get; internal set; }
public static List<JoinedCompetitionModel> JoinedCompetitionList { get; set; }//我参加的比赛
public static List<int> CompetitionIdList = new List<int>();
@ -157,6 +157,8 @@ public static class App
}
}
#endregion
//记录当前集合
public static MapRouteAreaItem currentArea = null;
static App()
{

6
Assets/Scripts/Scenes/MainController.cs
View File

@ -85,11 +85,15 @@ public class MainController : BaseScene
if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
{
UIManager.ShowHomePanel();
UIManager.ShowNewRouteOverviewPanel();
if (App.MainSceneParam["Name"] == "MapListPanel")
{
UIManager.ShowMapListPanel();
}
if (App.MainSceneParam["Name"] == "NewRouteDetail" && App.currentArea != null)
{
UIManager.ShowNewRouteDetailPanel(App.currentArea);
}
if (App.MainSceneParam["Name"] == "UserInfoPanel")
{
UIManager.ShowUserInfoPanel();

33
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
View File

@ -44,12 +44,14 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
float? localY = null;
MapRoute map;
Dictionary<string, Texture> caches;
public void Initial(MapRoute myMap, Dictionary<string, Texture> caches)
private MapRouteAreaItem area = null;
public void Initial(MapRoute myMap, Dictionary<string, Texture> caches, MapRouteAreaItem area = null)
{
if (caches != null)
{
this.caches = caches;
}
this.area = area;
map = myMap;
//localY = transform.GetComponent<RectTransform>().rect.height;
//Debug.Log(localY);
@ -87,20 +89,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
// SceneManager.LoadScene("Ride");
//});
transform.GetComponent<Button>().onClick.RemoveAllListeners();
transform.GetComponent<Button>().onClick.AddListener(() =>
{
//UIManager.ShowMapDetailPanel(myMap.Id);
App.RouteIdParam = myMap.Id;
if (!App.MainSceneParam.ContainsKey("Name"))
{
App.MainSceneParam.Add("Name", "MapListPanel");
}
else
{
App.MainSceneParam["Name"] = "MapListPanel";
}
SceneManager.LoadScene("Ride");
});
transform.GetComponent<Button>().onClick.AddListener(Ride);
transform.Find("Name").GetComponent<Text>().text = myMap.Name;
transform.Find("IdContainer/Text").GetComponent<Text>().text = $"#{myMap.Id}";
@ -136,13 +125,21 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
private void Ride()
{
App.RouteIdParam = map.Id;
if (!App.MainSceneParam.ContainsKey("Name"))
App.currentArea = area;
if (area != null)
{
App.MainSceneParam.Add("Name", "MapListPanel");
App.MainSceneParam["Name"] = "NewRouteDetail";
}
else
{
App.MainSceneParam["Name"] = "MapListPanel";
if (!App.MainSceneParam.ContainsKey("Name"))
{
App.MainSceneParam.Add("Name", "MapListPanel");
}
else
{
App.MainSceneParam["Name"] = "MapListPanel";
}
}
SceneManager.LoadScene("Ride");
//foreach (var item in Utils.propTextureCache)

4
Assets/Scripts/UI/Prefab/NewRoute/NewRouteItemController.cs
View File

@ -27,10 +27,10 @@ public class NewRouteItemController : MonoBehaviour
Utils.DisplayImageTempDict(GetComponent<RawImage>(), area.CoverImage, caches);
}
transform.Find("Panel/Text").GetComponent<Text>().text = area.Name;
UIManager.AddEvent(gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
GetComponent<Button>().onClick.RemoveAllListeners();
GetComponent<Button>().onClick.AddListener(() =>
{
UIManager.ShowNewRouteDetailPanel(area);
//ConfigHelper.mapApi.GetMapRouteAreaDetail(area.Id, 0, 10);
});
}
}

15
Assets/Scripts/UI/Prefab/Panel/MapListController.cs
View File

@ -46,14 +46,20 @@ public class MapListController : PFUIPanel
}
private bool isEnd = false;
private Transform topContainer;
void ResetPage()
{
var rect = transform.GetComponent<RectTransform>();
rect.offsetMax = new Vector2(rect.offsetMax.x, 0);
rect.offsetMin = new Vector2(rect.offsetMin.x, 0);
rect.localScale = Vector3.one;
rect.localPosition = Vector3.zero;
}
protected override void Start()
{
#if (UNITY_ANDROID || UNITY_IOS)
topContainer = transform.Find("Top");
var rect = transform.GetComponent<RectTransform>();
rect.offsetMax = new Vector2(rect.offsetMax.x, 0);
rect.offsetMin = new Vector2(rect.offsetMin.x, 0);
ResetPage();
//var rectTransform = transform.GetComponent<RectTransform>();
//var offsetMax = rectTransform.offsetMax;
//rectTransform.offsetMax = new Vector2(0, offsetMax.y);
@ -499,6 +505,9 @@ public class MapListController : PFUIPanel
{
transform.Find("RawImage").GetComponent<RawImage>().texture = App.DefaultRotateTexture;
}
#if UNITY_ANDROID || UNITY_IOS
ResetPage();
#endif
ResetPanel();
transform.MyDOFade();
}

29
Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
View File

@ -71,11 +71,20 @@ public class NewRouteDetailController : PFUIPanel
var left = transform.Find("Container/Left");
left.Find("Icon").GetComponent<RawImage>().texture = null;
scroll.content.DestroyChildren();
transform.Find("Container/Left/RideContainer/Text").GetComponent<Text>()
.text = string.Empty;
transform.Find("Container/Left/Infos/DistanceContainer/Text").GetComponent<Text>()
.text = string.Empty;
transform.Find("Container/Left/Infos/EleContainer/Text").GetComponent<Text>()
.text = string.Empty;
transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent<Text>()
.text = string.Empty;
if (area.BannerImage != null)
{
Utils.DisplayImageTempDict(left.Find("Icon").GetComponent<RawImage>(), area.BannerImage, caches);
}
left.Find("Name").GetComponent<Text>().text = area.Name;
GetData();
GetList();
}
@ -89,10 +98,26 @@ public class NewRouteDetailController : PFUIPanel
GetList();
}
}
private async void GetData()
{
var res = await ConfigHelper.mapApi.GetMapRouteAreaDetail(area.Id);
if (res.result)
{
transform.Find("Container/Left/RideContainer/Text").GetComponent<Text>()
.text = res.data.RideCount.ToString();
transform.Find("Container/Left/Infos/DistanceContainer/Text").GetComponent<Text>()
.text = $"{res.data.TotalDistance.ToString("#0")}KM";
transform.Find("Container/Left/Infos/EleContainer/Text").GetComponent<Text>()
.text = $"{res.data.TotalClimb.ToString("#0")}M";
transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent<Text>()
.text = $"{res.data.AverageGrade.ToString("#0.00")}%";
LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent<RectTransform>());
}
}
private async void GetList()
{
var res = await ConfigHelper.mapApi.GetMapRouteAreaDetail(area.Id, pageIndex, pageSize);
var res = await ConfigHelper.mapApi.GetMapRouteAreaDetailList(area.Id, pageIndex, pageSize);
if (res.result)
{
if (res.data.Count > 0)
@ -113,7 +138,7 @@ public class NewRouteDetailController : PFUIPanel
foreach (var item in list)
{
var obj = Instantiate(map);
obj.GetComponent<MapItem>().Initial(item, caches);
obj.GetComponent<MapItem>().Initial(item, caches, area);
//obj.SendMessage("Initial", );
obj.transform.SetParent(scroll.content.transform);
obj.transform.localScale = new Vector3(1, 1, 1);

29
Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs
View File

@ -78,20 +78,21 @@ public class NewRouteOverviewController: PFUIPanel
{
ToList("All Route");
});
#if !(UNITY_ANDROID || UNITY_IOS)
var banner = collectionContent.Find("Banner");
bannerContent = banner.Find("Viewport/Content").GetComponent<RectTransform>();
var btnLeft = banner.Find("Left");
var btnRight = banner.Find("Right");
UIManager.AddEvent(btnLeft.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
MoveBanner(false);
});
UIManager.AddEvent(btnRight.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
MoveBanner(true);
});
#endif
//banner暂时注释
//#if !(UNITY_ANDROID || UNITY_IOS)
// var banner = collectionContent.Find("Banner");
// bannerContent = banner.Find("Viewport/Content").GetComponent<RectTransform>();
// var btnLeft = banner.Find("Left");
// var btnRight = banner.Find("Right");
// UIManager.AddEvent(btnLeft.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
// {
// MoveBanner(false);
// });
// UIManager.AddEvent(btnRight.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
// {
// MoveBanner(true);
// });
//#endif
}
int pageIndex = 0, pageSize = 10;
bool isEnd = false,isLock = false;