Skip to content

Commit

Permalink
Fix double load issue
Browse files Browse the repository at this point in the history
  • Loading branch information
cheese3660 committed Jan 6, 2024
1 parent 4d8b50b commit 2562320
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/SpaceWarp.Core/InternalUtilities/AssetHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static void LoadAddressable(string catalog)
SpaceWarpPlugin.Instance.SWLogger.LogInfo($"Loaded addressables catalog {catalog}");
var locator = operation.Result;
SpaceWarpPlugin.Instance.SWLogger.LogInfo($"{catalog} ----- {locator.LocatorId}");
GameManager.Instance.Assets.RegisterResourceLocator(locator);
// GameManager.Instance.Assets.RegisterResourceLocator(locator);
}
}

Expand Down
8 changes: 5 additions & 3 deletions src/SpaceWarp.UI/UI/Settings/SettingsMenuController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ internal class SettingsMenuController : KerbalMonoBehaviour

private const string InputFieldPrefabPath = "GameManager/Default Game Instance(Clone)/UI Manager(Clone)/Main Canvas/MainMenu(Clone)/CampaignMenu/CreateCampaignMenu/Menu/CampaignOptions/CampaignName/CampaignNameInputField";

private GameObject _inputFieldPrefab;

private ModsSubMenu _modsSubMenu;
private GameObject _headerPrefab;
Expand Down Expand Up @@ -111,7 +112,7 @@ public void UpdatePrefabs()
}


var inputFieldPrefab = Instantiate(GameObject.Find(InputFieldPrefabPath), setting.transform);
var inputFieldPrefab = Instantiate(_inputFieldPrefab, setting.transform);
Destroy(inputFieldPrefab.GetChild("Icons"));
var extended = inputFieldPrefab.GetComponentInChildren<InputFieldExtended>();
var textArea = extended.gameObject;
Expand Down Expand Up @@ -139,8 +140,9 @@ private void Setup()
var graphics = GameObject.Find(GraphicsPath);
var content = GameObject.Find(ContentPath);
var graphicsSettings = GameObject.Find(ContentGraphicsPath);


_inputFieldPrefab = Instantiate(GameObject.Find(InputFieldPrefabPath),SpaceWarpPlugin.Instance.transform);
_inputFieldPrefab.Persist();
_inputFieldPrefab.transform.SetParent(SpaceWarpPlugin.Instance.transform);

var modsButton = Instantiate(graphics, categories.transform);
modsButton.GetComponentInChildren<Localize>().Term = "";
Expand Down

0 comments on commit 2562320

Please sign in to comment.