diff --git a/Assets/Animations/tablet/TabletAnimator.controller b/Assets/Animations/tablet/TabletAnimator.controller index a3f24c2..ff1cb61 100644 --- a/Assets/Animations/tablet/TabletAnimator.controller +++ b/Assets/Animations/tablet/TabletAnimator.controller @@ -54,6 +54,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-8393648053530875362 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsHistoryDisabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 9098608034871065455} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-8307011788919709770 AnimatorState: serializedVersion: 6 @@ -391,6 +416,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1107 &-5594021929421613132 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IsHistoryDisabled + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 879306808329958237} + m_Position: {x: 280, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 9098608034871065455} + m_Position: {x: 280, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 9098608034871065455} --- !u!1102 &-5472321662295205575 AnimatorState: serializedVersion: 6 @@ -1156,6 +1206,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: IsHistoryDisabled + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: UIToggle @@ -1301,6 +1357,18 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: IsHistoryDisabled + m_StateMachine: {fileID: -5594021929421613132} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} --- !u!1101 &290508635444048746 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -1351,6 +1419,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &879306808329958237 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: history_disabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8393648053530875362} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 84a5a018588b5254296034d82b47bf89, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &1009228170457654887 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -2431,6 +2526,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8710064670920389838 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsHistoryDisabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 879306808329958237} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &8783376939058054222 AnimatorStateMachine: serializedVersion: 6 @@ -2480,3 +2600,30 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &9098608034871065455 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: history_enabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8710064670920389838} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 011fed45fe9b5c04e9a7f64cdbc4796a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animations/tablet/history.disabled.anim b/Assets/Animations/tablet/history.disabled.anim new file mode 100644 index 0000000..e18e003 --- /dev/null +++ b/Assets/Animations/tablet/history.disabled.anim @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: history.disabled + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Canvas/RotationRoot/Overlay/LibraryModal/Body/History/Disabled + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 488091193 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Canvas/RotationRoot/Overlay/LibraryModal/Body/History/Disabled + classID: 1 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/tablet/history.disabled.anim.meta b/Assets/Animations/tablet/history.disabled.anim.meta new file mode 100644 index 0000000..173468f --- /dev/null +++ b/Assets/Animations/tablet/history.disabled.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84a5a018588b5254296034d82b47bf89 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/tablet/history.enabled.anim b/Assets/Animations/tablet/history.enabled.anim new file mode 100644 index 0000000..9a63c29 --- /dev/null +++ b/Assets/Animations/tablet/history.enabled.anim @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: history.enabled + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Canvas/RotationRoot/Overlay/LibraryModal/Body/History/Disabled + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 488091193 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Canvas/RotationRoot/Overlay/LibraryModal/Body/History/Disabled + classID: 1 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/tablet/history.enabled.anim.meta b/Assets/Animations/tablet/history.enabled.anim.meta new file mode 100644 index 0000000..1f588d8 --- /dev/null +++ b/Assets/Animations/tablet/history.enabled.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 011fed45fe9b5c04e9a7f64cdbc4796a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prefabs/ImageTab.prefab b/Prefabs/ImageTab.prefab index d1990a1..ef0aa08 100644 --- a/Prefabs/ImageTab.prefab +++ b/Prefabs/ImageTab.prefab @@ -4617,11 +4617,16 @@ MonoBehaviour: uIBookmarkNames: [] uIOriginalBookmarkButton: {fileID: 1215315567887163606} uIOriginalHistoryButton: {fileID: 4160286413516484864} + uIHistoryDisabled: 0 uIErrorTitle: {fileID: 7515315160584072894} uIErrorMessage: {fileID: 6773991918760296350} inputField: {fileID: 4839360843786961736} image: {fileID: 3937489300849477754} aspectRatioFitter: {fileID: 4655774779730696241} + rootGameObject: {fileID: 6723728149490601525} + pickupCollider: {fileID: 4508150202983583777} + isObjectSyncEnabled: 1 + isPickupEnabled: 1 --- !u!114 &1061264739079975055 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7217,6 +7222,140 @@ MonoBehaviour: m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5140252990356974326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3679027057392692919} + - component: {fileID: 2525283595806267584} + - component: {fileID: 4814917095581356013} + m_Layer: 13 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3679027057392692919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140252990356974326} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4984937632624171926} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2525283595806267584 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140252990356974326} + m_CullTransparentMesh: 1 +--- !u!114 &4814917095581356013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140252990356974326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u5C65\u6B74\u6A5F\u80FD\u306F\u30EF\u30FC\u30EB\u30C9\u5236\u4F5C\u8005\u306B\u3088\u3063\u3066\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2} + m_sharedMaterial: {fileID: -6069958157732398970, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5152073135134408759 GameObject: m_ObjectHideFlags: 0 @@ -8472,6 +8611,42 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0, y: 1} +--- !u!1 &6094505217795104742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4984937632624171926} + m_Layer: 13 + m_Name: Disabled + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4984937632624171926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6094505217795104742} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3679027057392692919} + m_Father: {fileID: 1748710860436428330} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 0, y: -100} + m_Pivot: {x: 0, y: 1} --- !u!1 &6235406014830827312 GameObject: m_ObjectHideFlags: 0 @@ -11312,6 +11487,7 @@ RectTransform: m_Children: - {fileID: 6407465110741380829} - {fileID: 7184186608389278671} + - {fileID: 4984937632624171926} m_Father: {fileID: 984126240018993809} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Prefabs/parts/Settings.About.Content.prefab b/Prefabs/parts/Settings.About.Content.prefab index 428eab3..b21dc70 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.2 + m_text: ImageTab v0.2.3 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2} m_sharedMaterial: {fileID: -6069958157732398970, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2} diff --git a/Runtime/Editor/ImageTabEditor.cs b/Runtime/Editor/ImageTabEditor.cs index 9a138c0..2c48410 100644 --- a/Runtime/Editor/ImageTabEditor.cs +++ b/Runtime/Editor/ImageTabEditor.cs @@ -4,7 +4,10 @@ using jp.ootr.ImageDeviceController.Editor; using UnityEditor; using UnityEngine; +using VRC.SDK3.Components; using VRC.SDKBase; +using VRC.SDKBase.Editor.BuildPipeline; +using Object = UnityEngine.Object; namespace jp.ootr.ImageTab.Editor { @@ -14,6 +17,9 @@ public class ImageTabEditor : CommonDeviceEditor private SerializedProperty _arWatchInterval; private SerializedProperty _uiBookmarkNames; private SerializedProperty _uiBookmarkUrls; + private SerializedProperty _uiHistoryDisabled; + private SerializedProperty _isObjectSyncEnabled; + private SerializedProperty _isPickupEnabled; public override void OnEnable() { @@ -21,6 +27,9 @@ public override void OnEnable() _arWatchInterval = serializedObject.FindProperty("arWatchInterval"); _uiBookmarkNames = serializedObject.FindProperty("uIBookmarkNames"); _uiBookmarkUrls = serializedObject.FindProperty("uIBookmarkUrls"); + _uiHistoryDisabled = serializedObject.FindProperty("uIHistoryDisabled"); + _isObjectSyncEnabled = serializedObject.FindProperty("isObjectSyncEnabled"); + _isPickupEnabled = serializedObject.FindProperty("isPickupEnabled"); } protected override void ShowContent() @@ -28,6 +37,18 @@ protected override void ShowContent() EditorGUILayout.Space(); serializedObject.Update(); EditorGUILayout.PropertyField(_arWatchInterval, new GUIContent("Rotation Check Interval")); + EditorGUILayout.Space(); + EditorGUILayout.PropertyField(_uiHistoryDisabled, new GUIContent("Disable History")); + EditorGUILayout.Space(); + EditorGUI.BeginChangeCheck(); + EditorGUILayout.PropertyField(_isObjectSyncEnabled, new GUIContent("Enable Object Sync")); + EditorGUILayout.Space(); + EditorGUILayout.PropertyField(_isPickupEnabled, new GUIContent("Enable Pickup")); + if (EditorGUI.EndChangeCheck()) + { + ImageTabUtils.UpdateObjectSync((ImageTab)target); + ImageTabUtils.UpdatePickup((ImageTab)target); + } serializedObject.ApplyModifiedProperties(); EditorGUILayout.Space(); BuildBookmark((ImageTab)target); @@ -89,5 +110,68 @@ private void BuildBookmark(ImageTab script) serializedObject.ApplyModifiedProperties(); } } + + [InitializeOnLoad] + public class PlayModeNotifier + { + static PlayModeNotifier() + { + EditorApplication.playModeStateChanged += OnPlayModeStateChanged; + } + + private static void OnPlayModeStateChanged(PlayModeStateChange state) + { + if (state == PlayModeStateChange.EnteredEditMode) + { + var imageTab = ComponentUtils.GetAllComponents(); + foreach (var tab in imageTab) + { + ImageTabUtils.UpdateObjectSync(tab); + ImageTabUtils.UpdatePickup(tab); + } + } + } + } + + public class SetObjectReferences : UnityEditor.Editor, IVRCSDKBuildRequestedCallback + { + public int callbackOrder => 12; + + public bool OnBuildRequested(VRCSDKRequestedBuildType requestedBuildType) + { + var imageTab = ComponentUtils.GetAllComponents(); + foreach (var tab in imageTab) + { + ImageTabUtils.UpdateObjectSync(tab); + ImageTabUtils.UpdatePickup(tab); + } + + return true; + } + } + + public static class ImageTabUtils + { + public static void UpdateObjectSync(ImageTab script) + { + var currentSyncObj = script.rootGameObject.GetComponent(); + if (script.isObjectSyncEnabled) + { + if (currentSyncObj == null) script.rootGameObject.AddComponent(); + } + else + { + if (currentSyncObj != null) Object.DestroyImmediate(currentSyncObj); + } + } + + public static void UpdatePickup(ImageTab script) + { + var so = new SerializedObject(script.pickupCollider); + so.Update(); + so.FindProperty("m_Enabled").boolValue = !script.isPickupEnabled; + so.ApplyModifiedProperties(); + } + } } #endif diff --git a/Runtime/jp.ootr.ImageTab/Scripts/13_UIFooter.cs b/Runtime/jp.ootr.ImageTab/Scripts/13_UIFooter.cs index 3bede0f..d804a5f 100644 --- a/Runtime/jp.ootr.ImageTab/Scripts/13_UIFooter.cs +++ b/Runtime/jp.ootr.ImageTab/Scripts/13_UIFooter.cs @@ -31,13 +31,11 @@ private void UpdateFooterButton() var castableDeviceCount = 0; foreach (var device in devices) { - if (device == null) continue; + if (device == null || device.deviceUuid == deviceUuid) continue; if (device.IsCastableDevice()) castableDeviceCount++; } - //自分が含まれるので2以上 - uICastModalButton.SetActive(castableDeviceCount > 1); - base.InitController(); + uICastModalButton.SetActive(castableDeviceCount > 0); } } } diff --git a/Runtime/jp.ootr.ImageTab/Scripts/23_UIHistory.cs b/Runtime/jp.ootr.ImageTab/Scripts/23_UIHistory.cs index a8a2e83..854d182 100644 --- a/Runtime/jp.ootr.ImageTab/Scripts/23_UIHistory.cs +++ b/Runtime/jp.ootr.ImageTab/Scripts/23_UIHistory.cs @@ -8,11 +8,20 @@ namespace jp.ootr.ImageTab public class UIHistory : UIBookmark { [SerializeField] private GameObject uIOriginalHistoryButton; + [SerializeField] private bool uIHistoryDisabled; private readonly string[] _uiHistoryPrefix = { "UIHistory" }; private InputField[] _uiHistoryButtonInputFields = new InputField[0]; private GameObject[] _uiHistoryButtons = new GameObject[0]; private Toggle[] _uiHistoryButtonToggles = new Toggle[0]; + + private readonly int _animatorIsHistoryDisabled = Animator.StringToHash("IsHistoryDisabled"); + + public override void InitController() + { + base.InitController(); + animator.SetBool(_animatorIsHistoryDisabled, uIHistoryDisabled); + } public virtual void UpdateHistoryUI(string[] urls, string[] filenames) { diff --git a/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs b/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs index b093891..91f6d1a 100644 --- a/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs +++ b/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs @@ -16,6 +16,12 @@ public class ImageTab : UIError [SerializeField] private RawImage image; [SerializeField] private AspectRatioFitter aspectRatioFitter; + + [SerializeField] public GameObject rootGameObject; + [SerializeField] public BoxCollider pickupCollider; + [SerializeField] public bool isObjectSyncEnabled = true; + [SerializeField] public bool isPickupEnabled = true; + private readonly int _animatorIsLoading = Animator.StringToHash("IsLoading"); private bool _isLoading; diff --git a/Runtime/jp.ootr.ImageTab/Udon/ImageTab.asset b/Runtime/jp.ootr.ImageTab/Udon/ImageTab.asset index 739930d..3cbb18f 100644 --- a/Runtime/jp.ootr.ImageTab/Udon/ImageTab.asset +++ b/Runtime/jp.ootr.ImageTab/Udon/ImageTab.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 65 + Data: 71 - Name: Entry: 7 Data: @@ -2482,10 +2482,65 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _uiHistoryPrefix + Data: uIHistoryDisabled - Name: $v Entry: 7 Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: uIHistoryDisabled + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _uiHistoryPrefix + - Name: $v + Entry: 7 + Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _uiHistoryPrefix @@ -2509,7 +2564,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 148|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2534,13 +2589,13 @@ MonoBehaviour: Data: _uiHistoryButtonInputFields - Name: $v Entry: 7 - Data: 146|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 149|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _uiHistoryButtonInputFields - Name: k__BackingField Entry: 7 - Data: 147|System.RuntimeType, mscorlib + Data: 150|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.UI.InputField[], UnityEngine.UI @@ -2549,7 +2604,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 147 + Data: 150 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2564,7 +2619,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 148|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 151|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2589,13 +2644,13 @@ MonoBehaviour: Data: _uiHistoryButtons - Name: $v Entry: 7 - Data: 149|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 152|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _uiHistoryButtons - Name: k__BackingField Entry: 7 - Data: 150|System.RuntimeType, mscorlib + Data: 153|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject[], UnityEngine.CoreModule @@ -2604,7 +2659,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 150 + Data: 153 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2619,7 +2674,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 151|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 154|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2644,7 +2699,7 @@ MonoBehaviour: Data: _uiHistoryButtonToggles - Name: $v Entry: 7 - Data: 152|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 155|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _uiHistoryButtonToggles @@ -2668,7 +2723,56 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 153|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 156|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _animatorIsHistoryDisabled + - Name: $v + Entry: 7 + Data: 157|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _animatorIsHistoryDisabled + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 158|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2693,7 +2797,7 @@ MonoBehaviour: Data: _historyFileNames - Name: $v Entry: 7 - Data: 154|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 159|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _historyFileNames @@ -2717,7 +2821,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 155|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 160|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2742,7 +2846,7 @@ MonoBehaviour: Data: _historyUrls - Name: $v Entry: 7 - Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 161|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _historyUrls @@ -2766,7 +2870,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 157|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 162|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2791,7 +2895,7 @@ MonoBehaviour: Data: _animatorCastModalState - Name: $v Entry: 7 - Data: 158|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 163|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _animatorCastModalState @@ -2815,7 +2919,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 159|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 164|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2840,7 +2944,7 @@ MonoBehaviour: Data: _animatorErrorModalState - Name: $v Entry: 7 - Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 165|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _animatorErrorModalState @@ -2864,7 +2968,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 161|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 166|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2889,7 +2993,7 @@ MonoBehaviour: Data: _animatorLibraryModalState - Name: $v Entry: 7 - Data: 162|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 167|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _animatorLibraryModalState @@ -2913,7 +3017,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 163|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 168|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2938,7 +3042,7 @@ MonoBehaviour: Data: _animatorSettingsModalState - Name: $v Entry: 7 - Data: 164|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 169|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _animatorSettingsModalState @@ -2962,7 +3066,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 165|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 170|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2987,7 +3091,7 @@ MonoBehaviour: Data: uIErrorTitle - Name: $v Entry: 7 - Data: 166|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 171|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: uIErrorTitle @@ -3011,14 +3115,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 167|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 168|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 173|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3042,7 +3146,7 @@ MonoBehaviour: Data: uIErrorMessage - Name: $v Entry: 7 - Data: 169|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: uIErrorMessage @@ -3066,14 +3170,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 170|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 175|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 171|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 176|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3097,13 +3201,13 @@ MonoBehaviour: Data: inputField - Name: $v Entry: 7 - Data: 172|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 177|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: inputField - Name: k__BackingField Entry: 7 - Data: 173|System.RuntimeType, mscorlib + Data: 178|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Components.VRCUrlInputField, VRCSDK3 @@ -3112,7 +3216,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 173 + Data: 178 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3127,14 +3231,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 174|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 179|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 175|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 180|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3158,7 +3262,7 @@ MonoBehaviour: Data: image - Name: $v Entry: 7 - Data: 176|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 181|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: image @@ -3182,14 +3286,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 177|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 182|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 178|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 183|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3213,7 +3317,7 @@ MonoBehaviour: Data: aspectRatioFitter - Name: $v Entry: 7 - Data: 179|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 184|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: aspectRatioFitter @@ -3237,14 +3341,240 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 180|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 185|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 186|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: rootGameObject + - Name: $v + Entry: 7 + Data: 187|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: rootGameObject + - Name: k__BackingField + Entry: 9 + Data: 99 + - Name: k__BackingField + Entry: 9 + Data: 99 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 188|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 189|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: pickupCollider + - Name: $v + Entry: 7 + Data: 190|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pickupCollider + - Name: k__BackingField + Entry: 7 + Data: 191|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.BoxCollider, UnityEngine.PhysicsModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 191 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 192|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 193|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: isObjectSyncEnabled + - Name: $v + Entry: 7 + Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: isObjectSyncEnabled + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 195|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 181|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 196|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: isPickupEnabled + - Name: $v + Entry: 7 + Data: 197|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: isPickupEnabled + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 198|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 199|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3268,7 +3598,7 @@ MonoBehaviour: Data: _animatorIsLoading - Name: $v Entry: 7 - Data: 182|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 200|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _animatorIsLoading @@ -3292,7 +3622,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 183|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 201|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -3317,7 +3647,7 @@ MonoBehaviour: Data: _isLoading - Name: $v Entry: 7 - Data: 184|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 202|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _isLoading @@ -3341,7 +3671,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 185|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 203|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -3366,7 +3696,7 @@ MonoBehaviour: Data: _localFileName - Name: $v Entry: 7 - Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 204|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _localFileName @@ -3390,7 +3720,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 187|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 205|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -3415,7 +3745,7 @@ MonoBehaviour: Data: _localSource - Name: $v Entry: 7 - Data: 188|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 206|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _localSource @@ -3439,7 +3769,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 189|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 207|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -3464,7 +3794,7 @@ MonoBehaviour: Data: _shouldPushHistory - Name: $v Entry: 7 - Data: 190|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 208|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _shouldPushHistory @@ -3488,14 +3818,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 191|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 209|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 192|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 210|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -3519,7 +3849,7 @@ MonoBehaviour: Data: _syncFileName - Name: $v Entry: 7 - Data: 193|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 211|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _syncFileName @@ -3543,14 +3873,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 194|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 212|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 195|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 213|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -3574,7 +3904,7 @@ MonoBehaviour: Data: _syncSource - Name: $v Entry: 7 - Data: 196|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 214|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _syncSource @@ -3598,14 +3928,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 197|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 215|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 198|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 216|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/package.json b/package.json index 2b838af..43df302 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jp.ootr.image-tab", "displayName": "ImageTab", - "version": "0.2.2", + "version": "0.2.3", "license": "MIT", "unity": "2022.3", "description": "Image tablet gimmick for VRChat",