From 8c7fa0f93693ea67001ef2244244798cd21ce1c8 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 6 Aug 2024 14:59:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=E6=94=AF=E6=8C=81screenCanvas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demo/Ranking/Assets/RankDemo/Rank.unity | 2402 +++++++++++++++++++---- Demo/Ranking/Assets/RankDemo/Ranking.cs | 59 +- Design/CustomURP.md | 2 +- 3 files changed, 2102 insertions(+), 361 deletions(-) diff --git a/Demo/Ranking/Assets/RankDemo/Rank.unity b/Demo/Ranking/Assets/RankDemo/Rank.unity index 3f5d9431e..4b51fe022 100644 --- a/Demo/Ranking/Assets/RankDemo/Rank.unity +++ b/Demo/Ranking/Assets/RankDemo/Rank.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.57481617, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +116,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -156,7 +155,6 @@ RectTransform: m_Children: - {fileID: 2142898091} m_Father: {fileID: 748550736} - 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} @@ -257,6 +255,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 58727540} m_CullTransparentMesh: 0 +--- !u!1 &153127028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 153127031} + - component: {fileID: 153127030} + - component: {fileID: 153127029} + m_Layer: 5 + m_Name: Item Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &153127029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153127028} + 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: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Option A +--- !u!222 &153127030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153127028} + m_CullTransparentMesh: 1 +--- !u!224 &153127031 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153127028} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1476696305} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: -0.5} + m_SizeDelta: {x: -30, y: -3} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &160375841 GameObject: m_ObjectHideFlags: 0 @@ -288,7 +365,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1471959977} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -330,6 +406,193 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 160375841} m_CullTransparentMesh: 0 +--- !u!1 &206186749 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 206186750} + - component: {fileID: 206186753} + - component: {fileID: 206186752} + - component: {fileID: 206186751} + m_Layer: 5 + m_Name: Template + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &206186750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206186749} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 912356670} + - {fileID: 379297328} + m_Father: {fileID: 1393248494} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &206186751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206186749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1551224865} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 912356670} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 379297329} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &206186752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206186749} + 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!222 &206186753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206186749} + m_CullTransparentMesh: 1 +--- !u!1 &227774083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 227774084} + - component: {fileID: 227774086} + - component: {fileID: 227774085} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &227774084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227774083} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1466692413} + 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!114 &227774085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227774083} + 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: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Test ToTempFilePath +--- !u!222 &227774086 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227774083} + m_CullTransparentMesh: 1 --- !u!1 &325200747 GameObject: m_ObjectHideFlags: 0 @@ -362,7 +625,6 @@ RectTransform: m_Children: - {fileID: 1391182765} m_Father: {fileID: 748550736} - 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} @@ -465,7 +727,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &703078932 +--- !u!1 &379297327 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -473,47 +735,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 703078933} - - component: {fileID: 703078936} - - component: {fileID: 703078935} - - component: {fileID: 703078934} + - component: {fileID: 379297328} + - component: {fileID: 379297331} + - component: {fileID: 379297330} + - component: {fileID: 379297329} m_Layer: 5 - m_Name: ShareButton + m_Name: Scrollbar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &703078933 +--- !u!224 &379297328 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703078932} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 379297327} + 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1471959977} - m_RootOrder: 3 + m_Children: + - {fileID: 698259116} + m_Father: {fileID: 206186750} 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: -323} - m_SizeDelta: {x: 179.23529, y: 52.601677} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &703078934 + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &379297329 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703078932} + m_GameObject: {fileID: 379297327} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -544,17 +806,22 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 703078935} - m_OnClick: + m_TargetGraphic: {fileID: 1428244457} + m_HandleRect: {fileID: 1428244456} + m_Direction: 2 + m_Value: 0 + m_Size: 0.2 + m_NumberOfSteps: 0 + m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!114 &703078935 +--- !u!114 &379297330 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703078932} + m_GameObject: {fileID: 379297327} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -568,8 +835,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5dcf9802da319a1448cdff4f97108074, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -578,15 +845,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &703078936 +--- !u!222 &379297331 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703078932} - m_CullTransparentMesh: 0 ---- !u!1 &705507993 + m_GameObject: {fileID: 379297327} + m_CullTransparentMesh: 1 +--- !u!1 &550236647 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -594,25 +861,460 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 705507995} - - component: {fileID: 705507994} - m_Layer: 0 - m_Name: Directional Light + - component: {fileID: 550236648} + - component: {fileID: 550236651} + - component: {fileID: 550236650} + - component: {fileID: 550236649} + m_Layer: 5 + m_Name: TestButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &705507994 -Light: +--- !u!224 &550236648 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 705507993} + m_GameObject: {fileID: 550236647} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 702804046} + m_Father: {fileID: 1471959977} + 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: 108.62, y: -323} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &550236649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550236647} m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 550236650} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &550236650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550236647} + 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!222 &550236651 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550236647} + m_CullTransparentMesh: 1 +--- !u!1 &698259115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 698259116} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &698259116 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698259115} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1428244456} + m_Father: {fileID: 379297328} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &702804045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 702804046} + - component: {fileID: 702804048} + - component: {fileID: 702804047} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &702804046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 702804045} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 550236648} + 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!114 &702804047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 702804045} + 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: ToTempFilePath +--- !u!222 &702804048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 702804045} + m_CullTransparentMesh: 1 +--- !u!1 &703078932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 703078933} + - component: {fileID: 703078936} + - component: {fileID: 703078935} + - component: {fileID: 703078934} + m_Layer: 5 + m_Name: ShareButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &703078933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703078932} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1471959977} + 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: -104, y: -323} + m_SizeDelta: {x: 179.23529, y: 52.601677} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &703078934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703078932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 703078935} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &703078935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703078932} + 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: 5dcf9802da319a1448cdff4f97108074, 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!222 &703078936 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703078932} + m_CullTransparentMesh: 0 +--- !u!1 &704820992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 704820995} + - component: {fileID: 704820994} + - component: {fileID: 704820993} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &704820993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704820992} + 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: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ScreenCanvas +--- !u!222 &704820994 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704820992} + m_CullTransparentMesh: 1 +--- !u!224 &704820995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704820992} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1393248494} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -7.5, y: -0.5} + m_SizeDelta: {x: -35, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &705507993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705507995} + - component: {fileID: 705507994} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &705507994 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 @@ -653,34 +1355,422 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &705507995 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &705507995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &748550732 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 748550736} + - component: {fileID: 748550735} + - component: {fileID: 748550734} + - component: {fileID: 748550733} + - component: {fileID: 748550737} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &748550733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748550732} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &748550734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748550732} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 600, y: 960} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &748550735 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748550732} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &748550736 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748550732} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1393248494} + - {fileID: 2029859335} + - {fileID: 58727541} + - {fileID: 1466692413} + - {fileID: 1373867583} + - {fileID: 325200748} + - {fileID: 1471959977} + m_Father: {fileID: 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &748550737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748550732} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f6b1f6498aee42d19e0df94f03d0c15, type: 3} + m_Name: + m_EditorClassIdentifier: + CanvasDropdown: {fileID: 1393248493} + InitButton: {fileID: 2029859336} + ShowButton: {fileID: 1373867584} + ShareButton: {fileID: 703078934} + ReportButton: {fileID: 58727542} + TestBeforeButton: {fileID: 1466692414} + TestAfterButton: {fileID: 550236649} + RankBody: {fileID: 160375843} + RankMask: {fileID: 325200747} + RankingBox: {fileID: 1471959976} +--- !u!1 &900613921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 900613922} + - component: {fileID: 900613924} + - component: {fileID: 900613923} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &900613922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 900613921} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1471959977} + 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: 352.6} + m_SizeDelta: {x: 299.44144, y: 57.805237} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &900613923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 900613921} + 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: a9bd85ec10f31194584d811abc430cc7, 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!222 &900613924 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 900613921} + m_CullTransparentMesh: 0 +--- !u!1 &912356669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 912356670} + - component: {fileID: 912356673} + - component: {fileID: 912356672} + - component: {fileID: 912356671} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &912356670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912356669} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1551224865} + m_Father: {fileID: 206186750} + 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: -18, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &912356671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912356669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &912356672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912356669} + 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: 10917, 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!222 &912356673 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 912356669} + m_CullTransparentMesh: 1 +--- !u!1 &963194225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &963194228 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 705507993} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_GameObject: {fileID: 963194225} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &748550732 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1052024814 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -688,122 +1778,348 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 748550736} - - component: {fileID: 748550735} - - component: {fileID: 748550734} - - component: {fileID: 748550733} - - component: {fileID: 748550737} + - component: {fileID: 1052024815} + - component: {fileID: 1052024817} + - component: {fileID: 1052024816} m_Layer: 5 - m_Name: Canvas + m_Name: Arrow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &748550733 +--- !u!224 &1052024815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052024814} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1393248494} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1052024816 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 748550732} + m_GameObject: {fileID: 1052024814} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &748550734 + 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: 10915, guid: 0000000000000000f000000000000000, type: 0} + 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!222 &1052024817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1052024814} + m_CullTransparentMesh: 1 +--- !u!1 &1083282618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1083282619} + - component: {fileID: 1083282621} + - component: {fileID: 1083282620} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1083282619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1083282618} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1471959977} + 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: 530, y: 830} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1083282620 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 748550732} + m_GameObject: {fileID: 1083282618} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 600, y: 960} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &748550735 -Canvas: + 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: 741a4d302fce6194ca74585e2191de30, 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!222 &1083282621 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 748550732} + m_GameObject: {fileID: 1083282618} + m_CullTransparentMesh: 0 +--- !u!1 &1143012555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1143012556} + - component: {fileID: 1143012558} + - component: {fileID: 1143012557} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1143012556 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143012555} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2029859335} + 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!114 &1143012557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143012555} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &748550736 + 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: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Init +--- !u!222 &1143012558 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1143012555} + m_CullTransparentMesh: 1 +--- !u!1 &1373867582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1373867583} + - component: {fileID: 1373867586} + - component: {fileID: 1373867585} + - component: {fileID: 1373867584} + m_Layer: 5 + m_Name: ShowButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1373867583 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 748550732} + m_GameObject: {fileID: 1373867582} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 58727541} - - {fileID: 1373867583} - - {fileID: 325200748} - - {fileID: 1471959977} - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Children: [] + m_Father: {fileID: 748550736} 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &748550737 + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -78.3, y: 97.6} + m_SizeDelta: {x: 73.536606, y: 95.21054} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1373867584 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 748550732} + m_GameObject: {fileID: 1373867582} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6f6b1f6498aee42d19e0df94f03d0c15, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - ShowButton: {fileID: 1373867584} - ShareButton: {fileID: 703078934} - ReportButton: {fileID: 58727542} - RankBody: {fileID: 160375843} - RankMask: {fileID: 325200747} - RankingBox: {fileID: 1471959976} ---- !u!1 &900613921 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 1373867585} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1373867585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1373867582} + 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: 67473c27e645647469fc859b68a5a5d7, 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!222 &1373867586 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1373867582} + m_CullTransparentMesh: 0 +--- !u!1 &1391182764 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -811,57 +2127,56 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 900613922} - - component: {fileID: 900613924} - - component: {fileID: 900613923} + - component: {fileID: 1391182765} + - component: {fileID: 1391182767} + - component: {fileID: 1391182766} m_Layer: 5 - m_Name: Image + m_Name: RankMask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &900613922 +--- !u!224 &1391182765 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900613921} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1391182764} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1471959977} - m_RootOrder: 1 + m_Father: {fileID: 325200748} 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: 352.6} - m_SizeDelta: {x: 299.44144, y: 57.805237} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 1198.84} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &900613923 +--- !u!114 &1391182766 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900613921} + m_GameObject: {fileID: 1391182764} 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_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0.69803923} 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: a9bd85ec10f31194584d811abc430cc7, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -871,15 +2186,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &900613924 +--- !u!222 &1391182767 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900613921} + m_GameObject: {fileID: 1391182764} m_CullTransparentMesh: 0 ---- !u!1 &963194225 +--- !u!1 &1393248492 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -887,83 +2202,135 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 963194228} - - component: {fileID: 963194227} - - component: {fileID: 963194226} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + - component: {fileID: 1393248494} + - component: {fileID: 1393248496} + - component: {fileID: 1393248495} + - component: {fileID: 1393248493} + m_Layer: 5 + m_Name: Dropdown (Legacy) + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &963194226 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} - m_Enabled: 1 ---- !u!20 &963194227 -Camera: +--- !u!114 &1393248493 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 1393248492} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &963194228 -Transform: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d0b652f32a2cc243917e4028fa0f046, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 1393248495} + m_Template: {fileID: 206186750} + m_CaptionText: {fileID: 704820993} + m_CaptionImage: {fileID: 0} + m_ItemText: {fileID: 153127029} + m_ItemImage: {fileID: 0} + m_Value: 0 + m_Options: + m_Options: + - m_Text: ScreenCanvas + m_Image: {fileID: 0} + - m_Text: OffScreenCanvas + m_Image: {fileID: 0} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_AlphaFadeSpeed: 0.15 +--- !u!224 &1393248494 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 1393248492} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Children: + - {fileID: 704820995} + - {fileID: 1052024815} + - {fileID: 206186750} + m_Father: {fileID: 748550736} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1083282618 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 320, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1393248495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393248492} + 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!222 &1393248496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393248492} + m_CullTransparentMesh: 1 +--- !u!1 &1428244455 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -971,43 +2338,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1083282619} - - component: {fileID: 1083282621} - - component: {fileID: 1083282620} + - component: {fileID: 1428244456} + - component: {fileID: 1428244458} + - component: {fileID: 1428244457} m_Layer: 5 - m_Name: bg + m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1083282619 +--- !u!224 &1428244456 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1083282618} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1428244455} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1471959977} - m_RootOrder: 0 + m_Father: {fileID: 698259116} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.2} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 530, y: 830} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1083282620 +--- !u!114 &1428244457 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1083282618} + m_GameObject: {fileID: 1428244455} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1021,8 +2387,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 741a4d302fce6194ca74585e2191de30, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1031,15 +2397,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1083282621 +--- !u!222 &1428244458 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1083282618} - m_CullTransparentMesh: 0 ---- !u!1 &1373867582 + m_GameObject: {fileID: 1428244455} + m_CullTransparentMesh: 1 +--- !u!1 &1466692412 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1047,44 +2413,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1373867583} - - component: {fileID: 1373867586} - - component: {fileID: 1373867585} - - component: {fileID: 1373867584} + - component: {fileID: 1466692413} + - component: {fileID: 1466692416} + - component: {fileID: 1466692415} + - component: {fileID: 1466692414} m_Layer: 5 - m_Name: ShowButton + m_Name: TestButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1373867583 +--- !u!224 &1466692413 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373867582} + m_GameObject: {fileID: 1466692412} 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_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 227774084} m_Father: {fileID: 748550736} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -78.3, y: 97.6} - m_SizeDelta: {x: 73.536606, y: 95.21054} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1373867584 +--- !u!114 &1466692414 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373867582} + m_GameObject: {fileID: 1466692412} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -1118,17 +2484,17 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1373867585} + m_TargetGraphic: {fileID: 1466692415} m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &1373867585 +--- !u!114 &1466692415 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373867582} + m_GameObject: {fileID: 1466692412} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1142,25 +2508,241 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 67473c27e645647469fc859b68a5a5d7, 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!222 &1373867586 -CanvasRenderer: + 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!222 &1466692416 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1466692412} + m_CullTransparentMesh: 1 +--- !u!1 &1471959976 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1471959977} + - component: {fileID: 1471959978} + m_Layer: 5 + m_Name: RankingBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1471959977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471959976} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1083282619} + - {fileID: 900613922} + - {fileID: 160375842} + - {fileID: 703078933} + - {fileID: 550236648} + m_Father: {fileID: 748550736} + 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: 530, y: 830} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!212 &1471959978 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1471959976} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1476696304 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1476696305} + - component: {fileID: 1476696306} + m_Layer: 5 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1476696305 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1476696304} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1701958143} + - {fileID: 1755289522} + - {fileID: 153127031} + m_Father: {fileID: 1551224865} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1476696306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1476696304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 1701958144} + toggleTransition: 1 + graphic: {fileID: 1755289523} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 +--- !u!1 &1551224864 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373867582} - m_CullTransparentMesh: 0 ---- !u!1 &1391182764 + serializedVersion: 6 + m_Component: + - component: {fileID: 1551224865} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1551224865 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551224864} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1476696305} + m_Father: {fileID: 912356670} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 48} + m_Pivot: {x: 0.5, y: 1} +--- !u!1 &1701958142 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1168,50 +2750,49 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1391182765} - - component: {fileID: 1391182767} - - component: {fileID: 1391182766} + - component: {fileID: 1701958143} + - component: {fileID: 1701958145} + - component: {fileID: 1701958144} m_Layer: 5 - m_Name: RankMask + m_Name: Item Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1391182765 +--- !u!224 &1701958143 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391182764} + m_GameObject: {fileID: 1701958142} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 325200748} - m_RootOrder: 0 + m_Father: {fileID: 1476696305} 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: 500, y: 1198.84} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1391182766 +--- !u!114 &1701958144 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391182764} + m_GameObject: {fileID: 1701958142} 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: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0.69803923} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1228,15 +2809,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1391182767 +--- !u!222 &1701958145 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1391182764} - m_CullTransparentMesh: 0 ---- !u!1 &1471959976 + m_GameObject: {fileID: 1701958142} + m_CullTransparentMesh: 1 +--- !u!1 &1755289521 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1244,91 +2825,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1471959977} - - component: {fileID: 1471959978} + - component: {fileID: 1755289522} + - component: {fileID: 1755289524} + - component: {fileID: 1755289523} m_Layer: 5 - m_Name: RankingBox + m_Name: Item Checkmark m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1471959977 + m_IsActive: 1 +--- !u!224 &1755289522 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1471959976} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1755289521} + 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1083282619} - - {fileID: 900613922} - - {fileID: 160375842} - - {fileID: 703078933} - m_Father: {fileID: 748550736} - m_RootOrder: 3 + m_Children: [] + m_Father: {fileID: 1476696305} 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: 530, y: 830} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!212 &1471959978 -SpriteRenderer: +--- !u!114 &1755289523 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1471959976} + m_GameObject: {fileID: 1755289521} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 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: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} + 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!222 &1755289524 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755289521} + m_CullTransparentMesh: 1 --- !u!1 &1945497799 GameObject: m_ObjectHideFlags: 0 @@ -1359,6 +2922,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -1388,13 +2952,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1945497799} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!850595691 &2016446073 LightingSettings: @@ -1403,7 +2967,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 4 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -1437,13 +3001,13 @@ LightingSettings: m_PVRCulling: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVREnvironmentSampleCount: 500 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 0 + m_PVREnvironmentImportanceSampling: 0 m_PVRFilteringMode: 2 m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeIndirect: 0 @@ -1458,6 +3022,129 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 +--- !u!1 &2029859334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2029859335} + - component: {fileID: 2029859338} + - component: {fileID: 2029859337} + - component: {fileID: 2029859336} + m_Layer: 5 + m_Name: InitButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2029859335 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029859334} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1143012556} + m_Father: {fileID: 748550736} + 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: 60} + m_SizeDelta: {x: 320, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2029859336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029859334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 2029859337} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2029859337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029859334} + 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!222 &2029859338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029859334} + m_CullTransparentMesh: 1 --- !u!1 &2142898090 GameObject: m_ObjectHideFlags: 0 @@ -1489,7 +3176,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 58727541} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1538,3 +3224,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2142898090} m_CullTransparentMesh: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 963194228} + - {fileID: 705507995} + - {fileID: 748550736} + - {fileID: 1945497802} diff --git a/Demo/Ranking/Assets/RankDemo/Ranking.cs b/Demo/Ranking/Assets/RankDemo/Ranking.cs index f05b49ea9..5baf7a522 100644 --- a/Demo/Ranking/Assets/RankDemo/Ranking.cs +++ b/Demo/Ranking/Assets/RankDemo/Ranking.cs @@ -19,14 +19,17 @@ public class OpenDataMessage public class Ranking : MonoBehaviour { + public Dropdown CanvasDropdown; + public Button InitButton; public Button ShowButton; public Button ShareButton; public Button ReportButton; - - + public Button TestBeforeButton; + public Button TestAfterButton; public RawImage RankBody; public GameObject RankMask; public GameObject RankingBox; + private CanvasType selectedCanvasType; void Start() { @@ -35,7 +38,6 @@ void Start() Init(); }); - /** * 使用群排行功能需要特殊设置分享功能，详情可见链接 * https://developers.weixin.qq.com/minigame/dev/guide/open-ability/share/share.html @@ -73,6 +75,14 @@ void Start() }); } + void InitOpenDataContext() + { + WX.GetOpenDataContext(new OpenDataContextOption + { + sharedCanvasMode = selectedCanvasType + }); + } + void ShowOpenData() { RankMask.SetActive(true); @@ -96,8 +106,43 @@ void ShowOpenData() WX.ShowOpenData(RankBody.texture, (int)p.x, Screen.height - (int)p.y, (int)((Screen.width / referenceResolution.x) * RankBody.rectTransform.rect.width), (int)((Screen.width / referenceResolution.x) * RankBody.rectTransform.rect.height)); } + private void TestToTempFilePath() + { + var info = WX.GetSystemInfoSync(); + // Test ToTempFilePath + WXCanvas.ToTempFilePath(new WXToTempFilePathParam() + { + success = (result) => + { + Debug.Log("ToTempFilePath success:" + JsonUtility.ToJson(result)); + // Test PreviewImage + WX.PreviewImage(new PreviewImageOption + { + urls = new string[] {result.tempFilePath}, + showmenu = true, + success = (res) => + { + Debug.Log("PreviewImage success:" + JsonUtility.ToJson(result)); + }, + fail = (res) => + { + Debug.Log("PreviewImage fail:" + JsonUtility.ToJson(result)); + } + }); + }, + fail = (result) => + { + Debug.Log("ToTempFilePath fail:" + JsonUtility.ToJson(result)); + } + }); + } + void Init() { + CanvasDropdown.onValueChanged.AddListener((int selectedIndex) => + { + selectedCanvasType = (CanvasType)selectedIndex; + }); ShowButton.onClick.AddListener(() => { @@ -132,14 +177,16 @@ void Init() { OpenDataMessage msgData = new OpenDataMessage(); msgData.type = "setUserRecord"; - msgData.score = Random.Range(1, 1000); - + msgData.score = Random.Range(1, 1000); string msg = JsonUtility.ToJson(msgData); Debug.Log(msg); WX.GetOpenDataContext().PostMessage(msg); }); - } + InitButton.onClick.AddListener(InitOpenDataContext); + TestBeforeButton.onClick.AddListener(TestToTempFilePath); + TestAfterButton.onClick.AddListener(TestToTempFilePath); + } } diff --git a/Design/CustomURP.md b/Design/CustomURP.md index e8c04b5a2..e43911672 100644 --- a/Design/CustomURP.md +++ b/Design/CustomURP.md @@ -98,7 +98,7 @@ - Light Probe 光照探头 (可以简化) - 材质 UnityPerMaterial 属性 (用不到的属性可以剔除掉) - Lightmap 光照贴图 (可以简化) - - Shader 优化 (多余的 Uniform 变量、半精度、简化计算等） + - Shader 优化 (多余的 Uniform 变量、半精度、简化计算等) - 简化阴影 Shadow Cascades (可以简化) - Light Cookie (根据项目需要，看是否去掉) - ScreenSpaceShadows、ScreenSpaceOcclusion (屏幕空间阴影、遮蔽，根据项目需要，看是否去掉) From 332f8b0fa353e6fa6a46b63bd297c86b600f81e2 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 6 Aug 2024 15:07:38 +0800 Subject: [PATCH 02/10] feat: update --- Demo/Ranking/Assets/RankDemo/Ranking.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Demo/Ranking/Assets/RankDemo/Ranking.cs b/Demo/Ranking/Assets/RankDemo/Ranking.cs index 5baf7a522..47eca3a10 100644 --- a/Demo/Ranking/Assets/RankDemo/Ranking.cs +++ b/Demo/Ranking/Assets/RankDemo/Ranking.cs @@ -30,6 +30,7 @@ public class Ranking : MonoBehaviour public GameObject RankMask; public GameObject RankingBox; private CanvasType selectedCanvasType; + private WXOpenDataContext openDataContext void Start() { @@ -70,14 +71,19 @@ void Start() string msg = JsonUtility.ToJson(msgData); ShowOpenData(); - WX.GetOpenDataContext().PostMessage(msg); + InitOpenDataContext(); + openDataContext.PostMessage(msg); } }); } void InitOpenDataContext() { - WX.GetOpenDataContext(new OpenDataContextOption + if (openDataContext) + { + return; + } + WXOpenDataContext openDataContext = WX.GetOpenDataContext(new OpenDataContextOption { sharedCanvasMode = selectedCanvasType }); @@ -152,7 +158,8 @@ void Init() msgData.type = "showFriendsRank"; string msg = JsonUtility.ToJson(msgData); - WX.GetOpenDataContext().PostMessage(msg); + InitOpenDataContext(); + openDataContext.PostMessage(msg); }); @@ -182,7 +189,8 @@ void Init() string msg = JsonUtility.ToJson(msgData); Debug.Log(msg); - WX.GetOpenDataContext().PostMessage(msg); + InitOpenDataContext(); + openDataContext.PostMessage(msg); }); InitButton.onClick.AddListener(InitOpenDataContext); From c277ca0e75e91e3e0ac30f234d07f26543a3ffe7 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 6 Aug 2024 15:11:35 +0800 Subject: [PATCH 03/10] feat: update --- Demo/Ranking/Assets/RankDemo/Ranking.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Demo/Ranking/Assets/RankDemo/Ranking.cs b/Demo/Ranking/Assets/RankDemo/Ranking.cs index 47eca3a10..b30bde066 100644 --- a/Demo/Ranking/Assets/RankDemo/Ranking.cs +++ b/Demo/Ranking/Assets/RankDemo/Ranking.cs @@ -30,7 +30,7 @@ public class Ranking : MonoBehaviour public GameObject RankMask; public GameObject RankingBox; private CanvasType selectedCanvasType; - private WXOpenDataContext openDataContext + private WXOpenDataContext openDataContext; void Start() { @@ -64,14 +64,15 @@ void Start() if (!string.IsNullOrEmpty(shareTicket) && query != null && query["minigame_action"] == "show_group_list") { + InitOpenDataContext(); + ShowOpenData(); + OpenDataMessage msgData = new OpenDataMessage(); msgData.type = "showGroupFriendsRank"; msgData.shareTicket = shareTicket; string msg = JsonUtility.ToJson(msgData); - ShowOpenData(); - InitOpenDataContext(); openDataContext.PostMessage(msg); } }); @@ -79,14 +80,13 @@ void Start() void InitOpenDataContext() { - if (openDataContext) + if (openDataContext == null) { - return; + WXOpenDataContext openDataContext = WX.GetOpenDataContext(new OpenDataContextOption + { + sharedCanvasMode = selectedCanvasType + }); } - WXOpenDataContext openDataContext = WX.GetOpenDataContext(new OpenDataContextOption - { - sharedCanvasMode = selectedCanvasType - }); } void ShowOpenData() @@ -152,13 +152,13 @@ void Init() ShowButton.onClick.AddListener(() => { + InitOpenDataContext(); ShowOpenData(); OpenDataMessage msgData = new OpenDataMessage(); msgData.type = "showFriendsRank"; string msg = JsonUtility.ToJson(msgData); - InitOpenDataContext(); openDataContext.PostMessage(msg); }); From 5b4ee708f4a840151229a601185702ad56b1d87b Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 6 Aug 2024 15:38:02 +0800 Subject: [PATCH 04/10] feat: update doc --- Design/OpenData.md | 105 ++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 40 deletions(-) diff --git a/Design/OpenData.md b/Design/OpenData.md index 517a6f0bb..9ac66574d 100644 --- a/Design/OpenData.md +++ b/Design/OpenData.md @@ -18,44 +18,44 @@ Unity 里面要实现 sharedCanvas 的绘制，核心在于 hook Unity 的渲染 3. 在需要绘制排行榜的时候，将原本要绘制的 WebGLObject 替换成通过 sharedCanvas 创建而来的 WebGLObject； 4. 在关闭排行榜的时候，停止步骤 3 的 hook； +**重点更新：** +**我们在基础库3.5.5版本支持了 screenCanvas 类型的开放数据域** +* 区别：SharedCanvas变成了在屏类型（screenCanvas），不再需要依赖游戏域循环刷新渲染 +* 好处：减少由于渲染离屏Canvas产生的干扰问题 +* 如何实现： +``` CSharp +WX.GetOpenDataContext(new OpenDataContextOption +{ + sharedCanvasMode = CanvasType.ScreenCanvas +}) +``` + ## 详细步骤 ### 1、设置占位纹理 在游戏需要展示的地方创建一个 RawImage，其中 Texture 属性自己选择透明的图片即可，后续展示时会被动态替换。因为unity纹理与 Web 的绘制存在倒立的差异，请将先将 rotation的x 设置为180，即让 `UI控件延X轴旋转180度` 再调整到游戏中合适的位置,如下图 ![avatar](../image/o2.png) -### 2、调用SDK的API -#### 2.1 在需要展示的地方调用，`WX.ShowOpenData` +### 2、调用SDK的API +#### 2.1 先初始化开放数据域类型 +初始化后canvas类型无法修改，只初始化一次并保存即可 ``` CSharp -WX.ShowOpenData(rawImage.texture, x, y, width, height); -``` -其中 : -* x : 占位区域对应屏幕左上角横坐标 -* y : 占位区域对应屏幕左上角纵坐标，注意左上角为（0，0） -* width : 占位区域对应的宽度 -* height : 占位区域对应的高度 - -WX.ShowOpenData 最终会调用 minigame/unity-sdk/open-data.js 内的 WXShowOpenData 方法，核心是三个作用： -1. 调用 wx.getOpenDataContext，这会触发开放数据域的初始化，也就是 open-data 文件夹下的代码在开放数据域初始化之后才能够执行； -2. 给开放数据域侧抛一个事件，告知开放域去执行数据拉取和渲染操作，对于 WXRender 的处理没有任何要求，开放数据域甚至可以忽略这个事件； -``` js -openDataContext.postMessage({ - type: "WXRender", - x: x, - y: y, - width: width, - height: height, - devicePixelRatio: window.devicePixelRatio, -}); +void InitOpenDataContext() +{ + if (openDataContext == null) + { + WXOpenDataContext openDataContext = WX.GetOpenDataContext(new OpenDataContextOption + { + sharedCanvasMode = selectedCanvasType + }); + } +} ``` -3. 开始 hook Unity 的渲染，原本的 RawImage 就会被替换成 sharedCanvas 的纹理。 - -#### 2.2 需要关闭时则调用，`WX.HideOpenData` -这一步非常重要，如果仅仅在 Unity 侧隐藏了 RawImage 而没有调用 WX.HideOpenData，很可能导致排行榜关闭之后文理错乱，比如有些地方的纹理变成了排行榜对应的纹理。 +`CanvasType`有`OffScreenCanvas`和`ScreenCanvas`两种类型，`OffScreenCanvas`为旧版本，优先推进使用`ScreenCanvas` -#### 2.3 通过 PostMessage 向开放数据域传递消息 +#### 2.2 通过 PostMessage 向开放数据域传递消息 -如果需要在 Unity 中向开放域页面传递数据，可以调用`WX.GetOpenDataContext`，如下代码： +如果需要在 Unity 中向开放域页面传递数据，可以调用`openDataContext.PostMessage`，如下代码： ``` CSharp [System.Serializable] public class OpenDataMessage @@ -67,9 +67,9 @@ public class OpenDataMessage OpenDataMessage msgData = new OpenDataMessage(); msgData.type = "showFriendsRank"; string msg = JsonUtility.ToJson(msgData); -WX.GetOpenDataContext().PostMessage(msg); +openDataContext.PostMessage(msg); ``` -开放域JS代码可以通过： +开放数据域JS代码可以按照以下实现： ``` js wx.onMessage(data => { console.log("[WX OpenData] onMessage", data); @@ -88,6 +88,34 @@ wx.onMessage(data => { } }); ``` +#### 2.3 在需要展示的地方调用，`WX.ShowOpenData` +``` CSharp +WX.ShowOpenData(rawImage.texture, x, y, width, height); +``` +其中 : +* x : 占位区域对应屏幕左上角横坐标 +* y : 占位区域对应屏幕左上角纵坐标，注意左上角为（0，0） +* width : 占位区域对应的宽度 +* height : 占位区域对应的高度 + +WX.ShowOpenData 最终会调用 minigame/unity-sdk/open-data.js 内的 WXShowOpenData 方法，核心是三个作用： +1. 调用 wx.getOpenDataContext，这会触发开放数据域的初始化，也就是 open-data 文件夹下的代码在开放数据域初始化之后才能够执行； +2. 给开放数据域侧抛一个事件，告知开放域去执行数据拉取和渲染操作，对于 WXRender 的处理没有任何要求，开放数据域甚至可以忽略这个事件； +``` js +// 注意，该代码是Unity模板中的代码，无需开发者实现 +openDataContext.postMessage({ + type: "WXRender", + x: x, + y: y, + width: width, + height: height, + devicePixelRatio: window.devicePixelRatio, +}); +``` +3. 如果是`OffScreenCanvas`模式，则会开始 hook Unity 的渲染，原本的 RawImage 就会被替换成 sharedCanvas 的纹理。如果是`ScreenCanvas`模式，则会修改宽高并直接在屏渲染 + +#### 2.4 需要关闭开放数据域时则调用，`WX.HideOpenData` +如果是`OffScreenCanvas`模式，这一步非常重要，如果仅仅在 Unity 侧隐藏了 RawImage 而没有调用 WX.HideOpenData，很可能导致排行榜关闭之后纹理错乱，比如有些地方的纹理变成了排行榜对应的纹理。 ### 3、导出选项勾选使用好友关系链 这一步会做两个事情： @@ -137,7 +165,7 @@ OpenDataMessage msgData = new OpenDataMessage(); msgData.type = "showFriendsRank"; string msg = JsonUtility.ToJson(msgData); -WX.GetOpenDataContext().PostMessage(msg); +openDataContext.PostMessage(msg); ``` 3. 开放数据域监听相应事件，展示群排行，详见 open-data。 @@ -146,6 +174,7 @@ WX.GetOpenDataContext().PostMessage(msg); + #### 5.2 群好友排行榜 1. 为了使用群排行榜，需要调用 WX.UpdateShareMenu 设置分享菜单 ``` CSharp @@ -179,14 +208,13 @@ WX.OnShow((OnShowCallbackResult res) => if (!string.IsNullOrEmpty(shareTicket) && query != null && query["minigame_action"] == "show_group_list") { + InitOpenDataContext(); + ShowOpenData(); OpenDataMessage msgData = new OpenDataMessage(); msgData.type = "showGroupFriendsRank"; msgData.shareTicket = shareTicket; - string msg = JsonUtility.ToJson(msgData); - - ShowOpenData(); - WX.GetOpenDataContext().PostMessage(msg); + openDataContext.PostMessage(msg); } }); ``` @@ -195,22 +223,19 @@ WX.OnShow((OnShowCallbackResult res) => 整体流程示意： - - ## 常见问题QA **Q1. 为什么第一次调用 WX.ShowOpenData 之后画面先黑一下再展示排行榜？** -A1. WX.ShowOpenData 在 openDataContext.postMessage WXRender 的事件之后立马就会开始 hook Unity 的渲染，如果开放数据域在监听到 WXRender 事件之后没有任何渲染行为，那么 sharedCanvas 纹理就还没有准备好，Unity 侧就可能出现黑一下的情况，解决办法是保证监听到 WXRender 事件之后有个同步的渲染行为，比如绘制个文案”好友数据加载中..."。 +A1. `WX.ShowOpenData` 在 `openDataContext.postMessage` `WXRender` 的事件之后立马就会开始 hook Unity 的渲染，如果开放数据域在监听到 `WXRender` 事件之后没有任何渲染行为，那么 sharedCanvas 纹理就还没有准备好，Unity 侧就可能出现黑一下的情况，解决办法是保证监听到 `WXRender` 事件之后有个同步的渲染行为，比如绘制个文案”好友数据加载中..."。 **Q2. 为什么我关闭排行榜之后界面上有些问题错乱了？** -A2. 基本上只可能是没调用 WX.HideOpenData，建议 WX.HideOpenData 打些日志来辅佐排查。 +A2. 基本上只可能是没调用 `WX.HideOpenData`，建议 `WX.HideOpenData` 打些日志来辅佐排查。 **Q3. 为什么开放数据域滚动事件不生效？** - A4. `WX.ShowOpenData(rawImage.texture, x, y, width, height)`的后面四个参数，核心目的是告诉开放数据域 sharedCanvas 最终被绘制在了屏幕的位置和尺寸，开放数据域才能够正确处理事件监听，遇到事件不生效的问题，首先排查传进来的参数是否符合预期，比如 x / y 不应该是负数。 \ No newline at end of file From b8016c02647cea531f81c358155e9d1a79266f97 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 6 Aug 2024 15:41:55 +0800 Subject: [PATCH 05/10] feat: update doc --- Design/OpenData.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Design/OpenData.md b/Design/OpenData.md index 9ac66574d..ac5079e9b 100644 --- a/Design/OpenData.md +++ b/Design/OpenData.md @@ -20,7 +20,7 @@ Unity 里面要实现 sharedCanvas 的绘制，核心在于 hook Unity 的渲染 **重点更新：** **我们在基础库3.5.5版本支持了 screenCanvas 类型的开放数据域** -* 区别：SharedCanvas变成了在屏类型（screenCanvas），不再需要依赖游戏域循环刷新渲染 +* 区别：sharedCanvas 变成了在屏类型（screenCanvas），不再需要依赖游戏域循环刷新渲染 * 好处：减少由于渲染离屏Canvas产生的干扰问题 * 如何实现： ``` CSharp @@ -51,7 +51,7 @@ void InitOpenDataContext() } } ``` -`CanvasType`有`OffScreenCanvas`和`ScreenCanvas`两种类型，`OffScreenCanvas`为旧版本，优先推进使用`ScreenCanvas` +`CanvasType`有`OffScreenCanvas`和`ScreenCanvas`两种类型，`OffScreenCanvas`为旧版本，推荐使用`ScreenCanvas` #### 2.2 通过 PostMessage 向开放数据域传递消息 From 16b7810828a96904f2ec3b8d4d1444f7cc3d29b3 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 12 Nov 2024 14:10:16 +0800 Subject: [PATCH 06/10] feat: screenCanvas rank --- Demo/Ranking/Assets/RankDemo/Rank.unity | 215 +++++++++++++++++++++++- Demo/Ranking/Assets/RankDemo/Ranking.cs | 47 +++++- 2 files changed, 250 insertions(+), 12 deletions(-) diff --git a/Demo/Ranking/Assets/RankDemo/Rank.unity b/Demo/Ranking/Assets/RankDemo/Rank.unity index 4b51fe022..e46e77bf7 100644 --- a/Demo/Ranking/Assets/RankDemo/Rank.unity +++ b/Demo/Ranking/Assets/RankDemo/Rank.unity @@ -38,6 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} + m_IndirectSpecularColor: {r: 0.4465788, g: 0.49641287, b: 0.5748173, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -866,7 +867,7 @@ GameObject: - component: {fileID: 550236650} - component: {fileID: 550236649} m_Layer: 5 - m_Name: TestButton + m_Name: TestButtonMainCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -889,7 +890,7 @@ RectTransform: 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: 108.62, y: -323} + m_AnchoredPosition: {x: 108.62, y: -298} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &550236649 @@ -1080,7 +1081,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ToTempFilePath + m_Text: MainToTempFilePath --- !u!222 &702804048 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1508,8 +1509,9 @@ MonoBehaviour: ShowButton: {fileID: 1373867584} ShareButton: {fileID: 703078934} ReportButton: {fileID: 58727542} - TestBeforeButton: {fileID: 1466692414} - TestAfterButton: {fileID: 550236649} + TestMainButton: {fileID: 1466692414} + TestMainWithSharedButton: {fileID: 550236649} + TestSharedButton: {fileID: 2004334518} RankBody: {fileID: 160375843} RankMask: {fileID: 325200747} RankingBox: {fileID: 1471959976} @@ -2418,7 +2420,7 @@ GameObject: - component: {fileID: 1466692415} - component: {fileID: 1466692414} m_Layer: 5 - m_Name: TestButton + m_Name: MainCanvasTestButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2560,6 +2562,7 @@ RectTransform: - {fileID: 160375842} - {fileID: 703078933} - {fileID: 550236648} + - {fileID: 2004334517} m_Father: {fileID: 748550736} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2742,6 +2745,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &1649957660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649957661} + - component: {fileID: 1649957663} + - component: {fileID: 1649957662} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1649957661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649957660} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2004334517} + 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!114 &1649957662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649957660} + 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: SharedToTempFilePath +--- !u!222 &1649957663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649957660} + m_CullTransparentMesh: 1 --- !u!1 &1701958142 GameObject: m_ObjectHideFlags: 0 @@ -2960,6 +3042,127 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2004334516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2004334517} + - component: {fileID: 2004334520} + - component: {fileID: 2004334519} + - component: {fileID: 2004334518} + m_Layer: 5 + m_Name: TestButtonSharedCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2004334517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004334516} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1649957661} + m_Father: {fileID: 1471959977} + 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: 108.62, y: -341.8} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2004334518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004334516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 2004334519} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2004334519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004334516} + 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!222 &2004334520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004334516} + m_CullTransparentMesh: 1 --- !u!850595691 &2016446073 LightingSettings: m_ObjectHideFlags: 0 diff --git a/Demo/Ranking/Assets/RankDemo/Ranking.cs b/Demo/Ranking/Assets/RankDemo/Ranking.cs index b30bde066..af47ed01f 100644 --- a/Demo/Ranking/Assets/RankDemo/Ranking.cs +++ b/Demo/Ranking/Assets/RankDemo/Ranking.cs @@ -24,8 +24,9 @@ public class Ranking : MonoBehaviour public Button ShowButton; public Button ShareButton; public Button ReportButton; - public Button TestBeforeButton; - public Button TestAfterButton; + public Button TestMainButton; // 测试只有MainCanvas + public Button TestMainWithSharedButton; // 测试MainCanvas和SharedCanvas一起 + public Button TestSharedButton; // 测试只有SharedCanvas public RawImage RankBody; public GameObject RankMask; public GameObject RankingBox; @@ -112,10 +113,11 @@ void ShowOpenData() WX.ShowOpenData(RankBody.texture, (int)p.x, Screen.height - (int)p.y, (int)((Screen.width / referenceResolution.x) * RankBody.rectTransform.rect.width), (int)((Screen.width / referenceResolution.x) * RankBody.rectTransform.rect.height)); } - private void TestToTempFilePath() + // 测试MainCanvas导出图片 + private void MainToTempFilePath() { var info = WX.GetSystemInfoSync(); - // Test ToTempFilePath + Debug.Log("Test MainCanvas ToTempFilePath"); WXCanvas.ToTempFilePath(new WXToTempFilePathParam() { success = (result) => @@ -143,6 +145,38 @@ private void TestToTempFilePath() }); } + // 测试SharedCanvas导出图片 + private void SharedToTempFilePath() + { + var info = WX.GetSystemInfoSync(); + Debug.Log("Test SharedCanvas ToTempFilePath"); + WXSharedCanvas.ToTempFilePath(new WXToTempFilePathParam() + { + success = (result) => + { + Debug.Log("ToTempFilePath success:" + JsonUtility.ToJson(result)); + // Test PreviewImage + WX.PreviewImage(new PreviewImageOption + { + urls = new string[] {result.tempFilePath}, + showmenu = true, + success = (res) => + { + Debug.Log("PreviewImage success:" + JsonUtility.ToJson(result)); + }, + fail = (res) => + { + Debug.Log("PreviewImage fail:" + JsonUtility.ToJson(result)); + } + }); + }, + fail = (result) => + { + Debug.Log("ToTempFilePath fail:" + JsonUtility.ToJson(result)); + } + }); + } + void Init() { CanvasDropdown.onValueChanged.AddListener((int selectedIndex) => @@ -194,7 +228,8 @@ void Init() }); InitButton.onClick.AddListener(InitOpenDataContext); - TestBeforeButton.onClick.AddListener(TestToTempFilePath); - TestAfterButton.onClick.AddListener(TestToTempFilePath); + TestMainButton.onClick.AddListener(MainToTempFilePath); + TestMainWithSharedButton.onClick.AddListener(MainToTempFilePath); + TestSharedButton.onClick.AddListener(SharedToTempFilePath); } } From 185d387d08b77fa8caff97b1799df83e457204e6 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 12 Nov 2024 14:36:34 +0800 Subject: [PATCH 07/10] feat: update --- Demo/Ranking/Assets/RankDemo/Ranking.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Demo/Ranking/Assets/RankDemo/Ranking.cs b/Demo/Ranking/Assets/RankDemo/Ranking.cs index af47ed01f..075d85b24 100644 --- a/Demo/Ranking/Assets/RankDemo/Ranking.cs +++ b/Demo/Ranking/Assets/RankDemo/Ranking.cs @@ -154,7 +154,7 @@ private void SharedToTempFilePath() { success = (result) => { - Debug.Log("ToTempFilePath success:" + JsonUtility.ToJson(result)); + Debug.Log("Shared ToTempFilePath success:" + JsonUtility.ToJson(result)); // Test PreviewImage WX.PreviewImage(new PreviewImageOption { @@ -162,17 +162,17 @@ private void SharedToTempFilePath() showmenu = true, success = (res) => { - Debug.Log("PreviewImage success:" + JsonUtility.ToJson(result)); + Debug.Log("Shared PreviewImage success:" + JsonUtility.ToJson(result)); }, fail = (res) => { - Debug.Log("PreviewImage fail:" + JsonUtility.ToJson(result)); + Debug.Log("Shared PreviewImage fail:" + JsonUtility.ToJson(result)); } }); }, fail = (result) => { - Debug.Log("ToTempFilePath fail:" + JsonUtility.ToJson(result)); + Debug.Log("Shared ToTempFilePath fail:" + JsonUtility.ToJson(result)); } }); } From 7404ade385f34cb637e7bd93b8d7af01893ec2c4 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 12 Nov 2024 15:15:32 +0800 Subject: [PATCH 08/10] feat: update --- Demo/Ranking/Assets/RankDemo/Ranking.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Demo/Ranking/Assets/RankDemo/Ranking.cs b/Demo/Ranking/Assets/RankDemo/Ranking.cs index 075d85b24..e8ab9823b 100644 --- a/Demo/Ranking/Assets/RankDemo/Ranking.cs +++ b/Demo/Ranking/Assets/RankDemo/Ranking.cs @@ -122,7 +122,7 @@ private void MainToTempFilePath() { success = (result) => { - Debug.Log("ToTempFilePath success:" + JsonUtility.ToJson(result)); + Debug.Log("MainCanvas ToTempFilePath success:" + JsonUtility.ToJson(result)); // Test PreviewImage WX.PreviewImage(new PreviewImageOption { @@ -130,17 +130,17 @@ private void MainToTempFilePath() showmenu = true, success = (res) => { - Debug.Log("PreviewImage success:" + JsonUtility.ToJson(result)); + Debug.Log("MainCanvas PreviewImage success:" + JsonUtility.ToJson(result)); }, fail = (res) => { - Debug.Log("PreviewImage fail:" + JsonUtility.ToJson(result)); + Debug.Log("MainCanvas PreviewImage fail:" + JsonUtility.ToJson(result)); } }); }, fail = (result) => { - Debug.Log("ToTempFilePath fail:" + JsonUtility.ToJson(result)); + Debug.Log("MainCanvas ToTempFilePath fail:" + JsonUtility.ToJson(result)); } }); } @@ -154,7 +154,7 @@ private void SharedToTempFilePath() { success = (result) => { - Debug.Log("Shared ToTempFilePath success:" + JsonUtility.ToJson(result)); + Debug.Log("SharedCanvas ToTempFilePath success:" + JsonUtility.ToJson(result)); // Test PreviewImage WX.PreviewImage(new PreviewImageOption { @@ -162,17 +162,17 @@ private void SharedToTempFilePath() showmenu = true, success = (res) => { - Debug.Log("Shared PreviewImage success:" + JsonUtility.ToJson(result)); + Debug.Log("SharedCanvas PreviewImage success:" + JsonUtility.ToJson(result)); }, fail = (res) => { - Debug.Log("Shared PreviewImage fail:" + JsonUtility.ToJson(result)); + Debug.Log("SharedCanvas PreviewImage fail:" + JsonUtility.ToJson(result)); } }); }, fail = (result) => { - Debug.Log("Shared ToTempFilePath fail:" + JsonUtility.ToJson(result)); + Debug.Log("SharedCanvas ToTempFilePath fail:" + JsonUtility.ToJson(result)); } }); } From 35b44b5f969fe3a2a71276a98cd7c240dcf89343 Mon Sep 17 00:00:00 2001 From: uhu Date: Tue, 19 Nov 2024 20:40:23 +0800 Subject: [PATCH 09/10] =?UTF-8?q?feat:=20=E9=AA=8C=E8=AF=81pre-v0.1.23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demo/Ranking/Assets/WX-WASM-SDK-V2.meta | 2 +- .../Ranking/Assets/WX-WASM-SDK-V2/Editor.meta | 8 + .../Editor/MiniGameConfig.asset | 97 ++++++++++++ .../Editor/MiniGameConfig.asset.meta | 8 + .../Assets/WX-WASM-SDK-V2/Runtime.meta | 2 +- .../WX-WASM-SDK-V2/Runtime/Plugins/link.xml | 5 + .../Runtime/Plugins/link.xml.meta | 7 + .../Runtime/wechat-default.meta | 8 + .../Runtime/wechat-default/images.meta | 8 + .../wechat-default/images/background.jpg | Bin 0 -> 8917 bytes .../wechat-default/images/background.jpg.meta | 140 ++++++++++++++++++ Demo/Ranking/Assets/WebGLTemplates.meta | 2 +- Demo/Ranking/Packages/manifest.json | 2 +- 13 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor.meta create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset.meta create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml.meta create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default.meta create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images.meta create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg create mode 100644 Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg.meta diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2.meta b/Demo/Ranking/Assets/WX-WASM-SDK-V2.meta index 4e0a8f3b5..5604e7d6c 100644 --- a/Demo/Ranking/Assets/WX-WASM-SDK-V2.meta +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: efe1d0acc4d46d24598cc7290af222cc +guid: fc7ae799303c24631b6406e5e237ed5b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor.meta b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor.meta new file mode 100644 index 000000000..cee8ec03f --- /dev/null +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86e17a6523e3a4a87bc95af92bec9d66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset new file mode 100644 index 000000000..856d43e51 --- /dev/null +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1795359250, guid: 1cf430f187a0b40eda7f668318d8be23, type: 3} + m_Name: MiniGameConfig + m_EditorClassIdentifier: + ProjectConf: + projectName: + Appid: + CDN: + assetLoadType: 1 + compressDataPackage: 0 + VideoUrl: + DST: + StreamCDN: + bundleHashLength: 32 + bundlePathIdentifier: StreamingAssets; + bundleExcludeExtensions: json; + AssetsUrl: + MemorySize: 256 + HideAfterCallMain: 1 + preloadFiles: + Orientation: 0 + bgImageSrc: Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg + dataFileSubPrefix: + maxStorage: 200 + defaultReleaseSize: 31457280 + texturesHashLength: 8 + texturesPath: Assets/Textures + needCacheTextures: 1 + loadingBarWidth: 240 + needCheckUpdate: 0 + disableHighPerformanceFallback: 0 + IOSDevicePixelRatio: 0 + SDKOptions: + UseFriendRelation: 1 + UseCompressedTexture: 0 + UseMiniGameChat: 0 + PreloadWXFont: 0 + CompileOptions: + DevelopBuild: 0 + AutoProfile: 0 + ScriptOnly: 0 + Il2CppOptimizeSize: 1 + profilingFuncs: 1 + Webgl2: 0 + fbslim: 0 + DeleteStreamingAssets: 1 + ProfilingMemory: 0 + CleanBuild: 0 + CustomNodePath: + autoAdaptScreen: 0 + showMonitorSuggestModal: 1 + enableProfileStats: 0 + enableRenderAnalysis: 0 + enablePerfAnalysis: 0 + iOSAutoGCInterval: 10000 + enableIOSPerformancePlus: 0 + brotliMT: 1 + CompressTexture: + halfSize: 0 + useDXT5: 0 + bundleSuffix: bundle + parallelWithBundle: 0 + bundleDir: + dstMinDir: + debugMode: 0 + force: 0 + PlayerPrefsKeys: [] + FontOptions: + CJK_Unified_Ideographs: 1 + C0_Controls_and_Basic_Latin: 1 + CJK_Symbols_and_Punctuation: 1 + General_Punctuation: 1 + Enclosed_CJK_Letters_and_Months: 1 + Vertical_Forms: 1 + CJK_Compatibility_Forms: 1 + Miscellaneous_Symbols: 1 + CJK_Compatibility: 1 + Halfwidth_and_Fullwidth_Forms: 1 + Dingbats: 1 + Letterlike_Symbols: 1 + Enclosed_Alphanumerics: 1 + Number_Forms: 1 + Currency_Symbols: 1 + Arrows: 1 + Geometric_Shapes: 1 + Mathematical_Operators: 1 + CustomUnicode: diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset.meta b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset.meta new file mode 100644 index 000000000..01cb006ac --- /dev/null +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d49ed1afb6a8947a58b3824107fe86ad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime.meta b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime.meta index 92f5f587a..a788fc8b4 100644 --- a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime.meta +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6283083d825b94a44a365681f601971b +guid: c0720abf4bd4f42e490fb146a70397fe folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml new file mode 100644 index 000000000..9ecd1a1be --- /dev/null +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml.meta b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml.meta new file mode 100644 index 000000000..802e2caf6 --- /dev/null +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/Plugins/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3c4b894534905418b820f2c8cc530cab +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default.meta b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default.meta new file mode 100644 index 000000000..665f30fa3 --- /dev/null +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39a35cdb766524d81b12f6a7bf1b4e5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images.meta b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images.meta new file mode 100644 index 000000000..093668db6 --- /dev/null +++ b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 216167ea9af6540e384d8890d05d15ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg b/Demo/Ranking/Assets/WX-WASM-SDK-V2/Runtime/wechat-default/images/background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9893bd55104b1becd247b63dd09b068377800663 GIT binary patch literal 8917 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 Date: Tue, 19 Nov 2024 20:48:21 +0800 Subject: [PATCH 10/10] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Design/OpenData.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Design/OpenData.md b/Design/OpenData.md index ac5079e9b..9500ecb49 100644 --- a/Design/OpenData.md +++ b/Design/OpenData.md @@ -19,8 +19,8 @@ Unity 里面要实现 sharedCanvas 的绘制，核心在于 hook Unity 的渲染 4. 在关闭排行榜的时候，停止步骤 3 的 hook； **重点更新：** -**我们在基础库3.5.5版本支持了 screenCanvas 类型的开放数据域** -* 区别：sharedCanvas 变成了在屏类型（screenCanvas），不再需要依赖游戏域循环刷新渲染 +**我们在基础库3.6.6版本支持了 ScreenCanvas 模式的开放数据域** +* 区别：sharedCanvas 变成了在屏模式（ScreenCanvas），不再需要依赖游戏域循环刷新渲染 * 好处：减少由于渲染离屏Canvas产生的干扰问题 * 如何实现： ``` CSharp @@ -228,14 +228,16 @@ WX.OnShow((OnShowCallbackResult res) => ## 常见问题QA **Q1. 为什么第一次调用 WX.ShowOpenData 之后画面先黑一下再展示排行榜？** - -A1. `WX.ShowOpenData` 在 `openDataContext.postMessage` `WXRender` 的事件之后立马就会开始 hook Unity 的渲染，如果开放数据域在监听到 `WXRender` 事件之后没有任何渲染行为，那么 sharedCanvas 纹理就还没有准备好，Unity 侧就可能出现黑一下的情况，解决办法是保证监听到 `WXRender` 事件之后有个同步的渲染行为，比如绘制个文案”好友数据加载中..."。 +- `WX.ShowOpenData` 在 `openDataContext.postMessage` `WXRender` 的事件之后立马就会开始 hook Unity 的渲染，如果开放数据域在监听到 `WXRender` 事件之后没有任何渲染行为，那么 sharedCanvas 纹理就还没有准备好，Unity 侧就可能出现黑一下的情况，解决办法是保证监听到 `WXRender` 事件之后有个同步的渲染行为，比如绘制个文案”好友数据加载中..."。 **Q2. 为什么我关闭排行榜之后界面上有些问题错乱了？** - -A2. 基本上只可能是没调用 `WX.HideOpenData`，建议 `WX.HideOpenData` 打些日志来辅佐排查。 +- 基本上只可能是没调用 `WX.HideOpenData`，建议 `WX.HideOpenData` 打些日志来辅佐排查。 **Q3. 为什么开放数据域滚动事件不生效？** -A4. `WX.ShowOpenData(rawImage.texture, x, y, width, height)`的后面四个参数，核心目的是告诉开放数据域 sharedCanvas 最终被绘制在了屏幕的位置和尺寸，开放数据域才能够正确处理事件监听，遇到事件不生效的问题，首先排查传进来的参数是否符合预期，比如 x / y 不应该是负数。 \ No newline at end of file +- `WX.ShowOpenData(rawImage.texture, x, y, width, height)`的后面四个参数，核心目的是告诉开放数据域 sharedCanvas 最终被绘制在了屏幕的位置和尺寸，开放数据域才能够正确处理事件监听，遇到事件不生效的问题，首先排查传进来的参数是否符合预期，比如 x / y 不应该是负数。 + +**Q4. 为什么使用ScreenCanvas模式之后，ToTempFilePath没有开放数据域的画面了？** + +- 因为ScreenCanvas模式的画布是浮在游戏主画布之上的，并不是同一个画布，如需保存开放数据域画面，需要使用`WXSharedCanvas.ToTempFilePath`，使用示例参考[示例](https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/tree/main/Demo/Ranking) \ No newline at end of file