Skip to content

Commit 16b7810

Browse files
author
uhu
committed
feat: screenCanvas rank
1 parent 9290bb0 commit 16b7810

File tree

2 files changed

+250
-12
lines changed

2 files changed

+250
-12
lines changed

‎Demo/Ranking/Assets/RankDemo/Rank.unity

Lines changed: 209 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 705507994}
41+
m_IndirectSpecularColor: {r: 0.4465788, g: 0.49641287, b: 0.5748173, a: 1}
4142
m_UseRadianceAmbientProbe: 0
4243
--- !u!157 &3
4344
LightmapSettings:
@@ -866,7 +867,7 @@ GameObject:
866867
- component: {fileID: 550236650}
867868
- component: {fileID: 550236649}
868869
m_Layer: 5
869-
m_Name: TestButton
870+
m_Name: TestButtonMainCanvas
870871
m_TagString: Untagged
871872
m_Icon: {fileID: 0}
872873
m_NavMeshLayer: 0
@@ -889,7 +890,7 @@ RectTransform:
889890
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
890891
m_AnchorMin: {x: 0.5, y: 0.5}
891892
m_AnchorMax: {x: 0.5, y: 0.5}
892-
m_AnchoredPosition: {x: 108.62, y: -323}
893+
m_AnchoredPosition: {x: 108.62, y: -298}
893894
m_SizeDelta: {x: 160, y: 30}
894895
m_Pivot: {x: 0.5, y: 0.5}
895896
--- !u!114 &550236649
@@ -1080,7 +1081,7 @@ MonoBehaviour:
10801081
m_HorizontalOverflow: 0
10811082
m_VerticalOverflow: 0
10821083
m_LineSpacing: 1
1083-
m_Text: ToTempFilePath
1084+
m_Text: MainToTempFilePath
10841085
--- !u!222 &702804048
10851086
CanvasRenderer:
10861087
m_ObjectHideFlags: 0
@@ -1508,8 +1509,9 @@ MonoBehaviour:
15081509
ShowButton: {fileID: 1373867584}
15091510
ShareButton: {fileID: 703078934}
15101511
ReportButton: {fileID: 58727542}
1511-
TestBeforeButton: {fileID: 1466692414}
1512-
TestAfterButton: {fileID: 550236649}
1512+
TestMainButton: {fileID: 1466692414}
1513+
TestMainWithSharedButton: {fileID: 550236649}
1514+
TestSharedButton: {fileID: 2004334518}
15131515
RankBody: {fileID: 160375843}
15141516
RankMask: {fileID: 325200747}
15151517
RankingBox: {fileID: 1471959976}
@@ -2418,7 +2420,7 @@ GameObject:
24182420
- component: {fileID: 1466692415}
24192421
- component: {fileID: 1466692414}
24202422
m_Layer: 5
2421-
m_Name: TestButton
2423+
m_Name: MainCanvasTestButton
24222424
m_TagString: Untagged
24232425
m_Icon: {fileID: 0}
24242426
m_NavMeshLayer: 0
@@ -2560,6 +2562,7 @@ RectTransform:
25602562
- {fileID: 160375842}
25612563
- {fileID: 703078933}
25622564
- {fileID: 550236648}
2565+
- {fileID: 2004334517}
25632566
m_Father: {fileID: 748550736}
25642567
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
25652568
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2742,6 +2745,85 @@ RectTransform:
27422745
m_AnchoredPosition: {x: 0, y: 0}
27432746
m_SizeDelta: {x: 0, y: 48}
27442747
m_Pivot: {x: 0.5, y: 1}
2748+
--- !u!1 &1649957660
2749+
GameObject:
2750+
m_ObjectHideFlags: 0
2751+
m_CorrespondingSourceObject: {fileID: 0}
2752+
m_PrefabInstance: {fileID: 0}
2753+
m_PrefabAsset: {fileID: 0}
2754+
serializedVersion: 6
2755+
m_Component:
2756+
- component: {fileID: 1649957661}
2757+
- component: {fileID: 1649957663}
2758+
- component: {fileID: 1649957662}
2759+
m_Layer: 5
2760+
m_Name: Text (Legacy)
2761+
m_TagString: Untagged
2762+
m_Icon: {fileID: 0}
2763+
m_NavMeshLayer: 0
2764+
m_StaticEditorFlags: 0
2765+
m_IsActive: 1
2766+
--- !u!224 &1649957661
2767+
RectTransform:
2768+
m_ObjectHideFlags: 0
2769+
m_CorrespondingSourceObject: {fileID: 0}
2770+
m_PrefabInstance: {fileID: 0}
2771+
m_PrefabAsset: {fileID: 0}
2772+
m_GameObject: {fileID: 1649957660}
2773+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
2774+
m_LocalPosition: {x: 0, y: 0, z: 0}
2775+
m_LocalScale: {x: 1, y: 1, z: 1}
2776+
m_ConstrainProportionsScale: 0
2777+
m_Children: []
2778+
m_Father: {fileID: 2004334517}
2779+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2780+
m_AnchorMin: {x: 0, y: 0}
2781+
m_AnchorMax: {x: 1, y: 1}
2782+
m_AnchoredPosition: {x: 0, y: 0}
2783+
m_SizeDelta: {x: 0, y: 0}
2784+
m_Pivot: {x: 0.5, y: 0.5}
2785+
--- !u!114 &1649957662
2786+
MonoBehaviour:
2787+
m_ObjectHideFlags: 0
2788+
m_CorrespondingSourceObject: {fileID: 0}
2789+
m_PrefabInstance: {fileID: 0}
2790+
m_PrefabAsset: {fileID: 0}
2791+
m_GameObject: {fileID: 1649957660}
2792+
m_Enabled: 1
2793+
m_EditorHideFlags: 0
2794+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
2795+
m_Name:
2796+
m_EditorClassIdentifier:
2797+
m_Material: {fileID: 0}
2798+
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
2799+
m_RaycastTarget: 1
2800+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
2801+
m_Maskable: 1
2802+
m_OnCullStateChanged:
2803+
m_PersistentCalls:
2804+
m_Calls: []
2805+
m_FontData:
2806+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
2807+
m_FontSize: 14
2808+
m_FontStyle: 0
2809+
m_BestFit: 0
2810+
m_MinSize: 10
2811+
m_MaxSize: 40
2812+
m_Alignment: 4
2813+
m_AlignByGeometry: 0
2814+
m_RichText: 1
2815+
m_HorizontalOverflow: 0
2816+
m_VerticalOverflow: 0
2817+
m_LineSpacing: 1
2818+
m_Text: SharedToTempFilePath
2819+
--- !u!222 &1649957663
2820+
CanvasRenderer:
2821+
m_ObjectHideFlags: 0
2822+
m_CorrespondingSourceObject: {fileID: 0}
2823+
m_PrefabInstance: {fileID: 0}
2824+
m_PrefabAsset: {fileID: 0}
2825+
m_GameObject: {fileID: 1649957660}
2826+
m_CullTransparentMesh: 1
27452827
--- !u!1 &1701958142
27462828
GameObject:
27472829
m_ObjectHideFlags: 0
@@ -2960,6 +3042,127 @@ Transform:
29603042
m_Children: []
29613043
m_Father: {fileID: 0}
29623044
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3045+
--- !u!1 &2004334516
3046+
GameObject:
3047+
m_ObjectHideFlags: 0
3048+
m_CorrespondingSourceObject: {fileID: 0}
3049+
m_PrefabInstance: {fileID: 0}
3050+
m_PrefabAsset: {fileID: 0}
3051+
serializedVersion: 6
3052+
m_Component:
3053+
- component: {fileID: 2004334517}
3054+
- component: {fileID: 2004334520}
3055+
- component: {fileID: 2004334519}
3056+
- component: {fileID: 2004334518}
3057+
m_Layer: 5
3058+
m_Name: TestButtonSharedCanvas
3059+
m_TagString: Untagged
3060+
m_Icon: {fileID: 0}
3061+
m_NavMeshLayer: 0
3062+
m_StaticEditorFlags: 0
3063+
m_IsActive: 1
3064+
--- !u!224 &2004334517
3065+
RectTransform:
3066+
m_ObjectHideFlags: 0
3067+
m_CorrespondingSourceObject: {fileID: 0}
3068+
m_PrefabInstance: {fileID: 0}
3069+
m_PrefabAsset: {fileID: 0}
3070+
m_GameObject: {fileID: 2004334516}
3071+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3072+
m_LocalPosition: {x: 0, y: 0, z: 0}
3073+
m_LocalScale: {x: 1, y: 1, z: 1}
3074+
m_ConstrainProportionsScale: 0
3075+
m_Children:
3076+
- {fileID: 1649957661}
3077+
m_Father: {fileID: 1471959977}
3078+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3079+
m_AnchorMin: {x: 0.5, y: 0.5}
3080+
m_AnchorMax: {x: 0.5, y: 0.5}
3081+
m_AnchoredPosition: {x: 108.62, y: -341.8}
3082+
m_SizeDelta: {x: 160, y: 30}
3083+
m_Pivot: {x: 0.5, y: 0.5}
3084+
--- !u!114 &2004334518
3085+
MonoBehaviour:
3086+
m_ObjectHideFlags: 0
3087+
m_CorrespondingSourceObject: {fileID: 0}
3088+
m_PrefabInstance: {fileID: 0}
3089+
m_PrefabAsset: {fileID: 0}
3090+
m_GameObject: {fileID: 2004334516}
3091+
m_Enabled: 1
3092+
m_EditorHideFlags: 0
3093+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
3094+
m_Name:
3095+
m_EditorClassIdentifier:
3096+
m_Navigation:
3097+
m_Mode: 3
3098+
m_WrapAround: 0
3099+
m_SelectOnUp: {fileID: 0}
3100+
m_SelectOnDown: {fileID: 0}
3101+
m_SelectOnLeft: {fileID: 0}
3102+
m_SelectOnRight: {fileID: 0}
3103+
m_Transition: 1
3104+
m_Colors:
3105+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
3106+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
3107+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
3108+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
3109+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
3110+
m_ColorMultiplier: 1
3111+
m_FadeDuration: 0.1
3112+
m_SpriteState:
3113+
m_HighlightedSprite: {fileID: 0}
3114+
m_PressedSprite: {fileID: 0}
3115+
m_SelectedSprite: {fileID: 0}
3116+
m_DisabledSprite: {fileID: 0}
3117+
m_AnimationTriggers:
3118+
m_NormalTrigger: Normal
3119+
m_HighlightedTrigger: Highlighted
3120+
m_PressedTrigger: Pressed
3121+
m_SelectedTrigger: Selected
3122+
m_DisabledTrigger: Disabled
3123+
m_Interactable: 1
3124+
m_TargetGraphic: {fileID: 2004334519}
3125+
m_OnClick:
3126+
m_PersistentCalls:
3127+
m_Calls: []
3128+
--- !u!114 &2004334519
3129+
MonoBehaviour:
3130+
m_ObjectHideFlags: 0
3131+
m_CorrespondingSourceObject: {fileID: 0}
3132+
m_PrefabInstance: {fileID: 0}
3133+
m_PrefabAsset: {fileID: 0}
3134+
m_GameObject: {fileID: 2004334516}
3135+
m_Enabled: 1
3136+
m_EditorHideFlags: 0
3137+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
3138+
m_Name:
3139+
m_EditorClassIdentifier:
3140+
m_Material: {fileID: 0}
3141+
m_Color: {r: 1, g: 1, b: 1, a: 1}
3142+
m_RaycastTarget: 1
3143+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
3144+
m_Maskable: 1
3145+
m_OnCullStateChanged:
3146+
m_PersistentCalls:
3147+
m_Calls: []
3148+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
3149+
m_Type: 1
3150+
m_PreserveAspect: 0
3151+
m_FillCenter: 1
3152+
m_FillMethod: 4
3153+
m_FillAmount: 1
3154+
m_FillClockwise: 1
3155+
m_FillOrigin: 0
3156+
m_UseSpriteMesh: 0
3157+
m_PixelsPerUnitMultiplier: 1
3158+
--- !u!222 &2004334520
3159+
CanvasRenderer:
3160+
m_ObjectHideFlags: 0
3161+
m_CorrespondingSourceObject: {fileID: 0}
3162+
m_PrefabInstance: {fileID: 0}
3163+
m_PrefabAsset: {fileID: 0}
3164+
m_GameObject: {fileID: 2004334516}
3165+
m_CullTransparentMesh: 1
29633166
--- !u!850595691 &2016446073
29643167
LightingSettings:
29653168
m_ObjectHideFlags: 0

‎Demo/Ranking/Assets/RankDemo/Ranking.cs

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ public class Ranking : MonoBehaviour
2424
public Button ShowButton;
2525
public Button ShareButton;
2626
public Button ReportButton;
27-
public Button TestBeforeButton;
28-
public Button TestAfterButton;
27+
public Button TestMainButton; // 测试只有MainCanvas
28+
public Button TestMainWithSharedButton; // 测试MainCanvas和SharedCanvas一起
29+
public Button TestSharedButton; // 测试只有SharedCanvas
2930
public RawImage RankBody;
3031
public GameObject RankMask;
3132
public GameObject RankingBox;
@@ -112,10 +113,11 @@ void ShowOpenData()
112113
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));
113114
}
114115

115-
private void TestToTempFilePath()
116+
// 测试MainCanvas导出图片
117+
private void MainToTempFilePath()
116118
{
117119
var info = WX.GetSystemInfoSync();
118-
// Test ToTempFilePath
120+
Debug.Log("Test MainCanvas ToTempFilePath");
119121
WXCanvas.ToTempFilePath(new WXToTempFilePathParam()
120122
{
121123
success = (result) =>
@@ -143,6 +145,38 @@ private void TestToTempFilePath()
143145
});
144146
}
145147

148+
// 测试SharedCanvas导出图片
149+
private void SharedToTempFilePath()
150+
{
151+
var info = WX.GetSystemInfoSync();
152+
Debug.Log("Test SharedCanvas ToTempFilePath");
153+
WXSharedCanvas.ToTempFilePath(new WXToTempFilePathParam()
154+
{
155+
success = (result) =>
156+
{
157+
Debug.Log("ToTempFilePath success:" + JsonUtility.ToJson(result));
158+
// Test PreviewImage
159+
WX.PreviewImage(new PreviewImageOption
160+
{
161+
urls = new string[] {result.tempFilePath},
162+
showmenu = true,
163+
success = (res) =>
164+
{
165+
Debug.Log("PreviewImage success:" + JsonUtility.ToJson(result));
166+
},
167+
fail = (res) =>
168+
{
169+
Debug.Log("PreviewImage fail:" + JsonUtility.ToJson(result));
170+
}
171+
});
172+
},
173+
fail = (result) =>
174+
{
175+
Debug.Log("ToTempFilePath fail:" + JsonUtility.ToJson(result));
176+
}
177+
});
178+
}
179+
146180
void Init()
147181
{
148182
CanvasDropdown.onValueChanged.AddListener((int selectedIndex) =>
@@ -194,7 +228,8 @@ void Init()
194228
});
195229

196230
InitButton.onClick.AddListener(InitOpenDataContext);
197-
TestBeforeButton.onClick.AddListener(TestToTempFilePath);
198-
TestAfterButton.onClick.AddListener(TestToTempFilePath);
231+
TestMainButton.onClick.AddListener(MainToTempFilePath);
232+
TestMainWithSharedButton.onClick.AddListener(MainToTempFilePath);
233+
TestSharedButton.onClick.AddListener(SharedToTempFilePath);
199234
}
200235
}

0 commit comments

Comments
 (0)