muffin v7.4
This commit is contained in:
parent
8a7847ff37
commit
a4175abacd
54 changed files with 95984 additions and 123967 deletions
|
|
@ -138,7 +138,7 @@ internal sealed class CraftworksSupplyController : IDisposable
|
|||
address->Close(fireCallback: true);
|
||||
if (addonById->NameString == "BankaCraftworksSupply")
|
||||
{
|
||||
_framework.RunOnTick((Action)InteractWithBankaCraftworksSupply, TimeSpan.FromMilliseconds(50L, 0L), 0, default(CancellationToken));
|
||||
_framework.RunOnTick((Action)InteractWithBankaCraftworksSupply, TimeSpan.FromMilliseconds(50L), 0, default(CancellationToken));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ internal sealed class CreditsController : IDisposable
|
|||
|
||||
private static DateTime _lastHandledAt = DateTime.MinValue;
|
||||
|
||||
private static readonly TimeSpan _reentrancySuppress = TimeSpan.FromMilliseconds(500L, 0L);
|
||||
private static readonly TimeSpan _reentrancySuppress = TimeSpan.FromMilliseconds(500L);
|
||||
|
||||
private static long _lastHandledAddr;
|
||||
|
||||
|
|
|
|||
|
|
@ -686,7 +686,6 @@ internal sealed class InteractionUiController : IDisposable
|
|||
if (aetheryte.HasValue)
|
||||
{
|
||||
EAetheryteLocation valueOrDefault = aetheryte.GetValueOrDefault();
|
||||
Span<DialogueChoice> span2;
|
||||
Span<DialogueChoice> span;
|
||||
switch (_aetheryteFunctions.CanRegisterFreeOrFavoriteAetheryte(valueOrDefault))
|
||||
{
|
||||
|
|
@ -696,12 +695,12 @@ internal sealed class InteractionUiController : IDisposable
|
|||
int num2 = 1 + list.Count;
|
||||
List<DialogueChoice> list3 = new List<DialogueChoice>(num2);
|
||||
CollectionsMarshal.SetCount(list3, num2);
|
||||
span2 = CollectionsMarshal.AsSpan(list3);
|
||||
Span<DialogueChoice> span3 = CollectionsMarshal.AsSpan(list3);
|
||||
int num = 0;
|
||||
span = CollectionsMarshal.AsSpan(list);
|
||||
span.CopyTo(span2.Slice(num, span.Length));
|
||||
span.CopyTo(span3.Slice(num, span.Length));
|
||||
num += span.Length;
|
||||
span2[num] = new DialogueChoice
|
||||
span3[num] = new DialogueChoice
|
||||
{
|
||||
Type = EDialogChoiceType.YesNo,
|
||||
ExcelSheet = "Addon",
|
||||
|
|
@ -719,7 +718,7 @@ internal sealed class InteractionUiController : IDisposable
|
|||
CollectionsMarshal.SetCount(list2, num);
|
||||
span = CollectionsMarshal.AsSpan(list2);
|
||||
int num2 = 0;
|
||||
span2 = CollectionsMarshal.AsSpan(list);
|
||||
Span<DialogueChoice> span2 = CollectionsMarshal.AsSpan(list);
|
||||
span2.CopyTo(span.Slice(num2, span2.Length));
|
||||
num2 += span2.Length;
|
||||
span[num2] = new DialogueChoice
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue