Skip to content

Commit 8ce25f2

Browse files
authored
Merge pull request #972 from xiashanabc/feat-v-shanxia
feat:添加wx.navigateBackMiniProgram
2 parents 037432e + bf49e73 commit 8ce25f2

File tree

4 files changed

+33
-1
lines changed

4 files changed

+33
-1
lines changed

Demo/API_V2/Assets/API/GUI/Interact/InteractSO.asset

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ MonoBehaviour:
2626
- buttonText: "\u9690\u85CF\u6D88\u606F\u63D0\u793A\u6846"
2727
- buttonText: "\u9690\u85CF loading \u63D0\u793A\u6846"
2828
initialResultList: []
29+
entryOrder: 0

Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs

+25
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ private void Start()
1111
// 绑定额外的按钮操作
1212
GameManager.Instance.detailsController.BindExtraButtonAction(0, navigateToMiniProgram);
1313
GameManager.Instance.detailsController.BindExtraButtonAction(1, exitMiniProgram);
14+
GameManager.Instance.detailsController.BindExtraButtonAction(2, backMiniProgram);
1415
}
1516

1617
// 测试 API
@@ -56,4 +57,28 @@ public void exitMiniProgram()
5657
{
5758
WX.ExitMiniProgram(new ExitMiniProgramOption { });
5859
}
60+
61+
public void backMiniProgram()
62+
{
63+
Debug.Log("触发返回到上一个小程序");
64+
WX.NavigateBackMiniProgram(new NavigateBackMiniProgramOption {
65+
success = (res) =>
66+
{
67+
Debug.Log("success: " + JsonUtility.ToJson(res));
68+
},
69+
fail = (res) =>
70+
{
71+
WX.ShowModal(
72+
new ShowModalOption()
73+
{
74+
content = "NavigateBackMiniProgram Fail Result:" + JsonUtility.ToJson(res)
75+
}
76+
);
77+
},
78+
complete = (res) =>
79+
{
80+
Debug.Log("complete");
81+
}
82+
});
83+
}
5984
}

Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
entryScriptTypeName: Navigate
1616
entryName: "\u8DF3\u8F6C"
17-
entryAPI: "\u8DF3\u8F6C\u76F8\u5173API"
17+
entryAPI: 'RestartMiniProgram | NavigateToMiniProgram
18+
19+
NavigateBackMiniProgram
20+
| ExitMiniProgram'
1821
entryDescription:
1922
optionList: []
2023
initialButtonText: "\u91CD\u542F\u5F53\u524D\u5C0F\u7A0B\u5E8F"
2124
extraButtonList:
2225
- buttonText: "\u6253\u5F00\u53E6\u4E00\u4E2A\u5C0F\u7A0B\u5E8F"
2326
- buttonText: "\u9000\u51FA\u5F53\u524D\u5C0F\u7A0B\u5E8F"
27+
- buttonText: "\u8FD4\u56DE\u5230\u4E0A\u4E00\u4E2A\u5C0F\u7A0B\u5E8F"
2428
initialResultList: []
29+
entryOrder: 0

Demo/API_V2/Assets/API/Navigate/NavigateSO.asset

+1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ MonoBehaviour:
1616
categorySprite: {fileID: 21300000, guid: 28238bea78eb34481998d9679ff9acc3, type: 3}
1717
entryList:
1818
- {fileID: 11400000, guid: ee0f2dd14aceb4a83a4c7c75f5c3b688, type: 2}
19+
- {fileID: 11400000, guid: 61851e0243a1f344885a04bdaa28ee40, type: 2}
1920
categoryOrder: 1

0 commit comments

Comments
 (0)