在录屏的后面再加一段视频

2a3185e2 · JiangWanZhi · aeeede9d · 2a3185e2 · 2a3185e2 · 2a3185e2
Commit 2a3185e2 authored Aug 28, 2023 by JiangWanZhi
9 changed files
--- a/Assets/Art/WaterMask.meta
+++ b/Assets/Art/WaterMask.meta
+fileFormatVersion: 2
+guid: e45a3af7ef9d4344b99500c5e1728e6f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Art/WaterMask/AdVideo.mp4
+++ b/Assets/Art/WaterMask/AdVideo.mp4
--- a/Assets/Art/WaterMask/AdVideo.mp4.meta
+++ b/Assets/Art/WaterMask/AdVideo.mp4.meta
+fileFormatVersion: 2
+guid: 17071c12ce7156840be9ee4c265f1450
+VideoClipImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Art/WaterMask/MyVideo.renderTexture
+++ b/Assets/Art/WaterMask/MyVideo.renderTexture
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MyVideo
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 100
+  m_Height: 100
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 94
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
--- a/Assets/Art/WaterMask/MyVideo.renderTexture.meta
+++ b/Assets/Art/WaterMask/MyVideo.renderTexture.meta
+fileFormatVersion: 2
+guid: a9bae581aa5b50343b384e88e1c25bb7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/NatCorder/Examples/ReplayCam/ReplayCam.cs
+++ b/Assets/NatCorder/Examples/ReplayCam/ReplayCam.cs
-/* 
-*   NatCorder
-*   Copyright (c) 2020 Yusuf Olokoba
-*/
-
-namespace NatSuite.Examples {
-
+namespace NatSuite.Examples 
+{
    using UnityEngine;
-    using System.Collections;
    using Recorders;
    using Recorders.Clocks;
    using Recorders.Inputs;
    using UnityEditor;
-    using UnityEngine.UI;
-    using static UnityEngine.GraphicsBuffer;
-    using UnityEngine.Rendering.Universal;
    using System.IO;
    using UnityEngine.Android;

@@ -72,8 +63,8 @@ namespace NatSuite.Examples {
            float y = targetpos.GetComponent<RectTransform>().sizeDelta.y;

            val = (float)Screen.width / x;
-            //cam.targetTexture = new RenderTexture((int)x, (int)y, 24, RenderTextureFormat.ARGB32);

+            cam.targetTexture = new RenderTexture((int)x, (int)y, 24, RenderTextureFormat.ARGB32);
            transform.position = new Vector3(targetpos.position.x, targetpos.position.y, transform.position.z);

            //cam.orthographicSize = 5f / val + 0.9f;
@@ -114,7 +105,6 @@ namespace NatSuite.Examples {

            recorder = null;

-            Test();
        }

        public async void StopRecording () 
@@ -141,18 +131,6 @@ namespace NatSuite.Examples {
            GameEndPanel.Instance.ShareMp4_Path = path;
            OnReplay(path);
        }
-
-        private void Test()
-        {
-            Debug.Log($"测试创建");
-            string path = "/storage/emulated/0/XYZ";
-            if (!Directory.Exists(path))
-            {
-                Debug.Log("不在");
-                Directory.CreateDirectory(path);
-            }
-            Debug.Log("完成");
-        }
        private void OnReplay(string path)
        {
            string destination = "";

--- a/Assets/Scenes/gameScene.unity
+++ b/Assets/Scenes/gameScene.unity
@@ -811,7 +811,7 @@ Camera:
  m_Depth: -1
  m_CullingMask:
    serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 55
  m_RenderingPath: -1
  m_TargetTexture: {fileID: 0}
  m_TargetDisplay: 0
@@ -973,7 +973,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 729cc869d00f86d428d989f7082544da, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  bannercolor: {r: 0, g: 0, b: 0, a: 0}
+  bannercolor: {r: 1, g: 1, b: 1, a: 0}
 --- !u!114 &377164658
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1150,7 +1150,7 @@ Canvas:
  m_OverrideSorting: 0
  m_OverridePixelPerfect: 0
  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
+  m_VertexColorAlwaysGammaSpace: 1
  m_AdditionalShaderChannelsFlag: 25
  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: -230597399
@@ -1171,6 +1171,7 @@ RectTransform:
  - {fileID: 1147557151012020857}
  - {fileID: 1955086771}
  - {fileID: 577897817}
+  - {fileID: 8259677887893077152}
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1313,6 +1314,42 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 452952300}
  m_CullTransparentMesh: 1
+--- !u!1 &454344868
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 454344869}
+  m_Layer: 0
+  m_Name: Watermarks
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &454344869
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 454344868}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 945105133}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -134, y: 57}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &491076100
 GameObject:
  m_ObjectHideFlags: 0
@@ -2211,13 +2248,14 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 454344869}
  m_Father: {fileID: 282620523}
  m_RootOrder: -1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -4, y: 245}
+  m_AnchoredPosition: {x: 0, y: 245}
  m_SizeDelta: {x: 506, y: 730}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &945105134
@@ -3549,6 +3587,86 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1643100473}
  m_CullTransparentMesh: 1
+--- !u!1 &1646290498
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1646290499}
+  - component: {fileID: 1646290501}
+  - component: {fileID: 1646290500}
+  m_Layer: 6
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1646290499
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1646290498}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6835098199542858169}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1646290500
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1646290498}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u4E2A\u662F\u6C34\u5370"
+--- !u!222 &1646290501
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1646290498}
+  m_CullTransparentMesh: 1
 --- !u!1 &1660833921
 GameObject:
  m_ObjectHideFlags: 0
@@ -4775,6 +4893,11 @@ MonoBehaviour:
  nOtShow_OnRecorder:
  - {fileID: 1885279593}
  - {fileID: 1381064498}
+  WaterMask_Canvas: {fileID: 3559224954541414634}
+  ADVideo: {fileID: 8688277621377235908}
+  WaterMarks: {fileID: 914023126419466401}
+  WaterMarks_Pos: {fileID: 454344869}
+  WaitWaterMaskVideo_Time: 2
  ShareMp4_Path: 
 --- !u!1 &1983902529
 GameObject:
@@ -5139,7 +5262,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -4, y: 245}
+  m_AnchoredPosition: {x: 0, y: 245}
  m_SizeDelta: {x: 492, y: 716}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2077948430
@@ -5738,6 +5861,24 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1949322863859588967}
  m_CullTransparentMesh: 1
+--- !u!1 &914023126419466401
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6835098199542858169}
+  - component: {fileID: 4019041522225130966}
+  - component: {fileID: 6835098199542858170}
+  m_Layer: 6
+  m_Name: WaterMask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!222 &982249068066296756
 CanvasRenderer:
  m_ObjectHideFlags: 0
@@ -5961,6 +6102,29 @@ RectTransform:
  m_AnchoredPosition: {x: 560, y: -120}
  m_SizeDelta: {x: 87, y: 91}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &1360664800682586703
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3559224954541414634}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 297775247}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 1
+  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: -230597399
+  m_SortingOrder: 1
+  m_TargetDisplay: 0
 --- !u!114 &1438794556952302352
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -7314,6 +7478,46 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1539005795910344629}
  m_CullTransparentMesh: 1
+--- !u!1 &3559224954541414634
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8259677887893077152}
+  - component: {fileID: 1360664800682586703}
+  - component: {fileID: 7237653860435174750}
+  m_Layer: 6
+  m_Name: WaterMaskCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3564808717310834443
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7456507504305674648}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3802799160322568495}
+  - {fileID: 6835098199542858169}
+  m_Father: {fileID: 8259677887893077152}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &3566262507550136241
 RectTransform:
  m_ObjectHideFlags: 0
@@ -7370,6 +7574,26 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!224 &3802799160322568495
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8733342233420103857}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3564808717310834443}
+  m_RootOrder: -1
+  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 &3849254273743703517
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -7530,6 +7754,14 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4019041522225130966
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914023126419466401}
+  m_CullTransparentMesh: 1
 --- !u!224 &4044314258423458531
 RectTransform:
  m_ObjectHideFlags: 0
@@ -8813,6 +9045,57 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!224 &6835098199542858169
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914023126419466401}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1646290499}
+  m_Father: {fileID: 3564808717310834443}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 114, y: -66}
+  m_SizeDelta: {x: 214.75, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6835098199542858170
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 914023126419466401}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6982672176724163313
 GameObject:
  m_ObjectHideFlags: 0
@@ -8879,6 +9162,23 @@ MonoBehaviour:
  scaleConstPos: {x: 0, y: 0}
  canvasCamera: {fileID: 297775247}
  Content: {fileID: 6786605224267383807}
+--- !u!114 &7237653860435174750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3559224954541414634}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!224 &7255145337877875340
 RectTransform:
  m_ObjectHideFlags: 0
@@ -9002,6 +9302,22 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!1 &7456507504305674648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3564808717310834443}
+  m_Layer: 6
+  m_Name: Video
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!114 &7465000424075170279
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -9448,6 +9764,27 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!224 &8259677887893077152
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3559224954541414634}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3564808717310834443}
+  m_Father: {fileID: 414882564}
+  m_RootOrder: -1
+  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!224 &8264718637096921617
 RectTransform:
  m_ObjectHideFlags: 0
@@ -9661,6 +9998,42 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7432927552733396289}
  m_CullTransparentMesh: 1
+--- !u!328 &8688277621377235908
+VideoPlayer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8733342233420103857}
+  m_Enabled: 1
+  m_VideoClip: {fileID: 32900000, guid: 17071c12ce7156840be9ee4c265f1450, type: 3}
+  m_TargetCameraAlpha: 1
+  m_TargetCamera3DLayout: 0
+  m_TargetCamera: {fileID: 0}
+  m_TargetTexture: {fileID: 8400000, guid: a9bae581aa5b50343b384e88e1c25bb7, type: 2}
+  m_TimeReference: 0
+  m_TargetMaterialRenderer: {fileID: 0}
+  m_TargetMaterialProperty: <noninit>
+  m_RenderMode: 2
+  m_AspectRatio: 2
+  m_DataSource: 0
+  m_TimeUpdateMode: 2
+  m_PlaybackSpeed: 1
+  m_AudioOutputMode: 2
+  m_TargetAudioSources:
+  - {fileID: 0}
+  m_DirectAudioVolumes:
+  - 1
+  m_Url: 
+  m_EnabledAudioTracks: 01
+  m_DirectAudioMutes: 00
+  m_ControlledAudioTrackCount: 1
+  m_PlayOnAwake: 0
+  m_SkipOnDrop: 1
+  m_Looping: 0
+  m_WaitForFirstFrame: 1
+  m_FrameReadyEventEnabled: 0
+  m_VideoShaders: []
 --- !u!114 &8699291600771406965
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -9691,6 +10064,60 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8733342233420103857
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3802799160322568495}
+  - component: {fileID: 8688277621377235908}
+  - component: {fileID: 8733342233420103859}
+  - component: {fileID: 8733342233420103858}
+  m_Layer: 6
+  m_Name: Video Player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &8733342233420103858
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8733342233420103857}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 8400000, guid: a9bae581aa5b50343b384e88e1c25bb7, type: 2}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!222 &8733342233420103859
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8733342233420103857}
+  m_CullTransparentMesh: 1
 --- !u!222 &8735085637294557441
 CanvasRenderer:
  m_ObjectHideFlags: 0

--- a/Assets/scripts/Views/GameEnd/GameEndPanel.cs
+++ b/Assets/scripts/Views/GameEnd/GameEndPanel.cs
@@ -2,9 +2,12 @@ using NatSuite.Examples;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using UnityEngine;
 using UnityEngine.Device;
 using UnityEngine.UI;
+using UnityEngine.Video;
+using Debug = UnityEngine.Debug;
 using SystemInfo = UnityEngine.SystemInfo;

 public class GameEndPanel : MonoBehaviour
@@ -32,6 +35,12 @@ public class GameEndPanel : MonoBehaviour
    public GameObject[] sHow_OnRecorder; //在录屏的时候显示的节点
    public GameObject[] nOtShow_OnRecorder; //在录屏的时候不显示的节点

+    public GameObject WaterMask_Canvas;  //水印画布
+    public VideoPlayer ADVideo;    //加在后面的水印视频
+    public GameObject WaterMarks; //录屏加的水印
+    public Transform WaterMarks_Pos;  //水印的位置
+    public float WaitWaterMaskVideo_Time; //等水印视频播完的时间
+
    [HideInInspector]
    public string ShareMp4_Path;
    private void Awake()
@@ -50,16 +59,7 @@ public class GameEndPanel : MonoBehaviour
        RegisterEvent(true);

        IsRecorder(false);
-    }
-
-
-    private void Update()
-    {
-        if (Input.GetKeyDown(KeyCode.S))  //测试把图片移到结束界面下来
-        {
-            BG.SetActive(true);
-            MovePic();
-        }
+        WaterMask_Canvas.SetActive(false);
    }

    public void OpenPanel()
@@ -108,12 +108,23 @@ public class GameEndPanel : MonoBehaviour
        StartCoroutine(DelayToStop());
    }

+    
    IEnumerator DelayToStop()
    {
-        yield return new WaitForSeconds(1);
+        yield return new WaitForSeconds(1); //这里是等图片的效果播完
+        ADVideo.Play();
+        ADVideo.transform.GetComponent<RectTransform>().sizeDelta = new Vector2(GameMgr.Ins.md.png.width, GameMgr.Ins.md.png.height);
+        ADVideo.transform.position = Mask.transform.position;
+        ADVideo.transform.localScale = GameMgr.Ins.GetComponent<ScaleToImage>().target.localScale;
+
+        yield return new WaitForSeconds(WaitWaterMaskVideo_Time); //这里等个两秒，等录屏后面的视频播完再停止录屏
+        ADVideo.Stop();
+        WaterMarks.SetActive(false);
        replayCam.StopRecording();

        IsRecorder(false);
+
+        WaterMask_Canvas.SetActive(false);
    }

    private void CreateItem() //创建列表item
@@ -148,21 +159,12 @@ public class GameEndPanel : MonoBehaviour
        yield return new WaitForEndOfFrame();

        new NativeShare().AddFile(ShareMp4_Path).Share();
-
-        //new NativeShare().AddFile(ShareMp4_Path)
-        //    .SetSubject("Subject goes here").SetText("Hello world!").SetUrl("https://github.com/yasirkula/UnityNativeShare")
-        //    .SetCallback((result, shareTarget) => Debug.Log("Share result: " + result + ", selected app: " + shareTarget))
-        //    .Share();
-
-        // Share on WhatsApp only, if installed (Android only)
-        //if( NativeShare.TargetExists( "com.whatsapp" ) )
-        //	new NativeShare().AddFile( filePath ).AddTarget( "com.whatsapp" ).Share();
    }
    private void RePlayVideo_Btn_Click()
    {
        Debug.Log("点击回放动画");

-        //GameMgr.Ins.RePlay();
+        GameMgr.Ins.RePlay();

    }

@@ -170,8 +172,12 @@ public class GameEndPanel : MonoBehaviour
    {
        Debug.Log("点击保存视频  ,开始录屏了");
        GameMgr.Ins.RePlay();
+        WaterMask_Canvas.SetActive(true);
+        WaterMarks.SetActive(true);
+        WaterMarks.transform.position = WaterMarks_Pos.transform.position;

        replayCam.StartRecording();
+
        IsRecorder(true);
    }

@@ -222,18 +228,6 @@ public class GameEndPanel : MonoBehaviour
    {
        //Debug.Log("11111  点击测试显示开屏广告按钮");
        MaxSDKManager.Instance.ShowAdByType(AdType.OpenApp,"点击测试显示开屏广告按钮");
-
-        texts[0] = "设备模型：" + SystemInfo.deviceModel;
-        texts[1] = "设备名称：" + SystemInfo.deviceName;
-        texts[2] = "设备类型：" + SystemInfo.deviceType;
-        texts[3] = "设备唯一标识符：" + SystemInfo.deviceUniqueIdentifier;
-        texts[4] = "操作系统：" + SystemInfo.operatingSystem;
-
-        foreach (var item in texts)
-        {
-            Debug.Log($"11111  {item}");
-        }
-
    }

 }
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -11,7 +11,7 @@ TagManager:
  - 
  - Water
  - UI
-  - 
+  - Video
  - 
  - 
  -