diff --git a/Assets/Prefabs/Tunnel Ghost.prefab b/Assets/Prefabs/Tunnel Ghost.prefab new file mode 100644 index 0000000..b1c1c92 --- /dev/null +++ b/Assets/Prefabs/Tunnel Ghost.prefab @@ -0,0 +1,147 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5774529217519747877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2868461863944357123} + - component: {fileID: 7212962834893447246} + - component: {fileID: 1458843810357922093} + - component: {fileID: 3714657548403815652} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2868461863944357123 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774529217519747877} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7892781535212668078} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!33 &7212962834893447246 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774529217519747877} + m_Mesh: {fileID: 4300000, guid: 791bea6128e52074ab5677f405e2d4d0, type: 3} +--- !u!23 &1458843810357922093 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774529217519747877} + 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: 25af05085d2957e42ac6b80b69ddd26a, 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!64 &3714657548403815652 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774529217519747877} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300000, guid: 791bea6128e52074ab5677f405e2d4d0, type: 3} +--- !u!1 &7817822323996939414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7892781535212668078} + m_Layer: 0 + m_Name: Tunnel Ghost + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7892781535212668078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7817822323996939414} + 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: + - {fileID: 2868461863944357123} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Tunnel Ghost.prefab.meta b/Assets/Prefabs/Tunnel Ghost.prefab.meta new file mode 100644 index 0000000..0339d68 --- /dev/null +++ b/Assets/Prefabs/Tunnel Ghost.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 532bea89bbc1d2245b65a9c22749711a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Tunnel.prefab b/Assets/Prefabs/Tunnel.prefab index 8b166ef..635783c 100644 --- a/Assets/Prefabs/Tunnel.prefab +++ b/Assets/Prefabs/Tunnel.prefab @@ -26,12 +26,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5334341810660213834} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7892781535212668078} + m_Father: {fileID: 5411003075815891614} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8060172296368980519 MonoBehaviour: @@ -45,12 +45,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 275306f282948c343bf20ee884ad22b8, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::TunnelNode - connectedNode: {fileID: 0} - otherEndOfThisSegment: {fileID: 2320767985316498782} - detectionRadius: 0.5 - tunnelLayer: - serializedVersion: 2 - m_Bits: 1024 + aboveNode: {fileID: 0} + belowNode: {fileID: 0} --- !u!65 &3945124241373782966 BoxCollider: m_ObjectHideFlags: 0 @@ -99,11 +95,11 @@ Transform: m_GameObject: {fileID: 5462246585413302240} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7892781535212668078} + m_Father: {fileID: 5411003075815891614} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2320767985316498782 MonoBehaviour: @@ -117,12 +113,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 275306f282948c343bf20ee884ad22b8, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::TunnelNode - connectedNode: {fileID: 0} - otherEndOfThisSegment: {fileID: 8060172296368980519} - detectionRadius: 0.5 - tunnelLayer: - serializedVersion: 2 - m_Bits: 1024 + aboveNode: {fileID: 0} + belowNode: {fileID: 0} --- !u!65 &2292926820231089492 BoxCollider: m_ObjectHideFlags: 0 @@ -144,7 +136,7 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &7817822323996939414 +--- !u!1 &6604660322217990819 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -152,49 +144,95 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7892781535212668078} - - component: {fileID: 1090720987273437667} - - component: {fileID: 2921653441481381272} - - component: {fileID: 5176949106980054761} - m_Layer: 0 - m_Name: Tunnel + - component: {fileID: 5411003075815891614} + m_Layer: 11 + m_Name: Visual m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7892781535212668078 +--- !u!4 &5411003075815891614 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7817822323996939414} + m_GameObject: {fileID: 6604660322217990819} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 2, z: 2} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4229549338725785498} - {fileID: 4703568612144557396} - {fileID: 5524516627708568918} - m_Father: {fileID: 0} + m_Father: {fileID: 7892781535212668078} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1090720987273437667 -MeshFilter: +--- !u!1 &7297238503126003997 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7817822323996939414} + serializedVersion: 6 + m_Component: + - component: {fileID: 4229549338725785498} + - component: {fileID: 8814453188119840062} + - component: {fileID: 1259349312969112981} + - component: {fileID: 7496526644261227494} + m_Layer: 11 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4229549338725785498 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7297238503126003997} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5411003075815891614} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!64 &8814453188119840062 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7297238503126003997} + 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: 5 + m_Convex: 1 + m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 791bea6128e52074ab5677f405e2d4d0, type: 3} ---- !u!23 &2921653441481381272 +--- !u!23 &1259349312969112981 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7817822323996939414} + m_GameObject: {fileID: 7297238503126003997} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -237,25 +275,43 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &5176949106980054761 -MeshCollider: +--- !u!33 &7496526644261227494 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7297238503126003997} + m_Mesh: {fileID: 4300000, guid: 791bea6128e52074ab5677f405e2d4d0, type: 3} +--- !u!1 &7817822323996939414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7892781535212668078} + m_Layer: 11 + m_Name: Tunnel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7892781535212668078 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7817822323996939414} - 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: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 791bea6128e52074ab5677f405e2d4d0, type: 3} + 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: + - {fileID: 5411003075815891614} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/DefenceScene.unity b/Assets/Scenes/DefenceScene.unity index 1d770fa..198de37 100644 --- a/Assets/Scenes/DefenceScene.unity +++ b/Assets/Scenes/DefenceScene.unity @@ -293,11 +293,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59717880} m_CullTransparentMesh: 1 ---- !u!4 &117302153 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - m_PrefabInstance: {fileID: 613577505} - m_PrefabAsset: {fileID: 0} --- !u!1 &227051990 GameObject: m_ObjectHideFlags: 0 @@ -465,12 +460,13 @@ RectTransform: - {fileID: 1558135261} - {fileID: 227051991} - {fileID: 599851510} + - {fileID: 2060458428} m_Father: {fileID: 1409253547} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -232.5, y: 80} - m_SizeDelta: {x: 465, y: 160} + m_AnchoredPosition: {x: -300, y: 80} + m_SizeDelta: {x: 600, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &280147084 MonoBehaviour: @@ -565,8 +561,8 @@ Transform: m_GameObject: {fileID: 290482131} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} - m_LocalScale: {x: 28, y: 2, z: 6} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 28, y: 1, z: 6} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 743367988} @@ -711,7 +707,7 @@ Transform: m_GameObject: {fileID: 342345820} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -9, y: -8, z: 0} + m_LocalPosition: {x: -9, y: -5, z: 0} m_LocalScale: {x: 10, y: 2, z: 6} m_ConstrainProportionsScale: 0 m_Children: [] @@ -878,36 +874,46 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::BuildManager cellSize: 1 + tunnelHeight: 3 groundLayer: serializedVersion: 2 m_Bits: 128 constructionSitePrefab: {fileID: 7327242023390354019, guid: 7d362c5c1b34c2b4e901294618e6c3e8, type: 3} - selectedTurret: - turretName: asd - finalPrefab: {fileID: 7327242023390354019, guid: f74a3b8b4fd9ffe44aab9f60247dc8b0, type: 3} - ghostPrefab: {fileID: 7327242023390354019, guid: 2c280b2ae26e7364b8afee740b7cc712, type: 3} - buildTime: 3 - size: {x: 1, y: 1} - isBuildMode: 0 playerLayer: serializedVersion: 2 m_Bits: 512 turretLibrary: - turretName: Arrow Tower + isTunnel: 0 finalPrefab: {fileID: 7327242023390354019, guid: 9f0adbb07b3928847861b8bf306ca412, type: 3} ghostPrefab: {fileID: 7327242023390354019, guid: 773f85c1a4ec87a4da4cbbb9d2e730cd, type: 3} buildTime: 3 size: {x: 1, y: 1} - turretName: Cannon Tower + isTunnel: 0 finalPrefab: {fileID: 7327242023390354019, guid: 77ee51d7bba39bb4ea1c89b16e1052ba, type: 3} ghostPrefab: {fileID: 7327242023390354019, guid: 898d65cff675d304a9eb583546d3312b, type: 3} buildTime: 5 size: {x: 2, y: 2} - turretName: Magic Tower + isTunnel: 0 finalPrefab: {fileID: 7327242023390354019, guid: 1a0743e23b3b9094bb86849376c9f73c, type: 3} ghostPrefab: {fileID: 7327242023390354019, guid: fc47abc0080971d4fa7cf22f661f1b98, type: 3} buildTime: 10 size: {x: 1, y: 1} + - turretName: Tunnel + isTunnel: 1 + finalPrefab: {fileID: 7817822323996939414, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + ghostPrefab: {fileID: 7817822323996939414, guid: 532bea89bbc1d2245b65a9c22749711a, type: 3} + buildTime: 10 + size: {x: 1, y: 1} + selectedTurret: + turretName: asd + isTunnel: 0 + finalPrefab: {fileID: 7327242023390354019, guid: f74a3b8b4fd9ffe44aab9f60247dc8b0, type: 3} + ghostPrefab: {fileID: 7327242023390354019, guid: 2c280b2ae26e7364b8afee740b7cc712, type: 3} + buildTime: 3 + size: {x: 1, y: 1} --- !u!1 &445606021 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6403733529880835406, guid: 443aa97110814434cb36b26656f1884c, type: 3} @@ -995,6 +1001,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1955bdf7dd2940f44aa117fbcf6eb626, type: 3} +--- !u!4 &545458833 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + m_PrefabInstance: {fileID: 1320111437} + m_PrefabAsset: {fileID: 0} --- !u!1 &584961938 GameObject: m_ObjectHideFlags: 0 @@ -1265,63 +1276,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599851509} m_CullTransparentMesh: 1 ---- !u!1001 &613577505 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 743367988} - m_Modifications: - - target: {fileID: 7817822323996939414, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_Name - value: Tunnel - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalPosition.x - value: -12 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} --- !u!1 &621471626 GameObject: m_ObjectHideFlags: 0 @@ -1334,7 +1288,6 @@ GameObject: - component: {fileID: 621471630} - component: {fileID: 621471629} - component: {fileID: 621471628} - - component: {fileID: 621471631} - component: {fileID: 621471635} - component: {fileID: 621471634} - component: {fileID: 621471636} @@ -1439,23 +1392,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 621471626} m_Mesh: {fileID: 4300000, guid: fafc239678bc5064887cfc699c21e355, type: 3} ---- !u!114 &621471631 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 621471626} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 29785216765776848b0c3cc745d761a7, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PlayerBuildInteract - interactRange: 3 - buildSpeedMultiplier: 1 - constructionLayer: - serializedVersion: 2 - m_Bits: 256 --- !u!114 &621471634 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1508,7 +1444,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 736c03e837e6b074ba7f90b813050aed, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::PlayerInteractionController - range: 1 + range: 5 interactableLayer: serializedVersion: 2 m_Bits: 1024 @@ -1710,8 +1646,7 @@ Transform: - {fileID: 372588680} - {fileID: 2084947170} - {fileID: 1564162731} - - {fileID: 117302153} - - {fileID: 2144751144} + - {fileID: 545458833} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &789135791 @@ -2283,6 +2218,68 @@ Transform: m_Children: [] m_Father: {fileID: 1842105546} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1320111437 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 743367988} + m_Modifications: + - target: {fileID: 2292926820231089492, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7817822323996939414, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_Name + value: Tunnel (1) + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalPosition.x + value: -11 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 5334341810660213834, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} --- !u!1 &1365372344 GameObject: m_ObjectHideFlags: 0 @@ -2635,6 +2632,143 @@ Transform: m_CorrespondingSourceObject: {fileID: 2338240775821095493, guid: 1955bdf7dd2940f44aa117fbcf6eb626, type: 3} m_PrefabInstance: {fileID: 1242393178} m_PrefabAsset: {fileID: 0} +--- !u!1 &1600458457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1600458458} + - component: {fileID: 1600458460} + - component: {fileID: 1600458459} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1600458458 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600458457} + 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: 2060458428} + 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 &1600458459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600458457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Tunnel + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1600458460 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600458457} + m_CullTransparentMesh: 1 --- !u!20 &1648146738 stripped Camera: m_CorrespondingSourceObject: {fileID: 5650099317679730308, guid: 2b08dd32e48ef5e4aa65a6122099152e, type: 3} @@ -3021,73 +3155,144 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2000300135} m_CullTransparentMesh: 1 +--- !u!1 &2060458427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2060458428} + - component: {fileID: 2060458431} + - component: {fileID: 2060458430} + - component: {fileID: 2060458429} + m_Layer: 5 + m_Name: Tunnel Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2060458428 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060458427} + 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: 1600458458} + m_Father: {fileID: 280147083} + 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: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2060458429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060458427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2060458430} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 412220988} + m_TargetAssemblyTypeName: BuildManager, Assembly-CSharp + m_MethodName: SelectTurret + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 3 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &2060458430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060458427} + 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: 1, g: 1, b: 1, a: 1} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &2060458431 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060458427} + m_CullTransparentMesh: 1 --- !u!4 &2084947170 stripped Transform: m_CorrespondingSourceObject: {fileID: 2338240775821095493, guid: 1955bdf7dd2940f44aa117fbcf6eb626, type: 3} m_PrefabInstance: {fileID: 497942047} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2144751143 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 743367988} - m_Modifications: - - target: {fileID: 7817822323996939414, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_Name - value: Tunnel - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalPosition.x - value: -12 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalPosition.y - value: -2.5 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} ---- !u!4 &2144751144 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7892781535212668078, guid: 48bf40d31e903d34f9469451d7de06dd, type: 3} - m_PrefabInstance: {fileID: 2144751143} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3690888448170635710 PrefabInstance: m_ObjectHideFlags: 0 @@ -3106,7 +3311,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1908074291664802429, guid: 2b08dd32e48ef5e4aa65a6122099152e, type: 3} propertyPath: m_LocalPosition.z - value: -7.59703 + value: -19.59703 objectReference: {fileID: 0} - target: {fileID: 1908074291664802429, guid: 2b08dd32e48ef5e4aa65a6122099152e, type: 3} propertyPath: m_LocalRotation.w @@ -3178,7 +3383,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4415413950589506134, guid: 2b08dd32e48ef5e4aa65a6122099152e, type: 3} propertyPath: m_LocalPosition.z - value: -7.59703 + value: -19.59703 objectReference: {fileID: 0} - target: {fileID: 4415413950589506134, guid: 2b08dd32e48ef5e4aa65a6122099152e, type: 3} propertyPath: m_LocalRotation.w @@ -3194,7 +3399,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5356928211000044894, guid: 2b08dd32e48ef5e4aa65a6122099152e, type: 3} propertyPath: FollowOffset.z - value: -8 + value: -20 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scripts/GameBase/BuildManager.cs b/Assets/Scripts/GameBase/BuildManager.cs index d1ec43d..60847a7 100644 --- a/Assets/Scripts/GameBase/BuildManager.cs +++ b/Assets/Scripts/GameBase/BuildManager.cs @@ -11,33 +11,88 @@ public class BuildManager : MonoBehaviour public struct TurretData { public string turretName; - public bool isTunnel; // [추가] 터널 여부 체크 + public bool isTunnel; public GameObject finalPrefab; public GameObject ghostPrefab; public float buildTime; public Vector2Int size; } - public bool IsBuildMode => isBuildMode; - [Header("Settings")] - [SerializeField] private float cellSize = 1f; + public float cellSize = 1f; + public float tunnelHeight = 3f; [SerializeField] private LayerMask groundLayer; - [SerializeField] private GameObject constructionSitePrefab; // 공용 토대 프리팹 - - [Header("Current Selection")] - [SerializeField] private TurretData selectedTurret; // 현재 선택된 타워 데이터 - [SerializeField] private bool isBuildMode = false; - - [SerializeField] private LayerMask playerLayer; // 플레이어의 레이어 + [SerializeField] private GameObject constructionSitePrefab; + [SerializeField] private LayerMask playerLayer; [Header("Turret Library")] - [SerializeField] private List turretLibrary; // 인스펙터에서 여러 타워 등록 + [SerializeField] private List turretLibrary; + [SerializeField] private TurretData selectedTurret; private GameObject _ghostInstance; private Material _ghostMaterial; - private HashSet _occupiedNodes = new HashSet(); + private bool _isBuildMode = false; + public bool IsBuildMode => _isBuildMode; + + // 좌표 레지스트리 (물리 탐색 대체) + private Dictionary _tunnelRegistry = new Dictionary(); + private HashSet _occupiedNodes = new HashSet(); + private PlayerInputActions _inputActions; + private Vector3Int _currentGridPos; + private float _currentY; + + + // 게임 시작 시 기존 터널들 등록 (반드시 필요!) + void Start() + { + // 1. 씬에 배치된 모든 터널을 찾아 등록하고 연결합니다. + RegisterAllExistingTunnels(); + } + + public void RegisterTunnel(Vector3Int pos, TunnelNode node) + { + if (!_tunnelRegistry.ContainsKey(pos)) + { + _tunnelRegistry.Add(pos, node); + _occupiedNodes.Add(pos); + Debug.Log($"[Registry] {pos} 좌표에 {node.name} 등록 완료"); + } + } + + // 씬에 이미 배치된 터널들을 등록하는 함수 (Start에서 호출) + public void RegisterAllExistingTunnels() + { + _tunnelRegistry.Clear(); + _occupiedNodes.Clear(); + + TunnelNode[] nodes = FindObjectsByType(FindObjectsSortMode.None); + HashSet roots = new HashSet(); + + foreach (var node in nodes) + { + Transform root = node.transform.parent.parent; // Tunnel (1) + if (!roots.Contains(root)) + { + Vector3Int pos = WorldToGrid3D(root.position); + RegisterTunnel(pos, node); + roots.Add(root); + } + } + + // 모든 등록이 끝난 후 '동시에' 연결 + foreach (var node in nodes) node.LinkVertical(); + } + + // [핵심 수정] 노드의 위치가 아닌, 터널 부모의 위치를 넣어도 정확한 격자가 나오도록 함 + public Vector3Int WorldToGrid3D(Vector3 worldPos) + { + int x = Mathf.FloorToInt(worldPos.x / cellSize); + int z = Mathf.FloorToInt(worldPos.z / cellSize); + // Y값은 tunnelHeight로 나눈 뒤 반올림(Round)하여 오차 극복 + int y = Mathf.RoundToInt(worldPos.y / tunnelHeight); + return new Vector3Int(x, y, z); + } void Awake() { @@ -47,234 +102,112 @@ public class BuildManager : MonoBehaviour void OnEnable() { - _inputActions.Player.Build.performed += OnBuildPerformed; - _inputActions.Player.Cancel.performed += OnCancelPerformed; - _inputActions.Player.ToggleBuild.performed += OnTogglePerformed; + // 최신 Input System 콜백 등록 + _inputActions.Player.Build.performed += ctx => OnBuildRequested(); + _inputActions.Player.Cancel.performed += ctx => ExitBuildMode(); + _inputActions.Player.ToggleBuild.performed += ctx => ToggleBuildMode(); _inputActions.Enable(); } - void OnDisable() - { - _inputActions.Disable(); - } + void OnDisable() => _inputActions.Disable(); void Update() { - if (!isBuildMode || _ghostInstance == null) return; + if (!_isBuildMode || _ghostInstance == null) return; - Vector2 mousePos = Mouse.current.position.ReadValue(); - Ray ray = Camera.main.ScreenPointToRay(mousePos); + UpdateGhostPosition(); + } - if (Physics.Raycast(ray, out RaycastHit hit, Mathf.Infinity, groundLayer)) + private void UpdateGhostPosition() + { + Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.ReadValue()); + int tunnelMask = LayerMask.GetMask("Tunnel"); + + if (Physics.Raycast(ray, out RaycastHit hit, Mathf.Infinity, groundLayer | tunnelMask)) { - Vector2Int gridPos = WorldToGrid(hit.point); - _ghostInstance.transform.position = GridToWorld(gridPos, selectedTurret.size); + Vector2Int xz = WorldToGrid(hit.point); + float targetY = 0.05f; + int floor = 0; - // [수정] CanBuild 호출 인자를 selectedTurret 전체로 변경 - bool canPlace = CanBuild(gridPos, selectedTurret); - - // 고스트 색상 변경 - if (_ghostMaterial != null) + // 터널 조준 시 지하로 스냅 + if (((1 << hit.collider.gameObject.layer) & tunnelMask) != 0) { - _ghostMaterial.color = canPlace ? new Color(0, 1, 0, 0.5f) : new Color(1, 0, 0, 0.5f); + xz = WorldToGrid(hit.collider.transform.position); + targetY = hit.collider.transform.position.y - tunnelHeight; + floor = Mathf.RoundToInt(targetY / tunnelHeight); } - // 미리보기 타워의 사거리 표시기 제어 - TowerRangeOverlay overlay = _ghostInstance.GetComponentInChildren(); - if (overlay != null) - { - overlay.ShowRange(true); - overlay.UpdateRangeScale(); // 매 프레임 스케일 보정 - } + _currentGridPos = new Vector3Int(xz.x, floor, xz.y); + _currentY = targetY; + + _ghostInstance.transform.position = new Vector3(xz.x * cellSize, targetY, xz.y * cellSize); + + bool canBuild = CanBuildVertical(_currentGridPos); + _ghostMaterial.color = canBuild ? new Color(0, 1, 0, 0.5f) : new Color(1, 0, 0, 0.5f); } } - // --- Input Callbacks --- - private void OnTogglePerformed(InputAction.CallbackContext context) => ToggleBuildMode(); - private void OnCancelPerformed(InputAction.CallbackContext context) + private bool CanBuildVertical(Vector3Int pos) { - if (isBuildMode) ToggleBuildMode(); + if (_occupiedNodes.Contains(pos)) return false; + // 지하 건설 시 위층 터널 존재 여부 확인 + if (pos.y < 0 && !_occupiedNodes.Contains(pos + Vector3Int.up)) return false; + + // 플레이어와 겹치는지 확인 + return !Physics.CheckBox(new Vector3(pos.x * cellSize, pos.y * tunnelHeight + 1f, pos.z * cellSize), + new Vector3(0.45f, 0.5f, 0.45f), Quaternion.identity, playerLayer); } - private void OnBuildPerformed(InputAction.CallbackContext context) + private void OnBuildRequested() { - if (!isBuildMode || EventSystem.current.IsPointerOverGameObject()) return; + if (!_isBuildMode || EventSystem.current.IsPointerOverGameObject()) return; + if (!CanBuildVertical(_currentGridPos)) return; - Vector2 mousePos = Mouse.current.position.ReadValue(); - Ray ray = Camera.main.ScreenPointToRay(mousePos); + _occupiedNodes.Add(_currentGridPos); + GameObject site = Instantiate(constructionSitePrefab, _ghostInstance.transform.position, Quaternion.identity); + site.GetComponent().Initialize(selectedTurret.finalPrefab, selectedTurret.buildTime, _currentGridPos); - if (Physics.Raycast(ray, out RaycastHit hit, Mathf.Infinity, groundLayer)) - { - Vector2Int gridPos = WorldToGrid(hit.point); - // [수정] CanBuild 호출 인자 변경 - if (CanBuild(gridPos, selectedTurret)) - { - Build(gridPos, selectedTurret); - } - } + ExitBuildMode(); } - // --- Core Logic --- - private void ToggleBuildMode() + public TunnelNode GetTunnelAt(Vector3Int pos) => _tunnelRegistry.GetValueOrDefault(pos); + + public Vector2Int WorldToGrid(Vector3 pos) => new Vector2Int(Mathf.FloorToInt(pos.x / cellSize), Mathf.FloorToInt(pos.z / cellSize)); + + private void ToggleBuildMode() { if (_isBuildMode) ExitBuildMode(); else EnterBuildMode(); } + private void EnterBuildMode() { - isBuildMode = !isBuildMode; - - if (isBuildMode) CreateGhost(); - else DestroyGhost(); - } - - private void CreateGhost() - { - if (selectedTurret.ghostPrefab == null) return; - if (_ghostInstance != null) Destroy(_ghostInstance); - + _isBuildMode = true; _ghostInstance = Instantiate(selectedTurret.ghostPrefab); - - // 고스트의 머티리얼 참조 (색상 변경용) - Renderer ghostRenderer = _ghostInstance.GetComponentInChildren(); - if (ghostRenderer != null) _ghostMaterial = ghostRenderer.material; - - // 1. 비주얼 스케일 조절 - Transform visual = _ghostInstance.transform.Find("Visual"); - if (visual != null) - { - visual.localScale = new Vector3(selectedTurret.size.x, 1f, selectedTurret.size.y); - } - - // 2. 바닥 정렬 - AlignToGround(_ghostInstance, 0f); + _ghostMaterial = _ghostInstance.GetComponentInChildren().material; } - - private void DestroyGhost() + private void ExitBuildMode() { - if (_ghostInstance != null) Destroy(_ghostInstance); - _ghostMaterial = null; - } - - private void Build(Vector2Int gridPos, TurretData data) - { - if (constructionSitePrefab == null || data.finalPrefab == null) - { - Debug.LogError("BuildManager: 프리팹 할당 상태를 확인하세요!"); - return; - } - - // 점유 노드 등록 - for (int x = 0; x < data.size.x; x++) - for (int y = 0; y < data.size.y; y++) - _occupiedNodes.Add(new Vector2Int(gridPos.x + x, gridPos.y + y)); - - // 토대 생성 - GameObject siteObj = Instantiate(constructionSitePrefab, GridToWorld(gridPos, data.size), Quaternion.identity); - - // 토대 비주얼 스케일 조절 - Transform visual = siteObj.transform.Find("Visual"); - if (visual != null) - { - visual.localScale = new Vector3(data.size.x, 1f, data.size.y); - } - - // 토대 바닥 정렬 - AlignToGround(siteObj, 0f); - - // 컴포넌트 초기화 - ConstructionSite siteScript = siteObj.GetComponent(); - if (siteScript != null) - { - siteScript.Initialize(data.finalPrefab, data.buildTime, data.size); - } - - ToggleBuildMode(); - } - - // --- Utilities --- - private bool CanBuild(Vector2Int startPos, TurretData data) - { - // 1. 기존 점유 노드 및 플레이어 충돌 체크 - for (int x = 0; x < data.size.x; x++) - { - for (int y = 0; y < data.size.y; y++) - { - if (_occupiedNodes.Contains(new Vector2Int(startPos.x + x, startPos.y + y))) - return false; - } - } - - // 플레이어와 겹치는지 체크 - Vector3 center = GridToWorld(startPos, data.size); - center.y = 1f; - Vector3 halfExtents = new Vector3(data.size.x * 0.45f, 0.5f, data.size.y * 0.45f); - if (Physics.CheckBox(center, halfExtents, Quaternion.identity, playerLayer)) - return false; - - // 2. 터널 연결 제약 조건 체크 - if (data.isTunnel) - { - return IsConnectedToExistingTunnel(startPos, data); - } - - return true; - } - - private bool IsConnectedToExistingTunnel(Vector2Int startPos, TurretData data) - { - // 첫 번째 터널은 자유롭게 설치 (또는 특정 구역 제한) - if (_occupiedNodes.Count == 0) return true; - - Vector3 ghostWorldPos = GridToWorld(startPos, data.size); - float checkRadius = cellSize * 1.5f; - Collider[] neighbors = Physics.OverlapSphere(ghostWorldPos, checkRadius, LayerMask.GetMask("Tunnel")); - - foreach (var col in neighbors) - { - TunnelNode node = col.GetComponent(); - if (node != null && node.gameObject.activeInHierarchy) - { - return true; - } - } - return false; - } - - public Vector2Int WorldToGrid(Vector3 worldPos) => new Vector2Int(Mathf.FloorToInt(worldPos.x / cellSize), Mathf.FloorToInt(worldPos.z / cellSize)); - - public Vector3 GridToWorld(Vector2Int gridPos, Vector2Int size) - { - return new Vector3(gridPos.x * cellSize + (size.x - 1) * cellSize * 0.5f, 0.05f, gridPos.y * cellSize + (size.y - 1) * cellSize * 0.5f); - } - - public void AlignToGround(GameObject obj, float yOffset) - { - Transform visual = obj.transform.Find("Visual"); - if (visual == null) return; - - MeshRenderer[] renderers = visual.GetComponentsInChildren(); - if (renderers.Length == 0) return; - - Bounds bounds = renderers[0].bounds; - foreach (var renderer in renderers) - { - bounds.Encapsulate(renderer.bounds); - } - - float bottomY = bounds.min.y - obj.transform.position.y; - visual.localPosition = new Vector3(0, -bottomY + yOffset, 0); - } - - private void OnDrawGizmos() - { - Gizmos.color = new Color(1, 1, 1, 0.1f); - for (int x = -10; x <= 10; x++) - for (int z = -10; z <= 10; z++) - Gizmos.DrawWireCube(new Vector3(x * cellSize, 0, z * cellSize), new Vector3(cellSize, 0.01f, cellSize)); + _isBuildMode = false; + if (_ghostInstance) Destroy(_ghostInstance); } + // BuildManager.cs 내부 public void SelectTurret(int index) { if (index >= 0 && index < turretLibrary.Count) { selectedTurret = turretLibrary[index]; - if (isBuildMode) CreateGhost(); + + // 현재 건설 모드가 아니라면 건설 모드로 진입 + if (!_isBuildMode) + { + EnterBuildMode(); + } + else + { + // 이미 건설 모드라면 고스트만 교체 + if (_ghostInstance) Destroy(_ghostInstance); + _ghostInstance = Instantiate(selectedTurret.ghostPrefab); + _ghostMaterial = _ghostInstance.GetComponentInChildren().material; + } + + Debug.Log($"{selectedTurret.turretName} 선택됨"); } } } \ No newline at end of file diff --git a/Assets/Scripts/Player/PlayerInteractionController.cs b/Assets/Scripts/Player/PlayerInteractionController.cs index e27b149..76eb0a2 100644 --- a/Assets/Scripts/Player/PlayerInteractionController.cs +++ b/Assets/Scripts/Player/PlayerInteractionController.cs @@ -1,35 +1,33 @@ using UnityEngine; using UnityEngine.InputSystem; +using System.Collections.Generic; public class PlayerInteractionController : MonoBehaviour { [Header("Detection Settings")] [SerializeField] private float range = 3f; - [SerializeField] private LayerMask interactableLayer; // Tunnel용 레이어 - [SerializeField] private LayerMask constructionLayer; // 건설 토대용 레이어 + [SerializeField] private LayerMask interactableLayer; // TunnelNode 감지용 + [SerializeField] private LayerMask constructionLayer; // ConstructionSite 감지용 [Header("Build Settings")] [SerializeField] private float buildSpeedMultiplier = 2f; private PlayerInputActions _inputActions; private bool _isHoldingInteract = false; + private TunnelTraveler _traveler; void Awake() { _inputActions = new PlayerInputActions(); + _traveler = GetComponent(); - // 탭(짧게 누르기) 시점 체크 - _inputActions.Player.Interact.performed += OnInteractTap; + // [최신화] 탭/홀드 로직을 Input Action 이벤트에 직접 바인딩 + // 1. 단일 상호작용 (터널 진입 등) + _inputActions.Player.Interact.performed += OnInteractPerformed; - // 홀드(꾹 누르기) 시작/종료 체크 - _inputActions.Player.Interact.started += ctx => { - _isHoldingInteract = true; - Debug.Log("인터랙션 버튼 누르기 시작 (건설 가속 준비)"); - }; - _inputActions.Player.Interact.canceled += ctx => { - _isHoldingInteract = false; - Debug.Log("인터랙션 버튼 뗌"); - }; + // 2. 지속 상호작용 (건설 가속) + _inputActions.Player.Interact.started += ctx => _isHoldingInteract = true; + _inputActions.Player.Interact.canceled += ctx => _isHoldingInteract = false; } void OnEnable() => _inputActions.Enable(); @@ -37,52 +35,65 @@ public class PlayerInteractionController : MonoBehaviour void Update() { - if (_isHoldingInteract) + // 홀드 중일 때만 건설 지원 로직 실행 + if (_isHoldingInteract && !(_traveler != null && _traveler.IsTraveling)) { PerformConstructionSupport(); } } - private void OnInteractTap(InputAction.CallbackContext context) + private void OnInteractPerformed(InputAction.CallbackContext context) { - Debug.Log("E 키 탭 감지! 주변 탐색 시작..."); + // [로그 1] 버튼 입력 자체가 인식되는지 확인 + Debug.Log("1. E 키 입력 감지됨"); + + if (_traveler != null && _traveler.IsTraveling) + { + Debug.Log("이동 중이라 상호작용 무시됨"); + return; + } + + // [로그 2] 탐색 시작 위치와 범위 확인 + Debug.Log($"2. 탐색 시작 - 위치: {transform.position}, 범위: {range}, 레이어: {interactableLayer.value}"); - // 1. 주변 모든 콜라이더 가져오기 (레이어 마스크 없이 먼저 테스트해보고 싶다면 0 대신 ~0 입력) Collider[] colliders = Physics.OverlapSphere(transform.position, range, interactableLayer); - Debug.Log($"주변 {interactableLayer.value} 레이어에서 {colliders.Length}개의 오브젝트 감지됨"); + // [로그 3] 감지된 콜라이더 개수 확인 + Debug.Log($"3. 감지된 콜라이더 개수: {colliders.Length}"); foreach (var col in colliders) { - // 2. 인터페이스 찾기 (본인 또는 부모에게서) + // [로그 4] 감지된 오브젝트의 이름 출력 + Debug.Log($"4. 감지된 오브젝트: {col.name}"); + IInteractable interactable = col.GetComponentInParent(); if (interactable != null) { - Debug.Log($"[성공] {col.name}에서 IInteractable 발견! 터널 진입합니다."); + Debug.Log("5. IInteractable 발견! Interact 실행"); interactable.Interact(gameObject); - _isHoldingInteract = false; // 이동 중에는 건설 지원 중단 - return; - } - else - { - Debug.Log($"[실패] {col.name} 감지되었으나 IInteractable 스크립트가 없음"); + break; } } } private void PerformConstructionSupport() { + // 주변의 건설 토대 감지 Collider[] targets = Physics.OverlapSphere(transform.position, range, constructionLayer); + foreach (var col in targets) { - ConstructionSite site = col.GetComponent(); + // 토대 스크립트 탐색 (부모 또는 본인) + ConstructionSite site = col.GetComponentInParent(); if (site != null) { + // 최신화된 AdvanceConstruction 호출 site.AdvanceConstruction(Time.deltaTime * buildSpeedMultiplier); } } } + // 에디터 시각화 void OnDrawGizmosSelected() { Gizmos.color = Color.yellow; diff --git a/Assets/Scripts/Tower/ConstructionSite.cs b/Assets/Scripts/Tower/ConstructionSite.cs index 540b835..3969ad4 100644 --- a/Assets/Scripts/Tower/ConstructionSite.cs +++ b/Assets/Scripts/Tower/ConstructionSite.cs @@ -1,96 +1,56 @@ using UnityEngine; -using UnityEngine.UI; public class ConstructionSite : MonoBehaviour { - [Header("UI Settings")] - [SerializeField] private GameObject uiPrefab; // Canvas 프리팹 - [SerializeField] private Vector3 uiOffset = new Vector3(0, 2f, 0); // 머리 위 높이 - - private Slider _progressSlider; - private GameObject _finalPrefab; // 이름을 _finalPrefab으로 통일하여 에러 방지 + private GameObject _finalPrefab; private float _buildTime; - private float _currentProgress = 0f; - private Vector2Int _size; + private float _timer; + private Vector3Int _gridPos; + private bool _isCompleted = false; // 중복 완공 방지 플래그 - public void Initialize(GameObject finalPrefab, float time, Vector2Int size) + public void Initialize(GameObject final, float time, Vector3Int pos) { - _finalPrefab = finalPrefab; + _finalPrefab = final; _buildTime = time; - _size = size; - - // UI 생성 및 초기화 - if (uiPrefab != null) - { - GameObject uiObj = Instantiate(uiPrefab, transform.position + uiOffset, Quaternion.identity, transform); - _progressSlider = uiObj.GetComponentInChildren(); - if (_progressSlider != null) - { - _progressSlider.maxValue = 1f; - _progressSlider.value = 0f; - } - } + _gridPos = pos; + _timer = 0; + _isCompleted = false; } + void Update() + { + if (_isCompleted) return; + + // 매 프레임 자동으로 시간이 흐름 + _timer += Time.deltaTime; + if (_timer >= _buildTime) Complete(); + } + + // [핵심] 플레이어가 상호작용 버튼을 꾹 누를 때 호출되는 함수 public void AdvanceConstruction(float amount) { - _currentProgress += amount; - float ratio = Mathf.Clamp01(_currentProgress / _buildTime); + if (_isCompleted) return; - // 슬라이더 업데이트 - if (_progressSlider != null) - { - _progressSlider.value = ratio; - } - - if (_currentProgress >= _buildTime) - { - CompleteBuild(); - } + _timer += amount; + if (_timer >= _buildTime) Complete(); } - private void CompleteBuild() + private void Complete() { - // 1. 실제 타워 생성 - GameObject finalTurret = Instantiate(_finalPrefab, transform.position, Quaternion.identity); + // 1. 터널 생성 + GameObject tunnel = Instantiate(_finalPrefab, transform.position, Quaternion.identity); + TunnelNode node = tunnel.GetComponentInChildren(); - // 2. BuildManager를 통한 지면 정렬 (스케일 반영을 위해 호출) - if (BuildManager.Instance != null) + if (node != null) { - BuildManager.Instance.AlignToGround(finalTurret, 0f); + // 2. [수정] 완공된 터널의 루트 위치로 좌표 계산 + Vector3Int myGridPos = BuildManager.Instance.WorldToGrid3D(tunnel.transform.position); + + // 3. 레지스트리 등록 및 연결 + BuildManager.Instance.RegisterTunnel(myGridPos, node); + node.LinkVertical(); } - // 3. 터널 노드 연결 갱신 (터널인 경우에만 작동) - UpdateTunnelConnections(finalTurret); - - // 4. 토대 제거 Destroy(gameObject); } - - private void UpdateTunnelConnections(GameObject newTurret) - { - // 3-1. 새로 생성된 타워 내부의 모든 TunnelNode를 찾아 주변 탐색 실행 - TunnelNode[] newNodes = newTurret.GetComponentsInChildren(); - if (newNodes.Length > 0) - { - foreach (var node in newNodes) - { - node.FindNeighborNode(); - } - - // 3-2. 주변에 이미 설치된 다른 터널 노드들도 새로운 터널을 인식하도록 재탐색 명령 - // 5f는 격자 크기에 맞춰 적절히 조절 (일반적으로 격자 한 칸 이상이면 충분) - Collider[] neighbors = Physics.OverlapSphere(transform.position, 5f, LayerMask.GetMask("Tunnel")); - foreach (var col in neighbors) - { - TunnelNode neighborNode = col.GetComponentInParent(); - if (neighborNode != null && !System.Array.Exists(newNodes, x => x == neighborNode)) - { - neighborNode.FindNeighborNode(); - } - } - - Debug.Log($"[Construction] {newTurret.name} 터널 연결 갱신 완료"); - } - } } \ No newline at end of file diff --git a/Assets/Scripts/TunnelNode.cs b/Assets/Scripts/TunnelNode.cs index fa4f11a..4c54838 100644 --- a/Assets/Scripts/TunnelNode.cs +++ b/Assets/Scripts/TunnelNode.cs @@ -2,41 +2,64 @@ using UnityEngine; public class TunnelNode : MonoBehaviour, IInteractable { - public TunnelNode connectedNode; - public TunnelNode otherEndOfThisSegment; - public float detectionRadius = 0.5f; - public LayerMask tunnelLayer; + public TunnelNode aboveNode; + public TunnelNode belowNode; + + // [중요] 이 노드가 속한 터널의 최상단 부모를 캐싱합니다. + private Transform _tunnelRoot; + + void Awake() + { + // 이름이 "Tunnel"로 시작하는 부모를 찾거나, 단순히 부모의 부모를 참조합니다. + // 여기서는 이미지 구조에 맞게 부모(Visual)의 부모(Tunnel (1))를 찾습니다. + _tunnelRoot = transform.parent.parent; + } + + public void LinkVertical() + { + // 루트(Tunnel 1)의 위치로 내 위치 파악 + Transform myRoot = transform.parent.parent; + Vector3Int myPos = BuildManager.Instance.WorldToGrid3D(myRoot.position); + + // 위/아래 터널 찾기 + TunnelNode targetAbove = BuildManager.Instance.GetTunnelAt(myPos + Vector3Int.up); + TunnelNode targetBelow = BuildManager.Instance.GetTunnelAt(myPos + Vector3Int.down); + + if (targetAbove != null) + { + this.aboveNode = targetAbove; + targetAbove.belowNode = this; // 상대방의 아래도 나로 설정 (양방향) + } + + if (targetBelow != null) + { + this.belowNode = targetBelow; + targetBelow.aboveNode = this; // 상대방의 위도 나로 설정 (양방향) + } + } + + private void OnDrawGizmos() + { + // 연결되었다면 Scene 뷰에서 선을 그림 + if (aboveNode != null) + { + Gizmos.color = Color.blue; + Gizmos.DrawLine(transform.position, aboveNode.transform.position); + Gizmos.DrawSphere(aboveNode.transform.position, 0.2f); + } + if (belowNode != null) + { + Gizmos.color = Color.cyan; + Gizmos.DrawLine(transform.position, belowNode.transform.position); + Gizmos.DrawSphere(belowNode.transform.position, 0.2f); + } + } - // --- IInteractable 구현부 --- public void Interact(GameObject user) { - // 상호작용한 플레이어의 TunnelTraveler를 찾아 이동 시작! - TunnelTraveler traveler = user.GetComponent(); - if (traveler != null) - { - traveler.StartTravel(this); - } + var traveler = user.GetComponent(); + if (traveler && !traveler.IsTraveling) traveler.StartTravel(this); } - public string GetInteractionText() - { - return "통로 진입"; - } - // ---------------------------- - - void Start() => FindNeighborNode(); - - public void FindNeighborNode() - { - Collider[] colliders = Physics.OverlapSphere(transform.position, detectionRadius, tunnelLayer); - foreach (var col in colliders) - { - TunnelNode neighbor = col.GetComponent(); - if (neighbor != null && neighbor != this && neighbor != otherEndOfThisSegment) - { - connectedNode = neighbor; - break; - } - } - } + public string GetInteractionText() => "터널 이용 [E]"; } \ No newline at end of file diff --git a/Assets/Scripts/TunnelTraveler.cs b/Assets/Scripts/TunnelTraveler.cs index f28e3ee..02117fa 100644 --- a/Assets/Scripts/TunnelTraveler.cs +++ b/Assets/Scripts/TunnelTraveler.cs @@ -4,87 +4,62 @@ using System.Collections.Generic; public class TunnelTraveler : MonoBehaviour { - public float travelSpeed = 25f; private bool _isTraveling = false; - // 외부에서 읽기 전용으로 접근할 수 있게 합니다. + public float travelSpeed = 20f; + private bool _isTraveling; public bool IsTraveling => _isTraveling; - private CharacterController _controller; - private Rigidbody _rigidbody; - - void Awake() - { - _controller = GetComponent(); - _rigidbody = GetComponent(); - } - - private IEnumerator TravelRoutine(List path, TunnelNode startNode) - { - _isTraveling = true; - - if (_controller != null) _controller.enabled = false; - if (_rigidbody != null) _rigidbody.isKinematic = true; - - // 1. 캐릭터 높이 보정값 계산 - float heightOffset = 0f; - if (_controller != null) heightOffset = _controller.height / 2f; - - // 2. [입구 정렬] 시작 노드의 정확한 중앙 위치로 플레이어를 즉시 이동시킵니다. - // 플레이어의 '발바닥' 위치를 노드 중앙보다 heightOffset만큼 아래로 맞춤 - Vector3 entryPosition = new Vector3(startNode.transform.position.x, - startNode.transform.position.y - heightOffset, - startNode.transform.position.z); - - // 시작 지점으로 순간이동 또는 아주 빠르게 정렬 - transform.position = entryPosition; - - // 3. 경로 이동 시작 - foreach (Vector3 targetPos in path) - { - Vector3 adjustedTarget = new Vector3(targetPos.x, targetPos.y - heightOffset, targetPos.z); - - while (Vector3.Distance(transform.position, adjustedTarget) > 0.01f) - { - transform.position = Vector3.MoveTowards(transform.position, adjustedTarget, travelSpeed * Time.deltaTime); - yield return null; - } - transform.position = adjustedTarget; - } - - if (_rigidbody != null) _rigidbody.isKinematic = false; - if (_controller != null) _controller.enabled = true; - - _isTraveling = false; - } - - // StartTravel 함수에서 startNode를 코루틴에 넘겨주도록 수정 - public void StartTravel(TunnelNode startNode) + public void StartTravel(TunnelNode start) { if (_isTraveling) return; - List path = GeneratePath(startNode); + // [디버그 1] 상호작용한 노드의 연결 상태 확인 + Debug.Log($"[Travel] 시작 노드: {start.name} | 위: {(start.aboveNode != null)} | 아래: {(start.belowNode != null)}"); + + List path = new List(); + + // 이동 방향 결정 (아래가 있으면 아래로, 없으면 위로) + bool goDown = start.belowNode != null; + TunnelNode curr = goDown ? start.belowNode : start.aboveNode; + + while (curr != null) + { + path.Add(curr.transform.position); + curr = goDown ? curr.belowNode : curr.aboveNode; + } + + // [디버그 2] 최종 경로 개수 확인 + Debug.Log($"[Travel] 생성된 경로 포인트 개수: {path.Count}"); + if (path.Count > 0) { - // startNode 정보를 함께 넘김 - StartCoroutine(TravelRoutine(path, startNode)); + StartCoroutine(Travel(path)); + } + else + { + Debug.LogWarning("[Travel] 이동할 경로가 없습니다! 노드 연결을 확인하세요."); } } - // GeneratePath 함수는 기존과 동일하게 유지합니다. - private List GeneratePath(TunnelNode startNode) + private IEnumerator Travel(List path) { - List path = new List(); - TunnelNode currentNode = startNode; - HashSet visited = new HashSet(); + Debug.Log("[Travel] 코루틴 이동 시작!"); + _isTraveling = true; + var cc = GetComponent(); + if (cc) cc.enabled = false; - while (currentNode != null && !visited.Contains(currentNode)) + foreach (var point in path) { - visited.Add(currentNode); - TunnelNode exitNode = currentNode.otherEndOfThisSegment; - if (exitNode == null) break; - - path.Add(exitNode.transform.position); - currentNode = exitNode.connectedNode; + Vector3 target = new Vector3(point.x, point.y - (cc ? cc.height / 2 : 0), point.z); + while (Vector3.Distance(transform.position, target) > 0.1f) + { + transform.position = Vector3.MoveTowards(transform.position, target, travelSpeed * Time.deltaTime); + yield return null; + } + transform.position = target; } - return path; + + if (cc) cc.enabled = true; + _isTraveling = false; + Debug.Log("[Travel] 이동 완료!"); } } \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 8036bcd..7b64868 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ TagManager: - ConstructionZone - Player - Interactable - - + - Tunnel - - -