|
@@ -304,8 +304,31 @@ public class GameManager : MonoSingleton<GameManager>
|
|
|
|
|
|
m_SetBtn.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward * 1.3f + new Vector3(-0.2f, 1f, 0);
|
|
|
|
|
|
-
|
|
|
+ if (avplayer && !avplayer.IsPlaying()&& !TemplateVideo.isPlayLock)
|
|
|
+ {
|
|
|
+ TemplateVideo.isPlaying = false;
|
|
|
+ avplayer = null;
|
|
|
+ }
|
|
|
+ if(TemplateVideo.isPlayLock)
|
|
|
+ {
|
|
|
+ lockTime += Time.time;
|
|
|
+ if(lockTime>1)
|
|
|
+ {
|
|
|
+ TemplateVideo.isPlayLock = false;
|
|
|
+ lockTime = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (TemplateVideo.temQueue.Count>0&&!TemplateVideo.isPlaying)
|
|
|
+ {
|
|
|
+ TemplateVideo.isPlaying = true;
|
|
|
+ TemplateVideo video = TemplateVideo.temQueue.Dequeue();
|
|
|
+ video.m_Video.transform.GetComponent<VideoPlayBtn>().m_IsPlaying = false;
|
|
|
+ video.m_Video.transform.GetComponent<VideoPlayBtn>().PlayVideoAuto();
|
|
|
+ avplayer = video.m_Video;
|
|
|
+ }
|
|
|
}
|
|
|
+ float lockTime = 0;
|
|
|
+ public AVProVideoPlayer avplayer;
|
|
|
|
|
|
public void Init()
|
|
|
{
|
|
@@ -1153,6 +1176,9 @@ public class GameManager : MonoSingleton<GameManager>
|
|
|
|
|
|
UpdateEditorUI();
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -1190,6 +1216,7 @@ public class GameManager : MonoSingleton<GameManager>
|
|
|
var pVideo = ResMgr.Instance.Load<GameObject>("Template/Prefab/Video");
|
|
|
go = Instantiate(pVideo, spoit.transform);
|
|
|
var videoitem = go.AddComponent<TemplateVideo>();
|
|
|
+ videoitem.autoplay = material.autoplay;
|
|
|
go.SetActive(true);
|
|
|
videoitem.SetData(mat, material.updateTime);
|
|
|
|