Switch engine asset references from Resources paths to Addressables GUIDs
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>
This commit is contained in:
parent
1fdf815111
commit
67cbf34b25
20 changed files with 544 additions and 555 deletions
|
|
@ -47,7 +47,7 @@ public class AetherDriveData : BehaviorData
|
|||
[Inspectable, JsonProperty("torqueAudio"), Key(12), RuntimeInspectable]
|
||||
public uint TorqueRatioAudioParameter;
|
||||
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("particles"), Key(13)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("particles"), Key(13)]
|
||||
public string Particles;
|
||||
|
||||
public override Behavior CreateInstance(EquippedItem item)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public class ThrusterData : BehaviorData
|
|||
[Inspectable, JsonProperty("energy"), Key(4), RuntimeInspectable]
|
||||
public PerformanceStat EnergyUsage = new PerformanceStat();
|
||||
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("Particles"), Key(5)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("Particles"), Key(5)]
|
||||
public string ParticlesPrefab;
|
||||
|
||||
public override Behavior CreateInstance(EquippedItem item)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ public abstract class WeaponData : BehaviorData
|
|||
[InspectableAnimationCurve, JsonProperty("damageCurve"), Key(7)]
|
||||
public BezierCurve DamageCurve;
|
||||
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("effect"), Key(8)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("effect"), Key(8)]
|
||||
public string EffectPrefab;
|
||||
|
||||
[Inspectable, JsonProperty("energy"), Key(9), RuntimeInspectable]
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ public class Faction
|
|||
[Inspectable, CultInspectorTextArea, JsonProperty("description"), Key(3)]
|
||||
public string Description;
|
||||
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("logo"), Key(4)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("logo"), Key(4)]
|
||||
public string Logo;
|
||||
|
||||
[Inspectable, CultReference(typeof(PersonalityAttribute), many: true), JsonProperty("personality"), Key(5)]
|
||||
|
|
|
|||
|
|
@ -349,7 +349,7 @@ public class ConsumableItemData : CraftedItemData
|
|||
[Inspectable, JsonProperty("duration"), Key(12)]
|
||||
public float Duration;
|
||||
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("icon"), Key(13)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("icon"), Key(13)]
|
||||
public string Icon;
|
||||
|
||||
[Inspectable, JsonProperty("effectiveness"), Key(14)]
|
||||
|
|
@ -359,7 +359,7 @@ public class ConsumableItemData : CraftedItemData
|
|||
[JsonObject(MemberSerialization.OptIn)]
|
||||
public abstract class EquippableItemData : CraftedItemData
|
||||
{
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("schematic"), Key(10)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("schematic"), Key(10)]
|
||||
public string Schematic;
|
||||
|
||||
[Inspectable, JsonProperty("behaviors"), Key(11)]
|
||||
|
|
@ -389,7 +389,7 @@ public abstract class EquippableItemData : CraftedItemData
|
|||
// [Inspectable, JsonProperty("sfx"), Key(19)]
|
||||
// public string SoundEffectTrigger;
|
||||
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("actionIcon"), Key(20)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("actionIcon"), Key(20)]
|
||||
public string ActionBarIcon;
|
||||
|
||||
[Inspectable, JsonProperty("soundBank"), Key(21)]
|
||||
|
|
@ -496,7 +496,7 @@ public class HullData : EquippableItemData
|
|||
[Inspectable, JsonProperty("hardpoints"), Key(23)]
|
||||
public List<HardpointData> Hardpoints = new List<HardpointData>();
|
||||
|
||||
[Inspectable, CultInspectorAssetPath, JsonProperty("prefab"), Key(24)]
|
||||
[Inspectable, CultInspectorAssetGuid, JsonProperty("prefab"), Key(24)]
|
||||
public string Prefab;
|
||||
|
||||
[Inspectable, JsonProperty("hullType"), Key(25)]
|
||||
|
|
|
|||
Loading…
Reference in a new issue