蓝色星空 1 year ago
parent
commit
a1ae9d7f28
2 changed files with 322 additions and 320 deletions
  1. 309 302
      Assets/Game/ShowXunJian/ShowXunJian.prefab
  2. 13 18
      Assets/Game/ShowXunJian/StartXunJian.cs

File diff suppressed because it is too large
+ 309 - 302
Assets/Game/ShowXunJian/ShowXunJian.prefab


+ 13 - 18
Assets/Game/ShowXunJian/StartXunJian.cs

@@ -9,14 +9,13 @@ namespace GHZLangChao
         [SerializeField] private RawImage ShowRawImage; // 显示的视频画面
 
         [SerializeField] private Image[] arrayImage; // 截图显示的画面
-        [SerializeField] private Image ScreenshotImage; // 截图的画面
+        //[SerializeField] private Image ScreenshotImage; // 截图的画面
         private int arrayImageIndex = 0; // 截图显示时要显示在哪个Image上的下标
         [SerializeField] private Button ScreenshotBtn0;
         [SerializeField] private Button ScreenshotBtn1;
         [SerializeField] private Button ScreenshotBtn2;
         [SerializeField] private Button CancelBtn;
         [SerializeField] private Button SaveBtn;
-        [SerializeField] private Button NavigationingBtn;
         void Start()
         {
             ScreenshotBtn0.onClick.AddListener(ClickScreenshot);
@@ -24,7 +23,6 @@ namespace GHZLangChao
             ScreenshotBtn2.onClick.AddListener(ClickScreenshot);
             SaveBtn.onClick.AddListener(ClickSave);
             CancelBtn.onClick.AddListener(ClickCancel);
-            NavigationingBtn.onClick.AddListener(Navigationing);
         }
 
         
@@ -46,37 +44,34 @@ namespace GHZLangChao
 
 
 #region 按钮点击
-        Sprite sprite;
+        [SerializeField] private Sprite mScreenshotSprite;
         private void ClickScreenshot()
         {
+            if(ShowRawImage.gameObject.activeSelf) return;
+            ShowRawImage.gameObject.SetActive(true);
             XRRGBCamera.Instance.playCamera(1280, 720);
             ShowRawImage.texture = XRRGBCamera.Instance.CaptureImage;
-            sprite = this.GetUtility<IRawImageForSpriteUtility>().SwitchSprite(ShowRawImage);
-            ShowRawImage.gameObject.SetActive(true);
-            ScreenshotImage.gameObject.SetActive(true);
-            ScreenshotImage.sprite = sprite;
-          
-            //ScreenshotImage.sprite = Sprite.Create(XRRGBCamera.Instance.CaptureImage as Texture2D, new Rect(0, 0, XRRGBCamera.Instance.CaptureImage.width, XRRGBCamera.Instance.CaptureImage.height), new Vector2(0.5f, 0.5f));
         }
         private void ClickSave()
         {
-            if(!ScreenshotImage.gameObject.activeSelf)
-                return;
+            var sprite = this.GetUtility<IRawImageForSpriteUtility>().SwitchSprite(ShowRawImage);
+            //ScreenshotImage.gameObject.SetActive(true);
+            //ScreenshotImage.sprite = sprite;
 
             arrayImage[arrayImageIndex].sprite = sprite;
             arrayImageIndex++;
             if(arrayImageIndex>=arrayImage.Length)
                 arrayImageIndex = 0;
 
-            ScreenshotImage.gameObject.SetActive(false);
+            //ScreenshotImage.gameObject.SetActive(false);
         }
         private void ClickCancel()
         {
-            ScreenshotImage.gameObject.SetActive(false);
-        }
-        public void Navigationing()
-        {
-            ScenesManager.Instance.showWindow(ScenesManager.SceneType.Navigationing);
+            arrayImageIndex--;
+            if(arrayImageIndex<0)
+                arrayImageIndex = arrayImage.Length-1;
+            arrayImage[arrayImageIndex].sprite = mScreenshotSprite;
+            //ScreenshotImage.gameObject.SetActive(false);
         }
 #endregion
     }

Some files were not shown because too many files changed in this diff