Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG

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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 29123333ae3fb8f4b9ff5dfbe4320207
+timeCreated: 1496770385
+licenseType: Store
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/02.Scripts/BlueWater.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.6.3
+//     version 1.7.0
 //     from Assets/02.Scripts/BlueWater.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

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

@@ -223,3 +223,45 @@ MonoBehaviour:
     <PenetrationResistivity>k__BackingField: 0
     <UsingBow>k__BackingField: 0
     <Inaccuracy>k__BackingField: 0
+  - <Idx>k__BackingField: enemy_stat_archer_test
+    <ViewIdx>k__BackingField: enemy_view_sailor_001
+    <UnitType>k__BackingField: 0
+    <AttackerType>k__BackingField: -1
+    <OffenseType>k__BackingField: -1
+    <DefenseType>k__BackingField: -1
+    <MaxHp>k__BackingField: 30
+    <CurrentHp>k__BackingField: 0
+    <Atk>k__BackingField: 10
+    <Def>k__BackingField: 5
+    <MoveSpd>k__BackingField: 10
+    <AtkCooldown>k__BackingField: 3
+    <ViewRange>k__BackingField: 40
+    <AtkRange>k__BackingField: 30
+    <DefenseRange>k__BackingField: 30
+    <ShieldPenetrationRate>k__BackingField: 25
+    <AvoidanceRate>k__BackingField: 20
+    <UsingShield>k__BackingField: 0
+    <PenetrationResistivity>k__BackingField: 0
+    <UsingBow>k__BackingField: 1
+    <Inaccuracy>k__BackingField: 4
+  - <Idx>k__BackingField: enemy_stat_captain_test
+    <ViewIdx>k__BackingField: enemy_view_captain_001
+    <UnitType>k__BackingField: 0
+    <AttackerType>k__BackingField: -1
+    <OffenseType>k__BackingField: -1
+    <DefenseType>k__BackingField: -1
+    <MaxHp>k__BackingField: 60
+    <CurrentHp>k__BackingField: 0
+    <Atk>k__BackingField: 50
+    <Def>k__BackingField: 6
+    <MoveSpd>k__BackingField: 12
+    <AtkCooldown>k__BackingField: 2
+    <ViewRange>k__BackingField: 40
+    <AtkRange>k__BackingField: 30
+    <DefenseRange>k__BackingField: 30
+    <ShieldPenetrationRate>k__BackingField: 25
+    <AvoidanceRate>k__BackingField: 20
+    <UsingShield>k__BackingField: 0
+    <PenetrationResistivity>k__BackingField: 0
+    <UsingBow>k__BackingField: 1
+    <Inaccuracy>k__BackingField: 4

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

@@ -21,7 +21,7 @@ MonoBehaviour:
     <AttackerType>k__BackingField: 1
     <OffenseType>k__BackingField: -1
     <DefenseType>k__BackingField: 3
-    <UnitList>k__BackingField: []
+    <EnemyAiList>k__BackingField: []
   - <Idx>k__BackingField: enemy_sword_knight_unit_001
     <CaptainStatIdx>k__BackingField: enemy_stat_captain_004
     <SailorStatIdx>k__BackingField: enemy_stat_sailor_004
@@ -30,7 +30,7 @@ MonoBehaviour:
     <AttackerType>k__BackingField: 1
     <OffenseType>k__BackingField: -1
     <DefenseType>k__BackingField: 2
-    <UnitList>k__BackingField: []
+    <EnemyAiList>k__BackingField: []
   - <Idx>k__BackingField: enemy_swordman_unit_001
     <CaptainStatIdx>k__BackingField: enemy_stat_captain_005
     <SailorStatIdx>k__BackingField: enemy_stat_sailor_005
@@ -39,4 +39,22 @@ MonoBehaviour:
     <AttackerType>k__BackingField: 1
     <OffenseType>k__BackingField: -1
     <DefenseType>k__BackingField: 0
-    <UnitList>k__BackingField: []
+    <EnemyAiList>k__BackingField: []
+  - <Idx>k__BackingField: enemy_archer_test
+    <CaptainStatIdx>k__BackingField: enemy_stat_captain_test
+    <SailorStatIdx>k__BackingField: enemy_stat_archer_test
+    <UnitName>k__BackingField: EnemyArcherTest
+    <SailorCount>k__BackingField: 3
+    <AttackerType>k__BackingField: 1
+    <OffenseType>k__BackingField: -1
+    <DefenseType>k__BackingField: 2
+    <EnemyAiList>k__BackingField: []
+  - <Idx>k__BackingField: 
+    <CaptainStatIdx>k__BackingField: 
+    <SailorStatIdx>k__BackingField: 
+    <UnitName>k__BackingField: 
+    <SailorCount>k__BackingField: 0
+    <AttackerType>k__BackingField: -1
+    <OffenseType>k__BackingField: -1
+    <DefenseType>k__BackingField: -1
+    <EnemyAiList>k__BackingField: []

BlueWater/Assets/05.Prefabs/Arrow_01.prefab

@@ -147,4 +147,4 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   autoDestroyTime: 5
-  arrowSpeed: 30
+  arrowSpeed: 45