Merge pull request #8 from o-tr/master

v0.2.5
o-tr · Oct 21, 2024 · 82b5628 · 82b5628
2 parents 8d7fe66 + 7b6c473
commit 82b5628
Show file tree

Hide file tree

Showing 11 changed files with 714 additions and 520 deletions.
diff --git a/Prefabs/ImageTab-Standalone.prefab b/Prefabs/ImageTab-Standalone.prefab
@@ -8,10 +8,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 63831019466496541, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 113351589260335553, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -20,10 +16,6 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 207820948270123821, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 327342837568399572, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: deviceName
       value: ImageTab-StandAlone
@@ -44,10 +36,6 @@ PrefabInstance:
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 383100322198360597, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 529848647084284649, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: deviceName
       value: ImageTab-Standalone
@@ -86,23 +74,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 728829452697184143, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_Value
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1156466205890782364, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1156466205890782364, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0016978356
-      objectReference: {fileID: 0}
-    - target: {fileID: 1207257838630220920, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
+      value: 0.0017086698
       objectReference: {fileID: 0}
     - target: {fileID: 1282963143555445929, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.001521829
+      value: 0.0016420089
       objectReference: {fileID: 0}
     - target: {fileID: 1390234051965789830, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_LocalPosition.x
@@ -150,23 +130,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1405952356446782647, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.001710174
+      value: 0.0017466825
       objectReference: {fileID: 0}
     - target: {fileID: 1511885331949849018, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_Size
-      value: 0.99999756
+      value: 0.9666625
       objectReference: {fileID: 0}
     - target: {fileID: 1511885331949849018, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_Value
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1586131032103368536, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 1766971180316213905, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
+      value: 0.99999696
       objectReference: {fileID: 0}
     - target: {fileID: 1883566420055463071, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.y
@@ -232,10 +204,6 @@ PrefabInstance:
       propertyPath: serializedProgramAsset
       value: 
       objectReference: {fileID: 11400000, guid: 56668be92e0c4e94aa25185ca57fc06f, type: 2}
-    - target: {fileID: 2370045073925656175, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 2402434971952185564, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -360,10 +328,6 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2990765332295901955, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 3152604355939220878, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -408,10 +372,6 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 3510893958836613726, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 3524610847571959028, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -460,13 +420,9 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4054458166882615381, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 4230316827428591493, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0015295504
+      value: 0.0015215264
       objectReference: {fileID: 0}
     - target: {fileID: 4500540767588099492, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.y
@@ -512,14 +468,6 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4580621240143062273, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 4609316310614733124, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 4636925746844235219, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: _syncMethod
       value: 3
@@ -536,10 +484,6 @@ PrefabInstance:
       propertyPath: m_Value
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4839360843786961736, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 4859939205859242916, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -576,46 +520,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5162576517950778646, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+    - target: {fileID: 5488388682203411280, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
+      propertyPath: controller
       value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 5281508972044349580, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5281508972044349580, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
+      objectReference: {fileID: 4840502122469130702}
+    - target: {fileID: 5488388682203411280, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
+      propertyPath: devices.Array.size
+      value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5488388682203411280, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
+      propertyPath: devices.Array.data[0]
+      value: 
+      objectReference: {fileID: 9084875739736594265}
     - target: {fileID: 5488388682203411280, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: serializationData.Prefab
       value: 
       objectReference: {fileID: 5488388682203411280, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-    - target: {fileID: 5602170834552813043, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5602170834552813043, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5885815362106339373, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 5886755961335587378, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 6053094511059796636, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 6176028437328095367, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 6227657792468110092, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_Size
       value: 0.99999976
@@ -624,10 +544,6 @@ PrefabInstance:
       propertyPath: m_Value
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6310969082563160212, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 6339422488299620767, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -660,10 +576,6 @@ PrefabInstance:
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6612188551694275898, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 6874091878592131898, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: serializationData.Prefab
       value: 
@@ -690,16 +602,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7031551874129150426, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_Size
-      value: 0.084045745
+      value: 0.08404553
       objectReference: {fileID: 0}
     - target: {fileID: 7031551874129150426, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_Value
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 7034448902564991821, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 7194981920504582644, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: _syncMethod
       value: 1
@@ -732,14 +640,6 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7329358627917694522, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 7382748563705719812, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 7534823909665766046, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -776,14 +676,6 @@ PrefabInstance:
       propertyPath: serializationData.Prefab
       value: 
       objectReference: {fileID: 7916643675693929657, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-    - target: {fileID: 7938467624753538088, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 7995963007252142879, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 8510243965504353382, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -839,7 +731,7 @@ PrefabInstance:
       addedObject: {fileID: 4840502122469130702}
     - targetCorrespondingSourceObject: {fileID: 3252946560401967925, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
       insertIndex: -1
-      addedObject: {fileID: 8068419832269840349}
+      addedObject: {fileID: 2125801367493272163}
   m_SourcePrefab: {fileID: 100100000, guid: 72334f698079a9843885087bfd7be0eb, type: 3}
 --- !u!1 &2242110492313448252 stripped
 GameObject:
@@ -903,7 +795,10 @@ MonoBehaviour:
     - Name: SupportedManifestVersion
       Entry: 3
       Data: 1
-  _udonSharpBackingUdonBehaviour: {fileID: 8068419832269840349}
+  _udonSharpBackingUdonBehaviour: {fileID: 2125801367493272163}
+  logLevel: 0
+  colorSchemeNames: []
+  colorSchemes: []
   usUrls: []
   usUrlStrings: []
   zlUdonZip: {fileID: 0}
@@ -912,9 +807,11 @@ MonoBehaviour:
   vlVideoPlayer: {fileID: 0}
   vlVideoRenderer: {fileID: 0}
   vlLoadTimeout: 5
+  localTextures: []
+  localTextureUrls: []
   devices:
   - {fileID: 9084875739736594265}
---- !u!114 &8068419832269840349
+--- !u!114 &2125801367493272163
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

diff --git a/Prefabs/ImageTab.prefab b/Prefabs/ImageTab.prefab
@@ -4129,7 +4129,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5688439922233641297}
   m_HandleRect: {fileID: 4859939205859242916}
   m_Direction: 2
-  m_Value: 1.0000336
+  m_Value: 1.0000153
   m_Size: 0.96666646
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -4600,7 +4600,7 @@ MonoBehaviour:
   splashImage: {fileID: 0}
   splashImageFitter: {fileID: 0}
   splashImageTexture: {fileID: 0}
-  deviceUuid: dc8143a8-39ec-4a92-bc65-b57e543c6783
+  deviceUuid: 
   arWatchInterval: 0.2
   arAnchorTop: {fileID: 6787314649853063368}
   arAnchorBottom: {fileID: 5291220489377781400}
@@ -5493,7 +5493,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5208330879468002635}
   m_HandleRect: {fileID: 7534823909665766046}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -7676,7 +7676,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3736263555747832656}
   m_HandleRect: {fileID: 3152604355939220878}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -7802,8 +7802,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 4557239007154202004}
   m_HandleRect: {fileID: 369675214934136848}
   m_Direction: 2
-  m_Value: 1.0000001
-  m_Size: 0.08404576
+  m_Value: 1
+  m_Size: 0.084045775
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

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.4
+  m_text: ImageTab v0.2.5
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2}
   m_sharedMaterial: {fileID: -6069958157732398970, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2}