Merge pull request #22 from o-tr/master

v0.2.18をリリース

Prefabs/ImageSlideViewer.prefab

@@ -1861,16 +1861,21 @@ MonoBehaviour:
   localizationValues: []
   localizationTargetKeys: []
   localizationTargets: []
+  deviceName: 
+  deviceIcon: {fileID: 0}
+  animator: {fileID: 5470781304978789982}
+  devices: []
+  controller: {fileID: 0}
   splashImage: {fileID: 643319091859997542}
   splashImageFitter: {fileID: 2269522274416780085}
   splashImageTexture: {fileID: 2800000, guid: 9d6cefbcf97cf2f4f96b427e7c7475e3, type: 3}
+  deviceUuid: 
   isObjectSyncEnabled: 0
   rootGameObject: {fileID: 7862952628220398662}
   presentationTransform: {fileID: 5123357268474587353}
   mainView: {fileID: 5369278872376500450}
   slideList: {fileID: 9077831920044016191}
   imageSlide: {fileID: 0}
-  animator: {fileID: 5470781304978789982}
   slideMainView: {fileID: 7496012666510957034}
   slideMainViewFitter: {fileID: 3288233352727952493}
   slideListViewRoot: {fileID: 6784192689468261567}
@@ -4447,6 +4452,8 @@ GameObject:
   - component: {fileID: 6321506635606379757}
   - component: {fileID: 4802096402255859169}
   - component: {fileID: 5470781304978789982}
+  - component: {fileID: 4016960653321919145}
+  - component: {fileID: 8761304422256894015}
   m_Layer: 13
   m_Name: GameObject
   m_TagString: Untagged
@@ -4490,7 +4497,7 @@ BoxCollider:
   m_Enabled: 1
   serializedVersion: 3
   m_Size: {x: 0.37, y: 0.005, z: 0.26}
-  m_Center: {x: 0, y: 0.002, z: 0.13068}
+  m_Center: {x: 0, y: -0.004, z: 0.13068}
 --- !u!54 &6321506635606379757
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -4571,6 +4578,54 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &4016960653321919145
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7862952628220398662}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9887330f34f84d5fbacc961847ad2bd2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  serializationData:
+    SerializedFormat: 2
+    SerializedBytes: 
+    ReferencedUnityObjects: []
+    SerializedBytesString: 
+    Prefab: {fileID: 0}
+    PrefabModificationsReferencedUnityObjects: []
+    PrefabModifications: []
+    SerializationNodes: []
+  _udonSharpBackingUdonBehaviour: {fileID: 8761304422256894015}
+  commonDevice: {fileID: 7638160203062392088}
+--- !u!114 &8761304422256894015
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7862952628220398662}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  interactTextPlacement: {fileID: 0}
+  interactText: Use
+  interactTextGO: {fileID: 0}
+  proximity: 2
+  SynchronizePosition: 0
+  AllowCollisionOwnershipTransfer: 0
+  Reliable: 0
+  _syncMethod: 0
+  serializedProgramAsset: {fileID: 11400000, guid: e62b8087a32f72b4b95f6eddf32cf115, type: 2}
+  programSource: {fileID: 11400000, guid: 5e09e88e03b7fa64c849cf2b1f9278fa, type: 2}
+  serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
+  publicVariablesUnityEngineObjects: []
+  publicVariablesSerializationDataFormat: 0
 --- !u!1 &7891373250867704291
 GameObject:
   m_ObjectHideFlags: 0

Runtime/jp.ootr.ImageSlide/Scripts/Viewer/11_BaseClass.cs

@@ -1,14 +1,11 @@
 using JetBrains.Annotations;
+using jp.ootr.ImageDeviceController.CommonDevice;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace jp.ootr.ImageSlide.Viewer
 {
-    public class BaseClass : common.BaseClass
+    public class BaseClass : CommonDevice
     {
-        [SerializeField] private RawImage splashImage;
-        [SerializeField] private AspectRatioFitter splashImageFitter;
-        [SerializeField] private Texture2D splashImageTexture;
         [SerializeField] internal bool isObjectSyncEnabled;
         [SerializeField] internal GameObject rootGameObject;
 

Runtime/jp.ootr.ImageSlide/Scripts/Viewer/13_UISlide.cs

@@ -9,8 +9,6 @@ public class UISlide : UISeekMode
     {
         [SerializeField] internal ImageSlide imageSlide;
 
-        [SerializeField] protected Animator animator;
-
         [SerializeField] private RawImage slideMainView;
         [SerializeField] private AspectRatioFitter slideMainViewFitter;