增加收获属性逻辑,优化掉落物表现效果

This commit is contained in:
2026-10-05 17:02:29 +08:00
parent d55b1013ca
commit 7590d78e74
53 changed files with 1633 additions and 241 deletions
@@ -0,0 +1,107 @@
using Cysharp.Threading.Tasks;
using GameFramework.Event;
using SepCore.AsyncTask;
using SepCore.CustomComponent;
using SepCore.Definition;
using SepCore.Entity;
using SepCore.Event;
using Random = UnityEngine.Random;
namespace SepCore.Battle
{
public sealed class DropService
{
private const float VacuumMaxDuration = 0.8f;
private const float VacuumAbsorbSpeed = 30f;
private TbGlobalConfig _globalConfig;
private bool _isListening;
private float _vacuumTimer;
public void Subscribe()
{
if (_isListening)
{
return;
}
_globalConfig = GameEntry.Luban.Global;
GameEntry.Event.Subscribe(DropSpawnRequestedEventArgs.EventId, OnDropSpawnRequested);
_isListening = true;
}
public void Unsubscribe()
{
if (!_isListening)
{
return;
}
_globalConfig = null;
GameEntry.Event.Unsubscribe(DropSpawnRequestedEventArgs.EventId, OnDropSpawnRequested);
_isListening = false;
}
public void StartVacuum()
{
_vacuumTimer = VacuumMaxDuration;
GameEntry.SimulationWorld.TriggerFullMapMagnet();
GameEntry.SimulationWorld.SyncPlayerAbsorbSettings(999f, VacuumAbsorbSpeed,
_globalConfig.CollectDistance, _globalConfig.RecoilDistance,
_globalConfig.RecoilDuration, _globalConfig.DashAccelerationDuration,
_globalConfig.DashMaxSpeedMultiplier, _globalConfig.TurnSpeed);
}
public bool UpdateVacuum(float elapseSeconds, Player player)
{
_vacuumTimer -= elapseSeconds;
if (GameEntry.SimulationWorld.PickupCount > 0 && _vacuumTimer > 0f)
{
return false;
}
CollectAllRemainingDrops(player);
return true;
}
public void HideAllDrops()
{
_vacuumTimer = 0f;
var entityGroup = GameEntry.Entity.GetEntityGroup(_globalConfig.DropGroupName);
var entities = entityGroup.GetAllEntities();
foreach (var entity in entities)
{
GameEntry.Entity.HideEntity(entity.Id);
}
}
private void CollectAllRemainingDrops(Player player)
{
var entityGroup = GameEntry.Entity.GetEntityGroup(_globalConfig.DropGroupName);
var entities = entityGroup.GetAllEntities();
foreach (var entity in entities)
{
if (entity is UnityGameFramework.Runtime.Entity runtimeEntity && runtimeEntity.Logic is DropEntity drop)
{
drop.TryCollect(player);
}
}
}
private void OnDropSpawnRequested(object sender, GameEventArgs e)
{
var eventArgs = (DropSpawnRequestedEventArgs)e;
int idx = Random.Range(0, _globalConfig.DropEntityAssetNames.Count);
var dropEntityAssetName = _globalConfig.DropEntityAssetNames[idx];
var data = new DropData(_globalConfig.DropEntityCoinCount, _globalConfig.DropEntityExpCount,
GameEntry.Entity.NextId(), dropEntityAssetName)
{
Position = eventArgs.Position
};
GameEntry.Entity.ShowDropAsync(data).Forget();
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 567ca35279f741d79f25e6d04bda5a63
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,63 @@
using SepCore.Definition;
using SepCore.Entity;
using SepCore.Event;
using UnityEngine;
using UnityGameFramework.Runtime;
namespace SepCore.Battle
{
public readonly struct HarvestSettlementResult
{
public static readonly HarvestSettlementResult Empty = new(0, 0, 0);
public int Income { get; }
public int Growth { get; }
public int NewHarvest { get; }
public HarvestSettlementResult(int income, int growth, int newHarvest)
{
Income = income;
Growth = growth;
NewHarvest = newHarvest;
}
}
public static class HarvestSettlementUtility
{
public const float HarvestCompoundRate = 0.05f;
public const string HarvestModifierSource = "HarvestInterest";
public static HarvestSettlementResult Settle(Player player)
{
if (player == null || !player.Available)
{
return HarvestSettlementResult.Empty;
}
int currentHarvest = Mathf.FloorToInt(player.StatComponent.GetStatValue(StatType.Harvesting));
if (currentHarvest <= 0)
{
return HarvestSettlementResult.Empty;
}
// 1. 发放等额金币/材料
player.Coin += currentHarvest;
// 2. 复合增长(利息):永久提升 5%(向上取整)
int growth = Mathf.CeilToInt(currentHarvest * HarvestCompoundRate);
if (growth > 0)
{
player.StatComponent.AddModifier(
StatType.Harvesting,
new StatModifier(growth, ModifierType.Flat, HarvestModifierSource));
}
int newHarvest = Mathf.FloorToInt(player.StatComponent.GetStatValue(StatType.Harvesting));
// 3. 广播收获结算事件
GameEntry.Event.Fire(player, WaveHarvestSettlementEventArgs.Create(currentHarvest, growth, newHarvest));
return new HarvestSettlementResult(currentHarvest, growth, newHarvest);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 193a30e24142468791b5c899b31ccae8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -11,6 +11,11 @@ namespace SepCore.Components
public float AbsorbRange => GameEntry.Luban.Global.DefaultAbsorbRange;
public float AbsorbSpeed => GameEntry.Luban.Global.AbsorbSpeed;
public float CollectDistance => GameEntry.Luban.Global.CollectDistance;
public float RecoilDistance => GameEntry.Luban.Global.RecoilDistance;
public float RecoilDuration => GameEntry.Luban.Global.RecoilDuration;
public float DashAccelerationDuration => GameEntry.Luban.Global.DashAccelerationDuration;
public float DashMaxSpeedMultiplier => GameEntry.Luban.Global.DashMaxSpeedMultiplier;
public float TurnSpeed => GameEntry.Luban.Global.TurnSpeed;
public void OnInit(Player player)
{
@@ -22,7 +27,8 @@ namespace SepCore.Components
{
if (!_player.Available) return;
GameEntry.SimulationWorld.SyncPlayerAbsorbSettings(AbsorbRange, AbsorbSpeed, CollectDistance);
GameEntry.SimulationWorld.SyncPlayerAbsorbSettings(AbsorbRange, AbsorbSpeed, CollectDistance,
RecoilDistance, RecoilDuration, DashAccelerationDuration, DashMaxSpeedMultiplier, TurnSpeed);
}
public void OnReset()
@@ -37,8 +37,8 @@ namespace SepCore.Components
_cachedTransform = target;
_direction = Vector3.forward;
_avoidEnemyOverlap = avoidEnemyOverlap;
_enemyBodyRadius = GameEntry.Luban.Global.EnemyBodyRadius;
_separationIterations = GameEntry.Luban.Global.EnemySeparationIterations;
_enemyBodyRadius = enemyBodyRadius ?? GameEntry.Luban.Global.EnemyBodyRadius;
_separationIterations = separationIterations ?? GameEntry.Luban.Global.EnemySeparationIterations;
TryGetComponent(out _player);
TryGetComponent(out _enemy);
@@ -3,8 +3,16 @@ namespace SepCore.Simulation
internal struct PickupStateSim : ISimulationComponent
{
public const int StateIdle = 0;
public const int StateAbsorbing = 1;
public const int StateAbsorbRequested = 1;
public const int StateRecoil = 2;
public const int StateDash = 3;
public const int StateCollected = 4;
public int State;
public float PhaseElapsed;
public float IdleElapsed;
public float FloatBaseHeight;
public Unity.Mathematics.float3 RecoilStartPosition;
public Unity.Mathematics.float3 RecoilDirection;
}
}
@@ -5,5 +5,6 @@ namespace SepCore.Simulation
internal struct PickupTransformSim : ISimulationComponent
{
public float3 Position;
public float3 Forward;
}
}
@@ -30,7 +30,9 @@ namespace SepCore.Simulation
void SyncEnemyMovementInput(int entityId, bool isMoving, in Vector3 direction, float speed,
bool avoidEnemyOverlap, float enemyBodyRadius, int separationIterations);
void SyncPlayerAbsorbSettings(float absorbRange, float absorbSpeed, float collectDistance);
void SyncPlayerAbsorbSettings(float absorbRange, float absorbSpeed, float collectDistance,
float recoilDistance, float recoilDuration, float dashAccelerationDuration,
float dashMaxSpeedMultiplier, float turnSpeed);
void TriggerFullMapMagnet();
}
@@ -12,30 +12,72 @@ namespace SepCore.Simulation
private float _playerAbsorbRange = -1f;
private float _playerAbsorbSpeed = -1f;
private float _playerCollectDistance = -1f;
private float _playerRecoilDistance = -1f;
private float _playerRecoilDuration = -1f;
private float _playerDashAccelerationDuration = -1f;
private float _playerDashMaxSpeedMultiplier = -1f;
private float _playerTurnSpeed = -1f;
public void SyncPlayerAbsorbSettings(float absorbRange, float absorbSpeed, float collectDistance)
public void SyncPlayerAbsorbSettings(float absorbRange, float absorbSpeed, float collectDistance,
float recoilDistance, float recoilDuration, float dashAccelerationDuration,
float dashMaxSpeedMultiplier, float turnSpeed)
{
_playerAbsorbRange = absorbRange;
_playerAbsorbSpeed = absorbSpeed;
_playerCollectDistance = collectDistance;
_playerRecoilDistance = recoilDistance;
_playerRecoilDuration = recoilDuration;
_playerDashAccelerationDuration = dashAccelerationDuration;
_playerDashMaxSpeedMultiplier = dashMaxSpeedMultiplier;
_playerTurnSpeed = turnSpeed;
}
private float ResolveAbsorbRange()
{
if (_playerAbsorbRange >= 0f) return _playerAbsorbRange;
return GameEntry.Luban != null ? GameEntry.Luban.Global.DefaultAbsorbRange : 2f;
return GameEntry.Luban.Global.DefaultAbsorbRange;
}
private float ResolveAbsorbSpeed()
{
if (_playerAbsorbSpeed >= 0f) return _playerAbsorbSpeed;
return GameEntry.Luban != null ? GameEntry.Luban.Global.AbsorbSpeed : 8f;
return GameEntry.Luban.Global.AbsorbSpeed;
}
private float ResolveCollectDistance()
{
if (_playerCollectDistance >= 0f) return _playerCollectDistance;
return GameEntry.Luban != null ? GameEntry.Luban.Global.CollectDistance : 0.5f;
return GameEntry.Luban.Global.CollectDistance;
}
private float ResolveRecoilDistance()
{
if (_playerRecoilDistance >= 0f) return _playerRecoilDistance;
return GameEntry.Luban.Global.RecoilDistance;
}
private float ResolveRecoilDuration()
{
if (_playerRecoilDuration >= 0f) return _playerRecoilDuration;
return GameEntry.Luban.Global.RecoilDuration;
}
private float ResolveDashAccelerationDuration()
{
if (_playerDashAccelerationDuration >= 0f) return _playerDashAccelerationDuration;
return GameEntry.Luban.Global.DashAccelerationDuration;
}
private float ResolveDashMaxSpeedMultiplier()
{
if (_playerDashMaxSpeedMultiplier >= 0f) return _playerDashMaxSpeedMultiplier;
return GameEntry.Luban.Global.DashMaxSpeedMultiplier;
}
private float ResolveTurnSpeed()
{
if (_playerTurnSpeed >= 0f) return _playerTurnSpeed;
return GameEntry.Luban.Global.TurnSpeed;
}
[Header("敌人互斥参数")]
@@ -146,8 +188,14 @@ namespace SepCore.Simulation
float absorbRange = ResolveAbsorbRange();
float absorbSpeed = ResolveAbsorbSpeed();
float collectDistance = ResolveCollectDistance();
float recoilDistance = ResolveRecoilDistance();
float recoilDuration = ResolveRecoilDuration();
float dashAccelerationDuration = ResolveDashAccelerationDuration();
float dashMaxSpeedMultiplier = ResolveDashMaxSpeedMultiplier();
float turnSpeed = ResolveTurnSpeed();
pickupMovementHandle = PickupMovementSystem.Schedule(_pickups, _collectedPickups, context.DeltaTime,
planarPlayerPosition, absorbRange, absorbSpeed, collectDistance, default);
planarPlayerPosition, absorbRange, absorbSpeed, collectDistance, recoilDistance,
recoilDuration, dashAccelerationDuration, dashMaxSpeedMultiplier, turnSpeed, default);
}
}
@@ -232,20 +280,12 @@ namespace SepCore.Simulation
}
else
{
var entityComponent = GameEntry.Entity;
if (entityComponent != null)
{
entityComponent.HideEntity(drop);
}
GameEntry.Entity.HideEntity(drop);
}
}
else
{
var entityComponent = GameEntry.Entity;
if (entityComponent != null)
{
entityComponent.HideEntity(entity);
}
GameEntry.Entity.HideEntity(entity);
}
}
@@ -264,19 +304,16 @@ namespace SepCore.Simulation
}
var entityComponent = GameEntry.Entity;
if (entityComponent != null && GameEntry.Luban != null)
var group = entityComponent.GetEntityGroup(GameEntry.Luban.Global.PlayerGroupName);
if (group != null && group.EntityCount > 0)
{
var group = entityComponent.GetEntityGroup(GameEntry.Luban.Global.PlayerGroupName);
if (group != null && group.EntityCount > 0)
var entities = group.GetAllEntities();
for (int i = 0; i < entities.Length; i++)
{
var entities = group.GetAllEntities();
for (int i = 0; i < entities.Length; i++)
if (entities[i] is UnityGameFramework.Runtime.Entity ugfEntity &&
ugfEntity.Logic is Player player && player.Available)
{
if (entities[i] is UnityGameFramework.Runtime.Entity ugfEntity &&
ugfEntity.Logic is Player player && player.Available)
{
return player;
}
return player;
}
}
}
@@ -16,30 +16,22 @@ namespace SepCore.Simulation
public void OnLateUpdate()
{
if (_world == null)
{
return;
}
var enemyManager = GameEntry.EnemyManager;
if (enemyManager != null && enemyManager.Enemies != null)
var enemies = enemyManager.Enemies;
foreach (var enemy in enemies)
{
var enemies = enemyManager.Enemies;
foreach (var enemy in enemies)
if (enemy is not EnemyBase enemyEntity || !enemyEntity.Available)
{
if (enemy is not EnemyBase enemyEntity || !enemyEntity.Available)
{
continue;
}
if (!_world._enemies.TryGetSimulationIndex(enemyEntity.Id, out int simulationIndex))
{
continue;
}
EnemyTransformSim enemyData = _world._enemies.Transform[simulationIndex];
ApplyEnemyPresentation(enemyEntity, in enemyData);
continue;
}
if (!_world._enemies.TryGetSimulationIndex(enemyEntity.Id, out int simulationIndex))
{
continue;
}
EnemyTransformSim enemyData = _world._enemies.Transform[simulationIndex];
ApplyEnemyPresentation(enemyEntity, in enemyData);
}
var projectiles = _world._projectiles;
@@ -69,7 +61,15 @@ namespace SepCore.Simulation
continue;
}
pickupEntity.CachedTransform.position = ToVector3(pickups.Transform[i].Position);
PickupTransformSim transformData = pickups.Transform[i];
Transform pickupTransform = pickupEntity.CachedTransform;
pickupTransform.position = ToVector3(transformData.Position);
Vector3 forward = ToVector3(transformData.Forward);
forward.y = 0f;
if (forward.sqrMagnitude > float.Epsilon)
{
pickupTransform.rotation = Quaternion.LookRotation(forward.normalized, Vector3.up);
}
}
}
@@ -99,11 +99,6 @@ namespace SepCore.Simulation
in ProjectileTransformSim projectileData)
{
Transform projectileTransform = projectileEntity.CachedTransform;
if (projectileTransform == null)
{
return;
}
projectileTransform.position = ToVector3(projectileData.Position);
Vector3 forward = ToVector3(projectileData.Forward);
if (forward.sqrMagnitude <= float.Epsilon)
@@ -6,6 +6,7 @@ namespace SepCore.Simulation
{
public int EntityId;
public Vector3 Position;
public Vector3 Forward;
public float PickupRadius;
public int State;
}
@@ -95,6 +95,7 @@ namespace SepCore.Simulation
{
EntityId = pickupEntity.Id,
Position = pickupEntity.CachedTransform.position,
Forward = pickupEntity.CachedTransform.forward,
PickupRadius = 0.35f
};
}
@@ -290,6 +290,7 @@ namespace SepCore.Simulation
{
EntityId = entityId,
Position = ToVector3(transform.Position),
Forward = ToVector3(transform.Forward),
PickupRadius = radius.Radius,
State = state.State
};
@@ -302,9 +303,9 @@ namespace SepCore.Simulation
return _pickups.Add(
new PickupIdentitySim { EntityId = simData.EntityId },
new PickupTransformSim { Position = ToFloat3(simData.Position) },
new PickupTransformSim { Position = ToFloat3(simData.Position), Forward = ToFloat3(simData.Forward) },
new PickupRadiusSim { Radius = simData.PickupRadius },
new PickupStateSim { State = simData.State });
new PickupStateSim { State = simData.State, FloatBaseHeight = simData.Position.y });
}
internal int UpsertPickup(in PickupSimData simData)
@@ -315,9 +316,17 @@ namespace SepCore.Simulation
}
_pickups.Identity[index] = new PickupIdentitySim { EntityId = simData.EntityId };
_pickups.Transform[index] = new PickupTransformSim { Position = ToFloat3(simData.Position) };
_pickups.Transform[index] = new PickupTransformSim
{
Position = ToFloat3(simData.Position),
Forward = ToFloat3(simData.Forward)
};
_pickups.Radius[index] = new PickupRadiusSim { Radius = simData.PickupRadius };
_pickups.State[index] = new PickupStateSim { State = simData.State };
_pickups.State[index] = new PickupStateSim
{
State = simData.State,
FloatBaseHeight = simData.Position.y
};
return index;
}
@@ -326,7 +335,15 @@ namespace SepCore.Simulation
int pickupCount = _pickups.Count;
for (int i = 0; i < pickupCount; i++)
{
_pickups.State[i] = new PickupStateSim { State = PickupStateSim.StateAbsorbing };
PickupStateSim state = _pickups.State[i];
if (state.State != PickupStateSim.StateIdle)
{
continue;
}
state.State = PickupStateSim.StateAbsorbRequested;
state.PhaseElapsed = 0f;
_pickups.State[i] = state;
}
}
@@ -11,14 +11,10 @@ namespace SepCore.Simulation
// W CollectedPickups
public static JobHandle Schedule(PickupStore pickups, NativeList<int> collectedPickups,
float deltaTime, float3 playerPosition, float absorbRange, float absorbSpeed, float collectDistance,
JobHandle dependency)
float recoilDistance, float recoilDuration, float dashAccelerationDuration,
float dashMaxSpeedMultiplier, float turnSpeed, JobHandle dependency)
{
int pickupCount = pickups.Count;
if (pickupCount == 0)
{
return dependency;
}
PickupMovementJob job = new PickupMovementJob
{
Transforms = pickups.Transform.Data.AsArray(),
@@ -27,9 +23,14 @@ namespace SepCore.Simulation
Radii = pickups.Radius.Data.AsArray(),
CollectedPickups = collectedPickups.AsParallelWriter(),
PlayerPosition = playerPosition,
AbsorbRange = math.max(0f, absorbRange),
AbsorbSpeed = math.max(0f, absorbSpeed),
CollectDistance = math.max(0f, collectDistance),
AbsorbRange = absorbRange,
AbsorbSpeed = absorbSpeed,
CollectDistance = collectDistance,
RecoilDistance = recoilDistance,
RecoilDuration = recoilDuration,
DashAccelerationDuration = dashAccelerationDuration,
DashMaxSpeedMultiplier = dashMaxSpeedMultiplier,
TurnSpeedRadians = math.radians(turnSpeed),
DeltaTime = deltaTime
};
return job.Schedule(pickupCount, 64, dependency);
@@ -39,6 +40,10 @@ namespace SepCore.Simulation
[BurstCompile]
internal struct PickupMovementJob : IJobParallelFor
{
private const float IdleFloatAmplitude = 0.08f;
private const float IdleFloatAngularFrequency = 3.14159265f;
private const float IdleRotationSpeedRadians = 0.610865238f;
public NativeArray<PickupTransformSim> Transforms;
public NativeArray<PickupStateSim> States;
[ReadOnly] public NativeArray<PickupIdentitySim> Identities;
@@ -48,52 +53,189 @@ namespace SepCore.Simulation
public float AbsorbRange;
public float AbsorbSpeed;
public float CollectDistance;
public float RecoilDistance;
public float RecoilDuration;
public float DashAccelerationDuration;
public float DashMaxSpeedMultiplier;
public float TurnSpeedRadians;
public float DeltaTime;
public void Execute(int index)
{
PickupTransformSim transform = Transforms[index];
PickupStateSim state = States[index];
PickupIdentitySim identity = Identities[index];
PickupRadiusSim radius = Radii[index];
float3 currentPosition = transform.Position;
float3 horizontalPosition = new float3(currentPosition.x, 0f, currentPosition.z);
float3 toPlayer = PlayerPosition - horizontalPosition;
float sqrDistance = math.lengthsq(toPlayer);
float effectiveCollectDistance = math.max(CollectDistance, radius.Radius);
float sqrCollectDistance = effectiveCollectDistance * effectiveCollectDistance;
if (sqrDistance <= sqrCollectDistance)
if (state.State == PickupStateSim.StateCollected)
{
CollectedPickups.AddNoResize(identity.EntityId);
return;
}
bool isAbsorbing = state.State == PickupStateSim.StateAbsorbing;
bool shouldAbsorb = isAbsorbing || (AbsorbRange > 0f && sqrDistance <= AbsorbRange * AbsorbRange);
PickupIdentitySim identity = Identities[index];
PickupRadiusSim radius = Radii[index];
float effectiveCollectDistance = math.max(CollectDistance, radius.Radius);
float deltaTime = DeltaTime;
if (shouldAbsorb && AbsorbSpeed > 0f && sqrDistance > float.Epsilon)
if (state.State == PickupStateSim.StateIdle)
{
state.State = PickupStateSim.StateAbsorbing;
float distance = math.sqrt(sqrDistance);
float step = AbsorbSpeed * DeltaTime;
state.IdleElapsed = math.fmod(state.IdleElapsed + deltaTime,
2f * math.PI / IdleFloatAngularFrequency);
transform.Position.y = state.FloatBaseHeight +
math.sin(state.IdleElapsed * IdleFloatAngularFrequency) * IdleFloatAmplitude;
RotateWhileIdle(ref transform, deltaTime);
if (step >= distance)
float3 toPlayer = PlayerPosition - transform.Position;
toPlayer.y = 0f;
if (AbsorbRange <= 0f || math.lengthsq(toPlayer) > AbsorbRange * AbsorbRange || AbsorbSpeed <= 0f)
{
transform.Position = new float3(PlayerPosition.x, currentPosition.y, PlayerPosition.z);
CollectedPickups.AddNoResize(identity.EntityId);
Transforms[index] = transform;
States[index] = state;
return;
}
BeginRecoil(ref transform, ref state, PlayerPosition);
}
else if (state.State == PickupStateSim.StateAbsorbRequested)
{
BeginRecoil(ref transform, ref state, PlayerPosition);
}
float remainingDeltaTime = deltaTime;
if (state.State == PickupStateSim.StateRecoil && remainingDeltaTime > 0f)
{
if (RecoilDuration <= 0f)
{
transform.Position = state.RecoilStartPosition + state.RecoilDirection * RecoilDistance;
state.State = PickupStateSim.StateDash;
state.PhaseElapsed = 0f;
}
else
{
float3 direction = toPlayer / distance;
transform.Position = currentPosition + direction * step;
}
float phaseRemaining = RecoilDuration - state.PhaseElapsed;
float stepTime = math.min(remainingDeltaTime, phaseRemaining);
state.PhaseElapsed += stepTime;
float recoilProgress = math.saturate(state.PhaseElapsed / RecoilDuration);
transform.Position = state.RecoilStartPosition +
state.RecoilDirection * (RecoilDistance * recoilProgress);
remainingDeltaTime -= stepTime;
Transforms[index] = transform;
States[index] = state;
if (state.PhaseElapsed >= RecoilDuration)
{
state.State = PickupStateSim.StateDash;
state.PhaseElapsed = 0f;
}
}
}
if (state.State == PickupStateSim.StateDash)
{
float3 toPlayer = PlayerPosition - transform.Position;
toPlayer.y = 0f;
float distance = math.length(toPlayer);
if (distance <= effectiveCollectDistance)
{
MarkCollected(ref state, identity.EntityId);
}
else if (remainingDeltaTime > 0f && AbsorbSpeed > 0f)
{
float step = GetDashDistance(AbsorbSpeed, state.PhaseElapsed, remainingDeltaTime,
DashAccelerationDuration, DashMaxSpeedMultiplier);
float distanceToCollect = distance - effectiveCollectDistance;
float movedDistance = math.min(step, distanceToCollect);
transform.Position += toPlayer / distance * movedDistance;
state.PhaseElapsed += remainingDeltaTime;
if (movedDistance >= distanceToCollect)
{
MarkCollected(ref state, identity.EntityId);
}
}
}
RotateTowardPlayer(ref transform, PlayerPosition, deltaTime);
Transforms[index] = transform;
States[index] = state;
}
private static void BeginRecoil(ref PickupTransformSim transform, ref PickupStateSim state,
float3 playerPosition)
{
float3 direction = transform.Position - playerPosition;
direction.y = 0f;
if (math.lengthsq(direction) <= float.Epsilon)
{
direction = new float3(0f, 0f, -1f);
}
else
{
direction = math.normalize(direction);
}
state.State = PickupStateSim.StateRecoil;
state.PhaseElapsed = 0f;
state.RecoilStartPosition = transform.Position;
state.RecoilDirection = direction;
if (math.lengthsq(transform.Forward) <= float.Epsilon)
{
transform.Forward = new float3(0f, 0f, 1f);
}
}
private static void RotateWhileIdle(ref PickupTransformSim transform, float deltaTime)
{
float3 forward = transform.Forward;
forward.y = 0f;
forward = math.lengthsq(forward) <= float.Epsilon
? new float3(0f, 0f, 1f)
: math.normalize(forward);
transform.Forward = math.normalize(math.rotate(
quaternion.AxisAngle(new float3(0f, 1f, 0f), IdleRotationSpeedRadians * deltaTime), forward));
}
private void MarkCollected(ref PickupStateSim state, int entityId)
{
state.State = PickupStateSim.StateCollected;
CollectedPickups.AddNoResize(entityId);
}
private static float GetDashDistance(float speed, float elapsed, float deltaTime,
float accelerationDuration, float maxSpeedMultiplier)
{
if (accelerationDuration <= 0f)
{
return speed * maxSpeedMultiplier * deltaTime;
}
float acceleratedUntil = math.min(accelerationDuration, elapsed + deltaTime);
float acceleratedDuration = math.max(0f, acceleratedUntil - elapsed);
float averageMultiplier = 1f + (maxSpeedMultiplier - 1f) *
(elapsed + acceleratedUntil) / (2f * accelerationDuration);
float distance = speed * acceleratedDuration * averageMultiplier;
float constantDuration = deltaTime - acceleratedDuration;
return distance + speed * maxSpeedMultiplier * constantDuration;
}
private void RotateTowardPlayer(ref PickupTransformSim transform, float3 playerPosition,
float deltaTime)
{
float3 targetDirection = playerPosition - transform.Position;
targetDirection.y = 0f;
if (math.lengthsq(targetDirection) <= float.Epsilon)
{
return;
}
targetDirection = math.normalize(targetDirection);
float3 currentForward = transform.Forward;
currentForward.y = 0f;
currentForward = math.lengthsq(currentForward) <= float.Epsilon
? new float3(0f, 0f, 1f)
: math.normalize(currentForward);
float signedAngle = math.atan2(math.cross(currentForward, targetDirection).y,
math.dot(currentForward, targetDirection));
float angleStep = math.clamp(signedAngle, -TurnSpeedRadians * deltaTime,
TurnSpeedRadians * deltaTime);
transform.Forward = math.normalize(math.rotate(quaternion.AxisAngle(new float3(0f, 1f, 0f), angleStep),
currentForward));
}
}
}
@@ -1,4 +1,3 @@
using SepCore.Entity;
using UnityEngine;
using UnityGameFramework.Runtime;
@@ -22,8 +21,6 @@ namespace SepCore.Entity
{
Log.Error("DropEntity.OnShow() called with wrong type: {0}.", userData?.GetType().Name);
}
CachedTransform.localScale = new Vector3(0.3f, 0.3f, 0.3f);
}
public bool TryCollect(Player player, float collectDistance = 0f)
@@ -48,10 +45,5 @@ namespace SepCore.Entity
GameEntry.Entity.HideEntity(this);
return true;
}
private void OnTriggerEnter(Collider other)
{
TryCollect(other.GetComponent<Player>());
}
}
}
@@ -1,7 +1,6 @@
using Cysharp.Threading.Tasks;
using SepCore.AsyncTask;
using SepCore.Components;
using SepCore.Definition;
using SepCore.Event;
using UnityEngine;
using UnityGameFramework.Runtime;
@@ -75,13 +74,7 @@ namespace SepCore.Entity
{
if (Random.value < EnemyData.DropPercent)
{
int coinCount = GameEntry.Luban.Global.DropEntityCoinCount;
int expCount = GameEntry.Luban.Global.DropEntityExpCount;
var data = new DropData(coinCount, expCount, GameEntry.Entity.NextId())
{
Position = CachedTransform.position
};
GameEntry.Entity.ShowDropAsync(data).Forget();
GameEntry.Event.Fire(this, DropSpawnRequestedEventArgs.Create(CachedTransform.position));
}
base.OnDead(attacker);
@@ -10,5 +10,6 @@ namespace SepCore.UI
public ItemType ItemType;
public int Price;
public object DataRow;
public bool IsLocked;
}
}
@@ -7,5 +7,6 @@ namespace SepCore.UI
public GoodsType GoodsType;
public int RefId;
public int Price;
public bool IsLocked;
}
}
@@ -13,8 +13,11 @@ namespace SepCore.UI
{
public class ShopUseCase : IUIUseCase
{
public const int ShopRerollBaseCost = 1;
private readonly Player _player;
private readonly int _currentLevel;
private readonly Func<int> _getCurrentLevel;
private int _currentLevel;
private readonly Action _onShopFinish;
private readonly IReadOnlyList<GoodsConfig> _allGoods;
@@ -23,28 +26,45 @@ namespace SepCore.UI
private readonly Dictionary<Rarity, List<GoodsConfig>> _goodsByRarity = new();
private readonly List<ShopGoodsSelection> _selections = new();
private int _refreshTime;
private int _rollTimesInThisShop;
public ShopUseCase(Player player, int currentLevel, Action onShopFinish)
public int CurrentLevel => _getCurrentLevel != null ? _getCurrentLevel() : _currentLevel;
public int RollTimesInThisShop => _rollTimesInThisShop;
public IReadOnlyList<ShopGoodsSelection> Selections => _selections;
public ShopUseCase(Player player, Func<int> getCurrentLevel, Action onShopFinish)
{
_player = player;
_currentLevel = currentLevel;
_getCurrentLevel = getCurrentLevel;
_currentLevel = getCurrentLevel != null ? getCurrentLevel() : 1;
_onShopFinish = onShopFinish;
_allGoods = GameEntry.Luban.GetTable<GoodsConfig>();
BuildGoodsRarityPools();
}
public ShopUseCase(Player player, int currentLevel, Action onShopFinish)
: this(player, () => currentLevel, onShopFinish)
{
}
public static int CalculateRefreshPrice(int wave, int rollTimes)
{
return ShopRerollBaseCost + (Mathf.Max(1, wave) * 1) + (Mathf.Max(0, rollTimes) * 2);
}
public ShopRawData CreateInitialModel()
{
_refreshTime = 0;
_currentLevel = _getCurrentLevel != null ? _getCurrentLevel() : _currentLevel;
_rollTimesInThisShop = 0;
int initialRefreshPrice = CalculateRefreshPrice(_currentLevel, _rollTimesInThisShop);
return new ShopRawData
{
CurrentLevel = _currentLevel,
RefreshPrice = _currentLevel,
RefreshPrice = initialRefreshPrice,
PlayerCoin = _player.Coin,
GoodsItems = BuildRandomGoodsItems(GameEntry.Luban.Global.ShopGoodsCount),
GoodsItems = RefreshGoodsSlots(GameEntry.Luban.Global.ShopGoodsCount),
PropItems = _player.Props,
PropMaxCount = GameEntry.Luban.Global.PropMaxCount,
WeaponItems = _player.Weapons,
@@ -84,17 +104,34 @@ namespace SepCore.UI
}
_player.Coin -= cost;
int refreshPrice = (_refreshTime + 1) * _currentLevel;
_refreshTime++;
_rollTimesInThisShop++;
int nextRefreshPrice = CalculateRefreshPrice(_currentLevel, _rollTimesInThisShop);
return new ShopRefreshResult
{
GoodsItems = BuildRandomGoodsItems(GameEntry.Luban.Global.ShopGoodsCount),
RefreshPrice = refreshPrice
GoodsItems = RefreshGoodsSlots(GameEntry.Luban.Global.ShopGoodsCount),
RefreshPrice = nextRefreshPrice
};
}
public bool ToggleLock(int goodsIndex)
{
if (goodsIndex < 0 || goodsIndex >= _selections.Count)
{
Log.Error("ShopUseCase::ToggleLock: Invalid goodsIndex {0}.", goodsIndex);
return false;
}
ShopGoodsSelection selection = _selections[goodsIndex];
if (selection == null)
{
return false;
}
selection.IsLocked = !selection.IsLocked;
return selection.IsLocked;
}
public async UniTask<ShopPurchaseResult> TryPurchaseAsync(int goodsIndex)
{
if (goodsIndex < 0 || goodsIndex >= _selections.Count)
@@ -137,76 +174,117 @@ namespace SepCore.UI
_onShopFinish?.Invoke();
}
private List<GoodsItemRawData> BuildRandomGoodsItems(int count)
private List<GoodsItemRawData> RefreshGoodsSlots(int count)
{
if (_allGoods.Count == 0)
{
Log.Error("ShopFormUseCase::BuildRandomGoodsItems(): _allGoods is empty");
Log.Error("ShopUseCase::RefreshGoodsSlots(): _allGoods is empty");
return null;
}
int finalCount = Mathf.Min(count, _allGoods.Count);
List<GoodsItemRawData> goodsItems = new List<GoodsItemRawData>(finalCount);
_selections.Clear();
while (_selections.Count < finalCount)
{
_selections.Add(null);
}
int currentLevel = _currentLevel;
float priceRandomPercent = GameEntry.Luban.Global.ShopPriceRandomPercent;
List<GoodsItemRawData> goodsItems = new List<GoodsItemRawData>(finalCount);
for (int i = 0; i < finalCount; i++)
{
ShopGoodsSelection existing = _selections[i];
if (existing != null && existing.IsLocked)
{
goodsItems.Add(CreateGoodsItemRawData(existing));
continue;
}
Rarity rarity = RollRarity(currentLevel);
GoodsConfig goodsConfig = PickGoodsByRarity(rarity);
if (goodsConfig == null)
{
Log.Error("ShopFormUseCase::BuildRandomGoodsItems: No available goods for selection.");
Log.Error("ShopUseCase::RefreshGoodsSlots: No available goods for selection.");
break;
}
GoodsItemRawData goodsItem = new GoodsItemRawData();
int price;
object dataRow;
ItemType itemType;
if (goodsConfig.GoodsType == GoodsType.Prop)
{
PropConfig propConfig = GameEntry.Luban.Get<PropConfig>(goodsConfig.RefId);
int basePrice = propConfig.Price;
price = CalculateRandomizedPrice(basePrice, priceRandomPercent);
goodsItem.ItemType = ItemType.Prop;
goodsItem.Rarity = propConfig.Rarity;
goodsItem.DataRow = propConfig;
itemType = ItemType.Prop;
rarity = propConfig.Rarity;
dataRow = propConfig;
}
else if (goodsConfig.GoodsType == GoodsType.Weapon)
{
WeaponConfig weaponConfig = GameEntry.Luban.Get<WeaponConfig>(goodsConfig.RefId);
int basePrice = weaponConfig.Price;
price = CalculateRandomizedPrice(basePrice, priceRandomPercent);
goodsItem.ItemType = ItemType.Weapon;
goodsItem.Rarity = weaponConfig.Rarity;
goodsItem.DataRow = weaponConfig;
itemType = ItemType.Weapon;
rarity = weaponConfig.Rarity;
dataRow = weaponConfig;
}
else
{
Log.Warning(
$"ShopFormUseCase::BuildRandomGoodsItems: Unsupported goods type = {goodsConfig.GoodsType}");
$"ShopUseCase::RefreshGoodsSlots: Unsupported goods type = {goodsConfig.GoodsType}");
continue;
}
goodsItem.Price = price;
_selections.Add(new ShopGoodsSelection
_selections[i] = new ShopGoodsSelection
{
GoodsType = goodsConfig.GoodsType,
RefId = goodsConfig.RefId,
Price = price
});
Price = price,
IsLocked = false
};
goodsItems.Add(goodsItem);
goodsItems.Add(new GoodsItemRawData
{
Price = price,
Rarity = rarity,
ItemType = itemType,
DataRow = dataRow,
IsLocked = false
});
}
return goodsItems;
}
private GoodsItemRawData CreateGoodsItemRawData(ShopGoodsSelection selection)
{
GoodsItemRawData item = new GoodsItemRawData
{
Price = selection.Price,
IsLocked = selection.IsLocked
};
if (selection.GoodsType == GoodsType.Prop)
{
PropConfig propConfig = GameEntry.Luban.Get<PropConfig>(selection.RefId);
item.ItemType = ItemType.Prop;
item.Rarity = propConfig.Rarity;
item.DataRow = propConfig;
}
else if (selection.GoodsType == GoodsType.Weapon)
{
WeaponConfig weaponConfig = GameEntry.Luban.Get<WeaponConfig>(selection.RefId);
item.ItemType = ItemType.Weapon;
item.Rarity = weaponConfig.Rarity;
item.DataRow = weaponConfig;
}
return item;
}
private void BuildGoodsRarityPools()
{
_goodsByRarity.Clear();
@@ -270,7 +348,8 @@ namespace SepCore.UI
private Rarity RollRarity(int level)
{
return RarityUtility.SelectRarityForLevel(level);
float luck = _player?.StatComponent != null ? _player.StatComponent.GetStatValue(StatType.Luck) : 0f;
return RarityUtility.SelectRarityForLevel(level, luck);
}
private static int CalculateRandomizedPrice(int basePrice, float priceRandomPercent)
@@ -6,16 +6,22 @@ namespace SepCore.CustomUtility
{
public static class RarityUtility
{
public static Rarity SelectRarityForLevel(int level)
public static Rarity SelectRarityForLevel(int level, float luck = 0f)
{
int configId = level >= 1000 ? level : 1000 + level;
LevelDropConfig dropConfig = GameEntry.Luban.Get<LevelDropConfig>(configId);
return SelectRarity(dropConfig);
return SelectRarity(dropConfig, luck);
}
public static Rarity SelectRarity(LevelDropConfig dropConfig)
public static Rarity SelectRarity(LevelDropConfig dropConfig, float luck = 0f)
{
float total = dropConfig.WhiteWeight + dropConfig.BlueWeight + dropConfig.PurpleWeight + dropConfig.RedWeight;
float whiteWeight = dropConfig.WhiteWeight;
float luckMultiplier = Mathf.Max(0f, 1f + luck * 0.015f);
float blueWeight = dropConfig.BlueWeight * luckMultiplier;
float purpleWeight = dropConfig.PurpleWeight * luckMultiplier;
float redWeight = dropConfig.RedWeight * luckMultiplier;
float total = whiteWeight + blueWeight + purpleWeight + redWeight;
if (total <= 0f)
{
Log.Error("LevelDropConfig '{0}' has invalid total weight '{1}'.", dropConfig.Id, total);
@@ -23,11 +29,11 @@ namespace SepCore.CustomUtility
}
float roll = Random.Range(0f, total);
if (roll < dropConfig.WhiteWeight) return Rarity.White;
roll -= dropConfig.WhiteWeight;
if (roll < dropConfig.BlueWeight) return Rarity.Blue;
roll -= dropConfig.BlueWeight;
if (roll < dropConfig.PurpleWeight) return Rarity.Purple;
if (roll < whiteWeight) return Rarity.White;
roll -= whiteWeight;
if (roll < blueWeight) return Rarity.Blue;
roll -= blueWeight;
if (roll < purpleWeight) return Rarity.Purple;
return Rarity.Red;
}
}