Merge pull request #26 from o-tr/master

v0.2.22をリリース

Prefabs/ImageSlideViewer.prefab

@@ -1325,7 +1325,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 36657328902437027}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -1895,6 +1895,11 @@ MonoBehaviour:
   syncingModalContainerTransform: {fileID: 5091887414043655682}
   syncingModalContent: {fileID: 9178016270300395852}
   syncingModalContentSizeFitter: {fileID: 4014660389653803171}
+  errorModal: {fileID: 5403126539454890960}
+  errorModalTransform: {fileID: 1582463422937012609}
+  errorTitle: {fileID: 3804332363416238641}
+  errorDescription: {fileID: 5015560605636087544}
+  errorDescriptionSizeFitter: {fileID: 5513127115311266921}
   targetColliders:
   - {fileID: 722368441950897630}
   transformLockButtonActiveIcon: {fileID: 2971953338018381896}

Runtime/jp.ootr.ImageSlide/Scripts/12_UIErrorModal.cs

@@ -13,7 +13,7 @@ public class UIErrorModal : UIAnimationHandler
         [SerializeField] private TextMeshProUGUI errorDescription;
         [SerializeField] private ContentSizeFitter errorDescriptionSizeFitter;
 
-        protected void ShowErrorModal(string title, string description)
+        protected virtual void ShowErrorModal(string title, string description)
         {
             errorModal.SetActive(true);
             errorTitle.text = title;
@@ -23,7 +23,7 @@ protected void ShowErrorModal(string title, string description)
             errorModalTransform.ToListChildrenVertical(24, 24, true);
         }
 
-        public void CloseErrorModal()
+        public virtual void CloseErrorModal()
         {
             errorModal.SetActive(false);
         }

Runtime/jp.ootr.ImageSlide/Scripts/22_LogicQueue.cs

@@ -430,6 +430,7 @@ private void DoSyncAll()
             if (!VRCJson.TrySerializeToJson(dic, JsonExportType.Minify, out var json))
             {
                 ConsoleError($"failed to serialize sync all json: {json}", _logicQueuePrefix);
+                ProcessQueue();
                 return;
             }
 
@@ -462,19 +463,37 @@ private void UpdateList(DataToken data)
                 sources.DataList.Count != options.DataList.Count)
             {
                 ConsoleError($"sources or options not found in update list: {data}", _logicQueuePrefix);
+                ProcessQueue();
                 return;
             }
 
             Sources = sources.DataList.ToStringArray();
             Options = options.DataList.ToStringArray();
             var fileNames = new string[Sources.Length][];
+            var error = false;
 
             for (int i = 0; i < Sources.Length; i++)
             {
-                fileNames[i] = controller.CcGetFileNames(Sources[i]);
+                var files =  controller.CcGetFileNames(Sources[i]);
+                if (files == null)
+                {
+                    Sources = Sources.Remove(i);
+                    Options = Options.Remove(i);
+                    fileNames = fileNames.Remove(i);
+                    error = true;
+                    continue;
+                }
+                fileNames[i] = files;
             }
             FileNames = fileNames;
 
+            if (error)
+            {
+                ConsoleError($"failed to update list: {data}", _logicQueuePrefix);
+                ProcessQueue();
+                return;
+            }
+
             UrlsUpdated();
             ProcessQueue();
         }

Runtime/jp.ootr.ImageSlide/Scripts/61_EventHandler.cs

@@ -35,6 +35,18 @@ protected override void HideSyncingModal()
             base.HideSyncingModal();
             foreach (var listener in listeners) listener.HideSyncingModal();
         }
+
+        protected override void ShowErrorModal(string title, string description)
+        {
+            base.ShowErrorModal(title, description);
+            foreach (var listener in listeners) listener.ShowErrorModal(title, description);
+        }
+
+        public override void CloseErrorModal()
+        {
+            base.CloseErrorModal();
+            foreach (var listener in listeners) listener.CloseErrorModal();
+        }
 
         protected override void SeekModeChanged(SeekMode mode)
         {

Runtime/jp.ootr.ImageSlide/Scripts/Viewer/16_UIErrorModal.cs

@@ -0,0 +1,30 @@
+using jp.ootr.common;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace jp.ootr.ImageSlide.Viewer
+{
+    public class UIErrorModal : UISplashScreen {
+        [SerializeField] private GameObject errorModal;
+        [SerializeField] private RectTransform errorModalTransform;
+        [SerializeField] private TextMeshProUGUI errorTitle;
+        [SerializeField] private TextMeshProUGUI errorDescription;
+        [SerializeField] private ContentSizeFitter errorDescriptionSizeFitter;
+
+        public void ShowErrorModal(string title, string message)
+        {
+            errorModal.SetActive(true);
+            errorTitle.text = title;
+            errorDescription.text = message;
+            errorDescriptionSizeFitter.SetLayoutVertical();
+
+            errorModalTransform.ToListChildrenVertical(24, 24, true);
+        }
+
+        public void CloseErrorModal()
+        {
+            errorModal.SetActive(false);
+        }
+    }
+}

Runtime/jp.ootr.ImageSlide/Scripts/Viewer/21_TransformLock.cs

@@ -2,7 +2,7 @@
 
 namespace jp.ootr.ImageSlide.Viewer
 {
-    public class TransformLock : UISplashScreen
+    public class TransformLock : UIErrorModal
     {
         [SerializeField] private Collider[] targetColliders;
         [SerializeField] private GameObject transformLockButtonActiveIcon;