From a156d3fb25a19967851c145f811782258dd663bf Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 04 Dec 2020 20:30:45 +0800
Subject: [PATCH] 排行榜
---
Assets/UI/Final/new/无连接效果图.jpg | 0
Assets/UI/Final/new/无连接效果图.jpg.meta | 118 +++++++++
Assets/Scripts/UI/FinalPanel/FinalHttp.cs | 1
Assets/UI/Final/new/NEW.png | 0
Assets/Scripts/Guide/TestButton.cs | 2
Assets/Scripts/UI/FinalPanel/FinalPanel.cs | 62 ++--
Assets/UI/Final/new/NEW.png.meta | 118 +++++++++
Assets/Resources/UI/Final/FinalPanel.prefab | 438 ++++++++++++++++-----------------
8 files changed, 481 insertions(+), 258 deletions(-)
diff --git a/Assets/Resources/UI/Final/FinalPanel.prefab b/Assets/Resources/UI/Final/FinalPanel.prefab
index 173c9ca..5bbc421 100644
--- a/Assets/Resources/UI/Final/FinalPanel.prefab
+++ b/Assets/Resources/UI/Final/FinalPanel.prefab
@@ -635,8 +635,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3094435713769264486}
- - {fileID: 3350616091600240741}
- - {fileID: 8837969454786444129}
+ - {fileID: 8520738696015552722}
m_Father: {fileID: 5825945650563712391}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -660,21 +659,21 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 990405539320604709}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: d83177762ed78d94fa96cd13d57e1ec3, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -762,6 +761,85 @@
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "25\u517310\u6CE2"
+--- !u!1 &1639736058019243637
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8520738696015552722}
+ - component: {fileID: 7291310089592777851}
+ - component: {fileID: 3902315524180476269}
+ m_Layer: 5
+ m_Name: Text (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8520738696015552722
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1639736058019243637}
+ 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: 4927369617353463650}
+ 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}
+ m_AnchoredPosition: {x: 0.000024318695, y: 288.6}
+ m_SizeDelta: {x: 282.62488, y: 55.334106}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7291310089592777851
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1639736058019243637}
+ m_CullTransparentMesh: 0
+--- !u!114 &3902315524180476269
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1639736058019243637}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 40
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 41
+ m_Alignment: 1
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u70B9\u51FB\u5C4F\u5E55\u7EE7\u7EED"
--- !u!1 &1705700870186153274
GameObject:
m_ObjectHideFlags: 0
@@ -2402,85 +2480,6 @@
otherBackGround: {fileID: 21300000, guid: 1400f7f2573e7ad47b86866c3f1bc515, type: 3}
tmpColor: {r: 0.22745098, g: 0.64705884, b: 0.9019608, a: 1}
otherColor: {r: 1, g: 1, b: 1, a: 1}
---- !u!1 &5044745503325751515
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1214289023748353300}
- - component: {fileID: 3006016164503088123}
- - component: {fileID: 3060304425738289023}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1214289023748353300
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5044745503325751515}
- 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: 8837969454786444129}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3006016164503088123
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5044745503325751515}
- m_CullTransparentMesh: 0
---- !u!114 &3060304425738289023
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5044745503325751515}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 40
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\u70B9\u51FB\u91CD\u73A9"
--- !u!1 &5223047231060357575
GameObject:
m_ObjectHideFlags: 0
@@ -2510,13 +2509,13 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 4927369617353463650}
- m_RootOrder: 1
+ m_Father: {fileID: 3094435713769264486}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: -480, y: -1820}
+ m_AnchoredPosition: {x: 45, y: -195}
+ m_SizeDelta: {x: 246, y: -226}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2956736030236417454
CanvasRenderer:
@@ -2539,7 +2538,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 0.61960787, g: 0.6, b: 0.5568628, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -2548,10 +2547,10 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 39
+ m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
- m_MinSize: 10
+ m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@@ -2559,7 +2558,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u6B63\u5728\u83B7\u53D6\u6392\u884C\u699C..."
+ m_Text: "\u5F53\u524D\u65E0\u7F51\u7EDC\u8FDE\u63A5"
--- !u!1 &5228513434825966373
GameObject:
m_ObjectHideFlags: 0
@@ -3434,126 +3433,6 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &6397631108322371343
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8837969454786444129}
- - component: {fileID: 6847446995232289651}
- - component: {fileID: 395060940888833384}
- - component: {fileID: 4722380994906066519}
- m_Layer: 5
- m_Name: ReplayBtn
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8837969454786444129
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6397631108322371343}
- 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:
- - {fileID: 1214289023748353300}
- m_Father: {fileID: 4927369617353463650}
- m_RootOrder: 2
- 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: -132}
- m_SizeDelta: {x: 200, y: 50}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6847446995232289651
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6397631108322371343}
- m_CullTransparentMesh: 0
---- !u!114 &395060940888833384
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6397631108322371343}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!114 &4722380994906066519
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6397631108322371343}
- 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: 395060940888833384}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
--- !u!1 &7021643747192633189
GameObject:
m_ObjectHideFlags: 0
@@ -4183,14 +4062,15 @@
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_Children:
+ - {fileID: 3350616091600240741}
m_Father: {fileID: 4927369617353463650}
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: 600, y: 100}
+ m_AnchoredPosition: {x: -34, y: 38}
+ m_SizeDelta: {x: 354, y: 326}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5661426738746949598
CanvasRenderer:
@@ -4220,7 +4100,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: ae15a1a70f26ffc40aa12196d0cfed6a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -4309,6 +4189,81 @@
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 789220
+--- !u!1 &8151384989646510913
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7180245002745373382}
+ - component: {fileID: 1850985012864175019}
+ - component: {fileID: 4174050132105207507}
+ m_Layer: 5
+ m_Name: NewPlayer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7180245002745373382
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8151384989646510913}
+ 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: 7909169244235860091}
+ m_RootOrder: 6
+ 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: -46, y: 0}
+ m_SizeDelta: {x: 92, y: 32}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1850985012864175019
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8151384989646510913}
+ m_CullTransparentMesh: 0
+--- !u!114 &4174050132105207507
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8151384989646510913}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 1eb7b3a3b052e8a49b482dd19d2fc192, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &8360541287418413787
GameObject:
m_ObjectHideFlags: 0
@@ -4721,6 +4676,7 @@
- {fileID: 7549551234397364973}
- {fileID: 3950903702536346173}
- {fileID: 893718499162205458}
+ - {fileID: 7180245002745373382}
m_Father: {fileID: 5825945650563712391}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4904,6 +4860,16 @@
m_Modification:
m_TransformParent: {fileID: 5825945650563712391}
m_Modifications:
+ - target: {fileID: 692239310643509749, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1258003287044920273, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1347244762514560074, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: m_Layer
@@ -4924,6 +4890,16 @@
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 5630114664672368968, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5666627951158537847, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6116729124393499060, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: m_Layer
@@ -4932,7 +4908,7 @@
- target: {fileID: 6225265779541526635, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: -21
objectReference: {fileID: 0}
- target: {fileID: 6225265779541526635, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
@@ -4987,17 +4963,22 @@
- target: {fileID: 6225265779541526635, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: m_LocalScale.x
- value: 10
+ value: 72
objectReference: {fileID: 0}
- target: {fileID: 6225265779541526635, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: m_LocalScale.y
- value: 10
+ value: 72
objectReference: {fileID: 0}
- target: {fileID: 6225265779541526635, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
propertyPath: m_LocalScale.z
- value: 10
+ value: 72
+ objectReference: {fileID: 0}
+ - target: {fileID: 7163144621968522884, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7173591909925423277, guid: 475bea2daa2edd9489bdf4733073ff7d,
type: 3}
@@ -5019,6 +5000,21 @@
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 7713960824261739460, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8428525158690824081, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8895110428726805397, guid: 475bea2daa2edd9489bdf4733073ff7d,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 475bea2daa2edd9489bdf4733073ff7d, type: 3}
--- !u!4 &216845836563390721 stripped
diff --git a/Assets/Scripts/Guide/TestButton.cs b/Assets/Scripts/Guide/TestButton.cs
index 2f24bf7..f6b20e4 100644
--- a/Assets/Scripts/Guide/TestButton.cs
+++ b/Assets/Scripts/Guide/TestButton.cs
@@ -217,7 +217,7 @@
GameObject a = Resources.Load<GameObject>("UI/Final/FinalPanel");
GameObject go = Instantiate(a, transform);
FinalPanel panelUI = go.GetComponent<FinalPanel>();
- panelUI.SetData("1关 1波", 401);
+ panelUI.SetData("1关 1波", 101);
//panelUI.SetPlayEffectAC(null);
}
diff --git a/Assets/Scripts/UI/FinalPanel/FinalHttp.cs b/Assets/Scripts/UI/FinalPanel/FinalHttp.cs
index 3492834..c4a648a 100644
--- a/Assets/Scripts/UI/FinalPanel/FinalHttp.cs
+++ b/Assets/Scripts/UI/FinalPanel/FinalHttp.cs
@@ -53,7 +53,6 @@
keyValues.Add("nickname", nickname);
keyValues.Add("score", score);
keyValues.Add("level", level);
-
keyValues.Add("extra", waveInfo);
HttpHelper.Request(this, url, HttpHelper.MethodType.POST, keyValues, delegate (object value)
diff --git a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
index de3d99f..b905de9 100644
--- a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
+++ b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
@@ -68,6 +68,7 @@
TextMeshProUGUI txt_HScore, txt_Index;
TextMeshProUGUI rankUpbj;
+ GameObject newPlayerImage;//新用户提示
/// <summary>
/// 入口函数
/// </summary>
@@ -129,12 +130,12 @@
itemThird = transform.Find("ItemPanel/FinalPanelItemThird").GetComponent<FinalPanelItem>();
httpCountDownPanel = transform.Find("HttpCountDownPanel").gameObject;
- countDownReplayBtn = transform.Find("HttpCountDownPanel/ReplayBtn").GetComponent<Button>();
- countDownTxt = transform.Find("HttpCountDownPanel/WarningTxt").GetComponent<Text>();
httpCountDownPanel.SetActive(false);
rankUpbj = transform.Find("Image_HScore/RankUp").GetComponent<TextMeshProUGUI>();
+ newPlayerImage = transform.Find("Image_HScore/NewPlayer").gameObject;
rankUpbj.gameObject.SetActive(false);
+
endPs = transform.Find("Effect_UI_JieSuanShengLi/03").GetComponent<ParticleSystem>();
@@ -148,6 +149,7 @@
}
else
{
+ newPlayerImage.SetActive(false);
StartHttp();
}
@@ -179,8 +181,6 @@
bool isSending;
int sendCount;
GameObject httpCountDownPanel;
- Button countDownReplayBtn;
- Text countDownTxt;
private void OpenHttpCountDown(bool isOn)
{
if (isOn)
@@ -202,19 +202,13 @@
yield return new WaitForSeconds(1.0f);
sendCount++;
Debug.Log($"等待了{sendCount}秒");
- if (sendCount == 3)
- {
- if (!httpCountDownPanel.activeSelf) httpCountDownPanel.SetActive(true);
- if (countDownReplayBtn.gameObject.activeSelf) countDownReplayBtn.gameObject.SetActive(false);
- }
- else if (sendCount > 10)
+ if (sendCount > 10)
{
Debug.Log("等了10秒了，连接失败");
- isSending = false;
- countDownTxt.text = "等了10秒了，连接失败";
- if (!countDownReplayBtn.gameObject.activeSelf) countDownReplayBtn.gameObject.SetActive(true);
+ if (!httpCountDownPanel.activeSelf) httpCountDownPanel.SetActive(true);
- countDownReplayBtn.onClick.AddListener(Close);
+ isSending = false;
+
break;
}
}
@@ -236,11 +230,12 @@
RefreshHttpData(allHttpGetInfoLis, myrank, mydataHttpInfo);
- if (allHttpGetInfoLis == null) return;
-
- txt_Name.text = mydataHttpInfo.nickname;
- txt_HScore.text = mydataHttpInfo.score.ToString();
- txt_Wave.text = mydataHttpInfo.waveInfo;
+ if (allHttpGetInfoLis != null)
+ {
+ txt_Name.text = mydataHttpInfo.nickname;
+ txt_HScore.text = mydataHttpInfo.score.ToString();
+ txt_Wave.text = mydataHttpInfo.waveInfo;
+ }
PlayDoTween();
}
@@ -310,12 +305,14 @@
/// <returns></returns>
IEnumerator PlayerItemDoTween()
{
-
yield return new WaitForEndOfFrame();
- scrollerCanvasGroup.alpha = 1;
- itemCanvasGroup.alpha = 1;
+ if (_data.Count > 0)
+ {
+ scrollerCanvasGroup.alpha = 1;
+ itemCanvasGroup.alpha = 1;
- image_HScore.SetActive(true);
+ image_HScore.SetActive(true);
+ }
yield break;
}
@@ -326,6 +323,10 @@
protected void TextDoTweenFinish()
{
waveText.gameObject.SetActive(true);
+ if (_allHttpGetInfoLis == null)
+ {
+ httpCountDownPanel.SetActive(true);
+ }
if (isNewH)
{
image_NewRecord.SetActive(true);
@@ -349,11 +350,7 @@
}
}
- // transform.Find("Image1").gameObject.SetActive(false);
- // transform.Find("Image2").gameObject.SetActive(false);
- // transform.Find("Image3").gameObject.SetActive(false);
endPs?.Play();
-
closeBtn.interactable = true;
}
@@ -429,20 +426,15 @@
return cellView;
}
+ List<HttpGetInfo> _allHttpGetInfoLis;
private void RefreshHttpData(List<HttpGetInfo> allHttpGetInfoLis, int myrank, HttpGetInfo mydataHttpInfo)
{
+ _allHttpGetInfoLis = allHttpGetInfoLis;
if (allHttpGetInfoLis == null)
{
- httpCountDownPanel.SetActive(true);
- countDownTxt.text = "获取排行榜失败";
- countDownReplayBtn.onClick.AddListener(Close);
+ //httpCountDownPanel.SetActive(true);
return;
}
-
- // if (isSending)
- // {
- // OpenHttpCountDown(false);
- // }
FinalPanelItemData data;
diff --git a/Assets/UI/Final/new/NEW.png b/Assets/UI/Final/new/NEW.png
new file mode 100644
index 0000000..c4c0c82
--- /dev/null
+++ b/Assets/UI/Final/new/NEW.png
Binary files differ
diff --git a/Assets/UI/Final/new/NEW.png.meta b/Assets/UI/Final/new/NEW.png.meta
new file mode 100644
index 0000000..a78f409
--- /dev/null
+++ b/Assets/UI/Final/new/NEW.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 1eb7b3a3b052e8a49b482dd19d2fc192
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git "a/Assets/UI/Final/new/\346\227\240\350\277\236\346\216\245\346\225\210\346\236\234\345\233\276.jpg" "b/Assets/UI/Final/new/\346\227\240\350\277\236\346\216\245\346\225\210\346\236\234\345\233\276.jpg"
new file mode 100644
index 0000000..acfdcf9
--- /dev/null
+++ "b/Assets/UI/Final/new/\346\227\240\350\277\236\346\216\245\346\225\210\346\236\234\345\233\276.jpg"
Binary files differ
diff --git "a/Assets/UI/Final/new/\346\227\240\350\277\236\346\216\245\346\225\210\346\236\234\345\233\276.jpg.meta" "b/Assets/UI/Final/new/\346\227\240\350\277\236\346\216\245\346\225\210\346\236\234\345\233\276.jpg.meta"
new file mode 100644
index 0000000..51a2b11
--- /dev/null
+++ "b/Assets/UI/Final/new/\346\227\240\350\277\236\346\216\245\346\225\210\346\236\234\345\233\276.jpg.meta"
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: d83177762ed78d94fa96cd13d57e1ec3
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
Gitblit v1.9.1