蓝色星空 1 gadu atpakaļ
vecāks
revīzija
6c9cb0d835

+ 1 - 0
Assets/Game/Blue/ScriptableObject/PrefabsAsset.asset

@@ -15,3 +15,4 @@ MonoBehaviour:
   RoomName_Item: {fileID: 6861891413660314999, guid: c094e2ac4157cdb40b236ada28d075d6, type: 3}
   SearchPanel_Item: {fileID: 6531081025574629906, guid: cc07db29cd740d54d974fd3083bae865, type: 3}
   FaultPanel_Item: {fileID: 7400388167945465585, guid: 48d98ef2483f27f41aa2ba8603fa54d5, type: 3}
+  WarningInfoItem: {fileID: 8552349058852812674, guid: 80f48a9072eaf8e45940f1bed09e9cab, type: 3}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 236 - 42428
Assets/Game/ShowXunJian/ShowXunJian.prefab


+ 20 - 15
Assets/Game/ShowXunJian/StartXunJian.cs

@@ -8,14 +8,12 @@ namespace GHZLangChao
     {
         public bool Test = false;
         [SerializeField] private RawImage ShowRawImage; // 显示的视频画面
-        [SerializeField] private GameObject ShowRaw_go; // 显示的视频画面
+        [SerializeField] private GameObject ShowRaw_go; // 显示的视频画面父物体
 
         [SerializeField] private Image[] arrayImage; // 截图显示的画面
         //[SerializeField] private Image ScreenshotImage; // 截图的画面
         private int arrayImageIndex = 0; // 截图显示时要显示在哪个Image上的下标
-        [SerializeField] private Button ScreenshotBtn0;
-        [SerializeField] private Button ScreenshotBtn1;
-        [SerializeField] private Button ScreenshotBtn2;
+        [SerializeField] private Button[] ScreenshotBtnList;
         [SerializeField] private Button CancelBtn;
         [SerializeField] private Button SaveBtn;
         [SerializeField] private bool[] toggleBoolList;
@@ -23,9 +21,10 @@ namespace GHZLangChao
         void Start()
         {
             y = transform.position.y;
-            ScreenshotBtn0.onClick.AddListener(ClickScreenshot);
-            ScreenshotBtn1.onClick.AddListener(ClickScreenshot);
-            ScreenshotBtn2.onClick.AddListener(ClickScreenshot);
+            foreach (Button btn in ScreenshotBtnList)
+            {
+                btn.onClick.AddListener(ClickScreenshot);
+            }
             SaveBtn.onClick.AddListener(ClickSave);
             //CancelBtn.onClick.AddListener(ClickCancel);
         }
@@ -64,11 +63,12 @@ namespace GHZLangChao
             if (!ShowRaw_go.activeSelf)
             {
                 ShowRaw_go.SetActive(true);
-                //ShowRawImage.gameObject.SetActive(true);
                 XRRGBCamera.Instance.playCamera(1280, 720);
                 ShowRawImage.texture = XRRGBCamera.Instance.CaptureImage;
             }
         }
+
+
         private void ClickSave()
         {
             var sprite = this.GetUtility<IRawImageForSpriteUtility>().SwitchSprite(ShowRawImage);
@@ -77,25 +77,30 @@ namespace GHZLangChao
 
             arrayImage[arrayImageIndex].sprite = sprite;
             arrayImageIndex++;
-            if (arrayImageIndex >= arrayImage.Length)
-                arrayImageIndex = 0;
-
-            //ScreenshotImage.gameObject.SetActive(false);
+            if (arrayImageIndex % 3 == 0)
+            {
+                arrayImageIndex -= 3;
+            }
+        }
+        public void SetIndex(int index)
+        {
+            this.arrayImageIndex = index;
         }
         private void ClickCancel()
         {
+            /*
             arrayImageIndex--;
             if (arrayImageIndex < 0)
                 arrayImageIndex = arrayImage.Length - 1;
             arrayImage[arrayImageIndex].sprite = mScreenshotSprite;
-            //ScreenshotImage.gameObject.SetActive(false);
+            */
         }
 
         public void End()
         {
-            foreach(bool isOn in toggleBoolList)
+            foreach (bool isOn in toggleBoolList)
             {
-                if(!isOn)
+                if (!isOn)
                 {
                     DefaultUI_go.SetActive(true);
                     return;

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels