Skip to content

Commit 5e876f8

Browse files
VincentWSZVincentWSZ
committed
拉取主分支合并
1 parent a4e3f32 commit 5e876f8

File tree

18 files changed

+49
-56
lines changed

18 files changed

+49
-56
lines changed

‎Demo/API_V2/Assets/API/APISO.asset

+15-15
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ MonoBehaviour:
1313
m_Name: APISO
1414
m_EditorClassIdentifier:
1515
categoryList:
16-
- {fileID: 11400000, guid: 587fe4b03da9d44779ac921ffdb216a7, type: 2}
1716
- {fileID: 11400000, guid: 82450cc74b3b4439da53b9f0f2298454, type: 2}
18-
- {fileID: 11400000, guid: 24d9eba5a9b3048b59cf7e5495bb999d, type: 2}
19-
- {fileID: 11400000, guid: 9977a581037b84833a32b508e00eb1a2, type: 2}
20-
- {fileID: 11400000, guid: 56f316e0e10ba419bbf19bd7a68bfc4c, type: 2}
21-
- {fileID: 11400000, guid: 6f0972f5fdc56c543b23c9873d760bf5, type: 2}
22-
- {fileID: 11400000, guid: a461b8cd70d9e4e23ad1cc953bec31e9, type: 2}
23-
- {fileID: 11400000, guid: 7ef06699cee7846b7823e4cc421418eb, type: 2}
24-
- {fileID: 11400000, guid: 55de20d536f8c4689bbd80553d87fe46, type: 2}
25-
- {fileID: 11400000, guid: f2c56d751bb7c4c398db7c1db352517d, type: 2}
2617
- {fileID: 11400000, guid: b4a6196f623dd4435a4f3bd70af92d06, type: 2}
18+
- {fileID: 11400000, guid: 96c20c2f2bb504877a24cb359162c323, type: 2}
19+
- {fileID: 11400000, guid: a461b8cd70d9e4e23ad1cc953bec31e9, type: 2}
2720
- {fileID: 11400000, guid: 6f6fdc677ed96437eb1fa0e7e272b6d8, type: 2}
28-
- {fileID: 11400000, guid: 8c2a99491f3c0446097220cd580dfe38, type: 2}
2921
- {fileID: 11400000, guid: 59792dcce94fc48f6ab5654a02c78c6d, type: 2}
30-
- {fileID: 11400000, guid: b34629c67a7664a428561dd0b3621995, type: 2}
31-
- {fileID: 11400000, guid: b363337bfb49b490e81fbfac3612f793, type: 2}
22+
- {fileID: 11400000, guid: 9977a581037b84833a32b508e00eb1a2, type: 2}
3223
- {fileID: 11400000, guid: 2bf0b496956fe4d89af32d301c33d9a6, type: 2}
33-
- {fileID: 11400000, guid: 96c20c2f2bb504877a24cb359162c323, type: 2}
24+
- {fileID: 11400000, guid: b363337bfb49b490e81fbfac3612f793, type: 2}
25+
- {fileID: 11400000, guid: f2c56d751bb7c4c398db7c1db352517d, type: 2}
26+
- {fileID: 11400000, guid: 55de20d536f8c4689bbd80553d87fe46, type: 2}
27+
- {fileID: 11400000, guid: 6f0972f5fdc56c543b23c9873d760bf5, type: 2}
28+
- {fileID: 11400000, guid: 8c2a99491f3c0446097220cd580dfe38, type: 2}
29+
- {fileID: 11400000, guid: 56f316e0e10ba419bbf19bd7a68bfc4c, type: 2}
30+
- {fileID: 11400000, guid: 7ef06699cee7846b7823e4cc421418eb, type: 2}
31+
- {fileID: 11400000, guid: 587fe4b03da9d44779ac921ffdb216a7, type: 2}
32+
- {fileID: 11400000, guid: 24d9eba5a9b3048b59cf7e5495bb999d, type: 2}
33+
- {fileID: 11400000, guid: b34629c67a7664a428561dd0b3621995, type: 2}
3434
nativeAbilityList:
35+
- {fileID: 11400000, guid: 3ccd91abf96ad407d92ada7e93eda0a4, type: 2}
3536
- {fileID: 11400000, guid: aad449a913b0c444fb827d7f3eafad70, type: 2}
36-
- {fileID: 11400000, guid: a999a30c61ceb450ca9ec0652c439b69, type: 2}
3737
- {fileID: 11400000, guid: 90da3e9d88868495d85959bf329b7dfd, type: 2}
38+
- {fileID: 11400000, guid: a999a30c61ceb450ca9ec0652c439b69, type: 2}
3839
- {fileID: 11400000, guid: 879518ab20abe40c7b42d213d2b57bdd, type: 2}
39-
- {fileID: 11400000, guid: 3ccd91abf96ad407d92ada7e93eda0a4, type: 2}

‎Demo/API_V2/Assets/API/Base/BaseSO.asset

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ MonoBehaviour:
1616
categoryName: "\u57FA\u7840"
1717
categorySprite: {fileID: 21300000, guid: a43db3a4b5b124728be9ff9ac754f5de, type: 3}
1818
entryList:
19-
- {fileID: 11400000, guid: d21307f6da1da4d7bb1322558c508822, type: 2}
19+
- {fileID: 11400000, guid: 3996b93c3d76d47088845abcebf960fb, type: 2}
2020
- {fileID: 11400000, guid: fc015bc2bdd084428ab1dc7cf5b87fba, type: 2}
21+
- {fileID: 11400000, guid: e535490610e214b1cabe9378cb46ea5a, type: 2}
2122
- {fileID: 11400000, guid: 29b8eb105fe9d400f9a79bdb140e85c9, type: 2}
22-
- {fileID: 11400000, guid: 3996b93c3d76d47088845abcebf960fb, type: 2}
23+
- {fileID: 11400000, guid: d21307f6da1da4d7bb1322558c508822, type: 2}
2324
- {fileID: 11400000, guid: 9d4267fc1b8274349a253ca28e0340d7, type: 2}
2425
- {fileID: 11400000, guid: e6944788ab3d04858bc3c6cf1f2f7273, type: 2}
25-
- {fileID: 11400000, guid: e535490610e214b1cabe9378cb46ea5a, type: 2}
2626
categoryOrder: 0

‎Demo/API_V2/Assets/API/Facility/FacilitySO.asset

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ MonoBehaviour:
1616
categoryName: "\u8BBE\u5907"
1717
categorySprite: {fileID: 21300000, guid: 53dd2b1922e5142ec8a53037f362fc56, type: 3}
1818
entryList:
19-
- {fileID: 11400000, guid: bbbc9b983d6d34ad3bac2921509f612f, type: 2}
20-
- {fileID: 11400000, guid: c17ae0ce755f04419b700825b20fd386, type: 2}
2119
- {fileID: 11400000, guid: a24af43ae51914d26b0bf637c283dab2, type: 2}
2220
- {fileID: 11400000, guid: 4eba2c9f2f2064e4081be74302ca4c33, type: 2}
21+
- {fileID: 11400000, guid: bbbc9b983d6d34ad3bac2921509f612f, type: 2}
22+
- {fileID: 11400000, guid: c17ae0ce755f04419b700825b20fd386, type: 2}
2323
- {fileID: 11400000, guid: ac09abff5d8bc48bbabd08bde820b58b, type: 2}
2424
- {fileID: 11400000, guid: 3bf339b994c544db3860ddf0a0dc8e20, type: 2}
2525
- {fileID: 11400000, guid: e92d94924be504167a342e42e1162f21, type: 2}

‎Demo/API_V2/Assets/API/FileSystem/FileSystemSO.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ MonoBehaviour:
2525
- {fileID: 11400000, guid: 65ab1b01a722b4542a14fcf9decca3de, type: 2}
2626
- {fileID: 11400000, guid: 19b80cb144f0c4ea28a4ddca7a2c2f09, type: 2}
2727
- {fileID: 11400000, guid: 0aa5d76237c844275add1612c47bddaa, type: 2}
28-
- {fileID: 11400000, guid: 73c05fc1ffae94ec1b69a00ee261d529, type: 2}
2928
- {fileID: 11400000, guid: 65a826f5f949544d8990e673231bb80f, type: 2}
29+
- {fileID: 11400000, guid: 73c05fc1ffae94ec1b69a00ee261d529, type: 2}
3030
- {fileID: 11400000, guid: 3a901e80b59ad4aafbe373ee6a8df2d8, type: 2}
3131
- {fileID: 11400000, guid: e7ea0be62dc6543b0a8dc629489c5e7e, type: 2}
3232
categoryOrder: 11

‎Demo/API_V2/Assets/API/NativeVideo/NativeVideoSO.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ MonoBehaviour:
1616
categoryName: "\u89C6\u9891"
1717
categorySprite: {fileID: 0}
1818
entryList:
19-
- {fileID: 11400000, guid: 5073e277b29d95642abb3c49fe94eea0, type: 2}
2019
- {fileID: 11400000, guid: 27654a238f98e4f7e8756e4caed418e1, type: 2}
20+
- {fileID: 11400000, guid: 5073e277b29d95642abb3c49fe94eea0, type: 2}
2121
- {fileID: 11400000, guid: ebd496025e81f434bb6b5b487cfbf2ed, type: 2}
2222
categoryOrder: 0

‎Demo/API_V2/Assets/API/Share/Favorites/FavoritesSO.asset

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: FavoritesSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: Favorites
1615
entryName: "\u6536\u85CF\u76D1\u542C"
16+
entryOrder: 0
17+
entryScriptTypeName: Favorites
1718
entryAPI: wx.onAddToFavorites | wx.offAddToFavorites
1819
entryDescription: "\u76D1\u542C\u7528\u6237\u70B9\u51FB\u83DC\u5355\u300C\u6536\u85CF\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6\n\uFF08\u5B89\u53537.0.15\u8D77\u652F\u6301\uFF0CiOS
1920
\u6682\u4E0D\u652F\u6301\uFF09\n\u6CE8\u610F\uFF1A\u7A7A\u9009\u9879\u5219\u4F7F\u7528\u9ED8\u8BA4\u503C"
@@ -34,4 +35,3 @@ MonoBehaviour:
3435
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u6536\u85CF"
3536
extraButtonList: []
3637
initialResultList: []
37-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/ShareAppMessage/ShareAppMessageSO.asset

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareAppMessageSO
1414
m_EditorClassIdentifier:
1515
entryScriptTypeName: ShareAppMessage
@@ -37,4 +37,3 @@ MonoBehaviour:
3737
initialButtonText: "\u4E3B\u52A8\u8F6C\u53D1\u5206\u4EAB"
3838
extraButtonList: []
3939
initialResultList: []
40-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/ShareImageMenu/ShareImageMenuSO.asset

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareImageMenuSO
1414
m_EditorClassIdentifier:
1515
entryScriptTypeName: ShowShareImageMenu
@@ -31,4 +31,3 @@ MonoBehaviour:
3131
initialButtonText: "\u6253\u5F00\u5206\u4EAB\u56FE\u7247\u5F39\u7A97"
3232
extraButtonList: []
3333
initialResultList: []
34-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/ShareInfo/ShareInfoSO.asset

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareInfoSO
1414
m_EditorClassIdentifier:
1515
entryScriptTypeName: ShareInfo
@@ -21,4 +21,3 @@ MonoBehaviour:
2121
initialButtonText: "\u83B7\u53D6\u5206\u4EAB\u8BE6\u60C5"
2222
extraButtonList: []
2323
initialResultList: []
24-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/ShareMenu/ShareMenuSO.asset

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareMenuSO
1414
m_EditorClassIdentifier:
1515
entryScriptTypeName: ShareMenu
@@ -22,4 +22,3 @@ MonoBehaviour:
2222
initialButtonText: "\u663E\u793A\u8F6C\u53D1\u6309\u94AE"
2323
extraButtonList: []
2424
initialResultList: []
25-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/ShareSO.asset

+1-10
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,5 @@ MonoBehaviour:
1515
isNative: 0
1616
categoryName: "\u8F6C\u53D1"
1717
categorySprite: {fileID: 21300000, guid: fcb0815b78313407ba299719f527350d, type: 3}
18-
entryList:
19-
- {fileID: 11400000, guid: 4bdaaff4820c8eb4e9de6e076f490ab0, type: 2}
20-
- {fileID: 11400000, guid: c8002e7d2e031d045a8f350dbea866b0, type: 2}
21-
- {fileID: 11400000, guid: 38157a28d0b1af140aa9247a67207552, type: 2}
22-
- {fileID: 11400000, guid: f854158c3e3d7c646a22ba9e8a6f3b43, type: 2}
23-
- {fileID: 11400000, guid: 82f8461435201ae4b8a61a442878e16b, type: 2}
24-
- {fileID: 11400000, guid: 2ba9a02a26c73e048b5307d234540ade, type: 2}
25-
- {fileID: 11400000, guid: d9ee7e215d0456b488d2a691988d3377, type: 2}
26-
- {fileID: 11400000, guid: 67f658e249949454a9336842877eacb2, type: 2}
27-
- {fileID: 11400000, guid: 6ad02ddcd43d7e5439afe0b165d92460, type: 2}
18+
entryList: []
2819
categoryOrder: 2

‎Demo/API_V2/Assets/API/Share/ShareTimeline/ShareTimelineSO.asset

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: ShareTimelineSO
1414
m_EditorClassIdentifier:
1515
entryScriptTypeName: ShareTimeline
@@ -42,4 +42,3 @@ MonoBehaviour:
4242
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u5206\u4EAB\u5230\u670B\u53CB\u5708"
4343
extraButtonList: []
4444
initialResultList: []
45-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/linkHand/linkHandSO.asset

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: linkHandSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: linkHand
1615
entryName: "\u76D1\u542C\u590D\u5236\u94FE\u63A5"
16+
entryOrder: 0
17+
entryScriptTypeName: linkHand
1718
entryAPI: wx.onCopyUrl | wx.offCopyUrl
1819
entryDescription: "\u76D1\u542C\u7528\u6237\u70B9\u51FB\u53F3\u4E0A\u89D2\u83DC\u5355\u7684\u300C\u590D\u5236\u94FE\u63A5\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6\u3002\n\u672C\u63A5\u53E3\u4E3A
1920
Beta \u7248\u672C\uFF0C\u6682\u53EA\u5728 Android \u5E73\u53F0\u652F\u6301\u3002"
2021
optionList: []
2122
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u590D\u5236\u94FE\u63A5"
2223
extraButtonList: []
2324
initialResultList: []
24-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/linkHand/linkHandSO.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo/API_V2/Assets/API/Share/onPcHand/onPcHandSO.asset

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: onPcHandSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: onPcHand
1615
entryName: "\u76D1\u542C\u5728\u7535\u8111\u4E0A\u6253\u5F00"
16+
entryOrder: 0
17+
entryScriptTypeName: onPcHand
1718
entryAPI: wx.onHandoff | wx.offHandoff |wx.setHandoffQuery
1819
entryDescription: "\u76D1\u542C\u7528\u6237\u70B9\u51FB\u83DC\u5355\u300C\u5728\u7535\u8111\u4E0A\u6253\u5F00\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6"
1920
optionList: []
2021
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u5728\u7535\u8111\u4E0A\u6253\u5F00"
2122
extraButtonList:
2223
- buttonText: "\u8BBE\u7F6E\u63A5\u529B\u53C2\u6570"
2324
initialResultList: []
24-
entryOrder: 0

‎Demo/API_V2/Assets/API/Share/onPcHand/onPcHandSO.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo/API_V2/Assets/API/Share/onShareAppMessage/onShareAppMessageSO.asset

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: onShareAppMessageSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: onShareAppMessage
1615
entryName: "\u76D1\u542C\u8F6C\u53D1"
16+
entryOrder: 0
17+
entryScriptTypeName: onShareAppMessage
1718
entryAPI: onShareAppMessage
1819
entryDescription: "\u76D1\u542C\u7528\u6237\u70B9\u51FB\u53F3\u4E0A\u89D2\u83DC\u5355\u7684\u300C\u8F6C\u53D1\u300D\u6309\u94AE\u65F6\u89E6\u53D1\u7684\u4E8B\u4EF6\n\u88AB\u52A8\u8F6C\u53D1\uFF0C\u53EF\u901A\u8FC7\u8FD4\u56DE\u81EA\u5B9A\u4E49\u8F6C\u53D1\u53C2\u6570\u6765\u4FEE\u6539\u8F6C\u53D1\u5361\u7247\u7684\u5185\u5BB9\uFF0C\u5426\u5219\u4F7F\u7528\u9ED8\u8BA4\u5185\u5BB9\u3002"
1920
optionList: []
2021
initialButtonText: "\u5F00\u59CB\u76D1\u542C\u8F6C\u53D1"
2122
extraButtonList: []
2223
initialResultList: []
23-
entryOrder: 0

‎Demo/API_V2/Assets/Scripts/DetailsEntry/Details.cs

+7
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ protected string GetOptionString(int optionIndex, string defaultValue = "")
5555
}
5656
return defaultValue;
5757
}
58+
//获得选项Bool类型值
59+
protected bool GetOptionBool(int optionIndex, bool defaultValue)
60+
{
61+
return options != null && optionIndex < options.Length && bool.TryParse(options[optionIndex], out bool value)
62+
? value
63+
: defaultValue;
64+
}
5865
// 打印当前选项的值
5966
protected void LogCurrentOptions()
6067
{

0 commit comments

Comments
 (0)