From 28de80f63873a3380c5d0735b18ce1cf69147f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com>
Date: Wed, 6 Mar 2024 12:23:41 +0800
Subject: [PATCH] 1
---
Assets/Resources/Prefabs/DoublePlay.prefab | 123 +++---
Assets/Resources/UIPanel/View_Panel2.prefab | 3 +
Assets/Zion/Scripts/Wzx/DoublePlayMain.cs | 14 +
Assets/Zion/Scripts/Wzx/DropdownDouble.cs | 4 +
Assets/Zion/Scripts/Wzx/VideoListManager.cs | 31 +-
ProjectSettings/EditorBuildSettings.asset | 3 +
ProjectSettings/ProjectSettings.asset | 4 +-
RenderHeads.AVProMovieCapture.Demos.csproj | 410 +++++++++---------
RenderHeads.AVProMovieCapture.Editor.csproj | 416 +++++++++----------
RenderHeads.AVProMovieCapture.Runtime.csproj | 410 +++++++++---------
10 files changed, 708 insertions(+), 710 deletions(-)
diff --git a/Assets/Resources/Prefabs/DoublePlay.prefab b/Assets/Resources/Prefabs/DoublePlay.prefab
index 293841e2..b345444d 100644
--- a/Assets/Resources/Prefabs/DoublePlay.prefab
+++ b/Assets/Resources/Prefabs/DoublePlay.prefab
@@ -1308,7 +1308,7 @@ RectTransform:
- {fileID: 7167972109621359833}
- {fileID: 395436158516527757}
m_Father: {fileID: 122061599886375676}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.17183334, y: 0.03951852}
m_AnchorMax: {x: 0.99166673, y: 0.81962967}
@@ -1459,7 +1459,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1480251055638496835
RectTransform:
m_ObjectHideFlags: 0
@@ -1902,8 +1902,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: abe63c6c7a141e049b4b93716755df46, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -1930,7 +1930,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 1480251055891144165}
m_SelectOnLeft: {fileID: 1480251056698846948}
m_SelectOnRight: {fileID: 1480251055970303639}
- m_Transition: 1
+ m_Transition: 2
m_Colors:
m_NormalColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -1984,7 +1984,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1480251055970303634
RectTransform:
m_ObjectHideFlags: 0
@@ -2198,7 +2198,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1480251056072614865}
+ m_Father: {fileID: 122061599886375676}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1480251056057912327
@@ -2251,7 +2251,6 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 1480251056057912326}
- {fileID: 1480251057036276748}
- {fileID: 1480251056219242806}
m_Father: {fileID: 6611480634414415942}
@@ -2476,7 +2475,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1480251056072614865}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1480251056219242807
MonoBehaviour:
@@ -3040,7 +3039,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -3193,7 +3192,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 5.700012, y: 0.000005722046}
m_SizeDelta: {x: 40, y: -0.0000076294}
m_Pivot: {x: 0.5, y: 0.5}
@@ -3218,7 +3217,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0, b: 0, a: 1}
+ m_Color: {r: 0.18039216, g: 0.38431376, b: 0.18039216, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -3288,7 +3287,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1480251056625790844
RectTransform:
m_ObjectHideFlags: 0
@@ -3466,8 +3465,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: abe63c6c7a141e049b4b93716755df46, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -3494,7 +3493,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 1480251055891144165}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 1480251055914214144}
- m_Transition: 1
+ m_Transition: 2
m_Colors:
m_NormalColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -3505,7 +3504,7 @@ MonoBehaviour:
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 21300000, guid: b53cf42599335744ab88c8b3c9801922, type: 3}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
@@ -3546,7 +3545,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1480251056723724231
RectTransform:
m_ObjectHideFlags: 0
@@ -3758,7 +3757,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -3794,7 +3793,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1480251057023120058
RectTransform:
m_ObjectHideFlags: 0
@@ -3903,7 +3902,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1480251056072614865}
- m_RootOrder: 1
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1480251057036276749
MonoBehaviour:
@@ -4129,7 +4128,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -4154,7 +4153,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0, b: 0, a: 1}
+ m_Color: {r: 0.18039216, g: 0.38431376, b: 0.18039216, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -6083,7 +6082,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 2073608.5}
+ m_AnchoredPosition: {x: 0, y: 2114779.8}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7554510022850465655
@@ -6794,6 +6793,7 @@ GameObject:
m_Component:
- component: {fileID: 122061599886375676}
- component: {fileID: 769766187}
+ - component: {fileID: 2191071513997971312}
m_Layer: 5
m_Name: DoublePlay
m_TagString: Untagged
@@ -6812,6 +6812,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1480251056057912326}
- {fileID: 986268761790548719}
- {fileID: 3963678744490064865}
- {fileID: 6611480634414415942}
@@ -6839,12 +6840,32 @@ MonoBehaviour:
state:
message:
data: []
+ videolistmanager: {fileID: 2191071513997971312}
DuplexPrefab: {fileID: 198960244992228328}
DuplexPrefabParent: {fileID: 2073225918468134698}
doublePlayIntroduceList: {fileID: 6201263142606722683}
doublePlayEvaluatePanel: {fileID: 3537909893660586897}
IntroduceList: {fileID: 7895018725875390904}
EvaluatePanel: {fileID: 3482592599960997813}
+ VideoUi: {fileID: 7815219803928858734}
+--- !u!114 &2191071513997971312
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3516102047471918540}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cc6402ad40b27814297734915c45fbb9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _name:
+ folderPath:
+ buttonPrefab: {fileID: 8952334741113374889, guid: 6d57b19603f643e418e201506ac97558,
+ type: 3}
+ buttonContainer: {fileID: 1480251056529467884}
+ vCR: {fileID: 1480251056057912327}
--- !u!1 &3635290306844282293
GameObject:
m_ObjectHideFlags: 0
@@ -9139,7 +9160,7 @@ GameObject:
- component: {fileID: 6648349032138352632}
- component: {fileID: 455702465014228114}
m_Layer: 5
- m_Name: Button
+ m_Name: btn_videoClose
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -9243,18 +9264,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 6648349032138352632}
m_OnClick:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 7815219803928858734}
- m_MethodName: SetActive
- m_Mode: 6
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
+ m_Calls: []
--- !u!1 &6601200476254135444
GameObject:
m_ObjectHideFlags: 0
@@ -10454,14 +10464,13 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6611480634414415942}
- - component: {fileID: 4015703846058849611}
m_Layer: 5
m_Name: UI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &6611480634414415942
RectTransform:
m_ObjectHideFlags: 0
@@ -10471,7 +10480,7 @@ RectTransform:
m_GameObject: {fileID: 7815219803928858734}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1480251055978339854}
- {fileID: 1480251056369346847}
@@ -10479,30 +10488,13 @@ RectTransform:
- {fileID: 1480251056072614865}
- {fileID: 7464397899082591565}
m_Father: {fileID: 122061599886375676}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &4015703846058849611
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7815219803928858734}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: cc6402ad40b27814297734915c45fbb9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- folderPath:
- buttonPrefab: {fileID: 8952334741113374889, guid: 6d57b19603f643e418e201506ac97558,
- type: 3}
- buttonContainer: {fileID: 1480251056529467884}
- vCR: {fileID: 1480251056057912327}
--- !u!1 &7882635800052961877
GameObject:
m_ObjectHideFlags: 0
@@ -11134,7 +11126,7 @@ RectTransform:
m_Children:
- {fileID: 7882635801159145295}
m_Father: {fileID: 122061599886375676}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -11664,18 +11656,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 6662063271224433003}
m_OnClick:
m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 7815219803928858734}
- m_MethodName: SetActive
- m_Mode: 6
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 1
- m_CallState: 2
+ m_Calls: []
--- !u!1 &8235714048282401752
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/UIPanel/View_Panel2.prefab b/Assets/Resources/UIPanel/View_Panel2.prefab
index 1a0d0478..e11b8be3 100644
--- a/Assets/Resources/UIPanel/View_Panel2.prefab
+++ b/Assets/Resources/UIPanel/View_Panel2.prefab
@@ -3254,6 +3254,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
subject: {fileID: 0}
+ ObjLoadingScene: {fileID: 0}
+ progressBar: {fileID: 0}
+ progressDisplay: {fileID: 0}
--- !u!1 &4190038651084140469
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Zion/Scripts/Wzx/DoublePlayMain.cs b/Assets/Zion/Scripts/Wzx/DoublePlayMain.cs
index 88e52a69..8aafdd7a 100644
--- a/Assets/Zion/Scripts/Wzx/DoublePlayMain.cs
+++ b/Assets/Zion/Scripts/Wzx/DoublePlayMain.cs
@@ -13,6 +13,8 @@ public class DoublePlayMain : MonoBehaviour
///
[Header("所有房间数据接口")]
public RoomData roomdata = new RoomData();
+
+ public VideoListManager videolistmanager = new VideoListManager();
///
/// 复盘回访预制体
///
@@ -44,6 +46,10 @@ public class DoublePlayMain : MonoBehaviour
///
private Button btn_video;
///
+ /// 关闭训练回放
+ ///
+ private Button btn_videoClose;
+ ///
/// 基本信息obj
///
public GameObject IntroduceList;
@@ -51,6 +57,10 @@ public class DoublePlayMain : MonoBehaviour
/// 训练评估obj
///
public GameObject EvaluatePanel;
+ ///
+ /// 复盘回放视频显示
+ ///
+ public GameObject VideoUi;
// Start is called before the first frame update
void Start()
{
@@ -58,6 +68,8 @@ public class DoublePlayMain : MonoBehaviour
Debug.Log("url.:"+ Url_RoomList);
tog_informition = transform.Find("IntroducePanel/tog_informition").GetComponent();
tog_evaluate = transform.Find("IntroducePanel/tog_evaluate").GetComponent();
+ btn_video = transform.Find("IntroducePanel/btn_video").GetComponent