Cut 2 of docs/addressables-cut.md. The asset move (git mv
Resources/{Prefabs,Schematics,Sprites/Icons} -> Content/...) and the
UnityHelpers.cs deletion already landed in 1fdf8151, picked up by a
concurrent session sharing this working tree; this commit is the rest
of Cut 2 landing on top of that shared state, atomically:
- Bump CultLib to cultlib-unity-v1.0.60 / caching-unity-v1.4.0 (both
45c2f40) in Packages/manifest.json, packages-lock.json and
Directory.Build.props, together with the 8 ServerShared
[CultInspectorAssetPath] usages becoming [CultInspectorAssetGuid] -
the .NET and Unity sides move together or nothing compiles.
- Assets/Scripts/EngineAssets.cs replaces UnityHelpers: loads an
Addressables key (bare GUID or guid[subAsset]) synchronously,
loading the GameObject and taking the component for the four sites
that load a component. ActionBarSlot, EntityInstance, ShipInstance
and ZoneRenderer call it instead of Resources.Load/UnityHelpers; the
inline "Assets/Resources/" prefix strips are gone with them.
CultCacheDrawers' schematic preview goes through
AssetDatabase.GUIDToAssetPath first.
- Assets/Scripts/Editor/EngineAssetCheck.cs validates every stored
[CultInspectorAssetGuid] value: 32 lowercase hex, resolves to a file,
is addressable, and satisfies its member's consumer-type contract
(Texture2D for icons/logos/schematics, a GameObject with the right
component for prefabs) - table-driven, so an attributed member with
no row fails loudly instead of being skipped.
- GameData/Aetheria.cc: the scratch migration (Aetheria.Shared + the
pinned CultLib revision, a throwaway console app, never landed)
walked all 138 attributed field slots across 180 documents,
rewriting the 30 non-empty Resources paths to their .meta GUIDs -
108 stayed empty, 0 unresolved, matching the map's census exactly.
Verification: dotnet test tests/Aetheria.Shared.Tests 61/61 green
against CultLib 45c2f40; Unity 6000.3.24f1 batchmode compiles clean;
EngineAssetCheck.Run passes all 30 stored references; the map's
negative greps are clean; tests/mutation_tests.py's 5 mutations (wrong
type, non-addressable, random guid, an old path, and an untabled
attributed member) are all caught and named, the control case and the
post-revert recompile stay clean, and the catalog/source are restored
byte-identical afterward.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
140 lines
No EOL
5 KiB
C#
140 lines
No EOL
5 KiB
C#
using System;
|
|
using System.Collections;
|
|
using System.Linq;
|
|
using UnityEngine;
|
|
using CultMath;
|
|
using CultMath.UnityBridge;
|
|
using static CultMath.math;
|
|
|
|
public class ShipInstance : EntityInstance
|
|
{
|
|
private static int _shipIndex;
|
|
public TractorBeam TractorBeam;
|
|
private class ThrusterInstance
|
|
{
|
|
public Thruster Thruster;
|
|
public ParticleSystem System;
|
|
public float BaseEmission;
|
|
public int MaxParticleCount;
|
|
}
|
|
|
|
private class AetherDriveInstance
|
|
{
|
|
public AetherDrive Drive;
|
|
public ParticleSystem Particles;
|
|
public float BaseEmission;
|
|
public float BaseForce;
|
|
}
|
|
|
|
private ThrusterInstance[] _thrusters;
|
|
private AetherDriveInstance _aetherDrive;
|
|
|
|
public Ship Ship { get; private set; }
|
|
|
|
private void Start()
|
|
{
|
|
var tractorBeamMain = TractorBeam.ParticleSystem.main;
|
|
tractorBeamMain.customSimulationSpace = LocalSpace;
|
|
}
|
|
|
|
public override void SetEntity(ZoneRenderer zoneRenderer, Entity entity)
|
|
{
|
|
base.SetEntity(zoneRenderer, entity);
|
|
var ship = entity as Ship;
|
|
if (ship == null)
|
|
{
|
|
Debug.LogError($"Attempted to assign non-ship entity to {gameObject.name} ship instance prefab!");
|
|
return;
|
|
}
|
|
Ship = ship;
|
|
var drive = ship.GetBehavior<AetherDrive>();
|
|
if (drive != null)
|
|
{
|
|
var particles = Instantiate(EngineAssets.Load<ParticleSystem>(drive.DriveData.Particles), transform, false);
|
|
var main = particles.main;
|
|
main.customSimulationSpace = LocalSpace;
|
|
_aetherDrive = new AetherDriveInstance
|
|
{
|
|
Drive = drive,
|
|
BaseEmission = particles.emission.rateOverTimeMultiplier,
|
|
Particles = particles,
|
|
BaseForce = particles.forceOverLifetime.z.curveMultiplier
|
|
};
|
|
}
|
|
_thrusters = ship.GetBehaviors<Thruster>().Select(thruster =>
|
|
{
|
|
var effectData = (ThrusterData) thruster.Data;
|
|
var particles = Instantiate(EngineAssets.Load<ParticleSystem>(effectData.ParticlesPrefab), transform, false);
|
|
var particlesShape = particles.shape;
|
|
var thrusterHardpoint = ThrusterHardpoints
|
|
.FirstOrDefault(t => t.name == ship.Hardpoints[thruster.Item.Position.x, thruster.Item.Position.y].Transform);
|
|
particlesShape.meshRenderer = thrusterHardpoint?.Emitter;
|
|
// if (!string.IsNullOrEmpty(thruster.Item.Data.SoundEffectTrigger) && thrusterHardpoint != null)
|
|
// {
|
|
// AkSoundEngine.RegisterGameObj(thrusterHardpoint.gameObject);
|
|
// AkSoundEngine.PostEvent(thruster.Item.Data.SoundEffectTrigger, thrusterHardpoint.gameObject);
|
|
// }
|
|
|
|
return new ThrusterInstance
|
|
{
|
|
Thruster = thruster,
|
|
System = particles,
|
|
BaseEmission = particles.emission.rateOverTimeMultiplier,
|
|
MaxParticleCount = 0
|
|
};
|
|
})
|
|
.ToArray();
|
|
|
|
foreach (var particle in _thrusters)
|
|
{
|
|
particle.System.gameObject.SetActive(false);
|
|
}
|
|
}
|
|
|
|
protected override void ShowUnfadedElements()
|
|
{
|
|
base.ShowUnfadedElements();
|
|
foreach (var particle in _thrusters)
|
|
{
|
|
particle.System.gameObject.SetActive(true);
|
|
}
|
|
}
|
|
|
|
protected override void HideUnfadedElements()
|
|
{
|
|
base.HideUnfadedElements();
|
|
foreach (var particle in _thrusters)
|
|
{
|
|
particle.System.gameObject.SetActive(false);
|
|
}
|
|
}
|
|
|
|
public override void Update()
|
|
{
|
|
base.Update();
|
|
|
|
TractorBeam.Power = Entity.TractorPower;
|
|
TractorBeam.Direction = Entity.LookDirection.ToUnity();
|
|
|
|
if (_aetherDrive != null)
|
|
{
|
|
var thrust = length(_aetherDrive.Drive.ThrustDirection);
|
|
var forceOverLifetime = _aetherDrive.Particles.forceOverLifetime;
|
|
forceOverLifetime.xMultiplier = _aetherDrive.Drive.ThrustDirection.x * _aetherDrive.BaseForce;
|
|
forceOverLifetime.zMultiplier = _aetherDrive.Drive.ThrustDirection.y * _aetherDrive.BaseForce;
|
|
var emissionModule = _aetherDrive.Particles.emission;
|
|
emissionModule.rateOverTimeMultiplier = _aetherDrive.BaseEmission * thrust;
|
|
}
|
|
|
|
foreach (var thrusterInstance in _thrusters)
|
|
{
|
|
var emissionModule = thrusterInstance.System.emission;
|
|
var item = thrusterInstance.Thruster.Item.EquippableItem;
|
|
var data = Entity.ItemManager.GetData(item);
|
|
thrusterInstance.MaxParticleCount = thrusterInstance.System.particleCount;
|
|
emissionModule.rateOverTimeMultiplier = thrusterInstance.BaseEmission * thrusterInstance.Thruster.Axis * (item.Durability / data.Durability);
|
|
}
|
|
|
|
transform.rotation = Ship.Rotation.ToUnity();
|
|
}
|
|
} |