diff --git a/Assets/ResWork/ShowVideo/Canvas_Video.prefab b/Assets/ResWork/ShowVideo/Canvas_Video.prefab deleted file mode 100644 index fb11cc4..0000000 --- a/Assets/ResWork/ShowVideo/Canvas_Video.prefab +++ /dev/null @@ -1,422 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3422903026182582810 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6212946523527258320} - - component: {fileID: 2647457804366001783} - - component: {fileID: 3690089281374790576} - - component: {fileID: 5503575469648484047} - - component: {fileID: 1552550356001035904} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6212946523527258320 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3422903026182582810} - 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: 483806476754885217} - 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!222 &2647457804366001783 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3422903026182582810} - m_CullTransparentMesh: 1 ---- !u!114 &3690089281374790576 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3422903026182582810} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8400000, guid: 649f1a652408da7469bf980308c0811c, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!328 &5503575469648484047 -VideoPlayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3422903026182582810} - m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: 539d60ff460912744a19f55123c2f7dc, type: 3} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 8400000, guid: 649f1a652408da7469bf980308c0811c, type: 2} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: - m_RenderMode: 2 - m_AspectRatio: 1 - m_DataSource: 0 - m_TimeUpdateMode: 2 - m_PlaybackSpeed: 1 - m_AudioOutputMode: 2 - m_TargetAudioSources: - - {fileID: 0} - m_DirectAudioVolumes: - - 1 - m_Url: - m_EnabledAudioTracks: 01 - m_DirectAudioMutes: 00 - m_ControlledAudioTrackCount: 1 - m_PlayOnAwake: 1 - m_SkipOnDrop: 1 - m_Looping: 0 - m_WaitForFirstFrame: 1 - m_FrameReadyEventEnabled: 0 - m_VideoShaders: [] ---- !u!114 &1552550356001035904 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3422903026182582810} - 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: 3690089281374790576} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082290617758677897} - m_TargetAssemblyTypeName: VideoMgr, Assembly-CSharp - m_MethodName: OnClick_Screen - 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 &4244186309149100293 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 483806476754885217} - - component: {fileID: 7667984366343797710} - - component: {fileID: 2082290617758677897} - - component: {fileID: 4266664207913904232} - - component: {fileID: 8321734305413827880} - m_Layer: 5 - m_Name: Canvas_Video - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &483806476754885217 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4244186309149100293} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6212946523527258320} - - {fileID: 7494319965654815115} - m_Father: {fileID: 0} - 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: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &7667984366343797710 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4244186309149100293} - 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: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &2082290617758677897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4244186309149100293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 138a50dc729f3f04ab15ff13f9c5c605, type: 3} - m_Name: - m_EditorClassIdentifier: - vp: {fileID: 5503575469648484047} - go_skip: {fileID: 8697174538894529552} ---- !u!114 &4266664207913904232 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4244186309149100293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1080, y: 1920} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &8321734305413827880 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4244186309149100293} - 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: 32 ---- !u!1 &8697174538894529552 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7494319965654815115} - - component: {fileID: 3870530827672743989} - - component: {fileID: 190219119701256158} - m_Layer: 5 - m_Name: skip - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7494319965654815115 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8697174538894529552} - 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: 483806476754885217} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -125, y: -70} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3870530827672743989 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8697174538894529552} - m_CullTransparentMesh: 1 ---- !u!114 &190219119701256158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8697174538894529552} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Tab to Skip - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} - m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 25 - m_fontSizeMax: 100 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/ResWork/ShowVideo/Canvas_Video.prefab.meta b/Assets/ResWork/ShowVideo/Canvas_Video.prefab.meta deleted file mode 100644 index 7e2be01..0000000 --- a/Assets/ResWork/ShowVideo/Canvas_Video.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9a598abe3865cb34aaf6c61dffd6e86e -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/ShowVideo/VideoMgr.cs b/Assets/ResWork/ShowVideo/VideoMgr.cs deleted file mode 100644 index f279483..0000000 --- a/Assets/ResWork/ShowVideo/VideoMgr.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections; -using UnityEngine; -using UnityEngine.Video; - -public class VideoMgr : MonoBehaviourSingletonTemplate -{ - public VideoPlayer vp; - public GameObject go_skip; - - Action act_end; - - void Start() - { - vp.loopPointReached += OnVideoEnd; - } - - public void PlayVideo(float skiptime, Action _end) - { - act_end = _end; - vp.gameObject.SetActive(true); - vp.Play(); - - StartCoroutine(Co_Run(skiptime)); - } - - IEnumerator Co_Run(float skiptime) - { - go_skip.SetActive(false); - yield return new WaitForSeconds(skiptime); - go_skip.SetActive(true); - } - - public void OnClick_Screen() - { - if (go_skip.activeInHierarchy) - OnVideoEnd(vp); - } - - private void OnVideoEnd(VideoPlayer source) - { - go_skip.SetActive(false); - vp.gameObject.SetActive(false); - act_end?.Invoke(); - } -} \ No newline at end of file diff --git a/Assets/ResWork/ShowVideo/VideoMgr.cs.meta b/Assets/ResWork/ShowVideo/VideoMgr.cs.meta deleted file mode 100644 index cb6c24a..0000000 --- a/Assets/ResWork/ShowVideo/VideoMgr.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 138a50dc729f3f04ab15ff13f9c5c605 \ No newline at end of file diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 4010ab3..d027a94 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -40519,7 +40519,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1044263885 RectTransform: m_ObjectHideFlags: 0 @@ -46965,6 +46965,172 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1207406150} m_CullTransparentMesh: 1 +--- !u!1 &1209398293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1209398298} + - component: {fileID: 1209398296} + - component: {fileID: 1209398297} + - component: {fileID: 1209398294} + - component: {fileID: 1209398295} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!328 &1209398294 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209398293} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: 539d60ff460912744a19f55123c2f7dc, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 649f1a652408da7469bf980308c0811c, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 1 + m_DataSource: 0 + m_TimeUpdateMode: 2 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] +--- !u!114 &1209398295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209398293} + 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: 1209398297} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2013608479} + m_TargetAssemblyTypeName: GachaUI, Assembly-CSharp + m_MethodName: OnClick_Skip + 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!222 &1209398296 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209398293} + m_CullTransparentMesh: 1 +--- !u!114 &1209398297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209398293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8400000, guid: 649f1a652408da7469bf980308c0811c, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!224 &1209398298 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209398293} + 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: 2013608478} + 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!1 &1213711857 GameObject: m_ObjectHideFlags: 0 @@ -63581,7 +63747,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1603391252 RectTransform: m_ObjectHideFlags: 0 @@ -64184,7 +64350,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1620551538 RectTransform: m_ObjectHideFlags: 0 @@ -74308,7 +74474,7 @@ GameObject: m_Component: - component: {fileID: 1861711112} m_Layer: 5 - m_Name: Center + m_Name: Reward m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -74333,10 +74499,10 @@ RectTransform: - {fileID: 839993134} m_Father: {fileID: 2013608478} 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_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 40, y: 778.5} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1862696617 GameObject: @@ -81200,6 +81366,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1603391252} + - {fileID: 1209398298} - {fileID: 735827464} - {fileID: 1861711112} - {fileID: 1898552898} @@ -81282,6 +81449,11 @@ MonoBehaviour: - {fileID: 855260482} - {fileID: 952113713} - {fileID: 1044263884} + rawImage: {fileID: 1209398297} + videoPlayer: {fileID: 1209398294} + gos_off_isPlaying: + - {fileID: 735827463} + - {fileID: 1898552897} --- !u!1 &2014651059 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 935f3a1..a880c7b 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; +using UnityEngine.Video; using Random = UnityEngine.Random; public class GachaUI : uScrollViewMgr @@ -29,6 +30,8 @@ public class GachaUI : uScrollViewMgr texts[1].text = $"{table_GlobalValue.Ins.Get_Float("GachaAD_Reward")}"; texts[2].text = $"{table_GlobalValue.Ins.Get_Int("GachaAmount")}"; texts[4].text = $"{table_GlobalValue.Ins.Get_Int("GachaAmount")}"; + + videoPlayer.loopPointReached += OnVideoEnd; } private void Update() @@ -62,6 +65,7 @@ public class GachaUI : uScrollViewMgr texts_luckypoint[i].alpha = 0f; Set_UI(false); Init_GachaAnim(); + Set_Video(); var cal = GachaAutoRefillTime - InternetTime.Ins.Time; if (cal.TotalMilliseconds > 0f) @@ -184,8 +188,7 @@ public class GachaUI : uScrollViewMgr { isGacha = true; Init_GachaAnim(); - VideoMgr.Ins.PlayVideo(1f, () => { StartCoroutine(GachaReward()); }); - //StartCoroutine(Co_Gacha()); + PlayVideo(); } } @@ -232,6 +235,8 @@ public class GachaUI : uScrollViewMgr IEnumerator GachaReward() { + yield return new WaitForSeconds(4f); + SaveMgr.Ins.Add_Money(eMoney.Gacha, -table_GlobalValue.Ins.Get_Int("GachaAmount")); var gradedata = table_gacharateconfig.Ins.Get_RadomData(); var reward = table_gachareward.Ins.Get_Reward(gradedata.n_GachaGrade); @@ -312,4 +317,82 @@ public class GachaUI : uScrollViewMgr { Application.OpenURL("https://mergehero.notion.site/2a7e9deec1718038bae6dbce1a91f4c4"); } + + #region 동영상 + public RawImage rawImage; + public VideoPlayer videoPlayer; + public GameObject[] gos_off_isPlaying; + + void Set_Video() + { + StartCoroutine(PrepareVideo()); + } + + // 1. 비디오 준비 및 첫 프레임 보여주기 + IEnumerator PrepareVideo() + { + videoPlayer.Prepare(); + + // 준비가 될 때까지 대기 + while (!videoPlayer.isPrepared) + yield return null; + + // RawImage에 비디오 텍스처 연결 + rawImage.texture = videoPlayer.texture; + + // 첫 프레임을 그리기 위해 아주 잠깐 재생했다가 멈춤 + videoPlayer.Play(); + + // 1프레임만 기다림 (화면에 그려질 시간 확보) + yield return null; + + videoPlayer.Pause(); + videoPlayer.time = 0; // 혹시 시간이 흘렀다면 0초로 강제 고정 + } + + // 2. 외부에서 이 함수를 호출하여 재생 시작 + public void PlayVideo() + { + if (videoPlayer.isPrepared) + { + DSUtil.InActivateGameObjects(gos_off_isPlaying); + videoPlayer.Play(); + StartCoroutine(GachaReward()); + } + } + + // 3. 동영상 재생이 끝났을 때 호출되는 이벤트 + void OnVideoEnd(VideoPlayer vp) + { + DSUtil.ActivateGameObjects(gos_off_isPlaying); + } + + // 4. 다시 첫 프레임으로 리셋하는 함수 + void ResetToFirstFrame() + { + // Stop()을 쓰지 않고, 시간만 0으로 돌립니다. + videoPlayer.time = 0; + + // 강제로 한 프레임을 업데이트하기 위해 Play -> 바로 Pause가 아니라 + // VideoPlayer는 시간을 바꾸면 자동으로 그 프레임을 찾아서 보여줍니다. + // 다만 반영될 시간을 조금 벌어주기 위해 코루틴을 씁니다. + StartCoroutine(SeekAndPause()); + } + + IEnumerator SeekAndPause() + { + // 시간을 0으로 맞춤 + videoPlayer.time = 0; + + // 재생을 해서 0초의 화면을 갱신하게 함 + videoPlayer.Play(); + + // 프레임이 갱신될 때까지 안전하게 대기 (0.1초 정도 여유를 둠) + // 혹은 위의 방법1처럼 while(videoPlayer.frame < 1)을 써도 되지만, + // 이미 재생했던 영상은 time=0으로 가면 frame이 초기화 안 될 수도 있어서 시간 대기가 안전할 수 있음 + yield return new WaitForSeconds(0.1f); + + videoPlayer.Pause(); + } + #endregion } \ No newline at end of file