Checkpoint 5 & Checkpoint 6

Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyData.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using DataTable;
 using Definition.Enum;
 using UnityEngine;
@@ -8,17 +9,7 @@ namespace Entity.EntityData
     [Serializable]
     public class EnemyData : TargetableObjectData
     {
-        [SerializeField] private EnemyType _enemyType;
-        
-        [SerializeField] private int _entityTypeId;
-
-        [SerializeField] private float _speedBase = 0;
-
-        [SerializeField] private int _dropCoin = 0;
-
-        [SerializeField] private int _dropExp = 0;
-
-        [SerializeField] private float _dropPercent = 0;
+        [SerializeField] private DREnemy _drEnemy;
 
         public EnemyData(int entityId, EnemyType enemyType, int level) : base(
             entityId, (int)enemyType, CampType.Enemy)
@@ -29,30 +20,46 @@ namespace Entity.EntityData
             {
                 throw new Exception($"Enemy data table row is missing, EnemyType='{enemyType}'.");
             }
+            else
+            {
+                _drEnemy = enemyRow;
+            }
 
             int effectiveLevel = Mathf.Max(1, level);
-
-            _enemyType = enemyType;
-            _entityTypeId = enemyRow.EntityTypeId;
             MaxHealthBase = enemyRow.MaxHealth + enemyRow.HpAddPerLevel * (effectiveLevel - 1);
-            _speedBase = enemyRow.Speed;
-            _dropCoin = enemyRow.DropCoin;
-            _dropExp = enemyRow.DropExp;
-            _dropPercent = enemyRow.DropPercent;
         }
 
-        public EnemyType EnemyType => _enemyType;
-        
-        public int EntityTypeId => _entityTypeId;
+        public EnemyType EnemyType => (EnemyType)_drEnemy.Id;
+
+        public int EntityTypeId => _drEnemy.EntityTypeId;
 
         public override int MaxHealthBase { get; }
 
-        public float SpeedBase => _speedBase;
+        public int AttackDamage => _drEnemy.AttackDamage;
 
-        public int DropCoin => _dropCoin;
+        public float AttackCooldown => _drEnemy.AttackCooldown;
 
-        public int DropExp => _dropExp;
+        public float AttackRange => _drEnemy.AttackRange;
 
-        public float DropPercent => _dropPercent;
+        public float SpeedBase => _drEnemy.Speed;
+
+        public int DropCoin => _drEnemy.DropCoin;
+
+        public int DropExp => _drEnemy.DropExp;
+
+        public float DropPercent => _drEnemy.DropPercent;
+
+        public IReadOnlyDictionary<string, string> Params => _drEnemy.Params;
+
+        public bool TryGetParam(string key, out string value)
+        {
+            value = null;
+            if (string.IsNullOrEmpty(key) || _drEnemy?.Params == null)
+            {
+                return false;
+            }
+
+            return _drEnemy.Params.TryGetValue(key.ToLower(), out value);
+        }
     }
-}
+}

Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyProjectileData.cs

@@ -0,0 +1,29 @@
+using System;
+using Definition.Enum;
+using UnityEngine;
+
+namespace Entity.EntityData
+{
+    [Serializable]
+    public class EnemyProjectileData : EntityDataBase
+    {
+        public EnemyProjectileData(int entityId, int ownerEntityId, CampType ownerCamp, int attackDamage,
+            float speed, float lifeTime, Vector3 direction)
+            : base(entityId, 0)
+        {
+            OwnerEntityId = ownerEntityId;
+            OwnerCamp = ownerCamp;
+            AttackDamage = attackDamage;
+            Speed = speed;
+            LifeTime = lifeTime;
+            Direction = direction;
+        }
+
+        public int OwnerEntityId { get; }
+        public CampType OwnerCamp { get; }
+        public int AttackDamage { get; }
+        public float Speed { get; }
+        public float LifeTime { get; }
+        public Vector3 Direction { get; }
+    }
+}

Assets/GameMain/Scripts/Entity/EntityData/Enemy/EnemyProjectileData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 52b38f83ab6c4029803d40c189db47c7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs

@@ -28,14 +28,15 @@ namespace Entity.EntityData
 
         public WeaponType WeaponType => (WeaponType)_drWeapon.Id;
 
-        public string GetParamsString(string paramsName)
+        public bool TryGetParam(string key, out string value)
         {
-            if (!Params.TryGetValue(paramsName.ToLower(), out var value))
+            value = null;
+            if (string.IsNullOrEmpty(key) || Params == null)
             {
-                throw new Exception($"Parameter '{paramsName}' not found.");
+                return false;
             }
 
-            return value;
+            return Params.TryGetValue(key.ToLower(), out value);
         }
 
         /// <summary>

Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLightningData.cs

@@ -0,0 +1,12 @@
+using Definition.Enum;
+
+namespace Entity.EntityData
+{
+    public class WeaponLightningData : WeaponData
+    {
+        public WeaponLightningData(int entityId, int ownerId, CampType ownerCamp)
+            : base(entityId, WeaponType.WeaponLightning, ownerId, ownerCamp)
+        {
+        }
+    }
+}

Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponLightningData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 25b0006918fd46959c7f6b8ec1bbc8ab
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: