diff --git a/Assets/Material/New Material 3.mat b/Assets/Material/New Material 3.mat index db6e60d..6019ed1 100644 --- a/Assets/Material/New Material 3.mat +++ b/Assets/Material/New Material 3.mat @@ -129,8 +129,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 3a2a937..885401f 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -723,7 +723,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 152444560} - m_Layer: 5 + m_Layer: 7 m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} @@ -1643,6 +1643,122 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 +--- !u!1 &216401856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 216401857} + - component: {fileID: 216401860} + - component: {fileID: 216401859} + - component: {fileID: 216401858} + m_Layer: 7 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &216401857 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216401856} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1201555537} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!65 &216401858 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216401856} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &216401859 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216401856} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 904c64b9d69b09845993100609b7b7b6, 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &216401860 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216401856} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &219801857 GameObject: m_ObjectHideFlags: 0 @@ -2246,7 +2362,7 @@ GameObject: - component: {fileID: 280381711} - component: {fileID: 280381710} - component: {fileID: 280381712} - m_Layer: 0 + m_Layer: 7 m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} @@ -2282,11 +2398,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1490221423} - - {fileID: 2095961660} - - {fileID: 2071460366} - - {fileID: 1201555537} - - {fileID: 629154676} - {fileID: 797096992} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3015,6 +3126,143 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030996972, guid: abc00000000006984399163773085844, type: 3} m_PrefabInstance: {fileID: 355604004} m_PrefabAsset: {fileID: 0} +--- !u!1 &364236725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 364236729} + - component: {fileID: 364236726} + - component: {fileID: 364236728} + - component: {fileID: 364236727} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &364236726 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364236725} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 128 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &364236727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364236725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 1 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &364236728 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364236725} + m_Enabled: 1 +--- !u!4 &364236729 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364236725} + serializedVersion: 2 + 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: 698882382} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &364993546 GameObject: m_ObjectHideFlags: 0 @@ -14255,7 +14503,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 622798399} - m_Layer: 5 + m_Layer: 7 m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} @@ -14291,7 +14539,7 @@ GameObject: m_Component: - component: {fileID: 629154676} - component: {fileID: 629154677} - m_Layer: 5 + m_Layer: 7 m_Name: Slot_B m_TagString: Untagged m_Icon: {fileID: 0} @@ -14305,16 +14553,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 629154675} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 1000, y: 1000, z: 1000} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 280381711} + m_Children: + - {fileID: 1212058213} + m_Father: {fileID: 797096992} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.2, y: 0.3} + m_AnchoredPosition: {x: -200, y: 300} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &629154677 @@ -15492,6 +15741,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 897962327430786761, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Cameras.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 897962327430786761, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: 'm_Cameras.Array.data[0]' + value: + objectReference: {fileID: 364236726} - target: {fileID: 2243020122175513880, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -15728,6 +15985,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -23 objectReference: {fileID: 0} + - target: {fileID: 7917674758326848207, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_CullingMask.m_Bits + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 8806329115733545877, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_Name value: XR Origin Hands (XR Rig) @@ -15782,7 +16043,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7917674758326848202, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + insertIndex: -1 + addedObject: {fileID: 364236729} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 8806329115733545877, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} insertIndex: -1 @@ -16006,7 +16270,7 @@ GameObject: - component: {fileID: 797096991} - component: {fileID: 797096990} - component: {fileID: 797096989} - m_Layer: 5 + m_Layer: 7 m_Name: CodingModeUI m_TagString: Untagged m_Icon: {fileID: 0} @@ -16089,6 +16353,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2106260778} + - {fileID: 1490221423} + - {fileID: 2095961660} + - {fileID: 2071460366} + - {fileID: 1201555537} + - {fileID: 629154676} m_Father: {fileID: 280381711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -642898,7 +643167,7 @@ GameObject: m_Component: - component: {fileID: 1201555537} - component: {fileID: 1201555538} - m_Layer: 5 + m_Layer: 7 m_Name: Slot_A m_TagString: Untagged m_Icon: {fileID: 0} @@ -642912,16 +643181,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1201555536} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 1000, y: 1000, z: 1000} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 280381711} + m_Children: + - {fileID: 216401857} + m_Father: {fileID: 797096992} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.2, y: 0.3} + m_AnchoredPosition: {x: 200, y: 300} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1201555538 @@ -643050,6 +643320,122 @@ Transform: m_CorrespondingSourceObject: {fileID: 1031056870, guid: abc00000000005328151253783129040, type: 3} m_PrefabInstance: {fileID: 1202724076} m_PrefabAsset: {fileID: 0} +--- !u!1 &1212058212 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1212058213} + - component: {fileID: 1212058216} + - component: {fileID: 1212058215} + - component: {fileID: 1212058214} + m_Layer: 7 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1212058213 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1212058212} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 629154676} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!65 &1212058214 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1212058212} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1212058215 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1212058212} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 904c64b9d69b09845993100609b7b7b6, 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1212058216 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1212058212} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1214286071 PrefabInstance: m_ObjectHideFlags: 0 @@ -646875,7 +647261,7 @@ GameObject: - component: {fileID: 1490221426} - component: {fileID: 1490221425} - component: {fileID: 1490221424} - m_Layer: 5 + m_Layer: 7 m_Name: Cube_Attack m_TagString: Untagged m_Icon: {fileID: 0} @@ -646889,17 +647275,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490221422} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 300, y: 300, z: 300} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1868875706} - m_Father: {fileID: 280381711} + m_Father: {fileID: 797096992} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.5, y: 0} + m_AnchoredPosition: {x: -500, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1490221424 @@ -651859,7 +652245,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1868875706} - m_Layer: 5 + m_Layer: 7 m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} @@ -654620,7 +655006,7 @@ GameObject: - component: {fileID: 2071460369} - component: {fileID: 2071460368} - component: {fileID: 2071460367} - m_Layer: 5 + m_Layer: 7 m_Name: Cube_Heal m_TagString: Untagged m_Icon: {fileID: 0} @@ -654634,17 +655020,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2071460365} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 300, y: 300, z: 300} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 622798399} - m_Father: {fileID: 280381711} + m_Father: {fileID: 797096992} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 500, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2071460367 @@ -654895,7 +655281,7 @@ GameObject: - component: {fileID: 2095961663} - component: {fileID: 2095961662} - component: {fileID: 2095961661} - m_Layer: 5 + m_Layer: 7 m_Name: Cube_Def m_TagString: Untagged m_Icon: {fileID: 0} @@ -654909,13 +655295,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2095961659} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_LocalScale: {x: 300, y: 300, z: 300} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 152444560} - m_Father: {fileID: 280381711} + m_Father: {fileID: 797096992} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -655323,7 +655709,7 @@ GameObject: - component: {fileID: 2106260778} - component: {fileID: 2106260780} - component: {fileID: 2106260779} - m_Layer: 5 + m_Layer: 7 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scripts/PlayerStatusManager.cs b/Assets/Scripts/PlayerStatusManager.cs index 72262f6..8cbcaa3 100644 --- a/Assets/Scripts/PlayerStatusManager.cs +++ b/Assets/Scripts/PlayerStatusManager.cs @@ -1,6 +1,7 @@ using UnityEngine; using UnityEngine.InputSystem; using System.Collections; +using System.Collections.Generic; // Listを使うために追加 /// /// プレイヤーの共通ゲージ、時間停止（Codingモード）、UI、および各種バフの制限時間を管理するクラス @@ -21,7 +22,6 @@ public class PlayerStatusManager : MonoBehaviour [Tooltip("画面全体を追従させる親オブジェクト（World Space Canvasや3D台座）を指定してください")] [SerializeField] private GameObject codingModeUI; - // ─── ★ここからバフ設定を新しく追加 ─── [Header("バフパラメータ設定")] [Tooltip("攻撃力UP・防御力UPの持続時間 (秒)")] [SerializeField] private float buffDuration = 10f; @@ -38,19 +38,14 @@ public class PlayerStatusManager : MonoBehaviour // 現在Codingモード（時間停止中）かどうかのフラグ private bool isCodingMode = false; - // ───────────────────────────────────── - #region プロパティ（外部のスクリプトからバフ状態を参照するための窓口） - /// 現在攻撃力UPバフが有効かどうか + // 【新設】一時停止させた敵のアニメーターを記憶しておくためのリスト + private List pausedAnimators = new List(); + + #region プロパティ public bool IsAttackBuffActive => attackBuffTimer > 0f; - - /// 現在防御力UPバフが有効かどうか public bool IsDefenseBuffActive => defenseBuffTimer > 0f; - - /// 現在の攻撃力倍率を返す（バフなしなら1.0倍） public float CurrentAttackMultiplier => IsAttackBuffActive ? attackBuffMultiplier : 1.0f; - - /// 現在の防御倍率を返す（バフなしなら1.0倍、バフありなら0.5倍など） public float CurrentDefenseMultiplier => IsDefenseBuffActive ? defenseBuffMultiplier : 1.0f; #endregion @@ -81,7 +76,7 @@ public class PlayerStatusManager : MonoBehaviour { CheckComboInput(); - // ★新設：ゲームプレイ中（時間停止中でないとき）のみ、バフのタイマーを減算する + // ゲームプレイ中（時間停止中でないとき）のみ、バフのタイマーを減算する if (!isCodingMode) { UpdateBuffTimers(); @@ -113,26 +108,59 @@ public class PlayerStatusManager : MonoBehaviour } } + /// + /// Codingモード（時間停止）を開始する + /// private void StartCodingMode() { isCodingMode = true; - Time.timeScale = 0f; // 時間を完全停止 + + // 【変更】Time.timeScaleは弄らず、シーン内のAnimatorを検索して停止させる + Animator[] allAnimators = FindObjectsByType(FindObjectsSortMode.None); + pausedAnimators.Clear(); + + foreach (var anim in allAnimators) + { + if (anim == null) continue; + + // ⚠️ プレイヤー自身のアニメーターまで止めないように除外する + // (このマネージャーがプレイヤーオブジェクトについている、またはPlayerタグを想定) + if (anim.gameObject == this.gameObject || anim.CompareTag("Player")) continue; + + // 元のスピードに関わらず、0に上書きしてアニメーションを完全停止 + anim.speed = 0f; + pausedAnimators.Add(anim); // 記憶リストに保存 + } if (codingModeUI != null) codingModeUI.SetActive(true); + Debug.Log("⏳ Codingモード：敵の時間（アニメーション）を停止しました。"); } + /// + /// バフを適用してゲームを再開する + /// public void ApplyBuffsAndResume(string buff1, string buff2) { - // 1. 選択された2つのバフをそれぞれ発動（重複なしの仕様を適用） + // 1. 選択された2つのバフをそれぞれ発動 ActivateBuffByName(buff1); ActivateBuffByName(buff2); - // 2. Codingモードの終了処理 + // 【変更】2. 停止させていた敵のアニメーターを元の速度（1.0f）に戻す + foreach (var anim in pausedAnimators) + { + if (anim != null) + { + anim.speed = 1f; + } + } + pausedAnimators.Clear(); // リストを空にする + + // 3. Codingモードの終了処理 isCodingMode = false; - Time.timeScale = 1f; // 時間を再開 if (codingModeUI != null) codingModeUI.SetActive(false); currentGauge = 0f; // ゲージを消費 + Debug.Log("▶ Codingモード終了：敵の時間を再開しました。"); } private void ActivateBuffByName(string buffName) @@ -140,17 +168,17 @@ public class PlayerStatusManager : MonoBehaviour switch (buffName) { case "AttackUp": - attackBuffTimer = buffDuration; // タイマーをリセット（上書き補給） + attackBuffTimer = buffDuration; Debug.Log($"⚔️ 攻撃力UPバフ発動！ 倍率: {attackBuffMultiplier} / 効果時間: {buffDuration}秒"); break; case "DefenseUp": - defenseBuffTimer = buffDuration; // タイマーをリセット（上書き補給） + defenseBuffTimer = buffDuration; Debug.Log($"🛡️ 防御力UPバフ発動！ 被ダメージ倍率: {defenseBuffMultiplier} / 効果時間: {buffDuration}秒"); break; case "Heal": - ExecuteHeal(); // HP回復は即時発動 + ExecuteHeal(); break; default: @@ -158,11 +186,10 @@ public class PlayerStatusManager : MonoBehaviour break; } } + private void ExecuteHeal() { Debug.Log($"💚 HP回復バフ発動！ 回復量: {hpHealAmount}"); - // プレイヤーのHealthスクリプトが完成したら、ここに回復処理を記述します - // PlayerHealth.Instance.Heal(hpHealAmount); } private void UpdateBuffTimers() diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 76ec59f..39ffab9 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - Water - UI - Floor - - + - Panel - - -