|
@@ -189,8 +189,6 @@ namespace Fort23.Mono
|
|
|
|
|
|
private void StartShowMassge()
|
|
|
{
|
|
|
-
|
|
|
-
|
|
|
if (index >= dialogueMessaga.Length)
|
|
|
{
|
|
|
if (eventConditionConfig.ID != 0 && !_isShowingOptions)
|
|
@@ -267,9 +265,9 @@ namespace Fort23.Mono
|
|
|
{
|
|
|
DialogueOptionWidget dialogueOptionWidget =
|
|
|
await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
|
|
|
- dialogueOptionWidget.CustomInit(i,CurrentEventList, eventConditionConfig.optionPara1[i], eventConditionConfig.ID, SelectOption);
|
|
|
+ dialogueOptionWidget.CustomInit(i, CurrentEventList, eventConditionConfig.optionPara1[i], eventConditionConfig.ID, SelectOption);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
|
|
|
|
|
@@ -279,16 +277,15 @@ namespace Fort23.Mono
|
|
|
|
|
|
private void SelectOption(DialogueOptionWidget obj)
|
|
|
{
|
|
|
+ if (!EventSystemManager.Instance.CeekEventGroupComplete(obj.eventLinkData.eventConditions))
|
|
|
+ {
|
|
|
+ // TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(selectedOptionID));
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
OptionMarsk.SetActive(false);
|
|
|
int selectedOptionID = obj.eventConditionConfig.ID;
|
|
|
- // if (obj.eventConditionConfig.ID != 0 && obj.eventConditionConfig.ConditionType != 0)
|
|
|
- // {
|
|
|
- // if (!EventSystemManager.Instance.IsEvenkLinkComplete(selectedOptionID))
|
|
|
- // {
|
|
|
- // TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(selectedOptionID));
|
|
|
- // return;
|
|
|
- // }
|
|
|
- // }
|
|
|
+
|
|
|
|
|
|
UIManager.Instance.HideUIUIPanel(this);
|
|
|
finish?.Invoke(selectedOptionID);
|