JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: JiNan:8e92ad3e8b8c13106073f7b1671a28331b5bf2fe
Branches Tags
JiNan:NewMaster
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main
..
compare: JiNan:20afeb9fa1f916bdd76b9ce9176bb4c99a7ed80f
Branches Tags
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:NewMaster
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main

No commits in common. "8e92ad3e8b8c13106073f7b1671a28331b5bf2fe" and "20afeb9fa1f916bdd76b9ce9176bb4c99a7ed80f" have entirely different histories.
8e92ad3e8b ... 20afeb9fa1

3 changed files with 45 additions and 313 deletions
Show Stats Expand all files Collapse all files

269
Assets/Art/Fonts/胡晓波男神体 SDF.asset
View File

File diff suppressed because one or more lines are too long

60
Assets/Scripts/UI/UITipWindow.cs
View File

@ -1,11 +1,13 @@
using System;
using UnityEngine;
using UnityEngine.UI;
using QFramework;
using System;
using System.Collections.Generic;
using static OperationController;
using TMPro;
using static OperationController;
using UnityEngine.Video;
using System.IO;
using System.Threading.Tasks;
namespace QFramework.Example
{
@ -76,16 +78,16 @@ namespace QFramework.Example
loader.LoadAsync();
}
transform.SetAsLastSibling();
ExportVideo();
}
}
protected override void OnShow()
{
@ -101,15 +103,7 @@ namespace QFramework.Example
loader.Recycle2Cache();
}
private void ExportVideo()
{
Debug.Log("????????"+mData.ExportVideoPath+"????????");
if (!string.IsNullOrEmpty(mData.ExportVideoPath))
if (string.IsNullOrEmpty(mData.ExportVideoPath) == false)
{
string OutPath = "";
@ -119,7 +113,7 @@ namespace QFramework.Example
WebGLDownLoadFile.Instance.DownloadVideo(url,sourcePath);
#elif UNITY_STANDALONE_WIN || UNITY_EDITOR
@ -154,40 +148,14 @@ WebGLDownLoadFile.Instance.DownloadVideo(url,sourcePath);
Debug.LogError($"·¢Éúδ֪´íÎó: {e.Message}");
}
#endif
}
else
{
Debug.Log(mData.ExportVideoPath+"????");
Debug.Log("½áÊø????");
}
}
#endif
}
}
}

29
Data/Xml/03_ChangJingXuNiPaiShe.xml
View File

@ -158,14 +158,10 @@
<Action type="Show" value="DanFan_2DCanvas/Connet/BaoGuangGroup" isShow="false"></Action>
<Action type="Show" value="DanFan_2DCanvas/Connet/拍照焦点_红色" isShow="false"></Action>
<!--<Action type="TipWindow" exportVideoPath="GenJingTou.mp4" value="导出成功，请返回指定文件夹查看。" btns="确认"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确认"></Condition>-->
<!--<Action type="TipWindow" value="欢迎进入实验" btns="确认"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确认"></Condition>-->
<Action type="TipWindow" exportVideoPath="GenJingTou.mp4" value="恭喜你完成摄像机拍摄，点击确定，保存摄像机拍摄文件" btns="确定"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
<Action type="OperationChange" name="初始化"></Action>
</Action>
@ -885,15 +881,11 @@
<Action type="TipWindow" value="恭喜你完成摄像机拍摄，点击确定，保存摄像机拍摄文件" btns="确定"> </Action>
<Action type="TipWindow" ExportVideoPath="GenJingTou.mp4" value="恭喜你完成摄像机拍摄，点击确定，保存摄像机拍摄文件" btns="确定"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
<Action type="TipWindow" exportVideoPath="Recordings/Movie_001.mp4" value="导出成功，请返回指定文件夹查看。" btns="确认"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确认"></Condition>
<Action type="Var" name="完成" value="1"></Action>
@ -1770,12 +1762,6 @@
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
<Action type="TipWindow" exportVideoPath="Recordings/Movie_002.mp4" value="导出成功，请返回指定文件夹查看。" btns="确认"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确认"></Condition>
<Action type="Var" name="完成" value="1"></Action>
@ -2422,9 +2408,6 @@
<Action type="TipWindow" value="恭喜你完成单反摄影，点击确定，保存摄像机拍摄文件" btns="确定"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
<Action type="TipWindow" exportVideoPath="Recordings/Movie_003.mp4" value="导出成功，请返回指定文件夹查看。" btns="确认"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确认"></Condition>
<Action type="Var" name="完成" value="1"></Action>