Merge pull request #7 from o-tr/master

v0.2.4をリリース
o-tr · Sep 15, 2024 · 8d7fe66 · 8d7fe66
2 parents 00ea48a + 9d5b8ec
commit 8d7fe66
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Prefabs/parts/Settings.About.Content.prefab b/Prefabs/parts/Settings.About.Content.prefab
@@ -663,7 +663,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: ImageTab v0.2.3
+  m_text: ImageTab v0.2.4
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2}
   m_sharedMaterial: {fileID: -6069958157732398970, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2}

diff --git a/Runtime/Editor/ImageTabEditor.cs b/Runtime/Editor/ImageTabEditor.cs
@@ -44,12 +44,12 @@ protected override void ShowContent()
             EditorGUILayout.PropertyField(_isObjectSyncEnabled, new GUIContent("Enable Object Sync"));
             EditorGUILayout.Space();
             EditorGUILayout.PropertyField(_isPickupEnabled, new GUIContent("Enable Pickup"));
+            serializedObject.ApplyModifiedProperties();
             if (EditorGUI.EndChangeCheck())
             {
                 ImageTabUtils.UpdateObjectSync((ImageTab)target);
                 ImageTabUtils.UpdatePickup((ImageTab)target);
             }
-            serializedObject.ApplyModifiedProperties();
             EditorGUILayout.Space();
             BuildBookmark((ImageTab)target);
         }
@@ -169,7 +169,7 @@ public static void UpdatePickup(ImageTab script)
         {
             var so = new SerializedObject(script.pickupCollider);
             so.Update();
-            so.FindProperty("m_Enabled").boolValue = !script.isPickupEnabled;
+            so.FindProperty("m_Enabled").boolValue = script.isPickupEnabled;
             so.ApplyModifiedProperties();
         }
     }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jp.ootr.image-tab",
   "displayName": "ImageTab",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "license": "MIT",
   "unity": "2022.3",
   "description": "Image tablet gimmick for VRChat",