修改反馈基本完成
@ -282,8 +282,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 483, y: -233}
|
m_AnchoredPosition: {x: 10, y: -19.5532}
|
||||||
m_SizeDelta: {x: 792, y: 458}
|
m_SizeDelta: {x: 1784.2219, y: 800.9055}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3280565993990436441
|
--- !u!222 &3280565993990436441
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -391,7 +391,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 5.7919, y: 0}
|
m_AnchoredPosition: {x: 5.79187, y: 0}
|
||||||
m_SizeDelta: {x: -1.429, y: 0}
|
m_SizeDelta: {x: -1.429, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &3356970918032840058
|
--- !u!1 &3356970918032840058
|
||||||
|
|||||||
@ -29,6 +29,7 @@ public class ActionHelper
|
|||||||
{ "UITextWindow", typeof(QFramework.Example.UITextWindow) },
|
{ "UITextWindow", typeof(QFramework.Example.UITextWindow) },
|
||||||
{ "UIKnowledge", typeof(QFramework.Example.UIKnowledge) },
|
{ "UIKnowledge", typeof(QFramework.Example.UIKnowledge) },
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -16,6 +16,9 @@ namespace QFramework.Example
|
|||||||
public List<string> btns;
|
public List<string> btns;
|
||||||
public float scrollSpeed = 25;
|
public float scrollSpeed = 25;
|
||||||
public string position;
|
public string position;
|
||||||
|
public string vidoePath;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
public partial class UITextWindow : UIPanel
|
public partial class UITextWindow : UIPanel
|
||||||
{
|
{
|
||||||
@ -86,6 +89,18 @@ namespace QFramework.Example
|
|||||||
Content.rectTransform.pivot = new Vector2(1, 0.5f);
|
Content.rectTransform.pivot = new Vector2(1, 0.5f);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(mData.vidoePath)){
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnShow()
|
protected override void OnShow()
|
||||||
@ -99,5 +114,8 @@ namespace QFramework.Example
|
|||||||
protected override void OnClose()
|
protected override void OnClose()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 127 KiB |
|
Before Width: | Height: | Size: 113 KiB |
|
Before Width: | Height: | Size: 112 KiB |
|
Before Width: | Height: | Size: 41 KiB |
|
Before Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 101 KiB |
@ -290,16 +290,14 @@
|
|||||||
</Component>
|
</Component>
|
||||||
|
|
||||||
|
|
||||||
|
<Component type="Button" size="642.3395,359.7235" pos="0,-653">
|
||||||
<Component type="Button" size="722.1123,299.2899" pos="0,-337">
|
|
||||||
<Action type="Sequence">
|
<Action type="Sequence">
|
||||||
<Action type="Log" value="111111111"></Action>
|
<Action type="Log" value="111111111"></Action>
|
||||||
<Action type="Audio" audioType="Voice" value="二、shiyanlilunrenzhi/sound_4.mp3" loop="false" waitFinished="false" volumen="1" isPlay="true"></Action>
|
<Action type="Audio" audioType="Voice" value="二、shiyanlilunrenzhi/sound_4.mp3" loop="false" waitFinished="false" volumen="1" isPlay="true"></Action>
|
||||||
<Action type="Log" value="2222222222"></Action>
|
<Action type="Log" value="2222222222"></Action>
|
||||||
</Action>
|
</Action>
|
||||||
</Component>
|
</Component>
|
||||||
|
<Component type="Button" size="1152.9,150.499" pos="-3.0518e-05,-1028">
|
||||||
<Component type="Button" size="722.1123,299.2899" pos="0,-337">
|
|
||||||
<Action type="Sequence">
|
<Action type="Sequence">
|
||||||
<Action type="Log" value="111111111"></Action>
|
<Action type="Log" value="111111111"></Action>
|
||||||
<Action type="Audio" audioType="Voice" value="二、shiyanlilunrenzhi/sound_5.mp3" loop="false" waitFinished="false" volumen="1" isPlay="true"></Action>
|
<Action type="Audio" audioType="Voice" value="二、shiyanlilunrenzhi/sound_5.mp3" loop="false" waitFinished="false" volumen="1" isPlay="true"></Action>
|
||||||
@ -309,6 +307,13 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Component type="Button" size="1152.911,127.6386" pos="0,-1187">
|
<Component type="Button" size="1152.911,127.6386" pos="0,-1187">
|
||||||
<Action type="Sequence">
|
<Action type="Sequence">
|
||||||
<Action type="Log" value="111111111"></Action>
|
<Action type="Log" value="111111111"></Action>
|
||||||
@ -459,11 +464,78 @@
|
|||||||
</Action>
|
</Action>
|
||||||
</Component>
|
</Component>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<Component type="Button" size="535.0657,137.6156" pos="-23,-10333">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="背景音乐"></Action>
|
||||||
|
<Action type="Audio" audioType="Voice" value="BgMusic.mp3" loop="false" waitFinished="false" volumen="1" isPlay="true"></Action>
|
||||||
|
<Action type="Log" value="2222222222"></Action>
|
||||||
|
</Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
|
||||||
|
<!--视频-->
|
||||||
|
|
||||||
|
<Component type="Button" size="989.7406,555.7889" pos="-23.0001,-8348">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="跟镜头"></Action>
|
||||||
|
<Action type="Audio" audioType="Voice" value="二、shiyanlilunrenzhi/BgMusic.mp3" loop="false" waitFinished="false" volumen="1" isPlay="true"></Action>
|
||||||
|
<Action type="Log" value="2222222222"></Action>
|
||||||
|
</Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
|
||||||
|
<Component type="Button" size="989.7406,555.7889" pos="-23.0001,-9003">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="升镜头"></Action>
|
||||||
|
<Action type="Video" value="ShengJiangJingTou.mp4" size="1784.222,800.9055" offset="10,10" finishedEvent="finished" closeEvent="close"></Action> </Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component type="Button" size="989.7406,555.7889" pos="-23.0001,-9640.831">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="降镜头"></Action>
|
||||||
|
<Action type="Video" value="ShengJiangJingTou.mp4" size="1784.222,800.9055" offset="10,10" finishedEvent="finished" closeEvent="close"></Action> </Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component type="Button" size="989.7406,555.7889" pos="-23.0001,-5756">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="推镜头"></Action>
|
||||||
|
<Action type="Video" value="TuiLaJingTou.mp4" size="1784.222,800.9055" offset="10,10" finishedEvent="finished" closeEvent="close"></Action> </Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<Component type="Button" size="989.7406,555.7889" pos="-23.0001,-6416">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="推镜头"></Action>
|
||||||
|
<Action type="Video" value="TuiLaJingTou.mp4" size="1784.222,800.9055" offset="10,10" finishedEvent="finished" closeEvent="close"></Action> </Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component type="Button" size="989.7406,555.7889" pos="-23.0001,-7046">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="摇镜头"></Action>
|
||||||
|
<Action type="Video" value="YaoJingTou.mp4" size="1784.222,800.9055" offset="10,10" finishedEvent="finished" closeEvent="close"></Action>
|
||||||
|
<Action type="Log" value="2222222222"></Action>
|
||||||
|
</Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component type="Button" size="989.7406,555.7889" pos="-23.0001,-7703">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="移镜头"></Action>
|
||||||
|
<Action type="Video" value="YiJingTou.mp4" size="1784.222,800.9055" offset="10,10" finishedEvent="finished" closeEvent="close"></Action>
|
||||||
|
<Action type="Log" value="2222222222"></Action>
|
||||||
|
</Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
<Component type="Button" size="535.0657,137.6156" pos="-23,-10333">
|
||||||
|
<Action type="Sequence">
|
||||||
|
<Action type="Log" value="跟镜头"></Action>
|
||||||
|
<Action type="Video" value="GenJingTou.mp4" size="1784.222,800.9055" offset="10,10" finishedEvent="finished" closeEvent="close"></Action>
|
||||||
|
<Action type="Log" value="2222222222"></Action>
|
||||||
|
</Action>
|
||||||
|
</Component>
|
||||||
|
|
||||||
|
|
||||||
</Knowledge>
|
</Knowledge>
|
||||||
|
|||||||
@ -876,7 +876,10 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Action type="TipWindow" value="恭喜你完成摄像机拍摄,点击确定,保存摄像机拍摄文件" btns="确定"> </Action>
|
<Action type="TipWindow" value="恭喜你完成摄像机拍摄,点击确定,保存摄像机拍摄文件" btns="确定"> </Action>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
|
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||