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

This commit is contained in:
Ben C 2022-06-19 16:48:31 -04:00
commit 45c80d3cf5
No known key found for this signature in database
GPG Key ID: 7F8F04504B670474

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules;
using NewHorizons.External.Modules;
using NewHorizons.Handlers;
using OWML.Common;
using System.Xml;
@ -83,6 +83,12 @@ namespace NewHorizons.Builder.Props
AddTranslation(xml);
conversationZone.transform.parent = sector?.transform ?? planetGO.transform;
if (string.IsNullOrEmpty(info.pathToAnimController))
{
conversationZone.transform.parent = planetGO.transform.Find(info.pathToAnimController);
}
conversationZone.transform.position = planetGO.transform.TransformPoint(info.position);
conversationZone.SetActive(true);