Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
JohnCorby 2022-08-05 17:01:09 -07:00
commit c54ed0599c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NewHorizons/Handlers/StreamingHandler.cs
View File

@ -82,8 +82,10 @@ namespace NewHorizons.Handlers
{ {
sector.OnOccupantEnterSector += _ => sector.OnOccupantEnterSector += _ =>
{ {
foreach (var assetBundle in assetBundles) // If both are already in then it already loaded
StreamingManager.LoadStreamingAssets(assetBundle); if (sector.ContainsOccupant(DynamicOccupant.Player) && sector.ContainsOccupant(DynamicOccupant.Probe)) return;
foreach (var assetBundle in assetBundles) StreamingManager.LoadStreamingAssets(assetBundle);
}; };
/* /*
sector.OnOccupantExitSector += _ => sector.OnOccupantExitSector += _ =>

4
NewHorizons/Schemas/body_schema.json
View File

@ -1016,6 +1016,10 @@
"parentPath": { "parentPath": {
"type": "string", "type": "string",
"description": "The path (not including the root planet object) of the parent of this game object. Optional (will default to the root sector)." "description": "The path (not including the root planet object) of the parent of this game object. Optional (will default to the root sector)."
},
"keepLoaded": {
"type": "boolean",
"description": "Should this detail stay loaded even if you're outside the sector (good for very large props)"
} }
} }
}, },