|
|
@@ -43,7 +43,7 @@ public class DialogueManager : Singleton<DialogueManager>
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- await PlayDialogue(dialogueID, true,true);
|
|
|
+ await PlayDialogue(dialogueID, true, true);
|
|
|
}
|
|
|
|
|
|
// EndDialogue1();
|
|
|
@@ -69,7 +69,7 @@ public class DialogueManager : Singleton<DialogueManager>
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private async CTask PlayDialogue(int dialogueID, bool isShowTips = false,bool isShowAnima = false)
|
|
|
+ private async CTask PlayDialogue(int dialogueID, bool isShowTips = false, bool isShowAnima = false)
|
|
|
{
|
|
|
currentDialogueID = dialogueID;
|
|
|
|
|
|
@@ -141,7 +141,7 @@ public class DialogueManager : Singleton<DialogueManager>
|
|
|
{
|
|
|
await DialoguePanel.OpenDialoguePanel(CurrentEventList, dialogueConfig.ID, null,
|
|
|
ShowDialogueEventData.MessageShowType.Verbatim,
|
|
|
- FishDialogue,isShowAnima);
|
|
|
+ FishDialogue, isShowAnima);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -263,7 +263,8 @@ public class DialogueManager : Singleton<DialogueManager>
|
|
|
// }
|
|
|
// else
|
|
|
{
|
|
|
- List<ItemInfo> items = DropManager.Instance.Drop(dialogueConfig.PrizeIDs[i],dialogueConfig.PrizeNums[i]);
|
|
|
+ List<ItemInfo> items =
|
|
|
+ DropManager.Instance.Drop(dialogueConfig.PrizeIDs[i], dialogueConfig.PrizeNums[i]);
|
|
|
itemInfos.AddRange(items);
|
|
|
}
|
|
|
}
|
|
|
@@ -355,6 +356,16 @@ public class DialogueManager : Singleton<DialogueManager>
|
|
|
EventSystemManager.Instance.AddEvent(dialogueConfig.ResultOptions[0]);
|
|
|
if (eventList != null)
|
|
|
{
|
|
|
+ EventConfig eventConfig =
|
|
|
+ ConfigComponent.Instance.Get<EventConfig>(dialogueConfig.ResultOptions[0]);
|
|
|
+ if (eventConfig.EventTriggerType == 4)
|
|
|
+ {
|
|
|
+ Dictionary<string, object> properties = new Dictionary<string, object>();
|
|
|
+ properties.Add("#MainId", EventSystemManager.Instance.GetMainEventDta()?.eventID);
|
|
|
+ DBManager.Instance.CustomEvent("#CurMainEventId", properties);
|
|
|
+ DBManager.Instance.UpdateUserProperty(properties);
|
|
|
+ }
|
|
|
+
|
|
|
AccountFileInfo.Instance.playerData.eventList.Add(eventList);
|
|
|
AccountFileInfo.Instance.SavePlayerData();
|
|
|
}
|