Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound

2026-02-25 23:35:25 +09:00
parent 93d326e692 863e98a53f
commit 72fe5e5b04
32 changed files with 116 additions and 67 deletions
--- a/Assets/Data/ScriptableObjects/Creep/Creep1.asset
+++ b/Assets/Data/ScriptableObjects/Creep/Creep1.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.CreepData
  id: 1
  memo: "\uAE30\uBCF81"
-  moveSpeed: 5
+  moveSpeed: 4
  maxHp: 75
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Creep/Creep2.asset
+++ b/Assets/Data/ScriptableObjects/Creep/Creep2.asset
@@ -14,8 +14,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.CreepData
  id: 2
  memo: "\uAE30\uBCF82"
-  moveSpeed: 4.5
-  maxHp: 100
+  moveSpeed: 3.5
+  maxHp: 50
  sight: 6
  atkRange: 4
  atkDamage: 15
--- a/Assets/Data/ScriptableObjects/Monster/Monster101.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster101.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 101
  memo: "Grunt(\uAE30\uBCF8)"
-  moveSpeed: 6.7
+  moveSpeed: 4.5
  maxHp: 75
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Monster/Monster102.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster102.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 102
  memo: "Tank(\uB290\uB9BC/\uB2E8\uB2E8)"
-  moveSpeed: 3.3
+  moveSpeed: 2.5
  maxHp: 125
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Monster/Monster103.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster103.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 103
  memo: "Ranged(\uC6D0\uAC70\uB9AC/\uC57D\uD568)"
-  moveSpeed: 5.3
+  moveSpeed: 3.5
  maxHp: 65
  sight: 6
  atkRange: 5
--- a/Assets/Data/ScriptableObjects/Monster/Monster104.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster104.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 104
  memo: "Fast(\uBE60\uB984/\uC57D\uD568)"
-  moveSpeed: 8.6
+  moveSpeed: 6
  maxHp: 45
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Monster/Monster105.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster105.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 105
  memo: "Elite(\uC18C\uC218 \uC815\uC608)"
-  moveSpeed: 6.6
+  moveSpeed: 4.5
  maxHp: 100
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Tower/Tower1.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower1.asset
@@ -18,8 +18,8 @@ MonoBehaviour:
  level: 1
  upgradeTo: 2
  towerType: attack
-  mana: 100
-  manpower: 10
+  mana: 150
+  manpower: 50
  sizeX: 4
  sizeY: 10
  sizeZ: 4
--- a/Assets/Data/ScriptableObjects/Tower/Tower10.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower10.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 0
  towerType: defense
  mana: 150
-  manpower: 20
+  manpower: 50
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 110
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Data/ScriptableObjects/Tower/Tower2.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower2.asset
@@ -18,8 +18,8 @@ MonoBehaviour:
  level: 2
  upgradeTo: 3
  towerType: attack
-  mana: 200
-  manpower: 20
+  mana: 300
+  manpower: 60
  sizeX: 4
  sizeY: 10
  sizeZ: 4
--- a/Assets/Data/ScriptableObjects/Tower/Tower3.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower3.asset
@@ -18,8 +18,8 @@ MonoBehaviour:
  level: 3
  upgradeTo: 4
  towerType: attack
-  mana: 300
-  manpower: 30
+  mana: 450
+  manpower: 70
  sizeX: 4
  sizeY: 10
  sizeZ: 4
--- a/Assets/Data/ScriptableObjects/Tower/Tower4.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower4.asset
@@ -18,8 +18,8 @@ MonoBehaviour:
  level: 4
  upgradeTo: 5
  towerType: attack
-  mana: 400
-  manpower: 40
+  mana: 600
+  manpower: 80
  sizeX: 4
  sizeY: 10
  sizeZ: 4
--- a/Assets/Data/ScriptableObjects/Tower/Tower5.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower5.asset
@@ -18,8 +18,8 @@ MonoBehaviour:
  level: 5
  upgradeTo: 0
  towerType: attack
-  mana: 600
-  manpower: 50
+  mana: 750
+  manpower: 100
  sizeX: 4
  sizeY: 10
  sizeZ: 4
--- a/Assets/Data/ScriptableObjects/Tower/Tower7.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower7.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 8
  towerType: defense
  mana: 30
-  manpower: 10
+  manpower: 20
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 50
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Data/ScriptableObjects/Tower/Tower8.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower8.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 9
  towerType: defense
  mana: 50
-  manpower: 20
+  manpower: 30
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 60
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Data/ScriptableObjects/Tower/Tower9.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower9.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 10
  towerType: defense
  mana: 100
-  manpower: 20
+  manpower: 40
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 80
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Prefabs/Creep/Creep1.prefab
+++ b/Assets/Prefabs/Creep/Creep1.prefab
@@ -995,7 +995,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 5
+  m_Speed: 4
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@@ -1034,9 +1034,16 @@ MonoBehaviour:
  attackRange: 1
  attackInterval: 2
  attackDamage: 10
-  moveSpeed: 5
+  moveSpeed: 4
  chaseSpeedMultiplier: 1
  showDebugInfo: 1
+  creepCamp: {fileID: 0}
+  enableAggroSystem: 1
+  damageAggroMultiplier: 2
+  aggroDecayRate: 5
+  aggroSwitchThreshold: 20
+  targetReevaluateInterval: 1
+  distanceSwitchThreshold: 5
 --- !u!95 &7284672060047320725
 Animator:
  serializedVersion: 7
--- a/Assets/Prefabs/Creep/Creep2.prefab
+++ b/Assets/Prefabs/Creep/Creep2.prefab
@@ -1642,7 +1642,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.EnemyUnit
  ShowTopMostFoldoutHeaderGroup: 1
  enemyTeam: 2
-  maxHealth: 100
+  maxHealth: 50
  damageEffectPrefab: {fileID: 4021103657954561961, guid: 5c755f9bc5253ea418e919994537dcc7, type: 3}
  destroyEffectPrefab: {fileID: 141433446842962269, guid: 9fe8f8b3288e45a44af36ff8aa04486e, type: 3}
  showHealthBar: 1
@@ -1657,7 +1657,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 4.5
+  m_Speed: 3.5
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@@ -1696,9 +1696,16 @@ MonoBehaviour:
  attackRange: 4
  attackInterval: 4
  attackDamage: 15
-  moveSpeed: 4.5
+  moveSpeed: 3.5
  chaseSpeedMultiplier: 1
  showDebugInfo: 1
+  creepCamp: {fileID: 0}
+  enableAggroSystem: 1
+  damageAggroMultiplier: 2
+  aggroDecayRate: 5
+  aggroSwitchThreshold: 20
+  targetReevaluateInterval: 1
+  distanceSwitchThreshold: 5
 --- !u!95 &367892292455292432
 Animator:
  serializedVersion: 7
--- a/Assets/Prefabs/Monster/Monster101.prefab
+++ b/Assets/Prefabs/Monster/Monster101.prefab
@@ -1329,7 +1329,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 6.7
+  m_Speed: 4.5
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@@ -1368,9 +1368,16 @@ MonoBehaviour:
  attackRange: 1
  attackInterval: 1.2
  attackDamage: 3
-  moveSpeed: 6.7
+  moveSpeed: 4.5
  chaseSpeedMultiplier: 1
  showDebugInfo: 1
+  creepCamp: {fileID: 0}
+  enableAggroSystem: 1
+  damageAggroMultiplier: 2
+  aggroDecayRate: 5
+  aggroSwitchThreshold: 20
+  targetReevaluateInterval: 1
+  distanceSwitchThreshold: 5
 --- !u!114 &2482720153194779286
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Monster/Monster102.prefab
+++ b/Assets/Prefabs/Monster/Monster102.prefab
@@ -1753,7 +1753,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 3.3
+  m_Speed: 2.5
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@@ -1792,9 +1792,16 @@ MonoBehaviour:
  attackRange: 1
  attackInterval: 1.5
  attackDamage: 4
-  moveSpeed: 3.3
+  moveSpeed: 2.5
  chaseSpeedMultiplier: 1
  showDebugInfo: 1
+  creepCamp: {fileID: 0}
+  enableAggroSystem: 1
+  damageAggroMultiplier: 2
+  aggroDecayRate: 5
+  aggroSwitchThreshold: 20
+  targetReevaluateInterval: 1
+  distanceSwitchThreshold: 5
 --- !u!114 &6540479212111277442
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Monster/Monster103.prefab
+++ b/Assets/Prefabs/Monster/Monster103.prefab
@@ -675,7 +675,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 5.3
+  m_Speed: 3.5
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@@ -714,9 +714,16 @@ MonoBehaviour:
  attackRange: 5
  attackInterval: 1.4
  attackDamage: 2
-  moveSpeed: 5.3
+  moveSpeed: 3.5
  chaseSpeedMultiplier: 1
  showDebugInfo: 1
+  creepCamp: {fileID: 0}
+  enableAggroSystem: 1
+  damageAggroMultiplier: 2
+  aggroDecayRate: 5
+  aggroSwitchThreshold: 20
+  targetReevaluateInterval: 1
+  distanceSwitchThreshold: 5
 --- !u!114 &8817410469440881478
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Monster/Monster104.prefab
+++ b/Assets/Prefabs/Monster/Monster104.prefab
@@ -1108,7 +1108,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 8.6
+  m_Speed: 6
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@@ -1147,9 +1147,16 @@ MonoBehaviour:
  attackRange: 1
  attackInterval: 1
  attackDamage: 2
-  moveSpeed: 8.6
+  moveSpeed: 6
  chaseSpeedMultiplier: 1
  showDebugInfo: 1
+  creepCamp: {fileID: 0}
+  enableAggroSystem: 1
+  damageAggroMultiplier: 2
+  aggroDecayRate: 5
+  aggroSwitchThreshold: 20
+  targetReevaluateInterval: 1
+  distanceSwitchThreshold: 5
 --- !u!114 &177302896207380593
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Monster/Monster105.prefab
+++ b/Assets/Prefabs/Monster/Monster105.prefab
@@ -1353,7 +1353,7 @@ NavMeshAgent:
  m_Enabled: 1
  m_AgentTypeID: 0
  m_Radius: 0.5
-  m_Speed: 6.6
+  m_Speed: 4.5
  m_Acceleration: 8
  avoidancePriority: 50
  m_AngularSpeed: 120
@@ -1392,9 +1392,16 @@ MonoBehaviour:
  attackRange: 1
  attackInterval: 1.3
  attackDamage: 7
-  moveSpeed: 6.6
+  moveSpeed: 4.5
  chaseSpeedMultiplier: 1
  showDebugInfo: 1
+  creepCamp: {fileID: 0}
+  enableAggroSystem: 1
+  damageAggroMultiplier: 2
+  aggroDecayRate: 5
+  aggroSwitchThreshold: 20
+  targetReevaluateInterval: 1
+  distanceSwitchThreshold: 5
 --- !u!114 &324484408599232274
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Player/Player.prefab
+++ b/Assets/Prefabs/Player/Player.prefab
@@ -417,11 +417,11 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.PlayerStats
  baseMaxHp: 100
  baseDamage: 10
-  baseCapacity: 100
+  baseCapacity: 50
  baseManpower: 10
-  baseMoveSpeed: 5
+  baseMoveSpeed: 4
  baseSight: 10
-  baseAttackRange: 2
+  baseAttackRange: 3
  baseHpRegen: 1
  baseHpRegenDelay: 5
 --- !u!1 &1862223349553492570
--- a/Assets/Resources/Data/ScriptableObjects/Upgrade/Upgrade13.asset
+++ b/Assets/Resources/Data/ScriptableObjects/Upgrade/Upgrade13.asset
@@ -23,5 +23,5 @@ MonoBehaviour:
  effectOpList:
  - mul
  effectValueList:
-  - 1.2
+  - 1.5
  sortOrder: 13
--- a/Assets/Resources/Data/ScriptableObjects/Upgrade/Upgrade14.asset
+++ b/Assets/Resources/Data/ScriptableObjects/Upgrade/Upgrade14.asset
@@ -23,5 +23,5 @@ MonoBehaviour:
  effectOpList:
  - mul
  effectValueList:
-  - 1.6
+  - 2
  sortOrder: 14
--- a/Assets/Resources/Data/ScriptableObjects/Upgrade/Upgrade15.asset
+++ b/Assets/Resources/Data/ScriptableObjects/Upgrade/Upgrade15.asset
@@ -23,5 +23,5 @@ MonoBehaviour:
  effectOpList:
  - mul
  effectValueList:
-  - 2
+  - 2.5
  sortOrder: 15