diff --git a/Assets/Prefab/StageObject/SurveillanceMonitor.prefab b/Assets/Prefab/StageObject/SurveillanceMonitor.prefab index 4a0cd00..280d4a0 100644 --- a/Assets/Prefab/StageObject/SurveillanceMonitor.prefab +++ b/Assets/Prefab/StageObject/SurveillanceMonitor.prefab @@ -53,6 +53,7 @@ MonoBehaviour: m_EditorClassIdentifier: PreviewVisible: 1 RuntimeOcclusion: 0 + RuntimeCollider: 0 mTrackableName: SurveillanceMonitor mInitializedInEditor: 1 mDataSetPath: Vuforia/HoloDive.xml @@ -251,8 +252,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4117548272753210964} + m_Children: [] m_Father: {fileID: 4117548272589941104} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -394,17 +394,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4117548272753210967} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.013} + m_LocalPosition: {x: 0, y: 0, z: -0.013000004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4117548272425669129} - m_Father: {fileID: 4117548272307517499} + m_Father: {fileID: 4117548272856178179} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: -0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0.96, y: 0.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4117548272753210960 @@ -521,7 +521,8 @@ Transform: m_LocalPosition: {x: 0, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4117548272753210964} m_Father: {fileID: 4117548272589941104} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index 2d8ee30..4f64530 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -142,6 +142,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: --- !u!114 &6441500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6441490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1778676317, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + mObserverBehaviour: {fileID: 6441499} + mHiddenRoot: {fileID: 0} + mTargetName: SurveillanceMonitor + mDatasetName: Vuforia/HoloDive.xml + mCastedBehaviour: {fileID: 6441499} + mMeshFilter: {fileID: 0} + mMeshRenderer: {fileID: 0} +--- !u!114 &6441501 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -737,231 +756,9 @@ Transform: - {fileID: 3205072947189789678} - {fileID: 82786545996901498} - {fileID: 1956700496} - - {fileID: 1584571491} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1584571487 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1584571491} - - component: {fileID: 1584571490} - - component: {fileID: 1584571489} - - component: {fileID: 1584571492} - m_Layer: 0 - m_Name: StudyDiaryWall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1584571489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584571487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 886328de6a5c14cbb85854fdf1a5085b, type: 3} - m_Name: - m_EditorClassIdentifier: - StatusFilter: 1 - UsePoseSmoothing: 0 - AnimationCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 3.3333333 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.3 - value: 1 - inSlope: 3.3333333 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - OnTargetFound: - m_PersistentCalls: - m_Calls: [] - OnTargetLost: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1584571490 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584571487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1631628248, guid: 8a9a760f95896c34689febc965510927, type: 3} - m_Name: - m_EditorClassIdentifier: - PreviewVisible: 1 - RuntimeOcclusion: 0 - mTrackableName: StudyDiaryWall - mInitializedInEditor: 1 - mDataSetPath: Vuforia/HoloDive.xml - mAspectRatio: 0.210714 - mImageTargetType: 0 - mWidth: 1 - mHeight: 0.210714 - mRuntimeTexture: {fileID: 0} - mMotionHint: 1 - mTrackingOptimization: 0 - mTrackingOptimizationNeedsUpgrade: 0 - mPreview: {fileID: 1584571492} ---- !u!4 &1584571491 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584571487} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.672} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1755286097} - m_Father: {fileID: 1377635662} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1584571492 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584571487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1778676317, guid: 8a9a760f95896c34689febc965510927, type: 3} - m_Name: - m_EditorClassIdentifier: - mObserverBehaviour: {fileID: 1584571490} - mHiddenRoot: {fileID: 0} - mTargetName: StudyDiaryWall - mDatasetName: Vuforia/HoloDive.xml - mCastedBehaviour: {fileID: 1584571490} - mMeshFilter: {fileID: 0} - mMeshRenderer: {fileID: 0} ---- !u!1 &1755286093 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1755286097} - - component: {fileID: 1755286096} - - component: {fileID: 1755286095} - - component: {fileID: 1755286094} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1755286094 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755286093} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1755286095 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755286093} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1755286096 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755286093} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1755286097 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755286093} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1584571491} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1956700496 stripped Transform: m_CorrespondingSourceObject: {fileID: 3076638751134587426, guid: 825dee72516b56c4698bfb18ff4d711e, @@ -1163,6 +960,25 @@ MonoBehaviour: mMeshFilter: {fileID: 0} mMeshRenderer: {fileID: 0} --- !u!114 &82786545996901516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82786545996901499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1778676317, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + mObserverBehaviour: {fileID: 82786545996901500} + mHiddenRoot: {fileID: 0} + mTargetName: BombDefusingDevice + mDatasetName: Vuforia/HoloDive.xml + mCastedBehaviour: {fileID: 82786545996901500} + mMeshFilter: {fileID: 0} + mMeshRenderer: {fileID: 0} +--- !u!114 &82786545996901517 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1577,6 +1393,25 @@ MonoBehaviour: mMeshFilter: {fileID: 0} mMeshRenderer: {fileID: 0} --- !u!114 &1743685104434787042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1743685104434787017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1778676317, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + mObserverBehaviour: {fileID: 1743685104434787018} + mHiddenRoot: {fileID: 0} + mTargetName: MainMonitor + mDatasetName: Vuforia/HoloDive.xml + mCastedBehaviour: {fileID: 1743685104434787018} + mMeshFilter: {fileID: 0} + mMeshRenderer: {fileID: 0} +--- !u!114 &1743685104434787043 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1905,6 +1740,25 @@ MonoBehaviour: mMeshFilter: {fileID: 0} mMeshRenderer: {fileID: 0} --- !u!114 &3076638751329680265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076638751329680243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1778676317, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + mObserverBehaviour: {fileID: 3076638751329680244} + mHiddenRoot: {fileID: 0} + mTargetName: CodeEntryScreen + mDatasetName: Vuforia/HoloDive.xml + mCastedBehaviour: {fileID: 3076638751329680244} + mMeshFilter: {fileID: 0} + mMeshRenderer: {fileID: 0} +--- !u!114 &3076638751329680266 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/User/Tomoi/Scripts/Base/HologramBaseObject.cs b/Assets/User/Tomoi/Scripts/Base/HologramBaseObject.cs index 1000bec..6fdd3c2 100644 --- a/Assets/User/Tomoi/Scripts/Base/HologramBaseObject.cs +++ b/Assets/User/Tomoi/Scripts/Base/HologramBaseObject.cs @@ -121,7 +121,7 @@ public void Viewing() //SEの再生 SEManager.Instance.PlaySE(SEType.Hologram_Scan, transform.position); isFarstLook = true; - + //AlwaysShowObjectが存在するときのみ実行 if (isAlwaysShow) { @@ -164,9 +164,8 @@ public void Viewing() { ArrowManager.Instance.SetupArrow(AlwaysShowObject); } - - ShowObject(); } + ShowObject(); } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bb1956b..9f790c4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.0.1 + bundleVersion: 2.0.2 preloadedAssets: - {fileID: 0} - {fileID: 0} @@ -256,6 +256,7 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1