From 6d72198a342c1a868e5ef5275b2a2a8a6929deaa Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 13 May 2024 15:41:35 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=9A=A9=20=EB=B2=84=EC=A0=84=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=2003?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BlueWater/Assets/02.Scripts/Item/DropItemController.cs | 6 +++--- BlueWater/Assets/02.Scripts/Player/Cannon.cs | 2 -- BlueWater/Assets/02.Scripts/Utility/Utils.cs | 9 --------- .../Assets/05.Prefabs/Items/Drop/FieldItemDrop.prefab | 2 +- BlueWater/Assets/link.xml | 5 +++++ BlueWater/Assets/link.xml.meta | 7 +++++++ 6 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 BlueWater/Assets/link.xml create mode 100644 BlueWater/Assets/link.xml.meta diff --git a/BlueWater/Assets/02.Scripts/Item/DropItemController.cs b/BlueWater/Assets/02.Scripts/Item/DropItemController.cs index baf524c05..c07d4f597 100644 --- a/BlueWater/Assets/02.Scripts/Item/DropItemController.cs +++ b/BlueWater/Assets/02.Scripts/Item/DropItemController.cs @@ -9,7 +9,7 @@ namespace BlueWaterProject { [Title("컴포넌트")] [SerializeField] private Rigidbody rb; - [SerializeField] private Collider collider; + [SerializeField] private Collider col; [SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private AudioSource audioSource; @@ -106,9 +106,9 @@ namespace BlueWaterProject rb.isKinematic = true; rb.useGravity = false; } - if (collider) + if (col) { - collider.enabled = false; + col.enabled = false; } var startPosition = transform.position; diff --git a/BlueWater/Assets/02.Scripts/Player/Cannon.cs b/BlueWater/Assets/02.Scripts/Player/Cannon.cs index a5280a935..3d1ef3132 100644 --- a/BlueWater/Assets/02.Scripts/Player/Cannon.cs +++ b/BlueWater/Assets/02.Scripts/Player/Cannon.cs @@ -127,7 +127,6 @@ namespace BlueWaterProject [Button("셋팅 초기화")] private void Init() { - projectileObject = Utils.LoadFromFolder("Assets/05.Prefabs/Particles/GrenadeFire", "GrenadeFireOBJ", ".prefab"); visualLook = transform.Find("VisualLook"); launchTransform = transform.Find("LaunchPosition"); predictedLine = transform.Find("CannonLineRenderer").GetComponent(); @@ -135,7 +134,6 @@ namespace BlueWaterProject { predictedLine.gameObject.SetActive(false); } - hitMarker = Utils.LoadFromFolder("Assets/05.Prefabs", "HitMarker", ".prefab"); } private void InitStart() diff --git a/BlueWater/Assets/02.Scripts/Utility/Utils.cs b/BlueWater/Assets/02.Scripts/Utility/Utils.cs index 714f5343a..df111d6dd 100644 --- a/BlueWater/Assets/02.Scripts/Utility/Utils.cs +++ b/BlueWater/Assets/02.Scripts/Utility/Utils.cs @@ -148,14 +148,5 @@ namespace BlueWaterProject var sharedVariable = behaviorTreeComponent.GetVariable(behaviorVariableName); sharedVariable?.SetValue(value); } - -#if UNITY_EDITOR - public static T LoadFromFolder(string folderPath, string name, string extension) where T : Object - { - var fullPath = System.IO.Path.Combine(folderPath, name + extension); - var t = AssetDatabase.LoadAssetAtPath(fullPath); - return t; - } -#endif } } \ No newline at end of file diff --git a/BlueWater/Assets/05.Prefabs/Items/Drop/FieldItemDrop.prefab b/BlueWater/Assets/05.Prefabs/Items/Drop/FieldItemDrop.prefab index cd1899368..65c32c984 100644 --- a/BlueWater/Assets/05.Prefabs/Items/Drop/FieldItemDrop.prefab +++ b/BlueWater/Assets/05.Prefabs/Items/Drop/FieldItemDrop.prefab @@ -345,8 +345,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3} m_Name: m_EditorClassIdentifier: - collider: {fileID: 1002976204637741028} rb: {fileID: 1807992347579204990} + col: {fileID: 1002976204637741028} spriteRenderer: {fileID: 4385550810937580112} audioSource: {fileID: 8975262077732393561} itemUiPrefab: {fileID: 0} diff --git a/BlueWater/Assets/link.xml b/BlueWater/Assets/link.xml new file mode 100644 index 000000000..e3f10ced9 --- /dev/null +++ b/BlueWater/Assets/link.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/BlueWater/Assets/link.xml.meta b/BlueWater/Assets/link.xml.meta new file mode 100644 index 000000000..8518cf176 --- /dev/null +++ b/BlueWater/Assets/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 41d2cb15daede3b48ab863a603d976e6 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: