From 899119f291ae287cb291ecfc449ac155c5b7911f Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Wed, 12 Mar 2025 10:50:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0wx.navigateB?= =?UTF-8?q?ackMiniProgram?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/API/Navigate/Navigate/Navigate.cs | 20 +++++++++++++++++++ .../API/Navigate/Navigate/NavigateSO.asset | 2 ++ .../Assets/API/Navigate/NavigateSO.asset | 1 + 3 files changed, 23 insertions(+) diff --git a/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs b/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs index 4207998a8..6b5dfd511 100644 --- a/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs +++ b/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs @@ -11,6 +11,7 @@ private void Start() // 绑定额外的按钮操作 GameManager.Instance.detailsController.BindExtraButtonAction(0, navigateToMiniProgram); GameManager.Instance.detailsController.BindExtraButtonAction(1, exitMiniProgram); + GameManager.Instance.detailsController.BindExtraButtonAction(2, backMiniProgram); } // 测试 API @@ -56,4 +57,23 @@ public void exitMiniProgram() { WX.ExitMiniProgram(new ExitMiniProgramOption { }); } + + public void backMiniProgram() + { + Debug.Log("触发返回到上一个小程序"); + WX.NavigateBackMiniProgram(new NavigateBackMiniProgramOption { + success = (res) => + { + Debug.Log("success: " + JsonUtility.ToJson(res)); + }, + fail = (res) => + { + Debug.Log("fail: " + JsonUtility.ToJson(res)); + }, + complete = (res) => + { + Debug.Log("complete"); + } + }); + } } diff --git a/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset b/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset index 607204e6b..208736465 100644 --- a/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset +++ b/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset @@ -21,4 +21,6 @@ MonoBehaviour: extraButtonList: - buttonText: "\u6253\u5F00\u53E6\u4E00\u4E2A\u5C0F\u7A0B\u5E8F" - buttonText: "\u9000\u51FA\u5F53\u524D\u5C0F\u7A0B\u5E8F" + - buttonText: "\u8FD4\u56DE\u5230\u4E0A\u4E00\u4E2A\u5C0F\u7A0B\u5E8F" initialResultList: [] + entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Navigate/NavigateSO.asset b/Demo/API_V2/Assets/API/Navigate/NavigateSO.asset index bee19bf91..17345f3da 100644 --- a/Demo/API_V2/Assets/API/Navigate/NavigateSO.asset +++ b/Demo/API_V2/Assets/API/Navigate/NavigateSO.asset @@ -16,4 +16,5 @@ MonoBehaviour: categorySprite: {fileID: 21300000, guid: 28238bea78eb34481998d9679ff9acc3, type: 3} entryList: - {fileID: 11400000, guid: ee0f2dd14aceb4a83a4c7c75f5c3b688, type: 2} + - {fileID: 11400000, guid: 61851e0243a1f344885a04bdaa28ee40, type: 2} categoryOrder: 1 From ab5b2a6bf9d59dce4a30ea996f42a5c531c8d5a1 Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Thu, 27 Mar 2025 11:46:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=8A=A0=E4=B8=8AshowModal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demo/API_V2/Assets/API/GUI/Interact/InteractSO.asset | 1 + Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Demo/API_V2/Assets/API/GUI/Interact/InteractSO.asset b/Demo/API_V2/Assets/API/GUI/Interact/InteractSO.asset index 1c8e32bb9..48bef4ab9 100644 --- a/Demo/API_V2/Assets/API/GUI/Interact/InteractSO.asset +++ b/Demo/API_V2/Assets/API/GUI/Interact/InteractSO.asset @@ -26,3 +26,4 @@ MonoBehaviour: - buttonText: "\u9690\u85CF\u6D88\u606F\u63D0\u793A\u6846" - buttonText: "\u9690\u85CF loading \u63D0\u793A\u6846" initialResultList: [] + entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs b/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs index 6b5dfd511..049c61d36 100644 --- a/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs +++ b/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs @@ -68,7 +68,12 @@ public void backMiniProgram() }, fail = (res) => { - Debug.Log("fail: " + JsonUtility.ToJson(res)); + WX.ShowModal( + new ShowModalOption() + { + content = "BannerAd OnLoad Result:" + JsonUtility.ToJson(res) + } + ); }, complete = (res) => { From bf49e7377bf4a988656f192359761cc5109b4f22 Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Thu, 27 Mar 2025 16:17:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=20=E6=9B=B4=E6=94=B9=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs | 2 +- Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs b/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs index 049c61d36..138e63b2a 100644 --- a/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs +++ b/Demo/API_V2/Assets/API/Navigate/Navigate/Navigate.cs @@ -71,7 +71,7 @@ public void backMiniProgram() WX.ShowModal( new ShowModalOption() { - content = "BannerAd OnLoad Result:" + JsonUtility.ToJson(res) + content = "NavigateBackMiniProgram Fail Result:" + JsonUtility.ToJson(res) } ); }, diff --git a/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset b/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset index 208736465..24f5d1ceb 100644 --- a/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset +++ b/Demo/API_V2/Assets/API/Navigate/Navigate/NavigateSO.asset @@ -14,7 +14,10 @@ MonoBehaviour: m_EditorClassIdentifier: entryScriptTypeName: Navigate entryName: "\u8DF3\u8F6C" - entryAPI: "\u8DF3\u8F6C\u76F8\u5173API" + entryAPI: 'RestartMiniProgram | NavigateToMiniProgram + + NavigateBackMiniProgram + | ExitMiniProgram' entryDescription: optionList: [] initialButtonText: "\u91CD\u542F\u5F53\u524D\u5C0F\u7A0B\u5E8F"