diff --git a/Assets/Data/ScriptableObjects/Tower/Tower1.asset b/Assets/Data/ScriptableObjects/Tower/Tower1.asset index ae158c9..17661e0 100644 --- a/Assets/Data/ScriptableObjects/Tower/Tower1.asset +++ b/Assets/Data/ScriptableObjects/Tower/Tower1.asset @@ -18,9 +18,9 @@ MonoBehaviour: id: 1 memo: "\uD0C0\uC6CC" mana: 25 - sizeX: 3 - sizeY: 3 - sizeZ: 3 + sizeX: 4 + sizeY: 10 + sizeZ: 4 placementOffset: {x: 0, y: 0, z: 0} allowRotation: 1 manpower: 10 diff --git a/Assets/Data/ScriptableObjects/Tower/Tower2.asset b/Assets/Data/ScriptableObjects/Tower/Tower2.asset index 78d375e..4a5f553 100644 --- a/Assets/Data/ScriptableObjects/Tower/Tower2.asset +++ b/Assets/Data/ScriptableObjects/Tower/Tower2.asset @@ -18,9 +18,9 @@ MonoBehaviour: id: 2 memo: "\uBCBD" mana: 5 - sizeX: 4 - sizeY: 3 - sizeZ: 2 + sizeX: 8 + sizeY: 4 + sizeZ: 3 placementOffset: {x: 0, y: 0, z: 0} allowRotation: 1 manpower: 5 diff --git a/Assets/Data/Scripts/DataClasses/TowerData.cs b/Assets/Data/Scripts/DataClasses/TowerData.cs index f56a827..46f8863 100644 --- a/Assets/Data/Scripts/DataClasses/TowerData.cs +++ b/Assets/Data/Scripts/DataClasses/TowerData.cs @@ -66,7 +66,7 @@ namespace Northbound.Data [Header("Properties for convenience")] public int width => sizeX; public int length => sizeY; - public float height => sizeZ; + public float height => sizeY; public int maxHealth => maxHp; public float visionRange => atkRange; public float requiredWorkAmount => manpower; @@ -77,7 +77,7 @@ namespace Northbound.Data bool isRotated = (rotation == 1 || rotation == 3); float w = isRotated ? length : width; float l = isRotated ? width : length; - return new Vector3(w, height, l); + return new Vector3(w, sizeY, l); } } } diff --git a/Assets/Models/building_tower_B_blue.fbx.meta b/Assets/Models/building_tower_B_blue.fbx.meta index 7b7b2c9..328191c 100644 --- a/Assets/Models/building_tower_B_blue.fbx.meta +++ b/Assets/Models/building_tower_B_blue.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 4 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -91,7 +91,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 4 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/wall_straight.fbx.meta b/Assets/Models/wall_straight.fbx.meta index 31cf921..078c6dd 100644 --- a/Assets/Models/wall_straight.fbx.meta +++ b/Assets/Models/wall_straight.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 4 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -91,7 +91,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 4 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Prefabs/Tower/Tower1.prefab b/Assets/Prefabs/Tower/Tower1.prefab index 0f4256d..4ec5c20 100644 --- a/Assets/Prefabs/Tower/Tower1.prefab +++ b/Assets/Prefabs/Tower/Tower1.prefab @@ -118,7 +118,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6062607789191353382} @@ -262,8 +262,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 3, y: 3, z: 3} - m_Center: {x: 0, y: 1.5, z: 0} + m_Size: {x: 4, y: 10, z: 4} + m_Center: {x: 0, y: 5, z: 0} --- !u!208 &100877884298911200 NavMeshObstacle: m_ObjectHideFlags: 0 @@ -274,11 +274,11 @@ NavMeshObstacle: m_Enabled: 1 serializedVersion: 3 m_Shape: 1 - m_Extents: {x: 1.5, y: 1.5, z: 1.5} + m_Extents: {x: 2, y: 5, z: 2} m_MoveThreshold: 0.1 m_Carve: 0 m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 1.5, z: 0} + m_Center: {x: 0, y: 5, z: 0} m_TimeToStationary: 0.5 --- !u!114 &8485093670801034058 MonoBehaviour: diff --git a/Assets/Prefabs/Tower/Tower2.prefab b/Assets/Prefabs/Tower/Tower2.prefab index ecf88e8..c447c82 100644 --- a/Assets/Prefabs/Tower/Tower2.prefab +++ b/Assets/Prefabs/Tower/Tower2.prefab @@ -81,8 +81,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 4, y: 2, z: 3} - m_Center: {x: 0, y: 1, z: 0} + m_Size: {x: 8, y: 4, z: 3} + m_Center: {x: 0, y: 2, z: 0} --- !u!208 &2615519446934682856 NavMeshObstacle: m_ObjectHideFlags: 0 @@ -93,11 +93,11 @@ NavMeshObstacle: m_Enabled: 1 serializedVersion: 3 m_Shape: 1 - m_Extents: {x: 2, y: 1, z: 1.5} + m_Extents: {x: 4, y: 2, z: 1.5} m_MoveThreshold: 0.1 m_Carve: 0 m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 1, z: 0} + m_Center: {x: 0, y: 2, z: 0} m_TimeToStationary: 0.5 --- !u!114 &3203720634638459019 MonoBehaviour: @@ -173,7 +173,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 4, y: 2, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1657799771882240} diff --git a/Assets/Scenes/GameMain.unity b/Assets/Scenes/GameMain.unity index ab3e886..3be7eba 100644 --- a/Assets/Scenes/GameMain.unity +++ b/Assets/Scenes/GameMain.unity @@ -1907,7 +1907,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.GlobalTimer ShowTopMostFoldoutHeaderGroup: 1 cycleLength: 5 - autoStart: 1 + autoStart: 0 pauseOnZero: 0 exceptionalFirstCycleLength: 1 showDebugLogs: 1 diff --git a/Assets/Scripts/Editor/TowerPrefabSetup.cs b/Assets/Scripts/Editor/TowerPrefabSetup.cs index ab0f743..762f350 100644 --- a/Assets/Scripts/Editor/TowerPrefabSetup.cs +++ b/Assets/Scripts/Editor/TowerPrefabSetup.cs @@ -40,9 +40,6 @@ namespace Northbound.Editor fbxInstance.transform.localPosition = Vector3.zero; fbxInstance.transform.localRotation = Quaternion.identity; - // Set model scale based on sizeX/sizeY/sizeZ - fbxInstance.transform.localScale = new Vector3(towerData.sizeX, towerData.sizeZ, towerData.sizeY); - modelTransform = fbxInstance.transform; Debug.Log($"[TowerPrefabSetup] Applied FBX model: {towerData.modelPath} with scale {towerData.sizeX}x{towerData.sizeZ}x{towerData.sizeY}"); @@ -72,9 +69,8 @@ namespace Northbound.Editor meshFilter.sharedMesh = mesh; modelTransform = renderer.transform; - modelTransform.localScale = new Vector3(towerData.sizeX, towerData.sizeZ, towerData.sizeY); - Debug.Log($"[TowerPrefabSetup] Applied mesh: {towerData.modelPath} with scale {towerData.sizeX}x{towerData.sizeZ}x{towerData.sizeY}"); + Debug.Log($"[TowerPrefabSetup] Applied mesh: {towerData.modelPath}"); } else { @@ -88,8 +84,8 @@ namespace Northbound.Editor { collider = prefab.AddComponent(); } - collider.size = new Vector3(towerData.sizeX, towerData.sizeZ, towerData.sizeY); - collider.center = new Vector3(0f, towerData.sizeZ / 2f, 0f); + collider.size = new Vector3(towerData.sizeX, towerData.sizeY, towerData.sizeZ); + collider.center = new Vector3(0f, towerData.sizeY / 2f, 0f); var navObstacle = prefab.GetComponent(); if (navObstacle == null) @@ -97,8 +93,8 @@ namespace Northbound.Editor navObstacle = prefab.AddComponent(); navObstacle.shape = NavMeshObstacleShape.Box; } - navObstacle.size = new Vector3(towerData.sizeX, towerData.sizeZ, towerData.sizeY); - navObstacle.center = new Vector3(0f, towerData.sizeZ / 2f, 0f); + navObstacle.size = new Vector3(towerData.sizeX, towerData.sizeY, towerData.sizeZ); + navObstacle.center = new Vector3(0f, towerData.sizeY / 2f, 0f); } private void RemoveOldModel(GameObject prefab) diff --git a/GameData/Tower.csv b/GameData/Tower.csv index 64baf32..bd79f2b 100644 --- a/GameData/Tower.csv +++ b/GameData/Tower.csv @@ -1,3 +1,3 @@ id,memo,mana,manpower,size_x,size_y,size_z,max_hp,atk_range,atk_damage,atk_interval_sec,model_path -1,타워,25,10,3,3,3,50,10,5,2,Assets/Models/building_tower_B_blue.fbx -2,벽,5,5,4,3,2,30,0,0,0,Assets/Models/wall_straight.fbx +1,타워,25,10,4,10,4,50,10,5,2,Assets/Models/building_tower_B_blue.fbx +2,벽,5,5,8,4,3,30,0,0,0,Assets/Models/wall_straight.fbx