From d900c0aa47fe2d2785e19bc9a8f46d03fa22f0f3 Mon Sep 17 00:00:00 2001 From: KawakamiKento Date: Thu, 4 Jun 2026 16:31:25 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=91=E3=83=AA=E3=82=A3=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Input/New Actions.inputactions | 50 ++- Assets/Scenes/GameScene.unity | 375 +++++++++++++++++- Assets/Scripts/EnemyAI.cs | 3 +- Assets/Scripts/PlayerStatusManager.cs | 115 ++++++ Assets/Scripts/PlayerStatusManager.cs.meta | 2 + Assets/Scripts/VRPunchAttack.cs | 4 + .../XR/Settings/OpenXRPackageSettings.asset | 6 +- 7 files changed, 544 insertions(+), 11 deletions(-) create mode 100644 Assets/Scripts/PlayerStatusManager.cs create mode 100644 Assets/Scripts/PlayerStatusManager.cs.meta diff --git a/Assets/Input/New Actions.inputactions b/Assets/Input/New Actions.inputactions index 3ea6ebd..d6d5ae8 100644 --- a/Assets/Input/New Actions.inputactions +++ b/Assets/Input/New Actions.inputactions @@ -3,7 +3,7 @@ "name": "New Actions", "maps": [ { - "name": "Test", + "name": "Move", "id": "b2843e79-b1b2-454c-9939-148d9b84f906", "actions": [ { @@ -117,6 +117,54 @@ "isPartOfComposite": false } ] + }, + { + "name": "Coding", + "id": "abbf7f01-062a-4810-b35d-e69c69424446", + "actions": [ + { + "name": "ZL", + "type": "Button", + "id": "1839ae60-9003-482a-badd-1a6f05ee0c41", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ZR", + "type": "Button", + "id": "87898d4b-c746-4055-9c80-2aa27808a185", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "716e9166-d6a5-4257-8a68-b1c9fe59a7c4", + "path": "{LeftHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "", + "action": "ZL", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9157c203-ddc2-40eb-8dd1-25f77954ae6d", + "path": "{RightHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "", + "action": "ZR", + "isComposite": false, + "isPartOfComposite": false + } + ] } ], "controlSchemes": [] diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index fd9da1e..9acab83 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -15771,6 +15771,108 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030992777, guid: abc00000000005945180234511010278, type: 3} m_PrefabInstance: {fileID: 796496939} m_PrefabAsset: {fileID: 0} +--- !u!1 &797096988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 797096992} + - component: {fileID: 797096991} + - component: {fileID: 797096990} + - component: {fileID: 797096989} + m_Layer: 5 + m_Name: CodingModeUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &797096989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797096988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &797096990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797096988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &797096991 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797096988} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1527351879} + m_PlaneDistance: 0.3 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &797096992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797096988} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2106260778} + m_Father: {fileID: 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &797729773 GameObject: m_ObjectHideFlags: 0 @@ -16618,6 +16720,85 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030996972, guid: abc00000000006984399163773085844, type: 3} m_PrefabInstance: {fileID: 855877253} m_PrefabAsset: {fileID: 0} +--- !u!1 &858106768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 858106771} + - component: {fileID: 858106770} + - component: {fileID: 858106769} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &858106769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858106768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 +--- !u!114 &858106770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858106768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &858106771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 858106768} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &870737821 PrefabInstance: m_ObjectHideFlags: 0 @@ -19019,6 +19200,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &1019043664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: Coding/ZL + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputActionReference + m_Asset: {fileID: -944628639613478452, guid: 5bbfa95a7ff8c42848c1cb2a29323d66, type: 3} + m_ActionId: 1839ae60-9003-482a-badd-1a6f05ee0c41 --- !u!1001 &1023362196 PrefabInstance: m_ObjectHideFlags: 0 @@ -645399,6 +645594,77 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1455781479 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1455781481} + - component: {fileID: 1455781480} + m_Layer: 0 + m_Name: PlayerManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1455781480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1455781479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0215a75a0f67e1b49a1b823cfc7b8503, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerStatusManager + zlButtonAction: + m_UseReference: 1 + m_Action: + m_Name: Zl Button + m_Type: 0 + m_ExpectedControlType: + m_Id: cf3f0bf6-8c89-4ecc-b943-cc6143a3294d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 1019043664} + zrButtonAction: + m_UseReference: 1 + m_Action: + m_Name: Zr Button + m_Type: 0 + m_ExpectedControlType: + m_Id: a47e1c18-0a17-461e-b11d-5f1bb9fd1af0 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 1559013432} + maxGauge: 10 + currentGauge: 0 + codingModeUI: {fileID: 797096988} +--- !u!4 &1455781481 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1455781479} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -42.26283, y: 26.04505, z: -3.36947} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1455907610 PrefabInstance: m_ObjectHideFlags: 0 @@ -646702,6 +646968,11 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!20 &1527351879 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 7917674758326848207, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 755171638} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1531652902 PrefabInstance: m_ObjectHideFlags: 0 @@ -646931,6 +647202,20 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 844457507} m_SourcePrefab: {fileID: 100100000, guid: abc00000000007233570920774401211, type: 3} +--- !u!114 &1559013432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: Coding/ZR + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputActionReference + m_Asset: {fileID: -944628639613478452, guid: 5bbfa95a7ff8c42848c1cb2a29323d66, type: 3} + m_ActionId: 87898d4b-c746-4055-9c80-2aa27808a185 --- !u!1001 &1563685289 PrefabInstance: m_ObjectHideFlags: 0 @@ -652074,9 +652359,6 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7357282918100569830, guid: 935264455f4b40f4ab5ea045bf9d7a3c, type: 3} - insertIndex: -1 - addedObject: {fileID: 438681047} - targetCorrespondingSourceObject: {fileID: 7357282918100569830, guid: 935264455f4b40f4ab5ea045bf9d7a3c, type: 3} insertIndex: -1 addedObject: {fileID: 438681046} @@ -652086,6 +652368,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7357282918100569830, guid: 935264455f4b40f4ab5ea045bf9d7a3c, type: 3} insertIndex: -1 addedObject: {fileID: 438681049} + - targetCorrespondingSourceObject: {fileID: 7357282918100569830, guid: 935264455f4b40f4ab5ea045bf9d7a3c, type: 3} + insertIndex: -1 + addedObject: {fileID: 438681047} - targetCorrespondingSourceObject: {fileID: 7357282918100569830, guid: 935264455f4b40f4ab5ea045bf9d7a3c, type: 3} insertIndex: -1 addedObject: {fileID: 438681048} @@ -653856,6 +654141,81 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2106260777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2106260778} + - component: {fileID: 2106260780} + - component: {fileID: 2106260779} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2106260778 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106260777} + 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: 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, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2106260779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106260777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.6666667} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2106260780 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106260777} + m_CullTransparentMesh: 1 --- !u!1001 &2107872959 PrefabInstance: m_ObjectHideFlags: 0 @@ -654602,9 +654962,12 @@ SceneRoots: - {fileID: 1390104103} - {fileID: 470348086} - {fileID: 976054323} - - {fileID: 404289285} - - {fileID: 755171638} + - {fileID: 47849131} - {fileID: 1784089338} - {fileID: 657866387} + - {fileID: 404289285} + - {fileID: 755171638} - {fileID: 1924402715} - - {fileID: 47849131} + - {fileID: 797096992} + - {fileID: 858106771} + - {fileID: 1455781481} diff --git a/Assets/Scripts/EnemyAI.cs b/Assets/Scripts/EnemyAI.cs index dbc4013..8cbcf7e 100644 --- a/Assets/Scripts/EnemyAI.cs +++ b/Assets/Scripts/EnemyAI.cs @@ -246,11 +246,12 @@ public class EnemyAI : MonoBehaviour { if(isDead) return; + if(currentState == AIState.Stun) return; + SetFistCollider(false); StopAllCoroutines(); isAttacking = false; isWandering = false; - isKnockbacking = false; if(agent.isOnNavMesh) { diff --git a/Assets/Scripts/PlayerStatusManager.cs b/Assets/Scripts/PlayerStatusManager.cs new file mode 100644 index 0000000..c10155f --- /dev/null +++ b/Assets/Scripts/PlayerStatusManager.cs @@ -0,0 +1,115 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +public class PlayerStatusManager : MonoBehaviour +{ + public static PlayerStatusManager Instance { get; private set;} + + [SerializeField] private InputActionProperty zlButtonAction; + [SerializeField] private InputActionProperty zrButtonAction; + + [SerializeField] private float maxGauge = 100f; + [SerializeField] private float currentGauge = 0f; + + [SerializeField] private GameObject codingModeUI; + + private bool isCodingMode = false; + + void Awake() + { + if(Instance == null) + { + Instance = this; + } + else + { + Destroy(gameObject); + } + } + + private void OnEnable() + { + if(zlButtonAction.action != null) zlButtonAction.action.Enable(); + if(zrButtonAction.action != null) zrButtonAction.action.Enable(); + } + + private void OnDisable() + { + if(zlButtonAction.action != null) zlButtonAction.action.Disable(); + if(zrButtonAction.action != null) zrButtonAction.action.Disable(); + } + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + if(codingModeUI != null) + { + codingModeUI.SetActive(false); + } + } + + // Update is called once per frame + void Update() + { + CheckComboInput(); + } + + public void AddGauge(float amout) + { + if(isCodingMode) return; + + currentGauge += amout; + currentGauge = Mathf.Clamp(currentGauge, 0f, maxGauge); + } + + private void CheckComboInput() + { + if(zlButtonAction.action == null || zrButtonAction.action ==null) return; + + bool zlPressed = zlButtonAction.action.triggered && zlButtonAction.action.ReadValue() > 0.5f; + bool zrPressed = zlButtonAction.action.triggered && zrButtonAction.action.ReadValue() > 0.5f; + + if(!isCodingMode && currentGauge >= maxGauge) + { + if((zlPressed && zrButtonAction.action.ReadValue() > 0.5f) || + (zrPressed && zlButtonAction.action.ReadValue() > 0.5f)) + { + StartCodingMode(); + } + } + else if(isCodingMode) + { + if((zlPressed && zrButtonAction.action.ReadValue() > 0.5f) || + (zrPressed && zlButtonAction.action.ReadValue() > 0.5f)) + { + EndCodingMode(); + } + } + } + + private void StartCodingMode() + { + isCodingMode = true; + + Time.timeScale = 0f; + + if(codingModeUI != null) + { + codingModeUI.SetActive(true); + } + } + + private void EndCodingMode() + { + isCodingMode = false; + + Time.timeScale = 1f; + + if(codingModeUI != null) + { + codingModeUI.SetActive(false); + } + + currentGauge = 0f; + } +} diff --git a/Assets/Scripts/PlayerStatusManager.cs.meta b/Assets/Scripts/PlayerStatusManager.cs.meta new file mode 100644 index 0000000..c283f56 --- /dev/null +++ b/Assets/Scripts/PlayerStatusManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0215a75a0f67e1b49a1b823cfc7b8503 \ No newline at end of file diff --git a/Assets/Scripts/VRPunchAttack.cs b/Assets/Scripts/VRPunchAttack.cs index 21dc712..1f74a28 100644 --- a/Assets/Scripts/VRPunchAttack.cs +++ b/Assets/Scripts/VRPunchAttack.cs @@ -102,11 +102,15 @@ public class VRInputPunch : MonoBehaviour { info.amount = (speed * damageMultiplier) * 2f; info.isPoseBonus = true; + + if(PlayerStatusManager.Instance != null) PlayerStatusManager.Instance.AddGauge(20f); } else { info.amount = speed * damageMultiplier; info.isPoseBonus = false; + + if(PlayerStatusManager.Instance != null) PlayerStatusManager.Instance.AddGauge(10f); } info.hitPosition = other.transform.position; info.punchDirection = velocity.normalized; diff --git a/Assets/XR/Settings/OpenXRPackageSettings.asset b/Assets/XR/Settings/OpenXRPackageSettings.asset index 7154d7e..312c3cc 100644 --- a/Assets/XR/Settings/OpenXRPackageSettings.asset +++ b/Assets/XR/Settings/OpenXRPackageSettings.asset @@ -1179,8 +1179,8 @@ MonoBehaviour: features: - {fileID: 7011443450567333355} - {fileID: -671281728444007487} - - {fileID: 6956056911768161135} - - {fileID: -6387251413244805544} + - {fileID: -901939997048047619} + - {fileID: -1734471456787174204} - {fileID: 8980318060753866109} - {fileID: -6559185765804338520} - {fileID: -4756202077021157709} @@ -1191,7 +1191,7 @@ MonoBehaviour: - {fileID: 348827886137839178} - {fileID: -7499073031166464939} - {fileID: 7666556398442971420} - - {fileID: -142859899272520151} + - {fileID: -7343570946846779558} - {fileID: 3985858319333531581} - {fileID: -6511185071715886993} - {fileID: -4363231183632145407}