diff --git a/Assets/Models/base.png.meta b/Assets/Models/base.png.meta index b4ba59c..811ab9a 100644 --- a/Assets/Models/base.png.meta +++ b/Assets/Models/base.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 diff --git a/Prefabs/ImageTab-Standalone.prefab b/Prefabs/ImageTab-Standalone.prefab index 1ee34d7..d1084f5 100644 --- a/Prefabs/ImageTab-Standalone.prefab +++ b/Prefabs/ImageTab-Standalone.prefab @@ -70,7 +70,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 728829452697184143, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Size - value: 0.99999803 + value: 1 objectReference: {fileID: 0} - target: {fileID: 728829452697184143, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Value @@ -82,7 +82,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1282963143555445929, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.0016420089 + value: 0.00018416488 objectReference: {fileID: 0} - target: {fileID: 1390234051965789830, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_LocalPosition.x @@ -134,11 +134,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1511885331949849018, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Size - value: 0.9666625 + value: 0.9666666 objectReference: {fileID: 0} - target: {fileID: 1511885331949849018, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Value - value: 0.99999696 + value: 0.9999298 objectReference: {fileID: 0} - target: {fileID: 1883566420055463071, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_AnchorMax.y @@ -194,7 +194,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2201376303051678702, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Size - value: 0.9999981 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2201376303051678702, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Value @@ -422,7 +422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4230316827428591493, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.0015215264 + value: 0.00030665635 objectReference: {fileID: 0} - target: {fileID: 4500540767588099492, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_AnchorMax.y @@ -602,11 +602,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7031551874129150426, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Size - value: 0.08404553 + value: 0.08404577 objectReference: {fileID: 0} - target: {fileID: 7031551874129150426, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: m_Value - value: 1 + value: 0.99999976 objectReference: {fileID: 0} - target: {fileID: 7194981920504582644, guid: 72334f698079a9843885087bfd7be0eb, type: 3} propertyPath: _syncMethod diff --git a/Prefabs/parts/Settings.About.Content.prefab b/Prefabs/parts/Settings.About.Content.prefab index 9cdfc0c..6ec5be8 100644 --- 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.5 + m_text: ImageTab v0.2.6 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2} m_sharedMaterial: {fileID: -6069958157732398970, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2} diff --git a/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs b/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs index 91f6d1a..9317dfb 100644 --- a/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs +++ b/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs @@ -83,7 +83,9 @@ public override void _OnDeserialization() controller.UnloadFilesFromUrl(this, _localSource); _localSource = _syncSource; _localFileName = _syncFileName; - LLIFetchImage(_localSource, _syncSource == _syncFileName ? URLType.Image : URLType.TextZip); + _localFileName.ParseFileName(out var type, out var options); + + LLIFetchImage(_localSource, type, options); } public void ClearUrl() diff --git a/package.json b/package.json index 7a2119d..cf63929 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jp.ootr.image-tab", "displayName": "ImageTab", - "version": "0.2.5", + "version": "0.2.6", "license": "MIT", "unity": "2022.3", "description": "Image tablet gimmick for VRChat", @@ -18,7 +18,7 @@ "com.vrchat.base": "^3.6.1", "com.vrchat.worlds": "^3.6.1", "jp.ootr.common": "~0.1.1", - "jp.ootr.image-device-controller": "~0.3.1" + "jp.ootr.image-device-controller": "~0.3.3" }, "legacyFolders": { "Assets\\jp.ootr\\imagetab": "44c35e5266e08d948a1cfe3898d9a753"