From 100aec41e020d7dfde18741d543d6b394eaacf5b Mon Sep 17 00:00:00 2001 From: v_shzhiwang <106916369+VincentWSZ@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:04:47 +0800 Subject: [PATCH 1/7] videoPlayer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加videoPlayer.loopPointReached功能。 --- Demo/API_V2/Assets/API/APISO.asset | 2 +- .../Assets/API/Facility/FacilitySO.asset | 4 +- .../Assets/API/FileSystem/FileSystemSO.asset | 2 +- Demo/API_V2/Assets/Scenes/VideoScene.unity | 1046 ++++++++++++++++- .../API_V2/Assets/Scripts/VideoController2.cs | 64 + .../Assets/Scripts/VideoController2.cs.meta | 11 + .../Scripts/VideoPlayerSliderController.cs | 46 + .../VideoPlayerSliderController.cs.meta | 11 + .../Editor/MiniGameConfig.asset | 15 +- Demo/API_V2/Packages/packages-lock.json | 54 +- .../PackageManagerSettings.asset | 6 +- .../API_V2/ProjectSettings/ProjectVersion.txt | 4 +- .../UnityConnectSettings.asset | 2 + 13 files changed, 1184 insertions(+), 83 deletions(-) create mode 100644 Demo/API_V2/Assets/Scripts/VideoController2.cs create mode 100644 Demo/API_V2/Assets/Scripts/VideoController2.cs.meta create mode 100644 Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs create mode 100644 Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs.meta diff --git a/Demo/API_V2/Assets/API/APISO.asset b/Demo/API_V2/Assets/API/APISO.asset index 55553c37..81b80af8 100644 --- a/Demo/API_V2/Assets/API/APISO.asset +++ b/Demo/API_V2/Assets/API/APISO.asset @@ -19,8 +19,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 9977a581037b84833a32b508e00eb1a2, type: 2} - {fileID: 11400000, guid: 56f316e0e10ba419bbf19bd7a68bfc4c, type: 2} - {fileID: 11400000, guid: 6f0972f5fdc56c543b23c9873d760bf5, type: 2} - - {fileID: 11400000, guid: a461b8cd70d9e4e23ad1cc953bec31e9, type: 2} - {fileID: 11400000, guid: 7ef06699cee7846b7823e4cc421418eb, type: 2} + - {fileID: 11400000, guid: a461b8cd70d9e4e23ad1cc953bec31e9, type: 2} - {fileID: 11400000, guid: 55de20d536f8c4689bbd80553d87fe46, type: 2} - {fileID: 11400000, guid: f2c56d751bb7c4c398db7c1db352517d, type: 2} - {fileID: 11400000, guid: b4a6196f623dd4435a4f3bd70af92d06, type: 2} diff --git a/Demo/API_V2/Assets/API/Facility/FacilitySO.asset b/Demo/API_V2/Assets/API/Facility/FacilitySO.asset index 248fd99f..f7bcd18e 100644 --- a/Demo/API_V2/Assets/API/Facility/FacilitySO.asset +++ b/Demo/API_V2/Assets/API/Facility/FacilitySO.asset @@ -15,10 +15,10 @@ MonoBehaviour: categoryName: "\u8BBE\u5907" categorySprite: {fileID: 21300000, guid: 53dd2b1922e5142ec8a53037f362fc56, type: 3} entryList: - - {fileID: 11400000, guid: bbbc9b983d6d34ad3bac2921509f612f, type: 2} - - {fileID: 11400000, guid: c17ae0ce755f04419b700825b20fd386, type: 2} - {fileID: 11400000, guid: a24af43ae51914d26b0bf637c283dab2, type: 2} - {fileID: 11400000, guid: 4eba2c9f2f2064e4081be74302ca4c33, type: 2} + - {fileID: 11400000, guid: bbbc9b983d6d34ad3bac2921509f612f, type: 2} + - {fileID: 11400000, guid: c17ae0ce755f04419b700825b20fd386, type: 2} - {fileID: 11400000, guid: ac09abff5d8bc48bbabd08bde820b58b, type: 2} - {fileID: 11400000, guid: 3bf339b994c544db3860ddf0a0dc8e20, type: 2} - {fileID: 11400000, guid: e92d94924be504167a342e42e1162f21, type: 2} diff --git a/Demo/API_V2/Assets/API/FileSystem/FileSystemSO.asset b/Demo/API_V2/Assets/API/FileSystem/FileSystemSO.asset index 2b8fc962..b711979f 100644 --- a/Demo/API_V2/Assets/API/FileSystem/FileSystemSO.asset +++ b/Demo/API_V2/Assets/API/FileSystem/FileSystemSO.asset @@ -24,8 +24,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 65ab1b01a722b4542a14fcf9decca3de, type: 2} - {fileID: 11400000, guid: 19b80cb144f0c4ea28a4ddca7a2c2f09, type: 2} - {fileID: 11400000, guid: 0aa5d76237c844275add1612c47bddaa, type: 2} - - {fileID: 11400000, guid: 73c05fc1ffae94ec1b69a00ee261d529, type: 2} - {fileID: 11400000, guid: 65a826f5f949544d8990e673231bb80f, type: 2} + - {fileID: 11400000, guid: 73c05fc1ffae94ec1b69a00ee261d529, type: 2} - {fileID: 11400000, guid: 3a901e80b59ad4aafbe373ee6a8df2d8, type: 2} - {fileID: 11400000, guid: e7ea0be62dc6543b0a8dc629489c5e7e, type: 2} categoryOrder: 11 diff --git a/Demo/API_V2/Assets/Scenes/VideoScene.unity b/Demo/API_V2/Assets/Scenes/VideoScene.unity index e5c18dbf..d6ac9285 100644 --- a/Demo/API_V2/Assets/Scenes/VideoScene.unity +++ b/Demo/API_V2/Assets/Scenes/VideoScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.373115, g: 0.38073772, b: 0.3587336, a: 1} + m_IndirectSpecularColor: {r: 0.37311494, g: 0.3807376, b: 0.35873333, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -158,7 +158,6 @@ RectTransform: - {fileID: 1656890407} - {fileID: 35265585} m_Father: {fileID: 101800050} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -257,7 +256,6 @@ RectTransform: m_Children: - {fileID: 519778135} m_Father: {fileID: 8994167} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -390,7 +388,6 @@ RectTransform: - {fileID: 8994167} - {fileID: 1664285539} m_Father: {fileID: 331073382} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -423,6 +420,121 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &116607597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 116607598} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &116607598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 116607597} + 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: 1251123292} + m_Father: {fileID: 811883141} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &311490548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311490549} + - component: {fileID: 311490551} + - component: {fileID: 311490550} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &311490549 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311490548} + 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: 1477806341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &311490550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311490548} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Stop +--- !u!222 &311490551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311490548} + m_CullTransparentMesh: 1 --- !u!1 &315024667 GameObject: m_ObjectHideFlags: 0 @@ -455,7 +567,6 @@ RectTransform: m_Children: - {fileID: 898601073} m_Father: {fileID: 1336824967} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -618,6 +729,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -635,8 +747,8 @@ RectTransform: m_Children: - {fileID: 1851619065} - {fileID: 101800050} + - {fileID: 894819587} m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -675,7 +787,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1336824967} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -771,7 +882,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1336824967} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -855,7 +965,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 35265585} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -900,6 +1009,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519778134} m_CullTransparentMesh: 0 +--- !u!1 &552579516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 552579517} + - component: {fileID: 552579520} + - component: {fileID: 552579519} + - component: {fileID: 552579518} + m_Layer: 5 + m_Name: ButtonStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &552579517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552579516} + 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: 852327708} + m_Father: {fileID: 894819587} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -226.61508, y: -547.1682} + m_SizeDelta: {x: 343.318, y: 128.038} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &552579518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552579516} + 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 552579519} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &552579519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552579516} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &552579520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552579516} + m_CullTransparentMesh: 1 --- !u!1 &630249090 GameObject: m_ObjectHideFlags: 0 @@ -932,7 +1162,6 @@ RectTransform: - {fileID: 1587772181} - {fileID: 1069909358} m_Father: {fileID: 1336824967} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -986,9 +1215,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705144908} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1049,14 +1286,304 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705144908} + serializedVersion: 2 m_LocalRotation: {x: -0.082156666, y: -0.9390545, z: 0.33253664, w: -0.029093198} m_LocalPosition: {x: 0, y: 0, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 39, y: -180, z: 10} +--- !u!1 &752405840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 752405841} + - component: {fileID: 752405843} + - component: {fileID: 752405842} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &752405841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752405840} + 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: 811883141} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &752405842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752405840} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &752405843 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752405840} + m_CullTransparentMesh: 1 +--- !u!1 &811883140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 811883141} + - component: {fileID: 811883142} + - component: {fileID: 811883143} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &811883141 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 811883140} + 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: 752405841} + - {fileID: 1930902290} + - {fileID: 116607598} + m_Father: {fileID: 894819587} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.968, y: -461.203} + m_SizeDelta: {x: 896.132, y: 21.493} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &811883142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 811883140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1251123293} + m_FillRect: {fileID: 1903846802} + m_HandleRect: {fileID: 1251123292} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &811883143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 811883140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2114722374} + m_TargetAssemblyTypeName: VideoPlayerSliderController, Assembly-CSharp + m_MethodName: PointerDown + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 3 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2114722374} + m_TargetAssemblyTypeName: VideoPlayerSliderController, Assembly-CSharp + m_MethodName: PointerUp + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &852327707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 852327708} + - component: {fileID: 852327710} + - component: {fileID: 852327709} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &852327708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852327707} + 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: 552579517} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &852327709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852327707} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Start +--- !u!222 &852327710 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852327707} + m_CullTransparentMesh: 1 --- !u!1 &872572323 GameObject: m_ObjectHideFlags: 0 @@ -1089,7 +1616,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1336824967} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1154,6 +1680,86 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &894819586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 894819587} + - component: {fileID: 894819590} + - component: {fileID: 894819588} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &894819587 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894819586} + 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: 552579517} + - {fileID: 1477806341} + - {fileID: 811883141} + m_Father: {fileID: 331073382} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &894819588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894819586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!223 &894819590 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894819586} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &898601072 GameObject: m_ObjectHideFlags: 0 @@ -1187,7 +1793,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 315024668} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1299,7 +1904,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 630249091} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1371,9 +1975,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157877201} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -1434,13 +2046,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157877201} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -2.6670482, y: 4.08, z: 11.7} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &1159140099 GameObject: @@ -1453,6 +2065,7 @@ GameObject: - component: {fileID: 1159140102} - component: {fileID: 1159140101} - component: {fileID: 1159140100} + - component: {fileID: 1159140103} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1482,9 +2095,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1517,15 +2138,108 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159140099} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_GameObject: {fileID: 1159140099} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1159140103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159140099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6643d012c4923944accb7c4c05a0f14, type: 3} + m_Name: + m_EditorClassIdentifier: + videoPlayer: {fileID: 2114722372} + playButton: {fileID: 552579518} + pauseButton: {fileID: 1477806342} + videoUrls: + - http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400 + - http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4 +--- !u!1 &1251123291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1251123292} + - component: {fileID: 1251123294} + - component: {fileID: 1251123293} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1251123292 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1251123291} + 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: 0} - m_RootOrder: 2 + m_Father: {fileID: 116607598} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1251123293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1251123291} + 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: 10913, guid: 0000000000000000f000000000000000, type: 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 &1251123294 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1251123291} + m_CullTransparentMesh: 1 --- !u!1 &1266172924 GameObject: m_ObjectHideFlags: 0 @@ -1612,13 +2326,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1266172924} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.2588191, z: 0, w: 0.9659258} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 30, z: 0} --- !u!1 &1336824966 GameObject: @@ -1661,7 +2375,6 @@ RectTransform: - {fileID: 1835667694} - {fileID: 1960300769} m_Father: {fileID: 2136465919} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1776,13 +2489,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1448331931} + serializedVersion: 2 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: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1453998631 GameObject: @@ -1816,7 +2529,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1336824967} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1881,6 +2593,127 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &1477806340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1477806341} + - component: {fileID: 1477806344} + - component: {fileID: 1477806343} + - component: {fileID: 1477806342} + m_Layer: 5 + m_Name: ButtonStop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1477806341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477806340} + 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: 311490549} + m_Father: {fileID: 894819587} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 225, y: -547.1682} + m_SizeDelta: {x: 343.318, y: 128.038} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1477806342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477806340} + 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: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1477806343} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1477806343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477806340} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1477806344 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1477806340} + m_CullTransparentMesh: 1 --- !u!1 &1587772180 GameObject: m_ObjectHideFlags: 0 @@ -1913,7 +2746,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 630249091} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2006,7 +2838,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8994167} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2101,7 +2932,6 @@ RectTransform: m_Children: - {fileID: 2136465919} m_Father: {fileID: 101800050} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2212,7 +3042,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!328 &1696896407 VideoPlayer: m_ObjectHideFlags: 0 @@ -2232,6 +3062,7 @@ VideoPlayer: m_RenderMode: 3 m_AspectRatio: 2 m_DataSource: 1 + m_TimeUpdateMode: 2 m_PlaybackSpeed: 1 m_AudioOutputMode: 2 m_TargetAudioSources: @@ -2255,13 +3086,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1696896406} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1077.2122, y: 1245.4257, z: -31.605785} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1756915864 GameObject: @@ -2295,7 +3126,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1336824967} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2391,7 +3221,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1336824967} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2475,7 +3304,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 331073382} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2520,6 +3348,117 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1851619064} m_CullTransparentMesh: 0 +--- !u!1 &1903846801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1903846802} + - component: {fileID: 1903846804} + - component: {fileID: 1903846803} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1903846802 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903846801} + 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: 1930902290} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1903846803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903846801} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1903846804 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903846801} + m_CullTransparentMesh: 1 +--- !u!1 &1930902289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1930902290} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1930902290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1930902289} + 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: 1903846802} + m_Father: {fileID: 811883141} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1960300768 GameObject: m_ObjectHideFlags: 0 @@ -2551,7 +3490,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1336824967} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2614,6 +3552,7 @@ GameObject: m_Component: - component: {fileID: 2114722373} - component: {fileID: 2114722372} + - component: {fileID: 2114722374} m_Layer: 0 m_Name: Video Player 2D m_TagString: Untagged @@ -2640,6 +3579,7 @@ VideoPlayer: m_RenderMode: 1 m_AspectRatio: 2 m_DataSource: 1 + m_TimeUpdateMode: 2 m_PlaybackSpeed: 1 m_AudioOutputMode: 2 m_TargetAudioSources: @@ -2663,14 +3603,29 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2114722371} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1077.2122, y: 1245.4257, z: -31.605785} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2114722374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2114722371} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97f8db200f07583419e353541eb664cf, type: 3} + m_Name: + m_EditorClassIdentifier: + m_player: {fileID: 2114722372} + m_slider: {fileID: 811883142} + m_bMouseUp: 1 --- !u!1 &2136465918 GameObject: m_ObjectHideFlags: 0 @@ -2704,7 +3659,6 @@ RectTransform: m_Children: - {fileID: 1336824967} m_Father: {fileID: 1664285539} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2762,3 +3716,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1266172926} + - {fileID: 1448331934} + - {fileID: 1159140102} + - {fileID: 2114722373} + - {fileID: 1696896408} + - {fileID: 705144912} + - {fileID: 331073382} + - {fileID: 1157877205} diff --git a/Demo/API_V2/Assets/Scripts/VideoController2.cs b/Demo/API_V2/Assets/Scripts/VideoController2.cs new file mode 100644 index 00000000..5842f8bc --- /dev/null +++ b/Demo/API_V2/Assets/Scripts/VideoController2.cs @@ -0,0 +1,64 @@ +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.Video; +using WeChatWASM; + +public class VideoController2 : MonoBehaviour +{ + public VideoPlayer videoPlayer; // 关联 VideoPlayer 组件 + public Button playButton; // 关联播放按钮 + public Button pauseButton; // 关联暂停按钮 + public string[] videoUrls; // 视频路径 + private int currentVideoIndex = 0; + + void Start() + { + // 设置视频路径 + videoPlayer.url = videoUrls[currentVideoIndex]; + + // 添加按钮点击事件 + playButton.onClick.AddListener(PlayVideo); + pauseButton.onClick.AddListener(PauseVideo); + + // 添加视频播放完成事件 + videoPlayer.loopPointReached += OnVideoEnd; + + } + + void PlayVideo() + { + if (videoPlayer.isPaused) + { + videoPlayer.Play(); // 如果视频已暂停，则继续播放 + } + } + + void PauseVideo() + { + if (videoPlayer.isPlaying) + { + videoPlayer.Pause(); // 暂停视频 + } + } + + // 视频播放完成时调用的方法 + void OnVideoEnd(VideoPlayer vp) + { + Debug.Log("视频播放完成"); + + // 增加当前视频索引 + currentVideoIndex++; + + // 检查是否还有下一个视频 + if (currentVideoIndex < videoUrls.Length) + { + videoPlayer.url = videoUrls[currentVideoIndex]; // 设置下一个视频的 URL + } + else + { + currentVideoIndex = 0; // 如果没有下一个视频，重置索引（可选） + } + videoPlayer.url = videoUrls[currentVideoIndex]; + videoPlayer.Play(); // 播放下一个视频 + } +} diff --git a/Demo/API_V2/Assets/Scripts/VideoController2.cs.meta b/Demo/API_V2/Assets/Scripts/VideoController2.cs.meta new file mode 100644 index 00000000..d36d32a0 --- /dev/null +++ b/Demo/API_V2/Assets/Scripts/VideoController2.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d6643d012c4923944accb7c4c05a0f14 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs b/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs new file mode 100644 index 00000000..c272bb2f --- /dev/null +++ b/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs @@ -0,0 +1,46 @@ +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.Video; + +public class VideoPlayerSliderController : MonoBehaviour +{ + public VideoPlayer m_player; + public Slider m_slider; + public bool m_bMouseUp = true; + void Start() + { + m_slider.onValueChanged.AddListener((float value) => + { + if (!m_bMouseUp) + { + SliderEvent(value); + } + }); + } + + // 如果启用 MonoBehaviour，则每个固定帧速率的帧都将调用此函数 + private void FixedUpdate() + { + if (m_bMouseUp) + { + m_slider.value = m_player.frame / (m_player.frameCount * 1.0f); + } + } + + public void PointerDown() + { + m_player.Pause(); + m_bMouseUp = false; + } + + public void PointerUp() + { + m_player.Play(); + m_bMouseUp = true; + } + + public void SliderEvent(float value) + { + m_player.frame = long.Parse((value * m_player.frameCount).ToString("0.")); + } +} diff --git a/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs.meta b/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs.meta new file mode 100644 index 00000000..8ea9305d --- /dev/null +++ b/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 97f8db200f07583419e353541eb664cf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset b/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset index 5d0f5117..73b121e6 100644 --- a/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset +++ b/Demo/API_V2/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset @@ -13,13 +13,13 @@ MonoBehaviour: m_Name: MiniGameConfig m_EditorClassIdentifier: ProjectConf: - projectName: - Appid: + projectName: API_V2_Video_git + Appid: wxde2e78d03039f4ad CDN: http://127.0.0.1:8080 assetLoadType: 0 compressDataPackage: 0 VideoUrl: - DST: + DST: D:/API_V2_Git_Video StreamCDN: bundleHashLength: 32 bundlePathIdentifier: StreamingAssets; @@ -46,7 +46,7 @@ MonoBehaviour: UseMiniGameChat: 0 PreloadWXFont: 0 CompileOptions: - DevelopBuild: 1 + DevelopBuild: 0 AutoProfile: 0 ScriptOnly: 0 Il2CppOptimizeSize: 1 @@ -57,13 +57,14 @@ MonoBehaviour: ProfilingMemory: 0 CleanBuild: 0 CustomNodePath: - autoAdaptScreen: 0 - showMonitorSuggestModal: 0 + autoAdaptScreen: 1 + showMonitorSuggestModal: 1 enableProfileStats: 0 enableRenderAnalysis: 0 + enablePerfAnalysis: 0 iOSAutoGCInterval: 10000 enableIOSPerformancePlus: 0 - brotliMT: 0 + brotliMT: 1 CompressTexture: halfSize: 0 useDXT5: 0 diff --git a/Demo/API_V2/Packages/packages-lock.json b/Demo/API_V2/Packages/packages-lock.json index d5b1a07f..36d1cdee 100644 --- a/Demo/API_V2/Packages/packages-lock.json +++ b/Demo/API_V2/Packages/packages-lock.json @@ -29,7 +29,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ai.navigation": { "version": "1.1.5", @@ -38,31 +38,31 @@ "dependencies": { "com.unity.modules.ai": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.analytics": { "version": "3.8.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.services.analytics": "1.0.4" + "com.unity.services.analytics": "1.0.4", + "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.collab-proxy": { "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { "version": "3.0.26", @@ -71,7 +71,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -80,21 +80,21 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.purchasing": { "version": "4.9.3", @@ -102,13 +102,13 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.8.1", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.services.core": "1.8.1" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.services.analytics": { "version": "5.0.0", @@ -116,21 +116,21 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.10.1", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.services.core": "1.10.1" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.services.core": { "version": "1.12.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.modules.unitywebrequest": "1.0.0" + "com.unity.modules.androidjni": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.test-framework": { "version": "1.1.33", @@ -141,7 +141,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.textmeshpro": { "version": "3.0.6", @@ -150,19 +150,19 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.timeline": { "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.ugui": { "version": "1.0.0", @@ -181,7 +181,7 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://packages.unity.cn" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/Demo/API_V2/ProjectSettings/PackageManagerSettings.asset b/Demo/API_V2/ProjectSettings/PackageManagerSettings.asset index 923d735d..48f7de19 100644 --- a/Demo/API_V2/ProjectSettings/PackageManagerSettings.asset +++ b/Demo/API_V2/ProjectSettings/PackageManagerSettings.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.com + m_Url: https://packages.unity.cn m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -832 - m_OriginalInstanceId: -834 + m_UserModificationsInstanceId: -854 + m_OriginalInstanceId: -856 m_LoadAssets: 0 diff --git a/Demo/API_V2/ProjectSettings/ProjectVersion.txt b/Demo/API_V2/ProjectSettings/ProjectVersion.txt index da671891..dd9bad9f 100644 --- a/Demo/API_V2/ProjectSettings/ProjectVersion.txt +++ b/Demo/API_V2/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.14f1 -m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) +m_EditorVersion: 2022.3.14f1c1 +m_EditorVersionWithRevision: 2022.3.14f1c1 (25540d4d24fc) diff --git a/Demo/API_V2/ProjectSettings/UnityConnectSettings.asset b/Demo/API_V2/ProjectSettings/UnityConnectSettings.asset index 2d81664b..f7b31b2b 100644 --- a/Demo/API_V2/ProjectSettings/UnityConnectSettings.asset +++ b/Demo/API_V2/ProjectSettings/UnityConnectSettings.asset @@ -10,6 +10,8 @@ UnityConnectSettings: m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_ConfigUrl: https://config.uca.cloud.unity3d.com m_DashboardUrl: https://dashboard.unity3d.com + m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events + m_CNConfigUrl: https://cdp.cloud.unity.cn/config m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com From 18c21d5e10fbea1c86ec90104d026175a755e7cb Mon Sep 17 00:00:00 2001 From: v_shzhiwang <106916369+VincentWSZ@users.noreply.github.com> Date: Tue, 10 Dec 2024 18:29:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9Button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改Button大小和同时播放两个视频 --- Demo/API_V2/Assets/Scenes/VideoScene.unity | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Demo/API_V2/Assets/Scenes/VideoScene.unity b/Demo/API_V2/Assets/Scenes/VideoScene.unity index d6ac9285..19a30b25 100644 --- a/Demo/API_V2/Assets/Scenes/VideoScene.unity +++ b/Demo/API_V2/Assets/Scenes/VideoScene.unity @@ -515,11 +515,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1564,11 +1564,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_MinSize: 0 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -3042,7 +3042,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!328 &1696896407 VideoPlayer: m_ObjectHideFlags: 0 From 525e8117d0c23d7dd5bdb1f49bb6bcd4b84a785d Mon Sep 17 00:00:00 2001 From: v_shzhiwang <106916369+VincentWSZ@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:49:04 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改button按钮大小为45 --- Demo/API_V2/Assets/Scenes/VideoScene.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Demo/API_V2/Assets/Scenes/VideoScene.unity b/Demo/API_V2/Assets/Scenes/VideoScene.unity index 19a30b25..377c7291 100644 --- a/Demo/API_V2/Assets/Scenes/VideoScene.unity +++ b/Demo/API_V2/Assets/Scenes/VideoScene.unity @@ -515,7 +515,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 50 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1564,7 +1564,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 50 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 From b28b9c8799d09f39d57b6b279d90208a76d6b077 Mon Sep 17 00:00:00 2001 From: v_shzhiwang <106916369+VincentWSZ@users.noreply.github.com> Date: Thu, 12 Dec 2024 18:15:18 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 归纳VideoController脚本的位置。 --- .../VideoController2.cs => API/Video/VideoController.cs} | 2 +- .../Video/VideoController.cs.meta} | 0 .../{Scripts => API/Video}/VideoPlayerSliderController.cs | 0 .../{Scripts => API/Video}/VideoPlayerSliderController.cs.meta | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename Demo/API_V2/Assets/{Scripts/VideoController2.cs => API/Video/VideoController.cs} (97%) rename Demo/API_V2/Assets/{Scripts/VideoController2.cs.meta => API/Video/VideoController.cs.meta} (100%) rename Demo/API_V2/Assets/{Scripts => API/Video}/VideoPlayerSliderController.cs (100%) rename Demo/API_V2/Assets/{Scripts => API/Video}/VideoPlayerSliderController.cs.meta (100%) diff --git a/Demo/API_V2/Assets/Scripts/VideoController2.cs b/Demo/API_V2/Assets/API/Video/VideoController.cs similarity index 97% rename from Demo/API_V2/Assets/Scripts/VideoController2.cs rename to Demo/API_V2/Assets/API/Video/VideoController.cs index 5842f8bc..7f3595ed 100644 --- a/Demo/API_V2/Assets/Scripts/VideoController2.cs +++ b/Demo/API_V2/Assets/API/Video/VideoController.cs @@ -3,7 +3,7 @@ using UnityEngine.Video; using WeChatWASM; -public class VideoController2 : MonoBehaviour +public class VideoController : MonoBehaviour { public VideoPlayer videoPlayer; // 关联 VideoPlayer 组件 public Button playButton; // 关联播放按钮 diff --git a/Demo/API_V2/Assets/Scripts/VideoController2.cs.meta b/Demo/API_V2/Assets/API/Video/VideoController.cs.meta similarity index 100% rename from Demo/API_V2/Assets/Scripts/VideoController2.cs.meta rename to Demo/API_V2/Assets/API/Video/VideoController.cs.meta diff --git a/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs b/Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs similarity index 100% rename from Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs rename to Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs diff --git a/Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs.meta b/Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs.meta similarity index 100% rename from Demo/API_V2/Assets/Scripts/VideoPlayerSliderController.cs.meta rename to Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs.meta From f8b608d10a714cb892f61f2900c97e7a35576e47 Mon Sep 17 00:00:00 2001 From: v_shzhiwang <106916369+VincentWSZ@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:11:14 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9D=A1=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API_V2/Assets/API/Facility/Screen/ScreenSO.asset | 1 + Demo/API_V2/Assets/API/Video/VideoController.cs | 10 ++++++++-- Demo/API_V2/Assets/Scenes/VideoScene.unity | 12 ++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Demo/API_V2/Assets/API/Facility/Screen/ScreenSO.asset b/Demo/API_V2/Assets/API/Facility/Screen/ScreenSO.asset index 54560447..b7bb2dc9 100644 --- a/Demo/API_V2/Assets/API/Facility/Screen/ScreenSO.asset +++ b/Demo/API_V2/Assets/API/Facility/Screen/ScreenSO.asset @@ -26,3 +26,4 @@ MonoBehaviour: - buttonText: "\u67E5\u8BE2\u7528\u6237\u662F\u5426\u5728\u5F55\u5C4F" - buttonText: "\u83B7\u53D6\u5C4F\u5E55\u4EAE\u5EA6" initialResultList: [] + entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Video/VideoController.cs b/Demo/API_V2/Assets/API/Video/VideoController.cs index 7f3595ed..0a67e169 100644 --- a/Demo/API_V2/Assets/API/Video/VideoController.cs +++ b/Demo/API_V2/Assets/API/Video/VideoController.cs @@ -44,8 +44,14 @@ void PauseVideo() // 视频播放完成时调用的方法 void OnVideoEnd(VideoPlayer vp) { - Debug.Log("视频播放完成"); - + WX.ShowModal(new ShowModalOption() + { + title = "提示", + content = "视频播放完成", + showCancel = false, + success = (res) => { + } + }); // 增加当前视频索引 currentVideoIndex++; diff --git a/Demo/API_V2/Assets/Scenes/VideoScene.unity b/Demo/API_V2/Assets/Scenes/VideoScene.unity index 377c7291..f5cde5f1 100644 --- a/Demo/API_V2/Assets/Scenes/VideoScene.unity +++ b/Demo/API_V2/Assets/Scenes/VideoScene.unity @@ -1045,7 +1045,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -226.61508, y: -547.1682} + m_AnchoredPosition: {x: -226.61508, y: -890} m_SizeDelta: {x: 343.318, y: 128.038} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &552579518 @@ -1406,8 +1406,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.968, y: -461.203} - m_SizeDelta: {x: 896.132, y: 21.493} + m_AnchoredPosition: {x: -0.968, y: -755} + m_SizeDelta: {x: 896.132, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &811883142 MonoBehaviour: @@ -2164,7 +2164,7 @@ MonoBehaviour: pauseButton: {fileID: 1477806342} videoUrls: - http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400 - - http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4 + - https://baikebcs.bdimg.com/baike-other/big-buck-bunny.mp4 --- !u!1 &1251123291 GameObject: m_ObjectHideFlags: 0 @@ -2200,7 +2200,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 50, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1251123293 MonoBehaviour: @@ -2629,7 +2629,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 225, y: -547.1682} + m_AnchoredPosition: {x: 225, y: -890} m_SizeDelta: {x: 343.318, y: 128.038} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1477806342 From e39c1584166e151169717f55eabd780447d2deb0 Mon Sep 17 00:00:00 2001 From: v_shzhiwang <106916369+VincentWSZ@users.noreply.github.com> Date: Mon, 6 Jan 2025 12:04:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PointerClick?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Report/ReportEvent/ReportEventSO.asset | 1 + .../API/Share/ShareEvent/ShareEventSO.asset | 1 + .../API/Share/ShareEvent2/ShareEvent2SO.asset | 1 + .../API/Video/VideoPlayerSliderController.cs | 26 +++++++++- Demo/API_V2/Assets/Scenes/VideoScene.unity | 52 ++++++++++++------- 5 files changed, 61 insertions(+), 20 deletions(-) diff --git a/Demo/API_V2/Assets/API/Report/ReportEvent/ReportEventSO.asset b/Demo/API_V2/Assets/API/Report/ReportEvent/ReportEventSO.asset index 717e45b7..d32d367f 100644 --- a/Demo/API_V2/Assets/API/Report/ReportEvent/ReportEventSO.asset +++ b/Demo/API_V2/Assets/API/Report/ReportEvent/ReportEventSO.asset @@ -28,3 +28,4 @@ MonoBehaviour: initialButtonText: "\u4E8B\u4EF6\u4E0A\u62A5" extraButtonList: [] initialResultList: [] + entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Share/ShareEvent/ShareEventSO.asset b/Demo/API_V2/Assets/API/Share/ShareEvent/ShareEventSO.asset index 02a01eee..e8e3af24 100644 --- a/Demo/API_V2/Assets/API/Share/ShareEvent/ShareEventSO.asset +++ b/Demo/API_V2/Assets/API/Share/ShareEvent/ShareEventSO.asset @@ -28,3 +28,4 @@ MonoBehaviour: - buttonText: "\u76D1\u542Csharetofriend" - buttonText: "\u76D1\u542C\u53F3\u4E0A\u89D2\u83DC\u5355\u7684\u8F6C\u53D1" initialResultList: [] + entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Share/ShareEvent2/ShareEvent2SO.asset b/Demo/API_V2/Assets/API/Share/ShareEvent2/ShareEvent2SO.asset index d4f27195..c47c6e5e 100644 --- a/Demo/API_V2/Assets/API/Share/ShareEvent2/ShareEvent2SO.asset +++ b/Demo/API_V2/Assets/API/Share/ShareEvent2/ShareEvent2SO.asset @@ -24,3 +24,4 @@ MonoBehaviour: - buttonText: "\u83B7\u53D6\u8F6C\u53D1\u8BE6\u7EC6\u4FE1\u606F" - buttonText: "\u9A8C\u8BC1\u79C1\u5BC6\u6D88\u606F" initialResultList: [] + entryOrder: 0 diff --git a/Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs b/Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs index c272bb2f..10ece954 100644 --- a/Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs +++ b/Demo/API_V2/Assets/API/Video/VideoPlayerSliderController.cs @@ -17,8 +17,7 @@ void Start() } }); } - - // 如果启用 MonoBehaviour，则每个固定帧速率的帧都将调用此函数 + private void FixedUpdate() { if (m_bMouseUp) @@ -43,4 +42,27 @@ public void SliderEvent(float value) { m_player.frame = long.Parse((value * m_player.frameCount).ToString("0.")); } + + public void PointerClick() + { + // 暂停视频 + m_player.Pause(); + + // 获取点击位置相对于滑动条的比例 + RectTransform rt = m_slider.GetComponent(); + Vector2 localPoint; + RectTransformUtility.ScreenPointToLocalPointInRectangle(rt, Input.mousePosition, null, out localPoint); + + // 计算点击位置对应的值 + float percentage = (localPoint.x - rt.rect.xMin) / rt.rect.width; + percentage = Mathf.Clamp01(percentage); + + // 设置视频帧 + m_player.frame = long.Parse((percentage * m_player.frameCount).ToString("0.")); + // 更新滑动条值 + m_slider.value = percentage; + + // 继续播放视频 + m_player.Play(); + } } diff --git a/Demo/API_V2/Assets/Scenes/VideoScene.unity b/Demo/API_V2/Assets/Scenes/VideoScene.unity index f5cde5f1..3642571c 100644 --- a/Demo/API_V2/Assets/Scenes/VideoScene.unity +++ b/Demo/API_V2/Assets/Scenes/VideoScene.unity @@ -1380,6 +1380,7 @@ GameObject: - component: {fileID: 811883141} - component: {fileID: 811883142} - component: {fileID: 811883143} + - component: {fileID: 811883144} m_Layer: 5 m_Name: Slider m_TagString: Untagged @@ -1477,7 +1478,7 @@ MonoBehaviour: callback: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2114722374} + - m_Target: {fileID: 811883144} m_TargetAssemblyTypeName: VideoPlayerSliderController, Assembly-CSharp m_MethodName: PointerDown m_Mode: 1 @@ -1493,7 +1494,7 @@ MonoBehaviour: callback: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2114722374} + - m_Target: {fileID: 811883144} m_TargetAssemblyTypeName: VideoPlayerSliderController, Assembly-CSharp m_MethodName: PointerUp m_Mode: 1 @@ -1505,6 +1506,37 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 811883144} + m_TargetAssemblyTypeName: VideoPlayerSliderController, Assembly-CSharp + m_MethodName: PointerClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &811883144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 811883140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97f8db200f07583419e353541eb664cf, type: 3} + m_Name: + m_EditorClassIdentifier: + m_player: {fileID: 2114722372} + m_slider: {fileID: 811883142} + m_bMouseUp: 1 --- !u!1 &852327707 GameObject: m_ObjectHideFlags: 0 @@ -3552,7 +3584,6 @@ GameObject: m_Component: - component: {fileID: 2114722373} - component: {fileID: 2114722372} - - component: {fileID: 2114722374} m_Layer: 0 m_Name: Video Player 2D m_TagString: Untagged @@ -3611,21 +3642,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2114722374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2114722371} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97f8db200f07583419e353541eb664cf, type: 3} - m_Name: - m_EditorClassIdentifier: - m_player: {fileID: 2114722372} - m_slider: {fileID: 811883142} - m_bMouseUp: 1 --- !u!1 &2136465918 GameObject: m_ObjectHideFlags: 0 From 1e84b0a087c1a5b601eceb51f97788a368905d7e Mon Sep 17 00:00:00 2001 From: v_shzhiwang <106916369+VincentWSZ@users.noreply.github.com> Date: Tue, 7 Jan 2025 19:14:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Demo/API_V2/Assets/Scenes/VideoScene.unity | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Demo/API_V2/Assets/Scenes/VideoScene.unity b/Demo/API_V2/Assets/Scenes/VideoScene.unity index 3642571c..25a54c21 100644 --- a/Demo/API_V2/Assets/Scenes/VideoScene.unity +++ b/Demo/API_V2/Assets/Scenes/VideoScene.unity @@ -1904,7 +1904,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "ios\u4E0B\u9AD8\u6027\u80FD+\u6A21\u5F0F\u65E0\u6CD5\u6B63\u5E38\u64AD\u653E\u89C6\u9891\n\u8FD9\u91CC\u4E3A\u4E24\u4E2A\u89C6\u9891\uFF0Cios\u53EA\u80FD\u540C\u65F6\u64AD\u653E\u4E00\u4E2A\u89C6\u9891" + m_Text: "ios\u4E0B\u9AD8\u6027\u80FD+\u6A21\u5F0F\u65E0\u6CD5\u6B63\u5E38\u64AD\u653E\u89C6\u9891\n\u8FD9\u91CC\u4E3A\u4E24\u4E2A\u89C6\u9891\uFF0Cios\u53EA\u80FD\u540C\u65F6\u64AD\u653E\u4E00\u4E2A\u89C6\u9891\n\n\u6309\u94AE\u548C\u8FDB\u5EA6\u6761\u4EC5\u63A7\u5236Video + Player 2D\u89C6\u9891\n\n\u8FDB\u5EA6\u6761\u62D6\u5230\u6700\u540E/\u89C6\u9891\u81EA\u7136\u64AD\u653E\u5230\u6700\u540E\u65F6\uFF0C\n\u89E6\u53D1\u201C\u89C6\u9891\u64AD\u653E\u5B8C\u6210\u201D\uFF0C\u64AD\u653E\u4E0B\u4E00\u4E2A\u89C6\u9891\u3002" --- !u!1 &1069909357 GameObject: m_ObjectHideFlags: 0 @@ -2041,7 +2042,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0