mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed some bugs with the switch system

Browse source
This commit is contained in:
Rapandrasmus 2023-11-26 00:52:56 +01:00
parent 75fc959860
commit 8000e22eb8
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs
View file

@ -50,6 +50,7 @@ namespace HeavenStudio.Editor
if (canDisable && active) if (canDisable && active)
{ {
Disable(); Disable();
GridGameSelector.instance.Enable();
} }
} }
canDisable = true; canDisable = true;
@ -66,6 +67,10 @@ namespace HeavenStudio.Editor
public void StartParams(RiqEntity entity) public void StartParams(RiqEntity entity)
{ {
var minigame = EventCaller.instance.GetMinigame(entity.datamodel.Split(0));
int actionIndex = minigame.actions.IndexOf(minigame.actions.Find(c => c.actionName == entity.datamodel.Split(1)));
Minigames.GameAction action = minigame.actions[actionIndex];
if (action.parameters != null) GridGameSelector.instance.Disable();
active = true; active = true;
AddParams(entity); AddParams(entity);
} }

28
Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs
View file

@ -37,7 +37,7 @@ namespace HeavenStudio.Editor
public float posDif; public float posDif;
public int ignoreSelectCount; public int ignoreSelectCount;
private int dragTimes; private int dragTimes;
private bool gameOpen; private bool gameOpen = true;
private float selectorHeight; private float selectorHeight;
private float eventSize; private float eventSize;
private float timeSinceUpdateIndex = 0.0f; private float timeSinceUpdateIndex = 0.0f;
@ -52,15 +52,15 @@ namespace HeavenStudio.Editor
eventSize = EventRef.GetComponent<RectTransform>().rect.height; eventSize = EventRef.GetComponent<RectTransform>().rect.height;
eventsParent = EventRef.transform.parent.GetChild(2).GetComponent<RectTransform>(); eventsParent = EventRef.transform.parent.GetChild(2).GetComponent<RectTransform>();
SelectedMinigame = EventCaller.instance.GetMinigame("gameManager"); SelectedMinigame = EventCaller.instance.GetMinigame(fxActive[0].name);
SwitchGameSelectionType(PersistentDataManager.gameSettings.useOldGameEventSelectionSystem); SwitchGameSelectionType(PersistentDataManager.gameSettings.useOldGameEventSelectionSystem);
EditorSettings.onUseOldChanged += SwitchGameSelectionType; EditorSettings.onUseOldChanged += SwitchGameSelectionType;
} }
private void Update() private void Update()
{ {
GameEventSelector.SetActive(_usingOld); GameEventSelector.SetActive(_usingOld && gameOpen);
_newGameEventSelector.SetActive(!_usingOld); _newGameEventSelector.SetActive(!_usingOld && gameOpen);
if (_usingOld) if (_usingOld)
{ {
if (!EventParameterManager.instance.active && !IsPointerOverUIElement() && _usingOld) if (!EventParameterManager.instance.active && !IsPointerOverUIElement() && _usingOld)
@ -158,7 +158,6 @@ namespace HeavenStudio.Editor
} }
EventParameterManager.instance.Disable(); EventParameterManager.instance.Disable();
gameOpen = true; gameOpen = true;
if (_usingOld) SelectGameOld(gameName, index); if (_usingOld) SelectGameOld(gameName, index);
else SelectGameNew(gameName, index); else SelectGameNew(gameName, index);
@ -491,6 +490,25 @@ namespace HeavenStudio.Editor
} }
public void Disable()
{
if (_usingOld)
{
DestroyEvents();
}
else
{
}
gameOpen = false;
}
public void Enable()
{
gameOpen = true;
SelectGame(SelectedMinigame.name);
}
#endregion #endregion
} }
} }