Merge branch 'programming'
This commit is contained in:
		
						commit
						039fca3aac
					
				@ -470,6 +470,14 @@ PrefabInstance:
 | 
				
			|||||||
      propertyPath: m_AnchoredPosition.y
 | 
					      propertyPath: m_AnchoredPosition.y
 | 
				
			||||||
      value: 0
 | 
					      value: 0
 | 
				
			||||||
      objectReference: {fileID: 0}
 | 
					      objectReference: {fileID: 0}
 | 
				
			||||||
 | 
					    - target: {fileID: 6476992883679287242, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
 | 
				
			||||||
 | 
					      propertyPath: speechKey
 | 
				
			||||||
 | 
					      value: 366T2LGGbIlIwMaqsXgyPhYOZ7XN9TXyyMEximTYmuUHZaIcEYejJQQJ99BEACI8hq2XJ3w3AAAYACOG9aeN
 | 
				
			||||||
 | 
					      objectReference: {fileID: 0}
 | 
				
			||||||
 | 
					    - target: {fileID: 6476992883679287242, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
 | 
				
			||||||
 | 
					      propertyPath: speechRegion
 | 
				
			||||||
 | 
					      value: switzerlandnorth
 | 
				
			||||||
 | 
					      objectReference: {fileID: 0}
 | 
				
			||||||
    - target: {fileID: 6488617071109158819, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
 | 
					    - target: {fileID: 6488617071109158819, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
 | 
				
			||||||
      propertyPath: m_Name
 | 
					      propertyPath: m_Name
 | 
				
			||||||
      value: ViaggioAI
 | 
					      value: ViaggioAI
 | 
				
			||||||
@ -522,6 +530,10 @@ PrefabInstance:
 | 
				
			|||||||
      propertyPath: m_AnchoredPosition.y
 | 
					      propertyPath: m_AnchoredPosition.y
 | 
				
			||||||
      value: 0
 | 
					      value: 0
 | 
				
			||||||
      objectReference: {fileID: 0}
 | 
					      objectReference: {fileID: 0}
 | 
				
			||||||
 | 
					    - target: {fileID: 7430897408325283729, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
 | 
				
			||||||
 | 
					      propertyPath: speechKey
 | 
				
			||||||
 | 
					      value: 366T2LGGbIlIwMaqsXgyPhYOZ7XN9TXyyMEximTYmuUHZaIcEYejJQQJ99BEACI8hq2XJ3w3AAAYACOG9aeN
 | 
				
			||||||
 | 
					      objectReference: {fileID: 0}
 | 
				
			||||||
    - target: {fileID: 8045499084232000901, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
 | 
					    - target: {fileID: 8045499084232000901, guid: 6287e16ef914a5149b47dccded9a2e99, type: 3}
 | 
				
			||||||
      propertyPath: m_AnchorMax.y
 | 
					      propertyPath: m_AnchorMax.y
 | 
				
			||||||
      value: 0
 | 
					      value: 0
 | 
				
			||||||
 | 
				
			|||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@ -1720,6 +1720,7 @@ GameObject:
 | 
				
			|||||||
  m_Component:
 | 
					  m_Component:
 | 
				
			||||||
  - component: {fileID: 1167381564}
 | 
					  - component: {fileID: 1167381564}
 | 
				
			||||||
  - component: {fileID: 1167381563}
 | 
					  - component: {fileID: 1167381563}
 | 
				
			||||||
 | 
					  - component: {fileID: 1167381565}
 | 
				
			||||||
  m_Layer: 0
 | 
					  m_Layer: 0
 | 
				
			||||||
  m_Name: MediaPlayer
 | 
					  m_Name: MediaPlayer
 | 
				
			||||||
  m_TagString: Untagged
 | 
					  m_TagString: Untagged
 | 
				
			||||||
@ -1748,8 +1749,8 @@ MonoBehaviour:
 | 
				
			|||||||
    transparency: 0
 | 
					    transparency: 0
 | 
				
			||||||
    alphaPacking: 0
 | 
					    alphaPacking: 0
 | 
				
			||||||
    stereoPacking: 0
 | 
					    stereoPacking: 0
 | 
				
			||||||
  _autoOpen: 1
 | 
					  _autoOpen: 0
 | 
				
			||||||
  _autoPlayOnStart: 1
 | 
					  _autoPlayOnStart: 0
 | 
				
			||||||
  _loop: 1
 | 
					  _loop: 1
 | 
				
			||||||
  _audioVolume: 1
 | 
					  _audioVolume: 1
 | 
				
			||||||
  _audioBalance: 0
 | 
					  _audioBalance: 0
 | 
				
			||||||
@ -1946,6 +1947,19 @@ Transform:
 | 
				
			|||||||
  m_Children: []
 | 
					  m_Children: []
 | 
				
			||||||
  m_Father: {fileID: 0}
 | 
					  m_Father: {fileID: 0}
 | 
				
			||||||
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
					  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
				
			||||||
 | 
					--- !u!114 &1167381565
 | 
				
			||||||
 | 
					MonoBehaviour:
 | 
				
			||||||
 | 
					  m_ObjectHideFlags: 0
 | 
				
			||||||
 | 
					  m_CorrespondingSourceObject: {fileID: 0}
 | 
				
			||||||
 | 
					  m_PrefabInstance: {fileID: 0}
 | 
				
			||||||
 | 
					  m_PrefabAsset: {fileID: 0}
 | 
				
			||||||
 | 
					  m_GameObject: {fileID: 1167381562}
 | 
				
			||||||
 | 
					  m_Enabled: 1
 | 
				
			||||||
 | 
					  m_EditorHideFlags: 0
 | 
				
			||||||
 | 
					  m_Script: {fileID: 11500000, guid: 1f9d0c2aced6745009cded319d0b6d14, type: 3}
 | 
				
			||||||
 | 
					  m_Name: 
 | 
				
			||||||
 | 
					  m_EditorClassIdentifier: 
 | 
				
			||||||
 | 
					  videoPath: PanoramaVideo/SBB_Panorama.mp4
 | 
				
			||||||
--- !u!1001 &1238952579
 | 
					--- !u!1001 &1238952579
 | 
				
			||||||
PrefabInstance:
 | 
					PrefabInstance:
 | 
				
			||||||
  m_ObjectHideFlags: 0
 | 
					  m_ObjectHideFlags: 0
 | 
				
			||||||
@ -3561,7 +3575,7 @@ MonoBehaviour:
 | 
				
			|||||||
  overrideLogStringDisplay: 0
 | 
					  overrideLogStringDisplay: 0
 | 
				
			||||||
  overrideDebugInternalActive: 0
 | 
					  overrideDebugInternalActive: 0
 | 
				
			||||||
  overrideDebugChangesActive: 0
 | 
					  overrideDebugChangesActive: 0
 | 
				
			||||||
  instanceID: 2808508
 | 
					  instanceID: 1048262
 | 
				
			||||||
  __behaviourTreeGenerator: {fileID: 0}
 | 
					  __behaviourTreeGenerator: {fileID: 0}
 | 
				
			||||||
  taskScripts:
 | 
					  taskScripts:
 | 
				
			||||||
  - {fileID: 4900000, guid: aceafeb25fe43443aa61f49093d6ed3b, type: 3}
 | 
					  - {fileID: 4900000, guid: aceafeb25fe43443aa61f49093d6ed3b, type: 3}
 | 
				
			||||||
 | 
				
			|||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										31
									
								
								Viagg-io/Assets/Scripts/PlayAVProVideo.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								Viagg-io/Assets/Scripts/PlayAVProVideo.cs
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,31 @@
 | 
				
			|||||||
 | 
					using System.Collections;
 | 
				
			||||||
 | 
					using System.Collections.Generic;
 | 
				
			||||||
 | 
					using UnityEngine;
 | 
				
			||||||
 | 
					using RenderHeads.Media.AVProVideo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public class PlayAVProVideo : MonoBehaviour
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    [SerializeField]
 | 
				
			||||||
 | 
					    string videoPath;
 | 
				
			||||||
 | 
					    private MediaPlayer _mediaPlayer;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Start is called before the first frame update
 | 
				
			||||||
 | 
					    void Start()
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        _mediaPlayer = GetComponent<MediaPlayer>();
 | 
				
			||||||
 | 
					        if (_mediaPlayer != null)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            Debug.Log("Panorama is loading");
 | 
				
			||||||
 | 
					            _mediaPlayer.OpenMedia(new MediaPath(videoPath, MediaPathType.RelativeToPersistentDataFolder), autoPlay: true);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private void OnDisable()
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        if (_mediaPlayer != null)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            Debug.Log("Panorama is closing");
 | 
				
			||||||
 | 
					            _mediaPlayer.CloseMedia();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										11
									
								
								Viagg-io/Assets/Scripts/PlayAVProVideo.cs.meta
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								Viagg-io/Assets/Scripts/PlayAVProVideo.cs.meta
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,11 @@
 | 
				
			|||||||
 | 
					fileFormatVersion: 2
 | 
				
			||||||
 | 
					guid: 1f9d0c2aced6745009cded319d0b6d14
 | 
				
			||||||
 | 
					MonoImporter:
 | 
				
			||||||
 | 
					  externalObjects: {}
 | 
				
			||||||
 | 
					  serializedVersion: 2
 | 
				
			||||||
 | 
					  defaultReferences: []
 | 
				
			||||||
 | 
					  executionOrder: 0
 | 
				
			||||||
 | 
					  icon: {instanceID: 0}
 | 
				
			||||||
 | 
					  userData: 
 | 
				
			||||||
 | 
					  assetBundleName: 
 | 
				
			||||||
 | 
					  assetBundleVariant: 
 | 
				
			||||||
@ -1,7 +0,0 @@
 | 
				
			|||||||
fileFormatVersion: 2
 | 
					 | 
				
			||||||
guid: 526d5174ea3e52044836bcbea53460b0
 | 
					 | 
				
			||||||
DefaultImporter:
 | 
					 | 
				
			||||||
  externalObjects: {}
 | 
					 | 
				
			||||||
  userData: 
 | 
					 | 
				
			||||||
  assetBundleName: 
 | 
					 | 
				
			||||||
  assetBundleVariant: 
 | 
					 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user