diff --git a/Assets/Resources/UI/Prefab/NewRoute/Mobile/RouteItem.prefab b/Assets/Resources/UI/Prefab/NewRoute/Mobile/RouteItem.prefab index b4e90c37..918a237a 100644 --- a/Assets/Resources/UI/Prefab/NewRoute/Mobile/RouteItem.prefab +++ b/Assets/Resources/UI/Prefab/NewRoute/Mobile/RouteItem.prefab @@ -280,7 +280,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.34901962} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.69803923} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/NewRoute/RouteGroup.prefab b/Assets/Resources/UI/Prefab/NewRoute/RouteGroup.prefab index 2f89ca3a..3e08479f 100644 --- a/Assets/Resources/UI/Prefab/NewRoute/RouteGroup.prefab +++ b/Assets/Resources/UI/Prefab/NewRoute/RouteGroup.prefab @@ -158,7 +158,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -166,10 +166,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 14 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 @@ -215,7 +215,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: 0, y: 0} + m_AnchoredPosition: {x: 585.5, y: 0} m_SizeDelta: {x: 1171, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5416700465887947142 diff --git a/Assets/Resources/UI/Prefab/NewRoute/RouteItem.prefab b/Assets/Resources/UI/Prefab/NewRoute/RouteItem.prefab index 5910f7e6..6a681cde 100644 --- a/Assets/Resources/UI/Prefab/NewRoute/RouteItem.prefab +++ b/Assets/Resources/UI/Prefab/NewRoute/RouteItem.prefab @@ -280,7 +280,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.34901962} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.69803923} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab index 83039b7a..867367e7 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab @@ -98,6 +98,91 @@ MonoBehaviour: m_GradientStyle: 0 m_ColorSpace: -1 m_IgnoreAspectRatio: 1 +--- !u!1 &4880552100986372010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1179986094936499423} + - component: {fileID: 7355554698068468737} + - component: {fileID: 6420456303145942237} + - component: {fileID: 6578938098601410972} + m_Layer: 5 + m_Name: gq + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1179986094936499423 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4880552100986372010} + 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: 9155624476384996310} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: -133} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7355554698068468737 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4880552100986372010} + m_CullTransparentMesh: 0 +--- !u!114 &6420456303145942237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4880552100986372010} + 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: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &6578938098601410972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4880552100986372010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 26 --- !u!1 &5526612271950846018 GameObject: m_ObjectHideFlags: 0 @@ -1616,6 +1701,121 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &5585260082309317354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1858389399489803280} + - component: {fileID: 5839647480544800936} + - component: {fileID: 5835293235213635132} + - component: {fileID: 6371129996010967724} + m_Layer: 5 + m_Name: HeadImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1858389399489803280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5585260082309317354} + 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: 9155624476384996310} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: -175} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0, y: 0} +--- !u!222 &5839647480544800936 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5585260082309317354} + m_CullTransparentMesh: 0 +--- !u!114 &5835293235213635132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5585260082309317354} + 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_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &6371129996010967724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5585260082309317354} + 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: 5835293235213635132} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!114 &3697670383128359563 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1699,6 +1899,8 @@ RectTransform: m_Children: - {fileID: 5526612272745412623} - {fileID: 8210619403058349570} + - {fileID: 1179986094936499423} + - {fileID: 1858389399489803280} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab index 344e1758..ef7d2cae 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab @@ -1062,6 +1062,8 @@ RectTransform: m_Children: - {fileID: 3728196983700296690} - {fileID: 5320224889662748359} + - {fileID: 2445898041947504840} + - {fileID: 7018802226566223343} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1529,6 +1531,206 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 26 +--- !u!1 &6200823709125725046 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2445898041947504840} + - component: {fileID: 6029610014371971748} + - component: {fileID: 937054492768111600} + - component: {fileID: 605584764814559528} + m_Layer: 5 + m_Name: gq + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2445898041947504840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200823709125725046} + 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: 3728196983693990286} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: -133} + m_SizeDelta: {x: 52, y: 52} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6029610014371971748 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200823709125725046} + m_CullTransparentMesh: 0 +--- !u!114 &937054492768111600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200823709125725046} + 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: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &605584764814559528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200823709125725046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 26 +--- !u!1 &6412129502326247266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7018802226566223343} + - component: {fileID: 3195876556518579325} + - component: {fileID: 7974394378472587640} + - component: {fileID: 2259489337912511542} + m_Layer: 5 + m_Name: HeadImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7018802226566223343 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6412129502326247266} + 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: 3728196983693990286} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 40, y: -175} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0, y: 0} +--- !u!222 &3195876556518579325 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6412129502326247266} + m_CullTransparentMesh: 0 +--- !u!114 &7974394378472587640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6412129502326247266} + 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_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &2259489337912511542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6412129502326247266} + 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: 7974394378472587640} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &7874734331461295940 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab index ce58e1ce..aca2dd20 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab @@ -1,5 +1,275 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3060614720484037117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4267677239220381336} + - component: {fileID: 7079145949622423480} + - component: {fileID: 973096408216707529} + - component: {fileID: 2069270412248716376} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4267677239220381336 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3060614720484037117} + 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: 9155624476384996310} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 2263, y: 2263} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7079145949622423480 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3060614720484037117} + m_CullTransparentMesh: 0 +--- !u!114 &973096408216707529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3060614720484037117} + 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_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 970fa7b2c5134aa4689616c9085aa237, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &2069270412248716376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3060614720484037117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2646b2ba277320e41bea125e9aebcb06, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &4668650731524334721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1911789732600455379} + - component: {fileID: 7724461041738267055} + - component: {fileID: 6926783926335709351} + - component: {fileID: 8650462206676515172} + m_Layer: 5 + m_Name: HeadImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1911789732600455379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668650731524334721} + 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: 9155624476384996310} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1444, y: -30} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7724461041738267055 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668650731524334721} + m_CullTransparentMesh: 0 +--- !u!114 &6926783926335709351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668650731524334721} + 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_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &8650462206676515172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668650731524334721} + 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: 6926783926335709351} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &5406787515043197059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9190980716715217045} + - component: {fileID: 1794599415301187487} + - component: {fileID: 8021082405646593204} + m_Layer: 5 + m_Name: gq + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9190980716715217045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5406787515043197059} + 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: 9155624476384996310} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1440, y: -26} + m_SizeDelta: {x: 72, y: 72} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1794599415301187487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5406787515043197059} + m_CullTransparentMesh: 0 +--- !u!114 &8021082405646593204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5406787515043197059} + 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_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 39c7432c0e6b9864d9adbcd21d6ead4b, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &5526612271950846018 GameObject: m_ObjectHideFlags: 0 @@ -105,7 +375,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Content: {fileID: 5526612272378935001} - m_Horizontal: 1 + m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 m_Elasticity: 0.1 @@ -1021,7 +1291,7 @@ RectTransform: - {fileID: 5526612273931728609} - {fileID: 5526612273599596600} m_Father: {fileID: 9155624476384996310} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1411,6 +1681,7 @@ GameObject: - component: {fileID: 5526612273772399088} - component: {fileID: 5526612273772399091} - component: {fileID: 5526612273772399089} + - component: {fileID: 167402321936590345} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -1458,7 +1729,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1485,6 +1756,29 @@ MonoBehaviour: m_EditorClassIdentifier: r: {x: 20, y: 0, z: 0, w: 0} rect2props: {x: 5.0000153, y: -5.000061, z: 260.92242, w: 267.9935} +--- !u!114 &167402321936590345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526612273772399093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Direction: 1 + m_Color1: {r: 1, g: 1, b: 1, a: 1} + m_Color2: {r: 1, g: 1, b: 1, a: 0} + m_Color3: {r: 1, g: 1, b: 1, a: 0} + m_Color4: {r: 1, g: 1, b: 1, a: 0} + m_Rotation: 37 + m_Offset1: 0 + m_Offset2: 0 + m_GradientStyle: 1 + m_ColorSpace: -1 + m_IgnoreAspectRatio: 1 --- !u!1 &5526612273925040425 GameObject: m_ObjectHideFlags: 0 @@ -1612,7 +1906,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 579, y: 0} + m_AnchoredPosition: {x: 289, y: 0} m_SizeDelta: {x: 1, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5526612273931728639 @@ -1695,8 +1989,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4267677239220381336} - {fileID: 5526612272745412623} - {fileID: 7110200543073462810} + - {fileID: 9190980716715217045} + - {fileID: 1911789732600455379} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1825,7 +2122,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab index 901d5a36..ee2ab9fb 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab @@ -1389,6 +1389,8 @@ RectTransform: m_Children: - {fileID: 3728196983700296690} - {fileID: 5320224889662748359} + - {fileID: 1440156313960039115} + - {fileID: 6844527832940631884} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1956,6 +1958,77 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5319489020088432260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1440156313960039115} + - component: {fileID: 6334531348307347676} + - component: {fileID: 7122438578368082733} + m_Layer: 5 + m_Name: gq + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1440156313960039115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319489020088432260} + 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: 3728196983693990286} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1440, y: -26} + m_SizeDelta: {x: 72, y: 72} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6334531348307347676 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319489020088432260} + m_CullTransparentMesh: 0 +--- !u!114 &7122438578368082733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319489020088432260} + 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_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 39c7432c0e6b9864d9adbcd21d6ead4b, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &5927054355167070298 GameObject: m_ObjectHideFlags: 0 @@ -2193,6 +2266,121 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7739007795840319476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6844527832940631884} + - component: {fileID: 97166207121493542} + - component: {fileID: 3481010227992928297} + - component: {fileID: 4302558783853902853} + m_Layer: 5 + m_Name: HeadImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6844527832940631884 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7739007795840319476} + 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: 3728196983693990286} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1444, y: -30} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0, y: 1} +--- !u!222 &97166207121493542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7739007795840319476} + m_CullTransparentMesh: 0 +--- !u!114 &3481010227992928297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7739007795840319476} + 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_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &4302558783853902853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7739007795840319476} + 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: 3481010227992928297} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8165667465128085941 GameObject: m_ObjectHideFlags: 0 @@ -2375,9 +2563,9 @@ RectTransform: m_Father: {fileID: 3728196982087670782} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1171, y: 191} m_Pivot: {x: 0, y: 1} --- !u!222 &1104243203791998138 diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index 5ac28ce1..fb27fa2b 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -178,5 +178,11 @@ namespace Assets.Scripts.Apis var result = await GetAsync>($"MapRouteArea/GetDetail?areaId={id}"); return result; } + + public async Task>> GetMaxRanking() + { + var result = await GetAsync>>($"Map/GetMaxRanking"); + return result; + } } } diff --git a/Assets/Scripts/Apis/Models/MapRouteArea.cs b/Assets/Scripts/Apis/Models/MapRouteArea.cs index e9fd961e..fabc0302 100644 --- a/Assets/Scripts/Apis/Models/MapRouteArea.cs +++ b/Assets/Scripts/Apis/Models/MapRouteArea.cs @@ -137,4 +137,25 @@ namespace Assets.Scripts.Apis.Models /// public DateTime UpdateTime { get; set; } } + + public class MapMaxRanking + { + /// + /// + /// + public string WxHeadImg { get; set; } + /// + /// 啊吧啊吧 + /// + public string NickName { get; set; } + /// + /// + /// + public int Id { get; set; } + /// + /// 啊吧啊吧今日爬坡最高0M! + /// + public string Message { get; set; } + } + } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index c763cfc9..6f475d0a 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -161,19 +161,23 @@ public static class App #endregion //记录当前集合 public static MapRouteAreaItem currentArea = null; + internal static Dictionary RouteNameDict = new Dictionary(); + static App() { - InitLanguage(); #if !UNITY_EDITOR //Host = "http://pf.juze.pro/"; //Host = "http://192.168.0.101:5087/"; //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); - Host = "https://wx.powerfun.com.cn/"; - //Host = "http://192.168.0.101:5085/"; - UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); - TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); + //线上 + //Host = "https://wx.powerfun.com.cn/"; + //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); + //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); + Host = "http://192.168.0.101:5085/"; + UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000); + TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001); Debug.unityLogger.logEnabled = false; #endif var isRower = PlayerPrefs.GetString("IsRowerMode"); diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 943d2837..be54b6b5 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -9,6 +9,7 @@ using Mapbox.Examples; using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using UnityEngine; using UnityEngine.SceneManagement; @@ -26,6 +27,7 @@ public class MainController : BaseScene DeviceCache.Init(PFConstants.DeviceCacheFolder); Loom.Initialize(); msg = transform.Find("GameObject/Message").GetComponent(); + InitialMessage(); #if UNITY_ANDROID || UNITY_IOS transform.GetComponent().referenceResolution = new Vector2(844, 390); //transform.Find("Panel").GetComponent().sizeDelta = new Vector2(844, 390); @@ -49,7 +51,77 @@ public class MainController : BaseScene modalRect.sizeDelta = new Vector2(1600, 900); App.MainDeviceAdapter.StartScan(); #endif + EventQueueSystem.AddListener(LinkedMessageHandler); + } + + CanvasGroup[] msgs; + Vector3 msgLocation; + int msgIndex = 0; + private void InitialMessage() + { + msgLocation = 1 * msg.transform.localPosition; + var msg2 = Instantiate(msg); + var msg3 = Instantiate(msg); + msg2.transform.SetParent(msg.transform.parent); + msg3.transform.SetParent(msg.transform.parent); + msg2.transform.localPosition = 1 * msgLocation; + msg2.transform.localScale = Vector3.one; + msg2.alpha = 0; + msg3.transform.localPosition = 1 * msgLocation; + msg3.transform.localScale = Vector3.one; + msg3.alpha = 0; + msgs = new CanvasGroup[] { msg, msg2, msg3 }; + } + private void LinkedMessageHandler(LinkedMessageEvent e) + { + //msg.transform.Find("Content") + emptyt = 0; + Debug.Log(e.content); + DoMessage(e); + } + + private void DoMessage(LinkedMessageEvent e) + { + var selectIndex = msgIndex % 3; + var m = msgs[selectIndex]; + if (msgIndex >= 3) // + { + //msgIndex = 0; + m.DOFade(0, 0.5f).onComplete = ()=> + { + SetMessage(m, e); + m.transform.localPosition = new Vector3(msgLocation.x, msgLocation.y - 54 * 2, msgLocation.z); + m.DOFade(1, 0.5f); + foreach (var item in msgs.Where((x, i) => i != selectIndex)) + { + item.transform.DOLocalMoveY(item.transform.localPosition.y + 54, 0.5f); + } + }; + } + else + { + SetMessage(m, e); + m.transform.localPosition = new Vector3(msgLocation.x, msgLocation.y - 54 * (msgIndex % 3), msgLocation.z); + m.DOFade(1, 0.5f); + } + msgIndex++; + } + + void FinishMessage() + { + msgIndex = 0; + foreach (var item in msgs) + { + item.DOFade(0, 0.3f); + } + } + private void SetMessage(CanvasGroup m,LinkedMessageEvent e) + { + m.transform.Find("Avatar").GetComponent().texture = null; + Utils.DisplayHead(m.transform.Find("Avatar").GetComponent(), e.avatar); + m.transform.Find("Nickname").GetComponent().text = e.nickname; + m.transform.Find("Content").GetComponent().text = e.content; } // Start is called before the first frame update async void Start() @@ -121,7 +193,8 @@ public class MainController : BaseScene LastRide();//检查本地异常中断的骑行并弹窗提示继续 } - + float maxt = 0f; //用于获取全服最值内容 + float emptyt = 0;//用于无消息计时 float t = 1f; float scanTicks = 0; // Update is called once per frame @@ -142,6 +215,12 @@ public class MainController : BaseScene UIManager.SendCompetitionStartMessage("Main"); t = 1; scanTicks++; + emptyt++; + if (emptyt >= 10) + { + emptyt = 0; + FinishMessage(); + } if (scanTicks == 10) { //App.MainDeviceAdapter.StopScan(); @@ -154,55 +233,77 @@ public class MainController : BaseScene { if (item.RouteId > 0) { - if (string.IsNullOrEmpty(item.RouteName)) + if (!App.RouteNameDict.ContainsKey(item.RouteId)) { var result = ConfigHelper.mapApi.GetById(item.RouteId); if (result.result) { item.RouteName = result.data.Name; + App.RouteNameDict.Add(item.RouteId, item.RouteName); } } - var message = item.IsCompleted ? $"{item.Name}完成了{item.RouteName}的挑战" : $"{item.Name}发起了对{item.RouteName}的挑战"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}"); + else + { + item.RouteName = App.RouteNameDict[item.RouteId]; + } + var message = ""; + if (item.TotalTicks == 0) + { + message = $"发起了对{item.RouteName}的挑战"; + } + if (item.IsCompleted) + { + message = $"完成了{item.RouteName}的挑战"; + } + if (!string.IsNullOrEmpty(message)) + { + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}"); + } } //距离 if (item.EndDistance > 50) { - var message = $"{item.Name}在骑行过程中突破了{"50KM"}的挑战" ; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}50KM"); + var message = $"在骑行过程中突破了{"50KM"}的挑战" ; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM"); } //速度 if (item.Speed > 10) { - var message = $"{item.Name}在骑行过程中速度达到了惊人的{item.Speed}KM/H"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}10KM/H"); + var message = $"在骑行过程中速度达到了惊人的{item.Speed}KM/H"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}10KM/H"); } //功体比 if (item.WeightKg > 2) { - var message = $"{item.Name}在骑行过程中功体比达到了惊人的{item.WeightKg}w/kg"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message), $"{item.RouteId}{item.Name}2WeightKg"); + var message = $"在骑行过程中功体比达到了惊人的{item.WeightKg}w/kg"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}2WeightKg"); } } } - - DoMessage(); - } - - float messageTime = 2; - CanvasGroup msg; - void DoMessage() - { - messageTime -= Time.deltaTime; - if (messageTime <= 0) + maxt -= Time.deltaTime; + if (maxt <= 0) { - msg.DOFade(1, 0.5f).onComplete = () => Invoke("fade0", 0.8f); - messageTime += 2; + GetMaxRanking(); + + maxt += 60f; } } + + private async void GetMaxRanking() + { + var res = await ConfigHelper.mapApi.GetMaxRanking(); + if (res.result) + { + foreach (var item in res.data) + { + EventQueueSystem.QueueEvent(new LinkedMessageEvent(item.Id, item.Message, item.WxHeadImg, item.NickName)); + } + } + } + + CanvasGroup msg; void fade0() { - Debug.Log(162 + "执行"); msg.DOFade(0, 0.5f); } private async Task Login() diff --git a/Assets/Scripts/Scenes/Ride/Scripts/EventQueueManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/EventQueueManager.cs index 37465ba2..2b5a7044 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/EventQueueManager.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/EventQueueManager.cs @@ -148,7 +148,7 @@ namespace Assets.Scenes.Ride.Scripts // timer += Time.deltaTime; //} timer += Time.deltaTime; - while (timer >= 1 && eventQueue.Count > 0) + while (timer >= 2 && eventQueue.Count > 0) { var e = eventQueue.Dequeue() as GameEvent; TriggerEvent(e); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs index 7acb0104..7cd5468b 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs @@ -91,12 +91,20 @@ namespace Assets.Scenes.Ride.Scripts { public int routeId;//线路Id public string content;//消息 - + public string avatar; + public string nickname; public LinkedMessageEvent(int routeId, string content) { this.routeId = routeId; this.content = content; } + public LinkedMessageEvent(int routeId, string content,string avatar,string nickname) + { + this.routeId = routeId; + this.content = content; + this.avatar = avatar; + this.nickname = nickname; + } private void CreateContent() { diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index ee530d1d..1bcdaf3b 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -459,6 +459,7 @@ public class MapListController : PFUIPanel { isRecent = true; } + transform.Find("Panel/Top/FavContainer").gameObject.SetActive(App.CurrentRouteType != "My Collection"); } void ResetList() { diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs index 5950cf1a..6260fd7d 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs @@ -33,12 +33,25 @@ public class NewRouteDetailController : PFUIPanel GC.Collect(); Debug.Log("list empty"); } + public override void Show() + { + base.Show(); + if (App.TextureCache.ContainsKey("rotateImage")) + { + transform.Find("RawImage").GetComponent().texture = App.TextureCache["rotateImage"]; + } + else if (App.DefaultRotateTexture != null) + { + transform.Find("RawImage").GetComponent().texture = App.DefaultRotateTexture; + } + } void Start() { transform.Find("MainNav").GetComponent().ShowBack(); var rect = transform.GetComponent(); rect.offsetMax = new Vector2(rect.offsetMax.x, 0); rect.offsetMin = new Vector2(rect.offsetMin.x, 0); + BindHeadImage(); } // Update is called once per frame diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs index 93743d07..8c94afc4 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs @@ -78,21 +78,22 @@ public class NewRouteOverviewController: PFUIPanel { ToList("All Route"); }); + BindHeadImage(); //banner暂时注释 -//#if !(UNITY_ANDROID || UNITY_IOS) -// var banner = collectionContent.Find("Banner"); -// bannerContent = banner.Find("Viewport/Content").GetComponent(); -// 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 + //#if !(UNITY_ANDROID || UNITY_IOS) + // var banner = collectionContent.Find("Banner"); + // bannerContent = banner.Find("Viewport/Content").GetComponent(); + // 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; @@ -167,6 +168,12 @@ public class NewRouteOverviewController: PFUIPanel bannerContent.DOLocalMoveX(startPos.Value + bannerIndex * 1171, 0.5f); #endif } + + /// + /// 绑定头像 + /// + + void ToList(string type) { App.CurrentRouteType = type;// ""; diff --git a/Assets/Scripts/UI/Prefab/Panel/PFUIPanel.cs b/Assets/Scripts/UI/Prefab/Panel/PFUIPanel.cs index f1bb0e33..21acab2e 100644 --- a/Assets/Scripts/UI/Prefab/Panel/PFUIPanel.cs +++ b/Assets/Scripts/UI/Prefab/Panel/PFUIPanel.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; +using Assets.Scripts; //namespace Assets.Scripts.UI.Prefab.Panel //{ @@ -55,11 +56,30 @@ public class PFUIPanel : UIBehaviour return; } var rawImg = panel.GetComponent(); - if(rawImg != null) + if (rawImg != null) { rawImg.material = material; return; } } + protected void BindHeadImage() + { + if (!transform.Find("HeadImage")) return; + var headImage = this.transform.Find("HeadImage").GetComponent(); + var material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); + var rect = ((RectTransform)headImage.transform).rect; + material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0)); + headImage.material = material; + //if (App.FromLogin) + //{ + Utils.DisplayHead(headImage, App.CurrentUser.WxHeadImg); + //} + + + UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) => + { + UIManager.ShowUserInfoPanel(); + }); + } } //} diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index df88a3aa..5b49b15e 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -435,14 +435,10 @@ public class UIManager : MonoBehaviour InitNow(); } EventQueueSystem.AddListener(CompetitonStartHandler); - EventQueueSystem.AddListener(LinkedMessageHandler); } //首页消息通知 - private void LinkedMessageHandler(LinkedMessageEvent e) - { - Debug.Log(e.content); - } + //比赛即将开始消息提醒 private void CompetitonStartHandler(CompetitonStartMessageEvent e) { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 999e430b..c5b8a1b5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Login-Mobile.unity - guid: 4be878da00cf764499988cf403faf94d + path: Assets/Scenes/Login.unity + guid: 6dce3e17997730b4492f91dd8fede429 - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4706883c..9b996cb4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}