From 074f914bbeb02984928c9d8c0dce025cda03a7ed Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Thu, 20 Mar 2025 14:56:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E7=94=9F=E5=91=BD=E5=91=A8?= =?UTF-8?q?=E6=9C=9F=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset index 8f95785fc..52918644a 100644 --- a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset +++ b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset @@ -16,10 +16,14 @@ MonoBehaviour: entryName: "\u751F\u547D\u5468\u671F" entryAPI: 'onHide | onShow - offHIde | offHide' - entryDescription: + offHide | offShow' + entryDescription: "onHide\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u9690\u85CF\u5230\u540E\u53F0\nonShow\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u56DE\u5230\u524D\u53F0\u7684\u4E8B\u4EF6\noffHide + / offShow : \u79FB\u9664\u76D1\u542C" optionList: [] initialButtonText: "\u5F00\u59CB\u76D1\u542C" extraButtonList: [] - initialResultList: [] + initialResultList: + - isDisableInitially: 0 + initialTitleText: + initialContentText: entryOrder: 2 From 02a8b5b941078244b0039a4acf3d76783f3da3cb Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Mon, 28 Apr 2025 17:27:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E5=91=BD=E5=91=A8=E6=9C=9F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=9F=B3?= =?UTF-8?q?=E9=A2=91=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/API/Base/LifeCycle/LifeCycle.cs | 32 +++++++++++++++++-- .../API/Base/LifeCycle/LifeCycleSO.asset | 14 ++++---- Demo/API_V2/Assets/API/Media/InnerAudio.meta | 8 +++++ .../Assets/API/Media/InnerAudio/InnerAudio.cs | 22 +++++++++++++ .../API/Media/InnerAudio/InnerAudio.cs.meta | 11 +++++++ .../API/Media/InnerAudio/InnerAudioSO.asset | 23 +++++++++++++ .../Media/InnerAudio/InnerAudioSO.asset.meta | 8 +++++ 7 files changed, 109 insertions(+), 9 deletions(-) create mode 100644 Demo/API_V2/Assets/API/Media/InnerAudio.meta create mode 100644 Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs create mode 100644 Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs.meta create mode 100644 Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset create mode 100644 Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta diff --git a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycle.cs b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycle.cs index 932e63af7..2ed34325f 100644 --- a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycle.cs +++ b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycle.cs @@ -6,11 +6,17 @@ public class LifeCycle : Details { + private void Start() + { + // 绑定额外的按钮操作 + GameManager.Instance.detailsController.BindExtraButtonAction(0, getLaunchOptionsSync); + GameManager.Instance.detailsController.BindExtraButtonAction(1, getEnterOptionsSync); + } private bool _isListening = false; private readonly Action _onShow = (res) => { - var result = "onShow\n" + JsonMapper.ToJson(res); + var result = "OnShow\n" + JsonMapper.ToJson(res); GameManager.Instance.detailsController.AddResult( new ResultData() { initialContentText = result } ); @@ -18,12 +24,13 @@ public class LifeCycle : Details private readonly Action _onHide = (res) => { - var result = "onHide\n" + JsonMapper.ToJson(res); + var result = "OnHide\n" + JsonMapper.ToJson(res); GameManager.Instance.detailsController.AddResult( new ResultData() { initialContentText = result } ); }; + // 测试 API protected override void TestAPI(string[] args) { @@ -39,8 +46,27 @@ protected override void TestAPI(string[] args) } _isListening = !_isListening; GameManager.Instance.detailsController.ChangeInitialButtonText( - _isListening ? "取消监听" : "开始监听" + _isListening ? "取消监听hide/show事件" : "开始监听hide/show事件" + ); + } + + public void getLaunchOptionsSync() + { + var LaunchOptionsSync = WX.GetLaunchOptionsSync(); + var result = "GetLaunchOptionsSync\n" + JsonMapper.ToJson(LaunchOptionsSync); + GameManager.Instance.detailsController.AddResult( + new ResultData() { initialContentText = result } + ); + } + + public void getEnterOptionsSync() + { + var EnterOptionsSync = WX.GetEnterOptionsSync(); + var result = "GetEnterOptionsSync\n" + JsonMapper.ToJson(EnterOptionsSync); + GameManager.Instance.detailsController.AddResult( + new ResultData() { initialContentText = result } ); + } private void OnDestroy() diff --git a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset index 52918644a..db13ee015 100644 --- a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset +++ b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset @@ -14,14 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: entryScriptTypeName: LifeCycle entryName: "\u751F\u547D\u5468\u671F" - entryAPI: 'onHide | onShow + entryAPI: 'OnHide | OnShow - offHide | offShow' - entryDescription: "onHide\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u9690\u85CF\u5230\u540E\u53F0\nonShow\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u56DE\u5230\u524D\u53F0\u7684\u4E8B\u4EF6\noffHide - / offShow : \u79FB\u9664\u76D1\u542C" + OffHide | OffShow' + entryDescription: "OnHide\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u9690\u85CF\u5230\u540E\u53F0\nOnShow\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u56DE\u5230\u524D\u53F0\u7684\u4E8B\u4EF6\nOffHide + / OffShow : \u79FB\u9664\u76D1\u542C" optionList: [] - initialButtonText: "\u5F00\u59CB\u76D1\u542C" - extraButtonList: [] + initialButtonText: "\u5F00\u59CB\u76D1\u542Chide/show\u4E8B\u4EF6" + extraButtonList: + - buttonText: "\u83B7\u53D6\u5C0F\u6E38\u620F\u51B7\u542F\u52A8\u53C2\u6570" + - buttonText: "\u83B7\u53D6\u5C0F\u6E38\u620F\u6253\u5F00\u7684\u53C2\u6570" initialResultList: - isDisableInitially: 0 initialTitleText: diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio.meta b/Demo/API_V2/Assets/API/Media/InnerAudio.meta new file mode 100644 index 000000000..e8f6b36b4 --- /dev/null +++ b/Demo/API_V2/Assets/API/Media/InnerAudio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd9da7ec11585544998b4c9e6e9433f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs new file mode 100644 index 000000000..af9865914 --- /dev/null +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using LitJson; +using UnityEngine; +using WeChatWASM; + +public class InnerAudio : Details +{ + protected override void TestAPI(string[] args) + { + var music = WX.CreateInnerAudioContext(new InnerAudioContextParam() { + src = "https://res.wx.qq.com/wechatgame/product/webpack/userupload/20220901/211827/CallMeTeenTop.mp3", + needDownload = true //表示等下载完之后再播放，便于后续复用，无延迟 + }); + music.OnCanplay(() => + { + Debug.Log("OnCanplay"); + music.Play(); + }); + } + +} diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs.meta b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs.meta new file mode 100644 index 000000000..22aa981e5 --- /dev/null +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d34440f857f826341a067af6e2496220 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset new file mode 100644 index 000000000..050392c9c --- /dev/null +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset @@ -0,0 +1,23 @@ +%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: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3} + m_Name: InnerAudioSO + m_EditorClassIdentifier: + entryScriptTypeName: InnerAudio + entryName: "\u97F3\u9891\u793A\u4F8B" + entryAPI: + entryDescription: + optionList: [] + initialButtonText: "\u64AD\u653E\u97F3\u9891" + extraButtonList: [] + initialResultList: [] + entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta new file mode 100644 index 000000000..5a34091e8 --- /dev/null +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fc3a7d7719412264b914d0ae6e094405 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From 29168e94528c58b26fad99e65fbf37a07cec445a Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Wed, 30 Apr 2025 09:55:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=EF=BC=9A=E9=9F=B3=E9=A2=91=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/API/Media/InnerAudio/InnerAudio.cs | 41 +- .../API/Media/InnerAudio/InnerAudioSO.asset | 5 +- Demo/API_V2/Assets/API/Media/MediaSO.asset | 1 + Demo/API_V2/Assets/Scenes/MainScene.unity | 406 +++++++++++++++++- 4 files changed, 449 insertions(+), 4 deletions(-) diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs index af9865914..450df442c 100644 --- a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudio.cs @@ -6,9 +6,18 @@ public class InnerAudio : Details { + WXInnerAudioContext music; + private void Start() + { + // 绑定额外的按钮操作 + GameManager.Instance.detailsController.BindExtraButtonAction(0, pause); + GameManager.Instance.detailsController.BindExtraButtonAction(1, stop); + GameManager.Instance.detailsController.BindExtraButtonAction(2, seek); + } + protected override void TestAPI(string[] args) { - var music = WX.CreateInnerAudioContext(new InnerAudioContextParam() { + music = WX.CreateInnerAudioContext(new InnerAudioContextParam() { src = "https://res.wx.qq.com/wechatgame/product/webpack/userupload/20220901/211827/CallMeTeenTop.mp3", needDownload = true //表示等下载完之后再播放，便于后续复用，无延迟 }); @@ -19,4 +28,34 @@ protected override void TestAPI(string[] args) }); } + + //暂停 + public void pause() + { + Debug.Log("pause"); + music.Pause(); + } + + //停止 + public void stop() + { + Debug.Log("stop"); + music.Stop(); + + } + + //跳转 + public void seek() + { + + Debug.Log("seek"); + music.Seek(3); + } + + private void OnDestroy() + { + Debug.Log("音频示例 OnDestroy"); + music.Stop(); + music.Destroy(); + } } diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset index 050392c9c..ec605c3ad 100644 --- a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset @@ -18,6 +18,9 @@ MonoBehaviour: entryDescription: optionList: [] initialButtonText: "\u64AD\u653E\u97F3\u9891" - extraButtonList: [] + extraButtonList: + - buttonText: "\u6682\u505C" + - buttonText: "\u505C\u6B62" + - buttonText: "\u8DF3\u8F6C" initialResultList: [] entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Media/MediaSO.asset b/Demo/API_V2/Assets/API/Media/MediaSO.asset index c6e6694dd..60d978475 100644 --- a/Demo/API_V2/Assets/API/Media/MediaSO.asset +++ b/Demo/API_V2/Assets/API/Media/MediaSO.asset @@ -16,6 +16,7 @@ MonoBehaviour: categorySprite: {fileID: 21300000, guid: 10009e080ceca4d88b96fcdff0749dfc, type: 3} entryList: - {fileID: 11400000, guid: 1d998af43281d4eee9e1effc8f83bddd, type: 2} + - {fileID: 11400000, guid: fc3a7d7719412264b914d0ae6e094405, type: 2} - {fileID: 11400000, guid: 1055cfc5cdda7407298fa2ff9997d0c6, type: 2} - {fileID: 11400000, guid: 480646e3cd4d6a948a7538d483c1b043, type: 2} - {fileID: 11400000, guid: ad04526c3748b4e2b8498f998dfea973, type: 2} diff --git a/Demo/API_V2/Assets/Scenes/MainScene.unity b/Demo/API_V2/Assets/Scenes/MainScene.unity index d18cd8efe..56bab7b44 100644 --- a/Demo/API_V2/Assets/Scenes/MainScene.unity +++ b/Demo/API_V2/Assets/Scenes/MainScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 170076734} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.574817, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -4887,6 +4887,7 @@ RectTransform: - {fileID: 1619215845} - {fileID: 810224146} - {fileID: 1043534569} + - {fileID: 1155040624} - {fileID: 266783340} - {fileID: 92764133} m_Father: {fileID: 20006571} @@ -6110,7 +6111,7 @@ LightingSettings: m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 1 - m_BakeBackend: 2 + m_BakeBackend: 1 m_LightmapMaxSize: 512 m_BakeResolution: 10 m_Padding: 2 @@ -16236,6 +16237,81 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &760341326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 760341327} + - component: {fileID: 760341329} + - component: {fileID: 760341328} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &760341327 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760341326} + 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: 1155040624} + 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: 0} + m_SizeDelta: {x: -50, y: 2} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &760341328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760341326} + 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.9333334, g: 0.9333334, b: 0.9333334, 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: 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 &760341329 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 760341326} + m_CullTransparentMesh: 0 --- !u!1 &770243520 GameObject: m_ObjectHideFlags: 0 @@ -23959,6 +24035,165 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1154343193} m_CullTransparentMesh: 0 +--- !u!1 &1155040623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1155040624} + - component: {fileID: 1155040629} + - component: {fileID: 1155040628} + - component: {fileID: 1155040627} + - component: {fileID: 1155040626} + - component: {fileID: 1155040625} + m_Layer: 5 + m_Name: "\u97F3\u9891\u793A\u4F8B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1155040624 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155040623} + 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: 1664004945} + - {fileID: 2070383678} + - {fileID: 760341327} + m_Father: {fileID: 271619912} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 500, y: -80} + m_SizeDelta: {x: 1000, y: 160} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1155040625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155040623} + 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: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1155040628} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1155040626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155040623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36afc0df23af49b5a395bf8d010e7c03, type: 3} + m_Name: + m_EditorClassIdentifier: + entrySO: {fileID: 11400000, guid: fc3a7d7719412264b914d0ae6e094405, type: 2} + entryNameText: {fileID: 1664004947} +--- !u!114 &1155040627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155040623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 160 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1155040628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155040623} + 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: 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 &1155040629 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155040623} + m_CullTransparentMesh: 0 --- !u!1 &1186788398 GameObject: m_ObjectHideFlags: 0 @@ -37079,6 +37314,98 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1661702716} m_CullTransparentMesh: 0 +--- !u!1 &1664004944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1664004945} + - component: {fileID: 1664004948} + - component: {fileID: 1664004947} + - component: {fileID: 1664004946} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1664004945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664004944} + 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: 1155040624} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -40, y: 0} + m_SizeDelta: {x: -160, y: -90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1664004946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664004944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad114bb7e387d46d7a9ad7af676060d0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1664004947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664004944} + 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, g: 0, b: 0, 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: 12800000, guid: 04a37534e45184b62bc44e172e5fe81e, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 230 + m_Alignment: 3 + m_AlignByGeometry: 1 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5F55\u97F3" +--- !u!222 &1664004948 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664004944} + m_CullTransparentMesh: 0 --- !u!1 &1664188342 GameObject: m_ObjectHideFlags: 0 @@ -44619,6 +44946,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2064116591} m_CullTransparentMesh: 0 +--- !u!1 &2070383677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2070383678} + - component: {fileID: 2070383680} + - component: {fileID: 2070383679} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2070383678 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070383677} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1155040624} + 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: -25, y: 0} + m_SizeDelta: {x: 72, y: 72} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &2070383679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070383677} + 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: b1a5e6c3cca1748e0a56f2485c899ceb, 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 &2070383680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070383677} + m_CullTransparentMesh: 0 --- !u!1 &2072623566 GameObject: m_ObjectHideFlags: 0 From 2f5f1d4618974292e0ced30766d2337945b2ada0 Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Fri, 6 Jun 2025 10:12:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9A=E5=90=88=E5=B9=B6=E4=B8=BB?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset | 3 ++- .../Assets/API/Media/InnerAudio/InnerAudioSO.asset | 10 +++++----- .../API/Media/InnerAudio/InnerAudioSO.asset.meta | 2 +- Demo/API_V2/Assets/API/Media/MediaSO.asset | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset index b3450c500..135cf9258 100644 --- a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset +++ b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset @@ -13,6 +13,8 @@ MonoBehaviour: m_Name: LifeCycleSO m_EditorClassIdentifier: entryName: "\u751F\u547D\u5468\u671F" + entryOrder: 2 + entryScriptTypeName: LifeCycle entryAPI: 'OnHide | OnShow OffHide | OffShow' @@ -27,4 +29,3 @@ MonoBehaviour: - isDisableInitially: 0 initialTitleText: initialContentText: - entryOrder: 2 diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset index ec605c3ad..c5fce969c 100644 --- a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset @@ -9,18 +9,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3} + m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3} m_Name: InnerAudioSO m_EditorClassIdentifier: + entryName: "\u97F3\u9891" + entryOrder: 0 entryScriptTypeName: InnerAudio - entryName: "\u97F3\u9891\u793A\u4F8B" - entryAPI: + entryAPI: WX.CreateInnerAudioContext entryDescription: optionList: [] - initialButtonText: "\u64AD\u653E\u97F3\u9891" + initialButtonText: "\u64AD\u653E" extraButtonList: - buttonText: "\u6682\u505C" - buttonText: "\u505C\u6B62" - buttonText: "\u8DF3\u8F6C" initialResultList: [] - entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta index 5a34091e8..eaddebf2a 100644 --- a/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta +++ b/Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc3a7d7719412264b914d0ae6e094405 +guid: 0a7c9b9ec3936214887602ce8fa8ab53 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Demo/API_V2/Assets/API/Media/MediaSO.asset b/Demo/API_V2/Assets/API/Media/MediaSO.asset index 1e70db742..a025235fa 100644 --- a/Demo/API_V2/Assets/API/Media/MediaSO.asset +++ b/Demo/API_V2/Assets/API/Media/MediaSO.asset @@ -17,7 +17,7 @@ MonoBehaviour: categorySprite: {fileID: 21300000, guid: 10009e080ceca4d88b96fcdff0749dfc, type: 3} entryList: - {fileID: 11400000, guid: 1d998af43281d4eee9e1effc8f83bddd, type: 2} - - {fileID: 11400000, guid: fc3a7d7719412264b914d0ae6e094405, type: 2} + - {fileID: 11400000, guid: 0a7c9b9ec3936214887602ce8fa8ab53, type: 2} - {fileID: 11400000, guid: 1055cfc5cdda7407298fa2ff9997d0c6, type: 2} - {fileID: 11400000, guid: 480646e3cd4d6a948a7538d483c1b043, type: 2} - {fileID: 11400000, guid: ad04526c3748b4e2b8498f998dfea973, type: 2} From cf2deed54f82295b6a0a2b696bdeac50637ac995 Mon Sep 17 00:00:00 2001 From: v_shanxia Date: Tue, 10 Jun 2025 16:05:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset index 135cf9258..694aadff5 100644 --- a/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset +++ b/Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset @@ -17,8 +17,10 @@ MonoBehaviour: entryScriptTypeName: LifeCycle entryAPI: 'OnHide | OnShow - OffHide | OffShow' - entryDescription: "OnHide\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u9690\u85CF\u5230\u540E\u53F0\nOnShow\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u56DE\u5230\u524D\u53F0\u7684\u4E8B\u4EF6\nOffHide + OffHide | OffShow + + GetLaunchOptionsSync | GetEnterOptionsSync' + entryDescription: "OnHide\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u9690\u85CF\u5230\u540E\u53F0\nOnShow\uFF1A\u76D1\u542C\u5C0F\u6E38\u620F\u56DE\u5230\u524D\u53F0\u7684\u4E8B\u4EF6\nGetLaunchOptionsSync\uFF1A\u83B7\u53D6\u5C0F\u6E38\u620F\u51B7\u542F\u52A8\u65F6\u7684\u53C2\u6570\nGetEnterOptionsSync\uFF1A\u83B7\u53D6\u5C0F\u6E38\u620F\u6253\u5F00\u7684\u53C2\u6570\uFF08\u5305\u62EC\u51B7\u542F\u52A8\u548C\u70ED\u542F\u52A8\uFF09\nOffHide / OffShow : \u79FB\u9664\u76D1\u542C" optionList: [] initialButtonText: "\u5F00\u59CB\u76D1\u542Chide/show\u4E8B\u4EF6"