Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove wait 10 seconds logic #6445

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
+30 −17
Open

remove wait 10 seconds logic #6445

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5139f4
remove wait 10 seconds logic
eugene-doobu Nov 21, 2024
680229b
fix comment
eugene-doobu Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 30 additions & 17 deletions nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
Expand Down Expand Up @@ -869,32 +870,44 @@ private void CustomEquipmentCraft()
private void ResponseCreateAvatar(
ActionEvaluation<CreateAvatar> eval)
{
UniTask.Run(async () =>
UniTask.RunOnThreadPool(async () =>
{
// sloth업데이트 이후 액션에서 지정한 블록보다 클라이언트의 블록이 높아지는 순간 아래 액션을 수행합니다.
// 타임아웃은 10초로, 일반적인 블록딜레이인 8초보다 조금 크게 설정하였습니다.
await UniTask.WaitUntil(() => Game.Game.instance.Agent.BlockIndex > eval.BlockIndex).TimeoutWithoutException(TimeSpan.FromSeconds(10));

await UniTask.SwitchToThreadPool();
await UpdateAgentStateAsync(eval);
await UpdateAvatarState(eval, eval.Action.index);
// 아바타 생성시 States초기화를 위해 forceNewSelection을 true로 설정합니다.
await RxProps.SelectAvatarAsync(eval.Action.index, eval.OutputState, true);

await UniTask.SwitchToMainThread();
// need AgentAddress check 'ValidateEvaluationForCurrentAgent'
var agentAddress = eval.Signer;
var avatarAddress = agentAddress.Derive(
string.Format(
CultureInfo.InvariantCulture,
"avatar-state-{0}",
eval.Action.index
)
);

var avatarState = States.Instance.AvatarStates[eval.Action.index];
RenderQuest(avatarState.address, avatarState.questList.completedQuestIds);
await UniTask.SwitchToMainThread();

var agentAddr = States.Instance.AgentState.address;
var avatarAddr = Addresses.GetAvatarAddress(agentAddr, eval.Action.index);
DialogPopup.DeleteDialogPlayerPrefs(avatarAddr);
// 액션이 정상적으로 실행되면 최대치로 채워지리라 예상, 최적화를 위해 GetState를 하지 않고 Set합니다.
ReactiveAvatarState.UpdateActionPoint(Action.DailyReward.ActionPointMax);
var loginDetail = Widget.Find<LoginDetail>();
if (loginDetail && loginDetail.IsActive())
if (StateGetter.TryGetAvatarState(
eval.OutputState,
agentAddress,
avatarAddress,
out var avatarState))
{
RenderQuest(avatarState.address, avatarState.questList.completedQuestIds);
DialogPopup.DeleteDialogPlayerPrefs(avatarAddress);
// 액션이 정상적으로 실행되면 최대치로 채워지리라 예상, 최적화를 위해 GetState를 하지 않고 Set합니다.
ReactiveAvatarState.UpdateActionPoint(Action.DailyReward.ActionPointMax);
var loginDetail = Widget.Find<LoginDetail>();
if (loginDetail && loginDetail.IsActive())
{
loginDetail.OnRenderCreateAvatar();
}
}
else
{
loginDetail.OnRenderCreateAvatar();
NcDebug.LogError("Failed to get avatar state.");
}
}).Forget();
}
Expand Down