Game Loop Galaxy Integration

Added sector map in Galaxy tab of in-game menu
Added player flag to Ship (replaces AGM.PlayerEntities)
Refactored sector map to depend on AGM
Moved sector generation to main menu
Main menu now supports resuming previous playthrough
Database and player settings now statically available via AGM
AGM saves current game state in PlayerSettings on exit
Sector generation is now asynchronous
Added progress callbacks to sector gen + progress dialog in menu
Confirmation Dialog / properties panel can now display dynamic text entry
Added zone title to Zone map
Eliminated ZoneData class (properties moved to ZonePack)
Sector, Zone and Entity serialization now fully functional
Entity settings now separate from player settings
Cleaned up old unused networking message classes
Name files now integrated with database cache
Added ability to save/load additive DB cache files in database panel
Cleaned up Wwise sound setup - removed redundant items & fixed spelling errors
Deleted Wwise cache + added to .gitignore
This commit is contained in:
Reinier Vens 2021-03-15 11:40:46 +00:00
commit 73651bf16a
130 changed files with 13423 additions and 4406 deletions

View file

@ -18,26 +18,20 @@ public class ConfirmationDialog : PropertiesPanel
public Button Confirm;
public TextMeshProUGUI ConfirmText;
public TextMeshProUGUI CancelText;
public bool LockDialog { get; set; }
private Action _onCancel;
private Action _onConfirm;
private void Start()
{
Cancel.onClick.AddListener(() =>
{
_onCancel?.Invoke();
End();
});
Confirm.onClick.AddListener(() =>
{
_onConfirm?.Invoke();
End();
});
Cancel.onClick.AddListener(() => End());
Confirm.onClick.AddListener(() => End());
if (CancelClickCatcher != null)
CancelClickCatcher.OnClick += data =>
{
_onCancel?.Invoke();
if (LockDialog) return;
End();
};
@ -49,12 +43,19 @@ public class ConfirmationDialog : PropertiesPanel
gameObject.SetActive(false);
}
private void End()
public void End(bool success = false)
{
CancelClickCatcher.gameObject.SetActive(false);
if(success) _onConfirm?.Invoke();
else _onCancel?.Invoke();
CancelClickCatcher?.gameObject.SetActive(false);
gameObject.SetActive(false);
}
public void MoveToCursor()
{
transform.position = Mouse.current.position.ReadValue();
}
public void Show(Action onConfirm = null, Action onCancel = null, string confirmText = "OK", string cancelText = "Cancel")
{
gameObject.SetActive(true);
@ -69,7 +70,6 @@ public class ConfirmationDialog : PropertiesPanel
ButtonGroup.SetActive(onConfirm!=null || onCancel!=null);
transform.position = Mouse.current.position.ReadValue();
CancelClickCatcher.gameObject.SetActive(true);
CancelClickCatcher?.gameObject.SetActive(true);
}
}