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

消息通知bug&赛事界面调整

Browse Source
This commit is contained in:
lishuo committed 2021-07-29 20:01:38 +08:00
1 parent 50fd9c3af6
commit 9ab8165630
15 files changed
+182 -93
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/Match/CompetitionResultPanel.prefab
+94 -30
View File
@@ -90,7 +90,6 @@ GameObject:
- component: {fileID: 807686475385249120}
- component: {fileID: 319842981081321694}
- component: {fileID: 3419393518372327006}
- component: {fileID: 6294539270716646236}
m_Layer: 5
m_Name: Close
m_TagString: Untagged
@@ -132,7 +131,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.8}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -168,9 +167,9 @@ MonoBehaviour:
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_NormalColor: {r: 0.23921569, g: 0.24313726, b: 0.3019608, a: 1}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 1, g: 1, b: 1, 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
@@ -199,20 +198,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 319842981081321692}
m_CullTransparentMesh: 0
--- !u!114 &6294539270716646236
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 319842981081321692}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3}
m_Name:
m_EditorClassIdentifier:
mType: 0
Tooltips: Close
--- !u!1 &319842981847980292
GameObject:
m_ObjectHideFlags: 0
@@ -311,7 +296,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2907692473210516730
RectTransform:
m_ObjectHideFlags: 0
@@ -330,7 +315,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 0, y: 34}
m_SizeDelta: {x: 40, y: 34}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &699406188596593605
CanvasRenderer:
@@ -1187,6 +1172,84 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1704703321856270639
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1268885097902296256}
- component: {fileID: 4947407605451430434}
- component: {fileID: 9171626373557116018}
m_Layer: 5
m_Name: WatchTitle (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1268885097902296256
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704703321856270639}
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: 6716961565728369172}
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: 143.5, y: -82.9}
m_SizeDelta: {x: 287, y: 48.866318}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4947407605451430434
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704703321856270639}
m_CullTransparentMesh: 0
--- !u!114 &9171626373557116018
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704703321856270639}
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: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: RANKING
--- !u!1 &1841578915492704467
GameObject:
m_ObjectHideFlags: 0
@@ -2032,14 +2095,15 @@ RectTransform:
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: 1268885097902296256}
m_Father: {fileID: 8381767031396044147}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 267.5, y: -141}
m_SizeDelta: {x: 287, y: 110}
m_AnchoredPosition: {x: 267.5, y: -122.9}
m_SizeDelta: {x: 287, y: 73.772644}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8255885746112685489
CanvasRenderer:
@@ -2078,10 +2142,10 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: COMPETITION RANKING
m_Text: COMPETITION
--- !u!1 &3705417091195862845
GameObject:
m_ObjectHideFlags: 0
@@ -2385,9 +2449,9 @@ RectTransform:
m_Father: {fileID: 2907692473210516730}
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: 20, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 20, y: -9}
m_SizeDelta: {x: 0, y: 16}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8186740343531769165
@@ -3985,7 +4049,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &9162128331779673185
RectTransform:
m_ObjectHideFlags: 0
Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab
+7 -7
View File
@@ -1504,7 +1504,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Apply
m_Text: Join
--- !u!1 &4080099147826733645
GameObject:
m_ObjectHideFlags: 0
@@ -2472,7 +2472,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 744, y: -482}
m_AnchoredPosition: {x: 744, y: -448}
m_SizeDelta: {x: 685, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6558498177234723984
@@ -3232,7 +3232,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 130.3, y: -455}
m_AnchoredPosition: {x: 130.3, y: -421}
m_SizeDelta: {x: 144.53284, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6558498177724301629
@@ -5808,7 +5808,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6558498179264530620
RectTransform:
m_ObjectHideFlags: 0
@@ -5964,7 +5964,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5095066172370528861
RectTransform:
m_ObjectHideFlags: 0
@@ -6587,7 +6587,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 290, y: -410}
m_AnchoredPosition: {x: 290, y: -376}
m_SizeDelta: {x: 460, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5714171831027139933
@@ -6798,7 +6798,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &455999053341543882
RectTransform:
m_ObjectHideFlags: 0
Assets/Resources/UI/Prefab/Match/FinalRankingItem.prefab
+3 -3
View File
@@ -322,7 +322,7 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 999bpm
@@ -845,7 +845,7 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 455w
@@ -936,7 +936,7 @@ MonoBehaviour:
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 97.1W/KG
Assets/Resources/UI/Prefab/Match/TopRankingItem.prefab
+4 -4
View File
@@ -119,8 +119,8 @@ RectTransform:
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: 252, y: 0}
m_SizeDelta: {x: 64, y: 22}
m_AnchoredPosition: {x: 244.41, y: 0}
m_SizeDelta: {x: 79.16922, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5946431579487976801
CanvasRenderer:
@@ -360,8 +360,8 @@ RectTransform:
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: 141.65, y: 0}
m_SizeDelta: {x: 143.2981, y: 22}
m_AnchoredPosition: {x: 137.41, y: 0}
m_SizeDelta: {x: 134.8265, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5549514346347886655
CanvasRenderer:
Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab
+1 -1
View File
@@ -279,7 +279,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5842261755140000527
RectTransform:
m_ObjectHideFlags: 0