Merge pull request #9 from o-tr/master

v0.2.7をリリース
o-tr · Nov 15, 2024 · 815cfa7 · 815cfa7
2 parents 2a6eeec + d62b9b3
commit 815cfa7
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 21 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/Prefabs/ImageSlide.prefab b/Prefabs/ImageSlide.prefab
@@ -532,7 +532,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 203.17834, y: -63}
+  m_AnchoredPosition: {x: 112, y: -63}
   m_SizeDelta: {x: 96, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2225579236738354912
@@ -1747,8 +1747,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
-    m_Right: 0
+    m_Left: 64
+    m_Right: 64
     m_Top: 12
     m_Bottom: 12
   m_ChildAlignment: 4
@@ -7456,7 +7456,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 193.87834, y: -63}
+  m_AnchoredPosition: {x: 112, y: -63}
   m_SizeDelta: {x: 96, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6816386810232970635
@@ -10516,6 +10516,7 @@ GameObject:
   - component: {fileID: 320582865231792734}
   - component: {fileID: 1458430323259060473}
   - component: {fileID: 3474547101386491644}
+  - component: {fileID: 7127313785679195897}
   m_Layer: 13
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -10540,7 +10541,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 407.83334, y: -63}
-  m_SizeDelta: {x: 265.31, y: 102}
+  m_SizeDelta: {x: 447.6667, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &320582865231792734
 CanvasRenderer:
@@ -10654,6 +10655,26 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   schemaName: PrimaryText
+--- !u!114 &7127313785679195897
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3399103645690519690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: 1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &3415120785091647299
 GameObject:
   m_ObjectHideFlags: 0
@@ -10689,7 +10710,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 130.07834, y: -63}
+  m_AnchoredPosition: {x: 112, y: -63}
   m_SizeDelta: {x: 96, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8091612007822472634
@@ -15207,6 +15228,7 @@ GameObject:
   - component: {fileID: 143885754653594381}
   - component: {fileID: 308430983532538212}
   - component: {fileID: 6374186337283270852}
+  - component: {fileID: 2903618558925840255}
   m_Layer: 13
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -15231,7 +15253,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 343.83337, y: -63}
-  m_SizeDelta: {x: 155.91, y: 102}
+  m_SizeDelta: {x: 319.6667, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &143885754653594381
 CanvasRenderer:
@@ -15343,6 +15365,26 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   schemaName: PrimaryText
+--- !u!114 &2903618558925840255
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5174463189252221303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: 1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &5174833279805906716
 GameObject:
   m_ObjectHideFlags: 0
@@ -17876,8 +17918,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
-    m_Right: 0
+    m_Left: 64
+    m_Right: 64
     m_Top: 12
     m_Bottom: 12
   m_ChildAlignment: 4
@@ -18377,8 +18419,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
-    m_Right: 0
+    m_Left: 64
+    m_Right: 64
     m_Top: 12
     m_Bottom: 12
   m_ChildAlignment: 4
@@ -18996,6 +19038,7 @@ GameObject:
   - component: {fileID: 3617927331998763615}
   - component: {fileID: 7492727058905160757}
   - component: {fileID: 5180777456611797755}
+  - component: {fileID: 5197038284012014283}
   m_Layer: 13
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -19020,7 +19063,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 343.83334, y: -63}
-  m_SizeDelta: {x: 283.51, y: 102}
+  m_SizeDelta: {x: 319.6667, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3617927331998763615
 CanvasRenderer:
@@ -19132,6 +19175,26 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   schemaName: PrimaryText
+--- !u!114 &5197038284012014283
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6836718058281971290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: 1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &6860065729210446134
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Prefabs/ImageSlideViewer.prefab b/Prefabs/ImageSlideViewer.prefab
@@ -265,7 +265,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &4014660389653803171
@@ -473,7 +473,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: Button
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: a26b723565eab5240b46df15781ed2a6, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
@@ -537,7 +537,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &7835976569162624283
@@ -1394,7 +1394,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &2013790485636329370
@@ -1961,7 +1961,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &2749453465204552211
@@ -2490,7 +2490,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &4274868873778623950
@@ -3057,7 +3057,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &5513127115311266921
@@ -3309,7 +3309,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jp.ootr.image-slide",
   "displayName": "ImageSlide",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "license": "MIT",
   "unity": "2022.3",
   "description": "Slide gimmick for VRChat using ImageDeviceController",