aly/qstbak
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

muffin v6.15

Browse source
This commit is contained in:
alydev 2025-10-09 08:41:52 +10:00
parent 84717c5024
commit 521c02e8b8
15 changed files with 71 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Questionable/Questionable.Controller.GameUi/InteractionUiController.cs
View file

@ -436,7 +436,7 @@ internal sealed class InteractionUiController : IDisposable
IGameObject target = _targetManager.Target;
if (target != null)
{
foreach (IQuestInfo item in from x in _questData.GetAllByIssuerDataId(target.DataId)
foreach (IQuestInfo item in from x in _questData.GetAllByIssuerDataId(target.BaseId)
where x.QuestId is QuestId
select x)
{
@ -485,9 +485,9 @@ internal sealed class InteractionUiController : IDisposable
_logger.LogDebug("Ignoring entry in DialogueChoices, no answer");
continue;
}
if (dialogueChoice2.DataId.HasValue && dialogueChoice2.DataId != _targetManager.Target?.DataId)
if (dialogueChoice2.DataId.HasValue && dialogueChoice2.DataId != _targetManager.Target?.BaseId)
{
_logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice2.DataId, _targetManager.Target?.DataId);
_logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice2.DataId, _targetManager.Target?.BaseId);
continue;
}
StringOrRegex stringOrRegex = ResolveReference(quest3, dialogueChoice2.ExcelSheet, dialogueChoice2.Prompt, dialogueChoice2.PromptIsRegularExpression);
@ -739,9 +739,9 @@ internal sealed class InteractionUiController : IDisposable
{
continue;
}
if (dialogueChoice.DataId.HasValue && dialogueChoice.DataId != _targetManager.Target?.DataId)
if (dialogueChoice.DataId.HasValue && dialogueChoice.DataId != _targetManager.Target?.BaseId)
{
_logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice.DataId, _targetManager.Target?.DataId);
_logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice.DataId, _targetManager.Target?.BaseId);
continue;
}
StringOrRegex stringOrRegex = ResolveReference(quest, dialogueChoice.ExcelSheet, dialogueChoice.Prompt, dialogueChoice.PromptIsRegularExpression);