Merge pull request #8 from o-tr/master

v0.2.6をリリース
o-tr · Nov 15, 2024 · 2a6eeec · 2a6eeec
2 parents e573b36 + f43b3be
commit 2a6eeec
Show file tree

Hide file tree

Showing 6 changed files with 365 additions and 303 deletions.
diff --git a/Assets/Textures/SplashScreen/ImageSlide.png b/Assets/Textures/SplashScreen/ImageSlide.png
diff --git a/Assets/Textures/SplashScreen/ImageSlideViewer.png b/Assets/Textures/SplashScreen/ImageSlideViewer.png
diff --git a/Runtime/jp.ootr.ImageSlide/Scripts/22_LogicQueue.cs b/Runtime/jp.ootr.ImageSlide/Scripts/22_LogicQueue.cs
@@ -101,11 +101,12 @@ protected void SeekTo(int index)
             AddSyncQueue(json.String);
         }
 
-        protected void UpdateSeekMode(SeekMode mode)
+        protected void SyncSeekMode(SeekMode mode)
         {
+            var modeInt = (int)mode;
             var dic = new DataDictionary();
             dic.SetValue("type", (int)QueueType.UpdateSeekMode);
-            dic.SetValue("mode", (int)mode);
+            dic.SetValue("mode", modeInt);
             if (!VRCJson.TrySerializeToJson(dic, JsonExportType.Minify, out var json))
             {
                 ConsoleError($"failed to serialize update seek mode json: {json}, {mode}", _logicQueuePrefix);
@@ -359,9 +360,9 @@ private void ApplySeekMode(DataToken data)
                 return;
             }
 
-            var mode = (SeekMode)modeToken.Double;
+            var mode = (int)modeToken.Double;
 
-            SeekModeChanged(mode);
+            SeekModeChanged((SeekMode)mode);
             ProcessQueue();
         }
 

diff --git a/Runtime/jp.ootr.ImageSlide/Scripts/23_LogicViewerSeekMode.cs b/Runtime/jp.ootr.ImageSlide/Scripts/23_LogicViewerSeekMode.cs
@@ -12,6 +12,8 @@ public class LogicViewerSeekMode : LogicQueue {
         [SerializeField] private Toggle allowViewedOnlyToggle;
         [SerializeField] private Toggle disallowAllToggle;
 
+        private bool _isSeekModeChangedByScript;
+
         public override void InitController()
         {
             base.InitController();
@@ -21,35 +23,45 @@ public override void InitController()
 
         private void UpdateToggleGroup()
         {
+            _isSeekModeChangedByScript = true;
             allowAllToggle.isOn = seekMode == SeekMode.AllowAll;
             allowPreviousOnlyToggle.isOn = seekMode == SeekMode.AllowPreviousOnly;
             allowViewedOnlyToggle.isOn = seekMode == SeekMode.AllowViewedOnly;
             disallowAllToggle.isOn = seekMode == SeekMode.DisallowAll;
+            _isSeekModeChangedByScript = false;
         }
 
         public void UpdateSeekMode()
         {
+            if (_isSeekModeChangedByScript) return;
             var value = seekModeToggleGroup.GetFirstActiveToggle();
             if (value == null) return;
             var mode = value.name;
             switch (mode)
             {
                 case "AllowAll":
-                    SeekModeChanged(SeekMode.AllowAll);
+                    SyncSeekMode(SeekMode.AllowAll);
                     break;
                 case "AllowPreviousOnly":
-                    SeekModeChanged(SeekMode.AllowPreviousOnly);
+                    SyncSeekMode(SeekMode.AllowPreviousOnly);
                     break;
                 case "AllowViewedOnly":
-                    SeekModeChanged(SeekMode.AllowViewedOnly);
+                    SyncSeekMode(SeekMode.AllowViewedOnly);
                     break;
                 case "DisallowAll":
-                    SeekModeChanged(SeekMode.DisallowAll);
+                    SyncSeekMode(SeekMode.DisallowAll);
                     break;
                 default:
                     ConsoleError($"Unknown seek mode: {mode}");
                     break;
             }
         }
+
+        protected override void SeekModeChanged(SeekMode mode)
+        {
+            base.SeekModeChanged(mode);
+            seekMode = mode;
+            UpdateToggleGroup();
+        }
     }
 }