Merge remote-tracking branch 'origin/main'

BlueWater/Assets/01.Scenes/02.Main_SJ2.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 29123333ae3fb8f4b9ff5dfbe4320207
+guid: d627e631b4f340a4cadd6bd7fef59c01
 timeCreated: 1496770385
 licenseType: Store
 DefaultImporter:

BlueWater/Assets/02.Scripts/Data/So/EnemyUnitStatDataSo.asset

@@ -31,6 +31,15 @@ MonoBehaviour:
     <OffenseType>k__BackingField: -1
     <DefenseType>k__BackingField: 3
     <EnemyAiList>k__BackingField: []
+  - <Idx>k__BackingField: enemy_spear_knight_unit_002_d5
+    <CaptainStatIdx>k__BackingField: enemy_stat_spearknight_101
+    <SailorStatIdx>k__BackingField: enemy_stat_spearknight_001
+    <UnitName>k__BackingField: EnemySpearKnightUnit002
+    <SailorCount>k__BackingField: 5
+    <AttackerType>k__BackingField: 1
+    <OffenseType>k__BackingField: -1
+    <DefenseType>k__BackingField: 2
+    <EnemyAiList>k__BackingField: []
   - <Idx>k__BackingField: enemy_spear_man_unit_001_d7
     <CaptainStatIdx>k__BackingField: enemy_stat_spearman_101
     <SailorStatIdx>k__BackingField: enemy_stat_spearman_001

BlueWater/Assets/05.Prefabs/Ai/Tower/ArrowTower.prefab

@@ -62,8 +62,8 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1.4999999, y: 1.4999999, z: 1.4999999}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2838228105937795849}
   m_Father: {fileID: 0}
@@ -174,7 +174,7 @@ MonoBehaviour:
   maxHp: 700
   currentHp: 0
   atk: 20
-  atkRange: 30
+  atkRange: 35
   atkCooldown: 0.5
   shieldPenetrationRate: 50
   inaccuracy: 0