MuHua/MuHua-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码合并

Browse Source
This commit is contained in:
MuHua-123
2024-11-08 18:15:06 +08:00
parent 5f169b90bb
commit 497b43a446
146 changed files with 2858 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModuleFunction/ModuleUIPanel/UIDeviceVideo.cs
+6 -6
View File
@@ -9,7 +9,7 @@ public class UIDeviceVideo : ModuleUIPanel<DataVideo> {
private Button CloseButton => element.Q<Button>("Close");
public override void Awake() {
//初始化模块
ModuleCore.VideoPanel = this;
//ModuleCore.VideoPanel = this;
InitElement();
//加载视频媒体ui
VisualElement media = element.Q<VisualElement>("MediaPlayer");
@@ -20,7 +20,7 @@ public class UIDeviceVideo : ModuleUIPanel<DataVideo> {
public override void Open(DataVideo data) {
this.data = data;
element.style.display = DisplayStyle.Flex;
ModuleCore.ModuleVideo.SetValue(data);
//ModuleCore.ModuleVideo.SetValue(data);
mediaPlayer.Open();
}
public override void Close() {
@@ -35,9 +35,9 @@ public class UIDeviceVideo : ModuleUIPanel<DataVideo> {
/// <summary> 全屏播放功能 </summary>
private void MediaPlayerFullScreen() {
element.style.display = DisplayStyle.None;
ModuleCore.FullScreenVideoPanel.Open(() => {
mediaPlayer.Open();
element.style.display = DisplayStyle.Flex;
});
//ModuleCore.FullScreenVideoPanel.Open(() => {
// mediaPlayer.Open();
// element.style.display = DisplayStyle.Flex;
//});
}
}
Assets/ModuleFunction/ModuleUIPanel/UIDeviceVideoImage.cs
+6 -6
View File
@@ -15,7 +15,7 @@ public class UIDeviceVideoImage : ModuleUIPanel<DataVideoImage> {
public override void Awake() {
//初始化模块
ModuleCore.VideoImagePanel = this;
//ModuleCore.VideoImagePanel = this;
InitElement();
//加载视频媒体ui
VisualElement media = element.Q<VisualElement>("MediaPlayer");
@@ -29,7 +29,7 @@ public class UIDeviceVideoImage : ModuleUIPanel<DataVideoImage> {
public override void Open(DataVideoImage data) {
this.data = data;
element.style.display = DisplayStyle.Flex;
ModuleCore.ModuleVideo.SetValue(data.dataVideo);
//ModuleCore.ModuleVideo.SetValue(data.dataVideo);
Image.style.backgroundImage = new StyleBackground(data.sprite);
Button2_clicked();
}
@@ -45,10 +45,10 @@ public class UIDeviceVideoImage : ModuleUIPanel<DataVideoImage> {
/// <summary> 全屏播放功能 </summary>
private void MediaPlayerFullScreen() {
element.style.display = DisplayStyle.None;
ModuleCore.FullScreenVideoPanel.Open(() => {
mediaPlayer.Open();
element.style.display = DisplayStyle.Flex;
});
//ModuleCore.FullScreenVideoPanel.Open(() => {
// mediaPlayer.Open();
// element.style.display = DisplayStyle.Flex;
//});
}
private void Button1_clicked() {
mediaPlayer.Close();
Assets/ModuleFunction/ModuleUIPanel/UIFullScreenVideo.cs
+1 -1
View File
@@ -8,7 +8,7 @@ public class UIFullScreenVideo : ModuleUIPanel<Action> {
private Action callback;
private MediaPlayer mediaPlayer;
public override void Awake() {
ModuleCore.FullScreenVideoPanel = this;
//ModuleCore.FullScreenVideoPanel = this;
InitElement();
VisualElement media = element.Q<VisualElement>("MediaPlayer");
mediaPlayer = new MediaPlayer(media, Close);
Assets/ModuleFunction/ModuleUIPanel/UILearningVideo.cs
+8 -8
View File
@@ -21,7 +21,7 @@ public class UILearningVideo : ModuleUIPanel<Action> {
private Button CloseButton => element.Q<Button>("Close");
public override void Awake() {
//初始化模块
ModuleCore.LearningVideoPanel = this;
//ModuleCore.LearningVideoPanel = this;
InitElement();
//加载视频媒体ui
VisualElement media = element.Q<VisualElement>("MediaPlayer");
@@ -49,24 +49,24 @@ public class UILearningVideo : ModuleUIPanel<Action> {
/// <summary> 全屏播放功能 </summary>
private void MediaPlayerFullScreen() {
element.style.display = DisplayStyle.None;
ModuleCore.FullScreenVideoPanel.Open(() => {
mediaPlayer.Open();
element.style.display = DisplayStyle.Flex;
});
//ModuleCore.FullScreenVideoPanel.Open(() => {
// mediaPlayer.Open();
// element.style.display = DisplayStyle.Flex;
//});
}
private void Button1_clicked() {
DataVideoClip videoClip = new DataVideoClip(clip1);
ModuleCore.ModuleVideo.SetValue(videoClip);
//ModuleCore.ModuleVideo.SetValue(videoClip);
mediaPlayer.Open();
}
private void Button2_clicked() {
DataVideoClip videoClip = new DataVideoClip(clip2);
ModuleCore.ModuleVideo.SetValue(videoClip);
//ModuleCore.ModuleVideo.SetValue(videoClip);
mediaPlayer.Open();
}
private void Button3_clicked() {
DataVideoClip videoClip = new DataVideoClip(clip3);
ModuleCore.ModuleVideo.SetValue(videoClip);
//ModuleCore.ModuleVideo.SetValue(videoClip);
mediaPlayer.Open();
}
}