Cleanup 1

2026-04-02 11:21:07 +08:00
parent 5ed792b09f
commit 1052cc0136
26 changed files with 600 additions and 2057 deletions
@@ -13,7 +13,6 @@ public abstract class EnemyBase : TargetableObject

    protected bool IsSimulationMovementEnabled()
    {
-        var simulationWorld = GameEntry.SimulationWorld;
-        return simulationWorld != null && simulationWorld.UseSimulationMovement;
+        return true;
    }
 }
@@ -10,9 +10,7 @@ namespace Entity
    {
        private EnemyProjectileData _projectileData;
        private Vector3 _direction = Vector3.forward;
-        private float _elapsedTime;
        private bool _isActive;
-        private bool _isSimulationDriven;
        private ImpactData _impactData;
        private Collider[] _cachedColliders;

@@ -33,7 +31,6 @@ namespace Entity
            }

            _isActive = true;
-            _elapsedTime = 0f;
            _impactData = new ImpactData(_projectileData.OwnerCamp, _projectileData.AttackDamage);

            _direction = _projectileData.Direction;
@@ -64,8 +61,7 @@ namespace Entity
                gameObject.layer = LayerMask.NameToLayer("EnemyWeapon");
            }

-            _isSimulationDriven = IsDrivenBySimulationWorld();
-            SetColliderEnabled(!_isSimulationDriven);
+            SetColliderEnabled(false);
        }

        protected override void OnUpdate(float elapseSeconds, float realElapseSeconds)
@@ -73,34 +69,12 @@ namespace Entity
            base.OnUpdate(elapseSeconds, realElapseSeconds);

            if (!_isActive || _projectileData == null) return;
-
-            bool isSimulationDriven = IsDrivenBySimulationWorld();
-            if (isSimulationDriven != _isSimulationDriven)
-            {
-                _isSimulationDriven = isSimulationDriven;
-                SetColliderEnabled(!_isSimulationDriven);
-            }
-
-            if (_isSimulationDriven) return;
-
-            if (_projectileData.Speed > 0f)
-            {
-                CachedTransform.position += _direction * (_projectileData.Speed * elapseSeconds);
-            }
-
-            _elapsedTime += elapseSeconds;
-            if (_projectileData.LifeTime > 0f && _elapsedTime >= _projectileData.LifeTime)
-            {
-                Expire();
-            }
        }

        protected override void OnHide(bool isShutdown, object userData)
        {
            _isActive = false;
            _projectileData = null;
-            _elapsedTime = 0f;
-            _isSimulationDriven = false;
            _impactData = default;
            _direction = Vector3.forward;

@@ -114,12 +88,6 @@ namespace Entity
            GameEntry.Entity.HideEntity(this);
        }

-        private static bool IsDrivenBySimulationWorld()
-        {
-            var simulationWorld = GameEntry.SimulationWorld;
-            return simulationWorld != null && simulationWorld.UseSimulationMovement;
-        }
-
        private void SetColliderEnabled(bool enabled)
        {
            _cachedColliders ??= GetComponentsInChildren<Collider>(true);
@@ -137,4 +105,4 @@ namespace Entity
            }
        }
    }
-}
+}
@@ -82,13 +82,6 @@ namespace Entity
            base.OnUpdate(elapseSeconds, realElapseSeconds);

            UpdateAttackState(elapseSeconds);
-
-            if (IsSimulationMovementEnabled())
-            {
-                return;
-            }
-
-            _movementComponent.OnUpdate(elapseSeconds, realElapseSeconds);
        }

        protected override void OnDead(EntityBase attacker)
@@ -95,11 +95,6 @@ namespace Entity
            if (_target == null)
            {
                _movementComponent.SetMove(false);
-                if (!IsSimulationMovementEnabled())
-                {
-                    _movementComponent.OnUpdate(elapseSeconds, realElapseSeconds);
-                }
-
                return;
            }

@@ -116,11 +111,6 @@ namespace Entity
                _movementComponent.SetMove(true);
                _movementComponent.SetDirection(GetTargetDirection());
            }
-
-            if (!IsSimulationMovementEnabled())
-            {
-                _movementComponent.OnUpdate(elapseSeconds, realElapseSeconds);
-            }
        }

        protected override void OnHide(bool isShutdown, object userData)
@@ -212,7 +212,6 @@ namespace Entity
            _inputComponent.OnUpdate(elapseSeconds, realElapseSeconds);

            _movementComponent.SetDirection(_inputComponent.Direction);
-            _movementComponent.OnUpdate(elapseSeconds, realElapseSeconds);
            _absorbComponent.OnUpdate(elapseSeconds, realElapseSeconds);
        }

@@ -13,26 +13,7 @@ namespace Entity.Weapon
                return null;
            }

-            if (TrySelectFromSpatialIndex(weapon, maxSqrRange, out EntityBase indexedTarget))
-            {
-                return indexedTarget;
-            }
-
-            EntityBase target = null;
-            float minSqrMagnitude = maxSqrRange > 0f ? maxSqrRange : float.MaxValue;
-
-            foreach (var candidate in candidates)
-            {
-                if (candidate == null || !candidate.Available) continue;
-
-                float sqrMagnitude = AIUtility.GetSqrMagnitudeXZ(weapon, candidate);
-                if (sqrMagnitude >= minSqrMagnitude) continue;
-
-                minSqrMagnitude = sqrMagnitude;
-                target = candidate;
-            }
-
-            return target;
+            return TrySelectFromSpatialIndex(weapon, maxSqrRange, out EntityBase indexedTarget) ? indexedTarget : null;
        }

        private static bool TrySelectFromSpatialIndex(WeaponBase weapon, float maxSqrRange, out EntityBase target)
@@ -44,7 +25,7 @@ namespace Entity.Weapon
            }

            var simulationWorld = GameEntry.SimulationWorld;
-            if (simulationWorld == null || !simulationWorld.UseSimulationMovement)
+            if (simulationWorld == null)
            {
                return false;
            }
@@ -65,4 +46,4 @@ namespace Entity.Weapon
            return true;
        }
    }
-}
+}