diff --git a/Assets/Data/ScriptableObjects/Monster/Monster101.asset b/Assets/Data/ScriptableObjects/Monster/Monster101.asset index db1fdf7..18a4d36 100644 --- a/Assets/Data/ScriptableObjects/Monster/Monster101.asset +++ b/Assets/Data/ScriptableObjects/Monster/Monster101.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData id: 101 memo: "Grunt(\uAE30\uBCF8)" - moveSpeed: 2.6 - maxHp: 30 + moveSpeed: 10 + maxHp: 50 atkRange: 1 atkDamage: 3 atkIntervalSec: 1.2 diff --git a/Assets/Data/ScriptableObjects/Monster/Monster102.asset b/Assets/Data/ScriptableObjects/Monster/Monster102.asset index 7f76e0e..5aa0417 100644 --- a/Assets/Data/ScriptableObjects/Monster/Monster102.asset +++ b/Assets/Data/ScriptableObjects/Monster/Monster102.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData id: 102 memo: "Fast(\uBE60\uB984/\uC57D\uD568)" - moveSpeed: 3.4 - maxHp: 18 + moveSpeed: 13 + maxHp: 30 atkRange: 1 atkDamage: 2 atkIntervalSec: 1 diff --git a/Assets/Data/ScriptableObjects/Monster/Monster103.asset b/Assets/Data/ScriptableObjects/Monster/Monster103.asset index dcde3f8..3f4b6d8 100644 --- a/Assets/Data/ScriptableObjects/Monster/Monster103.asset +++ b/Assets/Data/ScriptableObjects/Monster/Monster103.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData id: 103 memo: "Tank(\uB290\uB9BC/\uB2E8\uB2E8)" - moveSpeed: 2 - maxHp: 70 + moveSpeed: 5 + maxHp: 150 atkRange: 1 atkDamage: 4 atkIntervalSec: 1.5 diff --git a/Assets/Data/ScriptableObjects/Monster/Monster104.asset b/Assets/Data/ScriptableObjects/Monster/Monster104.asset index 0c0fff0..f0a10e7 100644 --- a/Assets/Data/ScriptableObjects/Monster/Monster104.asset +++ b/Assets/Data/ScriptableObjects/Monster/Monster104.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData id: 104 memo: "Ranged(\uC6D0\uAC70\uB9AC/\uC57D\uD568)" - moveSpeed: 2.4 - maxHp: 22 + moveSpeed: 8 + maxHp: 40 atkRange: 5 atkDamage: 2 atkIntervalSec: 1.4 diff --git a/Assets/Data/ScriptableObjects/Monster/Monster105.asset b/Assets/Data/ScriptableObjects/Monster/Monster105.asset index f6f5655..09f0cf4 100644 --- a/Assets/Data/ScriptableObjects/Monster/Monster105.asset +++ b/Assets/Data/ScriptableObjects/Monster/Monster105.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData id: 105 memo: "Elite(\uC18C\uC218 \uC815\uC608)" - moveSpeed: 2.8 - maxHp: 120 + moveSpeed: 10 + maxHp: 130 atkRange: 1 atkDamage: 7 atkIntervalSec: 1.3 diff --git a/Assets/Data/ScriptableObjects/Player/Player001.asset b/Assets/Data/ScriptableObjects/Player/Player001.asset index 7a1a530..97abccb 100644 --- a/Assets/Data/ScriptableObjects/Player/Player001.asset +++ b/Assets/Data/ScriptableObjects/Player/Player001.asset @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.PlayerData id: 1 memo: - moveSpeed: 10 - visionRadius: 20 - capacity: 100 + moveSpeed: 5 + visionRadius: 10 + capacity: 50 manpower: 10 maxHp: 100 - atkRange: 6 - atkDamage: 200 + atkRange: 3 + atkDamage: 10 atkIntervalSec: 1 prefabPath: Assets/Prefabs/Player diff --git a/Assets/Data/ScriptableObjects/Tower/Tower1.asset b/Assets/Data/ScriptableObjects/Tower/Tower1.asset index 5e3d8cb..737b499 100644 --- a/Assets/Data/ScriptableObjects/Tower/Tower1.asset +++ b/Assets/Data/ScriptableObjects/Tower/Tower1.asset @@ -15,14 +15,14 @@ MonoBehaviour: id: 1 memo: "\uD0C0\uC6CC" buildingName: - mana: 25 + mana: 100 manpower: 10 sizeX: 4 sizeY: 10 sizeZ: 4 maxHp: 50 atkRange: 10 - atkDamage: 5 + atkDamage: 3 atkIntervalSec: 2 modelPath: Assets/Models/building_tower_B_blue.fbx prefab: {fileID: 8512676738329978770, guid: 3f7838db2c2fc424d9bd9a0d243b43be, type: 3} diff --git a/Assets/Data/ScriptableObjects/Tower/Tower2.asset b/Assets/Data/ScriptableObjects/Tower/Tower2.asset index 8a19857..4291637 100644 --- a/Assets/Data/ScriptableObjects/Tower/Tower2.asset +++ b/Assets/Data/ScriptableObjects/Tower/Tower2.asset @@ -15,7 +15,7 @@ MonoBehaviour: id: 2 memo: "\uBCBD" buildingName: - mana: 5 + mana: 50 manpower: 5 sizeX: 8 sizeY: 4 diff --git a/Assets/Prefabs/Monster/Monster101.prefab b/Assets/Prefabs/Monster/Monster101.prefab index 7555eef..07b17c3 100644 --- a/Assets/Prefabs/Monster/Monster101.prefab +++ b/Assets/Prefabs/Monster/Monster101.prefab @@ -1312,7 +1312,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyUnit ShowTopMostFoldoutHeaderGroup: 1 enemyTeam: 3 - maxHealth: 30 + maxHealth: 50 damageEffectPrefab: {fileID: 0} destroyEffectPrefab: {fileID: 0} --- !u!195 &3634736894319727576 @@ -1325,7 +1325,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 2.6 + m_Speed: 10 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -1364,7 +1364,7 @@ MonoBehaviour: attackRange: 1 attackInterval: 1.2 attackDamage: 3 - moveSpeed: 2.6 + moveSpeed: 10 chaseSpeedMultiplier: 1.5 showDebugInfo: 1 --- !u!114 &2482720153194779286 diff --git a/Assets/Prefabs/Monster/Monster102.prefab b/Assets/Prefabs/Monster/Monster102.prefab index ccabf68..22bb2cb 100644 --- a/Assets/Prefabs/Monster/Monster102.prefab +++ b/Assets/Prefabs/Monster/Monster102.prefab @@ -1736,7 +1736,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyUnit ShowTopMostFoldoutHeaderGroup: 1 enemyTeam: 3 - maxHealth: 18 + maxHealth: 30 damageEffectPrefab: {fileID: 0} destroyEffectPrefab: {fileID: 0} --- !u!195 &2580823509700602203 @@ -1749,7 +1749,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 3.4 + m_Speed: 13 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -1788,7 +1788,7 @@ MonoBehaviour: attackRange: 1 attackInterval: 1 attackDamage: 2 - moveSpeed: 3.4 + moveSpeed: 13 chaseSpeedMultiplier: 1.5 showDebugInfo: 1 --- !u!114 &6540479212111277442 diff --git a/Assets/Prefabs/Monster/Monster103.prefab b/Assets/Prefabs/Monster/Monster103.prefab index 485aab8..74b21c2 100644 --- a/Assets/Prefabs/Monster/Monster103.prefab +++ b/Assets/Prefabs/Monster/Monster103.prefab @@ -658,7 +658,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyUnit ShowTopMostFoldoutHeaderGroup: 1 enemyTeam: 3 - maxHealth: 70 + maxHealth: 150 damageEffectPrefab: {fileID: 0} destroyEffectPrefab: {fileID: 0} --- !u!195 &7475699343328683952 @@ -671,7 +671,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 2 + m_Speed: 5 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -710,7 +710,7 @@ MonoBehaviour: attackRange: 1 attackInterval: 1.5 attackDamage: 4 - moveSpeed: 2 + moveSpeed: 5 chaseSpeedMultiplier: 1.5 showDebugInfo: 1 --- !u!114 &8817410469440881478 diff --git a/Assets/Prefabs/Monster/Monster104.prefab b/Assets/Prefabs/Monster/Monster104.prefab index ec11b3c..6167473 100644 --- a/Assets/Prefabs/Monster/Monster104.prefab +++ b/Assets/Prefabs/Monster/Monster104.prefab @@ -1091,7 +1091,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyUnit ShowTopMostFoldoutHeaderGroup: 1 enemyTeam: 3 - maxHealth: 22 + maxHealth: 40 damageEffectPrefab: {fileID: 0} destroyEffectPrefab: {fileID: 0} --- !u!195 &5366269420367463183 @@ -1104,7 +1104,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 2.4 + m_Speed: 8 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -1143,7 +1143,7 @@ MonoBehaviour: attackRange: 5 attackInterval: 1.4 attackDamage: 2 - moveSpeed: 2.4 + moveSpeed: 8 chaseSpeedMultiplier: 1.5 showDebugInfo: 1 --- !u!114 &177302896207380593 diff --git a/Assets/Prefabs/Monster/Monster105.prefab b/Assets/Prefabs/Monster/Monster105.prefab index e4fcf8f..733bc51 100644 --- a/Assets/Prefabs/Monster/Monster105.prefab +++ b/Assets/Prefabs/Monster/Monster105.prefab @@ -1336,7 +1336,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyUnit ShowTopMostFoldoutHeaderGroup: 1 enemyTeam: 3 - maxHealth: 120 + maxHealth: 130 damageEffectPrefab: {fileID: 0} destroyEffectPrefab: {fileID: 0} --- !u!195 &1255224548206942124 @@ -1349,7 +1349,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 2.8 + m_Speed: 10 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -1388,7 +1388,7 @@ MonoBehaviour: attackRange: 1 attackInterval: 1.3 attackDamage: 7 - moveSpeed: 2.8 + moveSpeed: 10 chaseSpeedMultiplier: 1.5 showDebugInfo: 1 --- !u!114 &324484408599232274 diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index fab860f..4e0b89e 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -83,7 +83,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::NetworkPlayerController ShowTopMostFoldoutHeaderGroup: 1 - moveSpeed: 10 + moveSpeed: 5 rotationSpeed: 10 initialTeam: 1 maxHealth: 100 @@ -193,8 +193,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Northbound.AttackAction ShowTopMostFoldoutHeaderGroup: 1 - attackRange: 6 - attackDamage: 200 + attackRange: 3 + attackDamage: 10 attackCooldown: 1 attackableLayer: serializedVersion: 2 @@ -246,7 +246,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Northbound.PlayerResourceInventory ShowTopMostFoldoutHeaderGroup: 1 - maxResourceCapacity: 100 + maxResourceCapacity: 50 --- !u!114 &2148255267416253297 MonoBehaviour: m_ObjectHideFlags: 0 @@ -260,7 +260,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Northbound.PlayerVisionProvider ShowTopMostFoldoutHeaderGroup: 1 - visionRange: 20 + visionRange: 10 --- !u!95 &1698609800605343773 Animator: serializedVersion: 7 diff --git a/Assets/Prefabs/Worker Hall.prefab b/Assets/Prefabs/Worker Hall.prefab index 52a5961..c7a2c98 100644 --- a/Assets/Prefabs/Worker Hall.prefab +++ b/Assets/Prefabs/Worker Hall.prefab @@ -79,7 +79,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject - GlobalObjectIdHash: 1153289458 + GlobalObjectIdHash: 106047719 InScenePlacedSourceGlobalObjectIdHash: 106047719 DeferredDespawnTick: 0 Ownership: 1 @@ -110,6 +110,7 @@ MonoBehaviour: spawnRadius: 0 maxWorkers: 5 spawnCooldown: 0 + recruitmentCost: 200 interactionAnimationTrigger: interactionPrompt: "[E] \uC6CC\uCEE4 \uC0DD\uC131" spawnEffectPrefab: {fileID: 0} diff --git a/Assets/Prefabs/Worker.prefab b/Assets/Prefabs/Worker.prefab index b99e747..c073325 100644 --- a/Assets/Prefabs/Worker.prefab +++ b/Assets/Prefabs/Worker.prefab @@ -101,12 +101,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Northbound.Worker ShowTopMostFoldoutHeaderGroup: 1 - maxBagCapacity: 50 + maxBagCapacity: 30 miningSpeed: 1 - followDistance: 3 - movementSpeed: 21.41 - resourcesPerMining: 29 - recruitmentCost: 10 + followDistance: 5 + movementSpeed: 5 + resourcesPerMining: 5 + recruitmentCost: 250 interactionAnimationTrigger: miningEffectPrefab: {fileID: 0} depositEffectPrefab: {fileID: 0} diff --git a/Assets/Scenes/GameMain.unity b/Assets/Scenes/GameMain.unity index 5608617..d8dfd3b 100644 --- a/Assets/Scenes/GameMain.unity +++ b/Assets/Scenes/GameMain.unity @@ -1690,6 +1690,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f0ad96fafd5ac4f4db7e02424e132b89, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::AutoHost + enableAutoHost: 1 + onlyInEditor: 1 --- !u!4 &1142746334 Transform: m_ObjectHideFlags: 0 @@ -2136,10 +2138,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Northbound.GlobalTimer ShowTopMostFoldoutHeaderGroup: 1 - cycleLength: 5 - autoStart: 0 + cycleLength: 90 + autoStart: 1 pauseOnZero: 0 - exceptionalFirstCycleLength: 1 + exceptionalFirstCycleLength: 0 showDebugLogs: 1 --- !u!4 &1442785555 Transform: diff --git a/GameData/Monster.csv b/GameData/Monster.csv index 8b57998..9e57ee6 100644 --- a/GameData/Monster.csv +++ b/GameData/Monster.csv @@ -1,6 +1,6 @@ id,memo,move_speed,max_hp,atk_range,atk_damage,atk_interval_sec,cost,weight,model_path,animation_controller_path -101,Grunt(기본),2.6,30,1,3,1.2,1,1,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/MonsterAnimationController.controller -102,Fast(빠름/약함),3.4,18,1,2,1,2,0.5,Assets/Models/Druid.fbx,Assets/Animations/MonsterAnimationController.controller -103,Tank(느림/단단),2,70,1,4,1.5,5,0.2,Assets/Models/Skeleton_Warrior.fbx,Assets/Animations/MonsterAnimationController.controller -104,Ranged(원거리/약함),2.4,22,5,2,1.4,3,0.333,Assets/Models/Skeleton_Rogue.fbx,Assets/Animations/MonsterAnimationController.controller -105,Elite(소수 정예),2.8,120,1,7,1.3,10,0.1,Assets/Models/Barbarian_Large.fbx,Assets/Animations/MonsterAnimationController.controller +101,Grunt(기본),10,50,1,3,1.2,1,1,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/MonsterAnimationController.controller +102,Fast(빠름/약함),11,30,1,2,1,2,0.5,Assets/Models/Druid.fbx,Assets/Animations/MonsterAnimationController.controller +103,Tank(느림/단단),8,100,1,4,1.5,5,0.2,Assets/Models/Skeleton_Warrior.fbx,Assets/Animations/MonsterAnimationController.controller +104,Ranged(원거리/약함),9,40,5,2,1.4,3,0.333,Assets/Models/Skeleton_Rogue.fbx,Assets/Animations/MonsterAnimationController.controller +105,Elite(소수 정예),10,90,1,7,1.3,10,0.1,Assets/Models/Barbarian_Large.fbx,Assets/Animations/MonsterAnimationController.controller diff --git a/GameData/Player.csv b/GameData/Player.csv index e9b1d26..0905909 100644 --- a/GameData/Player.csv +++ b/GameData/Player.csv @@ -1,2 +1,2 @@ id,memo,move_speed,vision_radius,capacity,manpower,max_hp,atk_range,atk_damage,atk_interval_sec,prefab_path -1,,5,10,50,10,100,3,100,1,Assets/Prefabs/Player/Player +1,,5,10,50,10,100,3,10,1,Assets/Prefabs/Player/Player diff --git a/GameData/Tower.csv b/GameData/Tower.csv index 92a9235..880e9c9 100644 --- a/GameData/Tower.csv +++ b/GameData/Tower.csv @@ -1,3 +1,3 @@ id,memo,building_name,mana,manpower,size_x,size_y,size_z,max_hp,atk_range,atk_damage,atk_interval_sec,model_path -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 +1,타워,,100,10,4,10,4,50,10,3,2,Assets/Models/building_tower_B_blue.fbx +2,벽,,50,5,8,4,3,30,0,0,0,Assets/Models/wall_straight.fbx