回放录屏更新

Assets/GameMgr/GameMgr.cs

@@ -65,7 +65,7 @@ public class GameMgr : MonoBehaviour
         curTime = 0;
     }
     //停止重播
-    private void StopRePlay()
+    public void StopRePlay()
     {
         md.StopRePlay();
         stepIndex = -1;
@@ -201,6 +201,7 @@ public class GameMgr : MonoBehaviour
             if (stepIndex >= md.dynamic.step.Count)
             {
                 stepIndex = -1;
+                EventDispatcher.Dispatch(EventName.Event.Event_StopRecording);
             }
         }
     }

Assets/NatCorder/Examples/ReplayCam/ReplayCam.cs

@@ -21,14 +21,14 @@ namespace NatSuite.Examples {
         {
             get
             {
-                return Screen.width;//(int)targetpos.GetComponent<RectTransform>().sizeDelta.x;
+                return (int)targetpos.GetComponent<RectTransform>().sizeDelta.x;
             }
         }
         public int videoHeight
         {
             get
             {
-                return Screen.height;//(int)targetpos.GetComponent<RectTransform>().sizeDelta.y;
+                return (int)targetpos.GetComponent<RectTransform>().sizeDelta.y;
             }
         }
         public bool recordMicrophone;
@@ -73,23 +73,22 @@ namespace NatSuite.Examples {
         {
             float x = targetpos.GetComponent<RectTransform>().sizeDelta.x;
             float y = targetpos.GetComponent<RectTransform>().sizeDelta.y;
-            targetpos.GetComponent<BoxCollider2D>().size = new Vector2(x, 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;
+            //cam.orthographicSize = 5f / val + 0.9f;
 
         }
 
         public void StartRecording () 
         {
             Debug.Log($"开始录屏");
-            //SetCamPos();
+            SetCamPos();
             // Start recording
-            var frameRate = Application.targetFrameRate;
+            var frameRate = 30;
             //var sampleRate = recordMicrophone ? AudioSettings.outputSampleRate : 0;
             //var channelCount = recordMicrophone ? (int)AudioSettings.speakerMode : 0;
             var sampleRate =  AudioSettings.outputSampleRate;
@@ -102,9 +101,21 @@ namespace NatSuite.Examples {
             //webCamTextureInput = new WebCamTextureInput(recorder, clock, (WebCamTexture)tex);
 
             //audioInput = recordMicrophone ? new AudioInput(recorder, clock, microphoneSource, true) : null;
-            //audioInput = new AudioInput(recorder, clock, audioListener);
+            audioInput = new AudioInput(recorder, clock, audioListener);
             // Unmute microphone
-            //microphoneSource.mute = audioInput == null;
+            microphoneSource.mute = true;// audioInput == null;
+        }
+
+        public  void InterruptRecording() //停止录屏，但是不保存
+        {
+            Debug.Log("停止录屏");
+            // Mute microphone
+            microphoneSource.mute = true;
+            // Stop recording
+            audioInput?.Dispose();
+            cameraInput?.Dispose();
+
+            recorder = null;
         }
 
         public async void StopRecording () 
@@ -114,7 +125,7 @@ namespace NatSuite.Examples {
             microphoneSource.mute = true;
             // Stop recording
             audioInput?.Dispose();
-            cameraInput.Dispose();
+            cameraInput?.Dispose();
             var path = await recorder.FinishWriting();
             // Playback recording
             Debug.Log($"Saved recording to: {path}");

Assets/Scenes/gameScene.unity

@@ -203,6 +203,43 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2435908}
   m_CullTransparentMesh: 1
+--- !u!1 &36661320
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 36661321}
+  m_Layer: 0
+  m_Name: Cancel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &36661321
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 36661320}
+  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: 925112935}
+  m_Father: {fileID: 282620523}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 187.5, y: -1082.5}
+  m_SizeDelta: {x: 375, y: 1083}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &39056317
 GameObject:
   m_ObjectHideFlags: 0
@@ -378,7 +415,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &244830826
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -394,7 +431,7 @@ MonoBehaviour:
   recordMicrophone: 0
   audioListener: {fileID: 297775246}
   cam: {fileID: 244830828}
-  targetpos: {fileID: 2022440215}
+  targetpos: {fileID: 2077948429}
 --- !u!114 &244830827
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -474,7 +511,7 @@ Camera:
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 5
+  orthographic size: 1.88
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
@@ -614,12 +651,13 @@ RectTransform:
   - {fileID: 945105133}
   - {fileID: 1885279594}
   - {fileID: 1381064499}
+  - {fileID: 36661321}
   m_Father: {fileID: 39056318}
   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: 271}
+  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!1 &297775245
@@ -906,7 +944,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!223 &414882563
 Canvas:
   m_ObjectHideFlags: 0
@@ -916,7 +954,7 @@ Canvas:
   m_GameObject: {fileID: 414882560}
   m_Enabled: 1
   serializedVersion: 3
-  m_RenderMode: 1
+  m_RenderMode: 2
   m_Camera: {fileID: 297775247}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
@@ -938,8 +976,8 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 414882560}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 30}
+  m_LocalScale: {x: 0.0061576352, y: 0.0061576352, z: 0.0061576352}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1147557151012020857}
@@ -951,8 +989,8 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &491076100
 GameObject:
   m_ObjectHideFlags: 0
@@ -1566,6 +1604,128 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 6616910588763818716, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
   m_PrefabInstance: {fileID: 8394779391782319571}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &925112934
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 925112935}
+  - component: {fileID: 925112938}
+  - component: {fileID: 925112937}
+  - component: {fileID: 925112936}
+  m_Layer: 0
+  m_Name: Btn_Cancel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &925112935
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 925112934}
+  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: 1085039866}
+  m_Father: {fileID: 36661321}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -188.1, y: 361}
+  m_SizeDelta: {x: 629.11, y: 101.33002}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &925112936
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 925112934}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 925112937}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &925112937
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 925112934}
+  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: 21300000, guid: cc1457334955a8a4495be319b035013e, type: 3}
+  m_Type: 1
+  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!222 &925112938
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 925112934}
+  m_CullTransparentMesh: 1
 --- !u!1 &945105132
 GameObject:
   m_ObjectHideFlags: 0
@@ -1591,7 +1751,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 945105132}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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
@@ -1601,7 +1761,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: -26.000006}
+  m_AnchoredPosition: {x: -4, y: 245}
   m_SizeDelta: {x: 506, y: 730}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &945105134
@@ -1800,6 +1960,86 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1083628060}
   m_CullTransparentMesh: 1
+--- !u!1 &1085039865
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1085039866}
+  - component: {fileID: 1085039868}
+  - component: {fileID: 1085039867}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1085039866
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1085039865}
+  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: 925112935}
+  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.3999939, y: -0.3999939}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1085039867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1085039865}
+  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.99607843, g: 0.99607843, b: 0.99215686, 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: 40
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u53D6\u6D88\u5F55\u5C4F"
+--- !u!222 &1085039868
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1085039865}
+  m_CullTransparentMesh: 1
 --- !u!224 &1093102238 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6616910588763818716, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
@@ -2197,7 +2437,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 187.5, y: -541.5}
+  m_AnchoredPosition: {x: 187.5, y: -1082.5}
   m_SizeDelta: {x: 375, y: 1083}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1555736098
@@ -3030,7 +3270,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: 0, y: -484.2}
+  m_AnchoredPosition: {x: 0, y: -213.20001}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1904010686
@@ -3522,7 +3762,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1955086771
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3561,10 +3801,19 @@ MonoBehaviour:
   RePlayVideo_Btn: {fileID: 1555736100}
   Share_Btn: {fileID: 1778506299}
   Continue_Btn: {fileID: 1083628062}
+  interruptRecording_Btn: {fileID: 925112936}
   PicParent: {fileID: 2022440215}
   scrollRect: {fileID: 1921562645}
   ItemParent: {fileID: 1994532034}
   item_obj: {fileID: 1219722612}
+  Mask: {fileID: 2077948429}
+  Mask_BG: {fileID: 945105133}
+  replayCam: {fileID: 244830826}
+  sHow_OnRecorder:
+  - {fileID: 36661320}
+  nOtShow_OnRecorder:
+  - {fileID: 1885279593}
+  - {fileID: 1381064498}
 --- !u!1 &1994532031
 GameObject:
   m_ObjectHideFlags: 0
@@ -3653,7 +3902,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2022440215}
   - component: {fileID: 2022440217}
-  - component: {fileID: 2022440216}
   m_Layer: 0
   m_Name: Pic
   m_TagString: Untagged
@@ -3678,39 +3926,9 @@ 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: -42, y: -204}
-  m_SizeDelta: {x: 200, y: 400}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2022440216
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2022440214}
-  m_Enabled: 0
-  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: 21300000, guid: fe9b18e09fff98f41b605cd4b200a7b6, type: 3}
-  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!222 &2022440217
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3879,7 +4097,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: -26}
+  m_AnchoredPosition: {x: -4, y: 245}
   m_SizeDelta: {x: 492, y: 716}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2077948430

Assets/scripts/EventName.cs

@@ -43,6 +43,11 @@ public static class EventName
         public const string Event_ImageScallChange = "Event_ImageScallChange";  //图片的缩放改变
         public const string Event_ReSetPicPos_Scale = "Event_ReSetPicPos_Scale";  //重新设置图片的位置和缩放
 
+        public const string Event_StrtRecording = "Event_StrtRecording";  //开始录屏
+        public const string Event_StopRecording = "Event_StopRecording"; //停止录屏
+        public const string Event_InterruptRecording = "Event_InterruptRecording"; //中断录屏
+
+        public const string Event_ReSetPicSize = "Event_ReSetPicSize"; //重置图片位置和大小
     }
 
     public class DataName

Assets/scripts/ScaleToImage.cs

@@ -75,15 +75,14 @@ public class ScaleToImage : MonoBehaviour
         target.gameObject.SetActive(true);
     }
 
+    private bool FirstFlag;
     private void Update()
     {
-
 #if UNITY_EDITOR
         MouseScale();
 #endif
         if (Input.touchCount == 2)
         {
-            RefreshScrollview();
             Scale();
             flag = true;
             scrollRect.inertia = false;
@@ -170,6 +169,7 @@ public class ScaleToImage : MonoBehaviour
     {
         if (!isInit_Scale)
         {
+            RefreshScrollview();
             SetscrollRectEnable(false);
             //两指点位
             touch1 = canvasCamera.ScreenToWorldPoint(Input.GetTouch(0).position);

Assets/scripts/Views/GameEnd/GameEndPanel.cs

+using NatSuite.Examples;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -6,17 +7,33 @@ using UnityEngine.UI;
 
 public class GameEndPanel : MonoBehaviour
 {
+    private static GameEndPanel instance;
+    public static GameEndPanel Instance => instance;
+
     public GameObject BG;
     public Button SaveVideo_Btn;
     public Button RePlayVideo_Btn;
     public Button Share_Btn;
     public Button Continue_Btn;
+    public Button interruptRecording_Btn; //中断录屏的按钮
 
     public Transform PicParent;
     public ScrollRect scrollRect;
     public HorizontalLayoutGroup ItemParent;
     public GameObject item_obj;
+    public RectTransform Mask;  //遮罩
+    public RectTransform Mask_BG; //遮罩前面的白框
+
+
+    public ReplayCam replayCam;
 
+    public GameObject[] sHow_OnRecorder; //在录屏的时候显示的节点
+    public GameObject[] nOtShow_OnRecorder; //在录屏的时候不显示的节点
+
+    private void Awake()
+    {
+        instance = this;
+    }
     private void Start()
     {
         ResiterEvent(true);
@@ -25,9 +42,76 @@ public class GameEndPanel : MonoBehaviour
         RePlayVideo_Btn.onClick.AddListener(RePlayVideo_Btn_Click);
         Share_Btn.onClick.AddListener(Share_Btn_Click);
         Continue_Btn.onClick.AddListener(Continue_Btn_Click);
+        interruptRecording_Btn.onClick.AddListener(InterruptRecording);
+        RegisterEvent(true);
+
+        IsRecorder(false);
+    }
+
+
+    private void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.S))  //测试把图片移到结束界面下来
+        {
+            BG.SetActive(true);
+            MovePic();
+        }
+    }
+
+    public void OpenPanel()
+    {
+        BG.SetActive(true);
+        MovePic();
+    }
+    private void MovePic()
+    {
+        GameMgr.Ins.transform.parent = PicParent;
+        GameMgr.Ins.transform.position = PicParent.position;
+
+        var Scaletoimage = GameMgr.Ins.GetComponent<ScaleToImage>();
+
+        Scaletoimage.target.localScale = Vector3.one * 0.3f;
+        float scale = Scaletoimage.target.localScale.x;
+        float picsize_x = GameMgr.Ins.md.png.width;
+        float picsize_y = GameMgr.Ins.md.png.height;
+        Mask.sizeDelta = new Vector2(picsize_x * scale, picsize_y * scale);
+        Mask_BG.sizeDelta = new Vector2(picsize_x * scale + 10, picsize_y * scale + 10);
 
     }
 
+    private void RegisterEvent(bool flag)
+    {
+        EventDispatcher.RegisterEvent(EventName.Event.Event_StopRecording, StopRecording, flag);
+        EventDispatcher.RegisterEvent(EventName.Event.Event_InterruptRecording, InterruptRecording, flag);
+    }
+
+    private void InterruptRecording(object[] values)
+    {
+        InterruptRecording();
+    }
+
+    private void InterruptRecording()
+    {
+        Debug.Log("中断录屏");
+        GameMgr.Ins.StopRePlay();
+        replayCam.InterruptRecording();
+        IsRecorder(false);
+    }
+    private void StopRecording(object[] values)
+    {
+        Debug.Log("录屏完成");
+
+        StartCoroutine(DelayToStop());
+    }
+
+    IEnumerator DelayToStop()
+    {
+        yield return new WaitForSeconds(1);
+        replayCam.StopRecording();
+
+        IsRecorder(false);
+    }
+
     private void CreateItem() //创建列表item
     {
         int childNum = 10;
@@ -56,13 +140,32 @@ public class GameEndPanel : MonoBehaviour
     private void RePlayVideo_Btn_Click()
     {
         Debug.Log("点击回放动画");
+
+        GameMgr.Ins.RePlay();
     }
 
     private void SaveVideo_Btn_Click()
     {
-        Debug.Log("点击保存视频");
+        Debug.Log("点击保存视频  ,开始录屏了");
+        GameMgr.Ins.RePlay();
+
+        replayCam.StartRecording();
+        IsRecorder(true);
     }
 
+    private void IsRecorder(bool flag)
+    {
+
+        foreach (var item in nOtShow_OnRecorder)
+        {
+            item.SetActive(!flag);
+        }
+
+        foreach (var item in sHow_OnRecorder)
+        {
+            item.SetActive(flag);
+        }
+    }
     private void ResiterEvent(bool flag)
     {
         EventDispatcher.RegisterEvent(EventName.Event.Event_AllGroupOver, GameEnd, flag);

Assets/scripts/Views/gameScene/Gameing.cs

@@ -6,10 +6,16 @@ using UnityEngine.UI;
 
 public class Gameing : MonoBehaviour
 {
+    private static Gameing instance;
+    public static Gameing Instance=>instance;
     public Button ReSetPos_Btn;
     public float ShowBtnScale;//显示重设位置按钮的缩放值
     public GameObject AutoFille_Btn;  //自动涂色的按钮
-    // Start is called before the first frame update
+    private void Awake()
+    {
+        instance  = this;   
+    }
+
     void Start()
     {
         ResiterEvent(true);
@@ -23,6 +29,7 @@ public class Gameing : MonoBehaviour
         EventDispatcher.RegisterEvent(EventName.Event.Event_GroupItemSelect, ShowAutoFill_Btn, flag);
     }
 
+
     private void ShowAutoFill_Btn(object[] values)
     {
         if (!AutoFille_Btn.activeSelf)

Assets/scripts/Views/maingame/GroupListManager.cs

@@ -140,6 +140,11 @@ public class GroupListManager : MonoBehaviour
         float value = ClickAreaCount / AllAreaCount;
         AllProcress.value = value;
         AllProcress_Text.text = value.ToString("P0");
+
+        if (value == 1)
+        {
+            GameEndPanel.Instance.OpenPanel();
+        }
     }
 
     public float bigvalue=1;
@@ -201,6 +206,9 @@ public class GroupListManager : MonoBehaviour
                 }
             };
         };
+
+
+        Vibration.VibrateNope();  //现在没有开关，直接震动
     }
 
     IEnumerator DelayToSetContent()
@@ -267,7 +275,7 @@ public class GroupListManager : MonoBehaviour
             {
                 var item = roomGroupsData[i];
                 NowJindu = (float)dynamic.GetCountById(item.id) / item.roomIds.Count;
-                AllAreaCount = AllAreaCount + item.roomIds.Count + dynamic.GetCountById(item.id);
+                AllAreaCount = AllAreaCount + item.roomIds.Count;
                 ClickAreaCount = ClickAreaCount + dynamic.GetCountById(item.id);
                 if (NowJindu >= 1)
                     continue;
@@ -414,5 +422,8 @@ public class GroupListManager : MonoBehaviour
     public void Test_Btn_RePlay()
     {
         GameMgr.Ins.RePlay();
+
+        EventDispatcher.Dispatch("Test");
+
     }
 }