feat: improved the composited buttons prefab

kurone-kito · Jul 2, 2024 · c273345 · c273345
1 parent f554f00
commit c273345
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 45 deletions.
diff --git a/Packages/black.kit.vrcui/Examples/Prefabs/Molecules/CompositedButtonsCatalog.prefab b/Packages/black.kit.vrcui/Examples/Prefabs/Molecules/CompositedButtonsCatalog.prefab
@@ -249,7 +249,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 4
+  m_Spacing: 6
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
@@ -279,32 +279,32 @@ PrefabInstance:
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 41
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 49.5
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 3049244214837169386, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
@@ -414,32 +414,32 @@ PrefabInstance:
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 18
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 8478920512604646623, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
@@ -449,32 +449,32 @@ PrefabInstance:
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 76
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -644,32 +644,32 @@ PrefabInstance:
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 40.999996
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 49.5
       objectReference: {fileID: 0}
     - target: {fileID: 2969185114942874247, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 3049244214837169386, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
@@ -774,32 +774,32 @@ PrefabInstance:
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 18
       objectReference: {fileID: 0}
     - target: {fileID: 5034906012699378117, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     - target: {fileID: 8478920512604646623, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
@@ -809,32 +809,32 @@ PrefabInstance:
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 76
       objectReference: {fileID: 0}
     - target: {fileID: 9018295468145663063, guid: 80ae882bcb3d2f243abf54c3e7d2d6e3,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -18
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -855,6 +855,11 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4376603064121850805}
     m_Modifications:
+    - target: {fileID: 807476271539857432, guid: 58d8c047cefd8fc4dbd108025a800bb2,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 5.45
+      objectReference: {fileID: 0}
     - target: {fileID: 4900855840667732032, guid: 58d8c047cefd8fc4dbd108025a800bb2,
         type: 3}
       propertyPath: m_Sprite
@@ -1115,6 +1120,11 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 4376603064121850805}
     m_Modifications:
+    - target: {fileID: 807476271539857432, guid: 58d8c047cefd8fc4dbd108025a800bb2,
+        type: 3}
+      propertyPath: m_fontSize
+      value: 5.45
+      objectReference: {fileID: 0}
     - target: {fileID: 1120485072827207475, guid: 58d8c047cefd8fc4dbd108025a800bb2,
         type: 3}
       propertyPath: m_Interactable

diff --git a/Packages/black.kit.vrcui/Runtime/Prefabs/Molecules/Buttons/RoundedButtonWithBadge.prefab b/Packages/black.kit.vrcui/Runtime/Prefabs/Molecules/Buttons/RoundedButtonWithBadge.prefab
@@ -176,12 +176,12 @@ PrefabInstance:
     - target: {fileID: 3052835837067337220, guid: 33e81857b280fb94387d5b63e50542ad,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 42
+      value: 34
       objectReference: {fileID: 0}
     - target: {fileID: 3052835837067337220, guid: 33e81857b280fb94387d5b63e50542ad,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 42
+      value: 34
       objectReference: {fileID: 0}
     - target: {fileID: 3052835837067337220, guid: 33e81857b280fb94387d5b63e50542ad,
         type: 3}
@@ -310,10 +310,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
-  m_MinWidth: 42
-  m_MinHeight: 42
-  m_PreferredWidth: 42
-  m_PreferredHeight: 42
+  m_MinWidth: 34
+  m_MinHeight: 34
+  m_PreferredWidth: 34
+  m_PreferredHeight: 34
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1

diff --git a/...es/black.kit.vrcui/Runtime/Prefabs/Molecules/Buttons/RoundedButtonWithOnFocusBadge.prefab b/...es/black.kit.vrcui/Runtime/Prefabs/Molecules/Buttons/RoundedButtonWithOnFocusBadge.prefab
@@ -192,12 +192,12 @@ PrefabInstance:
     - target: {fileID: 6745888474918830401, guid: 58d8c047cefd8fc4dbd108025a800bb2,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 42
+      value: 34
       objectReference: {fileID: 0}
     - target: {fileID: 6745888474918830401, guid: 58d8c047cefd8fc4dbd108025a800bb2,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 42
+      value: 34
       objectReference: {fileID: 0}
     - target: {fileID: 6745888474918830401, guid: 58d8c047cefd8fc4dbd108025a800bb2,
         type: 3}