From e5e0f03e3d0eea1adcd9179235b999be77178390 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 23 Oct 2023 16:19:40 +0900 Subject: [PATCH] =?UTF-8?q?Physics=20=EC=88=98=EC=A0=95=20crewmate=20<->?= =?UTF-8?q?=20Enemy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Restart 추가 중 + uiCanvas -> worldSpaceCanvas 수정 + OverlayCanvas 추가 --- .../Assets/01.Scenes/03.Stage_Test.unity | 269 +++++++++++++++++- .../02.Scripts/Character/Crewmate/Crewmate.cs | 10 +- .../02.Scripts/Character/Enemy/Enemy.cs | 10 +- .../Character/Player/Type/InIslandPlayer.cs | 10 +- .../Assets/02.Scripts/Ui/RestartPopupUi.cs | 17 ++ .../02.Scripts/Ui/RestartPopupUi.cs.meta | 11 + .../ProjectSettings/DynamicsManager.asset | 2 +- 7 files changed, 307 insertions(+), 22 deletions(-) create mode 100644 BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs create mode 100644 BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta diff --git a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity index ec577e17e..15d58f663 100644 --- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity +++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity @@ -2920,6 +2920,87 @@ Transform: - {fileID: 302959423} m_Father: {fileID: 971043561} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &393497260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 393497261} + - component: {fileID: 393497263} + - component: {fileID: 393497262} + m_Layer: 5 + m_Name: RestartPopUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &393497261 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393497260} + 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: 1236881601} + m_Father: {fileID: 1063731841} + 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!114 &393497262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393497260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6e074aea35c9d74cbebeef6f096b12d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &393497263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 393497260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, + type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!1 &417739631 GameObject: m_ObjectHideFlags: 0 @@ -3221,7 +3302,6 @@ MonoBehaviour: k__BackingField: 0 beAttacked: 0 isAttacking: 0 - k__BackingField: [] --- !u!114 &418278343 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6860,13 +6940,13 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: 1 - k__BackingField: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, - type: 3} k__BackingField: {fileID: 418278336} k__BackingField: - {fileID: 1362034959} - {fileID: 302959427} - currentInIslandPlayer: {fileID: 0} + k__BackingField: [] + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} slowSpeed: 0.1 k__BackingField: 0 k__BackingField: 0 @@ -7418,6 +7498,108 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1054195006} m_PrefabAsset: {fileID: 0} +--- !u!1 &1063731837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1063731841} + - component: {fileID: 1063731840} + - component: {fileID: 1063731839} + - component: {fileID: 1063731838} + m_Layer: 5 + m_Name: OverlayCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1063731838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 2238015 +--- !u!114 &1063731839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1063731840 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 334724478} + m_PlaneDistance: 100 + 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: -1197429611 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1063731841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1063731837} + 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: 393497261} + 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 &1068410569 GameObject: m_ObjectHideFlags: 0 @@ -7594,7 +7776,7 @@ GameObject: - component: {fileID: 1104839424} - component: {fileID: 1104839423} m_Layer: 5 - m_Name: UiCanvas + m_Name: WorldSpaceCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8217,6 +8399,81 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &1236881600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1236881601} + - component: {fileID: 1236881603} + - component: {fileID: 1236881602} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1236881601 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236881600} + 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: 393497261} + 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!114 &1236881602 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236881600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} + 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 &1236881603 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236881600} + m_CullTransparentMesh: 1 --- !u!1001 &1241095002 PrefabInstance: m_ObjectHideFlags: 0 @@ -9806,7 +10063,6 @@ MonoBehaviour: m_Bits: 0 projectileObj: {fileID: 6365080210048648475, guid: d101d38de657e0b42aa2aea84f8590c7, type: 3} - shootLocation: {fileID: 214533790} speed: 500 --- !u!114 &1362034960 MonoBehaviour: @@ -23756,6 +24012,7 @@ SceneRoots: - {fileID: 879331195} - {fileID: 269653247} - {fileID: 1104839426} + - {fileID: 1063731841} - {fileID: 971043561} - {fileID: 1068410571} - {fileID: 1805195289} diff --git a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs index 928f062ab..fb96dc7d7 100644 --- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs +++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs @@ -106,7 +106,7 @@ namespace BlueWaterProject private BehaviorTree bt; private Transform unitRoot; protected Animator myAnimator; - private Canvas uiCanvas; + private Canvas worldSpaceCanvas; // Hash protected static readonly int RunStateHash = Animator.StringToHash("RunState"); @@ -151,16 +151,16 @@ namespace BlueWaterProject } } - uiCanvas = GameObject.Find("UiCanvas")?.GetComponent(); - if (uiCanvas == null) + worldSpaceCanvas = GameObject.Find("WorldSpaceCanvas")?.GetComponent(); + if (worldSpaceCanvas == null) { - print("uiCanvas를 찾을 수 없습니다."); + print("WorldSpaceCanvas 찾을 수 없습니다."); } else { if (useHpSlider) { - hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent(); + hpSlider = Instantiate(hpSliderPrefab, worldSpaceCanvas.transform).GetComponent(); hpSlider.gameObject.name = gameObject.name + " HpSlider"; hpSlider.transform.rotation = unitRoot.transform.rotation; } diff --git a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs index ab7ffbd8e..4e71e646d 100644 --- a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs +++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs @@ -106,7 +106,7 @@ namespace BlueWaterProject protected BehaviorTree bt; private Transform unitRoot; protected Animator myAnimator; - private Canvas uiCanvas; + private Canvas worldSpaceCanvas; // Hash protected static readonly int RunStateHash = Animator.StringToHash("RunState"); @@ -228,16 +228,16 @@ namespace BlueWaterProject } } - uiCanvas = GameObject.Find("UiCanvas")?.GetComponent(); - if (uiCanvas == null) + worldSpaceCanvas = GameObject.Find("WorldSpaceCanvas")?.GetComponent(); + if (worldSpaceCanvas == null) { - print("uiCanvas를 찾을 수 없습니다."); + print("WorldSpaceCanvas 찾을 수 없습니다."); } else { if (useHpSlider) { - hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent(); + hpSlider = Instantiate(hpSliderPrefab, worldSpaceCanvas.transform).GetComponent(); hpSlider.gameObject.name = gameObject.name + " HpSlider"; hpSlider.transform.rotation = unitRoot.transform.rotation; } diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs index e30614c14..f397450d8 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs @@ -101,7 +101,7 @@ namespace BlueWaterProject private BehaviorTree bt; private Transform unitRoot; private Animator myAnimator; - private Canvas uiCanvas; + private Canvas worldSpaceCanvas; // Hash private static readonly int RunStateHash = Animator.StringToHash("RunState"); @@ -178,16 +178,16 @@ namespace BlueWaterProject } } - uiCanvas = GameObject.Find("UiCanvas")?.GetComponent(); - if (uiCanvas == null) + worldSpaceCanvas = GameObject.Find("WorldSpaceCanvas")?.GetComponent(); + if (worldSpaceCanvas == null) { - print("uiCanvas를 찾을 수 없습니다."); + print("WorldSpaceCanvas 찾을 수 없습니다."); } else { if (useHpSlider) { - hpSlider = Instantiate(hpSliderPrefab, uiCanvas.transform).GetComponent(); + hpSlider = Instantiate(hpSliderPrefab, worldSpaceCanvas.transform).GetComponent(); hpSlider.gameObject.name = gameObject.name + " HpSlider"; hpSlider.transform.rotation = unitRoot.transform.rotation; } diff --git a/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs new file mode 100644 index 000000000..4bd655a5f --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs @@ -0,0 +1,17 @@ +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.SceneManagement; + +// ReSharper disable once CheckNamespace +namespace BlueWaterProject +{ + public class RestartPopupUi : MonoBehaviour + { + private void OnInteraction(InputValue value) + { + var currentSceneIndex = SceneManager.GetActiveScene().buildIndex; + + SceneManager.LoadScene(currentSceneIndex); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta new file mode 100644 index 000000000..d629be695 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Ui/RestartPopupUi.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a6e074aea35c9d74cbebeef6f096b12d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/ProjectSettings/DynamicsManager.asset b/BlueWater/ProjectSettings/DynamicsManager.asset index 9d0ea37d4..a79ee00fd 100644 --- a/BlueWater/ProjectSettings/DynamicsManager.asset +++ b/BlueWater/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 - m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826220008062000000000000000000008222000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826220008262000000000000000000008262000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0