diff --git a/Assets/Scenes/Scene-MOTY.unity b/Assets/Scenes/Scene-MOTY.unity index bd21ea5..985488e 100644 --- a/Assets/Scenes/Scene-MOTY.unity +++ b/Assets/Scenes/Scene-MOTY.unity @@ -194,6 +194,76 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 73630329} m_CullTransparentMesh: 1 +--- !u!1 &114847192 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114847193} + - component: {fileID: 114847194} + m_Layer: 5 + m_Name: Video Player-Ending + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &114847193 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114847192} + 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: 1120668005} + 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, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!328 &114847194 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114847192} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: f318bc40e37de8f4fa449e6a7d83f667, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: fac3a29942542a84083286b2d8b376dc, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 5 + m_DataSource: 1 + m_TimeUpdateMode: 2 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 0 + m_TargetAudioSources: [] + m_DirectAudioVolumes: [] + m_Url: file://../Material/moty/ending.mp4 + m_EnabledAudioTracks: + m_DirectAudioMutes: + m_ControlledAudioTrackCount: 0 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 1 + m_WaitForFirstFrame: 0 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] --- !u!1 &129014402 GameObject: m_ObjectHideFlags: 0 @@ -843,12 +913,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6900c568ad7dd3a4d93dc992baf8627f, type: 3} m_Name: m_EditorClassIdentifier: - intro: {fileID: 337468573} + standby: {fileID: 337468573} + ending: {fileID: 1120668006} + ad: {fileID: 515636251} main: {fileID: 1995476944} videoStandby: {fileID: 291798772} videoIntro: {fileID: 1629399498} - videoEnding: {fileID: 1426676209} - videoAd: {fileID: 1499937801} + videoEnding: {fileID: 114847194} + videoAd: {fileID: 1531505671} mask: {fileID: 1255800685} _fadeDuration: 1 _hintDuration: 0.5 @@ -941,7 +1013,7 @@ GameObject: - component: {fileID: 337468572} - component: {fileID: 337468573} m_Layer: 5 - m_Name: Video + m_Name: Video Standby m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -960,8 +1032,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 291798771} - - {fileID: 1499937800} - - {fileID: 1426676208} - {fileID: 1819050385} m_Father: {fileID: 473271735} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2682,6 +2752,8 @@ RectTransform: m_Children: - {fileID: 243707688} - {fileID: 337468572} + - {fileID: 515636250} + - {fileID: 1120668005} - {fileID: 1995476943} - {fileID: 697235288} - {fileID: 129014403} @@ -2788,6 +2860,56 @@ Transform: - {fileID: 1109170008} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &515636249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515636250} + - component: {fileID: 515636251} + m_Layer: 5 + m_Name: Video Ad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &515636250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515636249} + 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: 1531505670} + - {fileID: 776879263} + m_Father: {fileID: 473271735} + 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!225 &515636251 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515636249} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -3021,8 +3143,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, y: -512} - m_SizeDelta: {x: 1280, y: 1024} + m_AnchoredPosition: {x: 0, y: -360} + m_SizeDelta: {x: 1280, y: 720} m_Pivot: {x: 0.5, y: 0} --- !u!114 &550776839 MonoBehaviour: @@ -3934,6 +4056,78 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imagePath: ./Material/Light-Mask.png +--- !u!1 &776879262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 776879263} + - component: {fileID: 776879265} + - component: {fileID: 776879264} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &776879263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776879262} + 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: 1 + m_Children: [] + m_Father: {fileID: 515636250} + 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, y: -360} + m_SizeDelta: {x: 1280, y: 720} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &776879264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776879262} + 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: c0eb51b67f8f8de4abfe463866648662, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &776879265 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776879262} + m_CullTransparentMesh: 1 --- !u!1 &794429370 GameObject: m_ObjectHideFlags: 0 @@ -5127,6 +5321,56 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1 &1120668004 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120668005} + - component: {fileID: 1120668006} + m_Layer: 5 + m_Name: Video Ending + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1120668005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120668004} + 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: 114847193} + - {fileID: 1967134309} + m_Father: {fileID: 473271735} + 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!225 &1120668006 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120668004} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1146279346 GameObject: m_ObjectHideFlags: 0 @@ -5309,10 +5553,10 @@ RectTransform: - {fileID: 555167254} m_Father: {fileID: 1317646465} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 707.5, y: -60} - m_SizeDelta: {x: 0, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 60, y: 0} m_Pivot: {x: 1, y: 0} --- !u!114 &1255800684 MonoBehaviour: @@ -5872,76 +6116,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imagePath: ./Material/Postcard/default.jpg ---- !u!1 &1426676207 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1426676208} - - component: {fileID: 1426676209} - m_Layer: 5 - m_Name: Video Player-Ending - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1426676208 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426676207} - 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: 337468572} - 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, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!328 &1426676209 -VideoPlayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1426676207} - m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: f318bc40e37de8f4fa449e6a7d83f667, type: 3} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 8400000, guid: 6c974968dd7933a4daab7dba5fd02dfd, type: 2} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: - m_RenderMode: 2 - m_AspectRatio: 5 - m_DataSource: 1 - m_TimeUpdateMode: 2 - m_PlaybackSpeed: 1 - m_AudioOutputMode: 0 - m_TargetAudioSources: [] - m_DirectAudioVolumes: [] - m_Url: file://../Material/moty/ending.mp4 - m_EnabledAudioTracks: - m_DirectAudioMutes: - m_ControlledAudioTrackCount: 0 - m_PlayOnAwake: 1 - m_SkipOnDrop: 1 - m_Looping: 1 - m_WaitForFirstFrame: 0 - m_FrameReadyEventEnabled: 0 - m_VideoShaders: [] --- !u!1 &1457143871 GameObject: m_ObjectHideFlags: 0 @@ -6220,7 +6394,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1494193408} m_CullTransparentMesh: 1 ---- !u!1 &1499937799 +--- !u!1 &1531505669 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6228,47 +6402,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1499937800} - - component: {fileID: 1499937801} + - component: {fileID: 1531505670} + - component: {fileID: 1531505671} m_Layer: 5 m_Name: Video Player-Ad m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1499937800 + m_IsActive: 1 +--- !u!224 &1531505670 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499937799} + m_GameObject: {fileID: 1531505669} 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: 337468572} + m_Father: {fileID: 515636250} 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, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!328 &1499937801 +--- !u!328 &1531505671 VideoPlayer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499937799} + m_GameObject: {fileID: 1531505669} m_Enabled: 1 m_VideoClip: {fileID: 32900000, guid: f318bc40e37de8f4fa449e6a7d83f667, type: 3} m_TargetCameraAlpha: 1 m_TargetCamera3DLayout: 0 m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 8400000, guid: 6c974968dd7933a4daab7dba5fd02dfd, type: 2} + m_TargetTexture: {fileID: 8400000, guid: c0eb51b67f8f8de4abfe463866648662, type: 2} m_TimeReference: 0 m_TargetMaterialRenderer: {fileID: 0} m_TargetMaterialProperty: @@ -7442,6 +7616,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1963683446} m_CullTransparentMesh: 1 +--- !u!1 &1967134308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1967134309} + - component: {fileID: 1967134311} + - component: {fileID: 1967134310} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1967134309 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967134308} + 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: 1 + m_Children: [] + m_Father: {fileID: 1120668005} + 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, y: -360} + m_SizeDelta: {x: 1280, y: 720} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1967134310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967134308} + 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: fac3a29942542a84083286b2d8b376dc, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1967134311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967134308} + m_CullTransparentMesh: 1 --- !u!1 &1988834084 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/MotyOscHandler.cs b/Assets/Scripts/MotyOscHandler.cs index 5040162..1c2c91e 100644 --- a/Assets/Scripts/MotyOscHandler.cs +++ b/Assets/Scripts/MotyOscHandler.cs @@ -11,12 +11,16 @@ public class MotyOscHandler : MonoBehaviour { [SerializeField] - public CanvasGroup intro; + public CanvasGroup standby; + [SerializeField] + public CanvasGroup ending; [SerializeField] - public CanvasGroup main; + public CanvasGroup ad; + [SerializeField] + public CanvasGroup main; [SerializeField] public VideoPlayer videoStandby; @@ -126,7 +130,7 @@ public class MotyOscHandler : MonoBehaviour mask.fillAmount = 0f; } - + public void ToggleVideo(string status) { switch(status) @@ -137,7 +141,10 @@ public class MotyOscHandler : MonoBehaviour videoIntro.time = 0f; videoIntro.Play(); - if (intro.alpha > 0f) StartCoroutine(FadeCanvasGroup(intro, intro.alpha, 0f, _fadeDuration)); + if (standby.alpha > 0f) StartCoroutine(FadeCanvasGroup(standby, standby.alpha, 0f, _fadeDuration)); + if (main.alpha > 0f) StartCoroutine(FadeCanvasGroup(main, main.alpha, 0f, _fadeDuration)); + if (ad.alpha > 0f) StartCoroutine(FadeCanvasGroup(ad, ad.alpha, 0f, _fadeDuration)); + if (ending.alpha > 0f) StartCoroutine(FadeCanvasGroup(ending, ending.alpha, 0f, _fadeDuration)); break; case "end": videoStandby.gameObject.SetActive(false); @@ -146,16 +153,27 @@ public class MotyOscHandler : MonoBehaviour videoEnding.time = 0f; videoEnding.Play(); - if (intro.alpha < 1f) StartCoroutine(FadeCanvasGroup(intro, intro.alpha, 1f, _fadeDuration)); + + if (standby.alpha > 0f) StartCoroutine(FadeCanvasGroup(standby, standby.alpha, 0f, _fadeDuration)); + if (main.alpha > 0f) StartCoroutine(FadeCanvasGroup(main, main.alpha, 0f, _fadeDuration)); + if (ad.alpha > 0f) StartCoroutine(FadeCanvasGroup(ad, ad.alpha, 0f, _fadeDuration)); + if (ending.alpha < 1.0f) StartCoroutine(FadeCanvasGroup(ending, ending.alpha, 1f, _fadeDuration)); + break; - case "standby": + case "standby": + case "reset": videoStandby.gameObject.SetActive(true); videoEnding.gameObject.SetActive(false); videoAd.gameObject.SetActive(false); videoStandby.time = 0f; videoStandby.Play(); - if (intro.alpha < 1f) StartCoroutine(FadeCanvasGroup(intro, intro.alpha, 1f, _fadeDuration)); + + if (standby.alpha < 1.0f) StartCoroutine(FadeCanvasGroup(standby, standby.alpha, 1f, _fadeDuration)); + if (main.alpha > 0f) StartCoroutine(FadeCanvasGroup(main, main.alpha, 0f, _fadeDuration)); + if (ad.alpha > 0f) StartCoroutine(FadeCanvasGroup(ad, ad.alpha, 0f, _fadeDuration)); + if (ending.alpha > 0f) StartCoroutine(FadeCanvasGroup(ending, ending.alpha, 0f, _fadeDuration)); + break; case "ad": videoStandby.gameObject.SetActive(false); @@ -164,13 +182,12 @@ public class MotyOscHandler : MonoBehaviour videoAd.time = 0f; videoAd.Play(); - if (intro.alpha < 1f) StartCoroutine(FadeCanvasGroup(intro, intro.alpha, 1f, _fadeDuration)); - break; - case "reset": - videoStandby.gameObject.SetActive(false); - videoEnding.gameObject.SetActive(false); - videoAd.gameObject.SetActive(false); - StartCoroutine(FadeCanvasGroup(intro, intro.alpha, 0f, _fadeDuration)); + + if (standby.alpha > 0f) StartCoroutine(FadeCanvasGroup(standby, standby.alpha, 0f, _fadeDuration)); + if (main.alpha > 0f) StartCoroutine(FadeCanvasGroup(main, main.alpha, 0f, _fadeDuration)); + if (ad.alpha < 1f) StartCoroutine(FadeCanvasGroup(ad, ad.alpha, 1f, _fadeDuration)); + if (ending.alpha > 0f) StartCoroutine(FadeCanvasGroup(ending, ending.alpha, 0f, _fadeDuration)); + break; } } diff --git a/Assets/Textures/Moty Video Texture Ad.renderTexture b/Assets/Textures/Moty Video Texture Ad.renderTexture new file mode 100644 index 0000000..3f8e87e --- /dev/null +++ b/Assets/Textures/Moty Video Texture Ad.renderTexture @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Moty Video Texture Ad + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 + m_Width: 1280 + m_Height: 720 + m_AntiAliasing: 8 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Textures/Moty Video Texture Ad.renderTexture.meta b/Assets/Textures/Moty Video Texture Ad.renderTexture.meta new file mode 100644 index 0000000..e3ae29d --- /dev/null +++ b/Assets/Textures/Moty Video Texture Ad.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0eb51b67f8f8de4abfe463866648662 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Moty Video Texture BG.renderTexture b/Assets/Textures/Moty Video Texture BG.renderTexture index 4a24cdc..b307cc3 100644 --- a/Assets/Textures/Moty Video Texture BG.renderTexture +++ b/Assets/Textures/Moty Video Texture BG.renderTexture @@ -15,7 +15,7 @@ RenderTexture: m_IsAlphaChannelOptional: 0 serializedVersion: 5 m_Width: 1280 - m_Height: 1024 + m_Height: 720 m_AntiAliasing: 8 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/Assets/Textures/Moty Video Texture Ending.renderTexture b/Assets/Textures/Moty Video Texture Ending.renderTexture new file mode 100644 index 0000000..a60d160 --- /dev/null +++ b/Assets/Textures/Moty Video Texture Ending.renderTexture @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Moty Video Texture Ending + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 + m_Width: 1280 + m_Height: 720 + m_AntiAliasing: 8 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Textures/Moty Video Texture Ending.renderTexture.meta b/Assets/Textures/Moty Video Texture Ending.renderTexture.meta new file mode 100644 index 0000000..8bf038c --- /dev/null +++ b/Assets/Textures/Moty Video Texture Ending.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fac3a29942542a84083286b2d8b376dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: