Skip to content

Commit

Permalink
Merge pull request planetarium#319 from planetarium/rc-v100034
Browse files Browse the repository at this point in the history 
v100034
  • Loading branch information
@ipdae
ipdae authored Mar 3, 2021
2 parents ebdde2d + 52b58c5 commit 29a8a10
Show file tree
Hide file tree
Showing 32 changed files with 311 additions and 311 deletions.
20 changes: 10 additions & 10 deletions Lib9c/Action/Buy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ public override IAccountStateDelta Execute(IActionContext context)
var sw = new Stopwatch();
sw.Start();
var started = DateTimeOffset.UtcNow;
Log.Debug("{Addresses}Buy exec started", addressesHex);
Log.Verbose("{Addresses}Buy exec started", addressesHex);

if (!states.TryGetAvatarState(ctx.Signer, buyerAvatarAddress, out var buyerAvatarState))
{
throw new FailedLoadStateException($"{addressesHex}Aborted as the avatar state of the buyer was failed to load.");
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!buyerAvatarState.worldInformation.IsStageCleared(GameConfig.RequireClearedStageLevel.ActionsInShop))
Expand All @@ -157,10 +157,10 @@ public override IAccountStateDelta Execute(IActionContext context)
}

sw.Stop();
Log.Debug("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

Log.Debug(
Log.Verbose(
"{AddressesHex}Execute Buy; buyer: {Buyer} seller: {Seller}",
addressesHex,
buyerAvatarAddress,
Expand All @@ -184,7 +184,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!states.TryGetAvatarState(sellerAgentAddress, sellerAvatarAddress, out var sellerAvatarState))
Expand All @@ -194,7 +194,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

// 돈은 있냐?
Expand Down Expand Up @@ -265,19 +265,19 @@ public override IAccountStateDelta Execute(IActionContext context)

states = states.SetState(sellerAvatarAddress, sellerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(buyerAvatarAddress, buyerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(ShopState.Address, shopStateDict);
sw.Stop();
var ended = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Debug("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);
Log.Verbose("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);

return states;
}
Expand Down
20 changes: 10 additions & 10 deletions Lib9c/Action/Buy2.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ public override IAccountStateDelta Execute(IActionContext context)
var sw = new Stopwatch();
sw.Start();
var started = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Buy exec started", addressesHex);
Log.Verbose("{AddressesHex}Buy exec started", addressesHex);

if (!states.TryGetAvatarState(ctx.Signer, buyerAvatarAddress, out var buyerAvatarState))
{
throw new FailedLoadStateException($"{addressesHex}Aborted as the avatar state of the buyer was failed to load.");
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!buyerAvatarState.worldInformation.IsStageCleared(GameConfig.RequireClearedStageLevel.ActionsInShop))
Expand All @@ -98,10 +98,10 @@ public override IAccountStateDelta Execute(IActionContext context)
}

sw.Stop();
Log.Debug("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

Log.Debug(
Log.Verbose(
"{AddressesHex}Execute Buy; buyer: {Buyer} seller: {Seller}",
addressesHex,
buyerAvatarAddress,
Expand All @@ -125,7 +125,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!states.TryGetAvatarState(sellerAgentAddress, sellerAvatarAddress, out var sellerAvatarState))
Expand All @@ -135,7 +135,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

// 돈은 있냐?
Expand Down Expand Up @@ -206,19 +206,19 @@ public override IAccountStateDelta Execute(IActionContext context)

states = states.SetState(sellerAvatarAddress, sellerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(buyerAvatarAddress, buyerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(ShopState.Address, shopStateDict);
sw.Stop();
var ended = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Debug("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);
Log.Verbose("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);

return states;
}
Expand Down
20 changes: 10 additions & 10 deletions Lib9c/Action/Buy3.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ public override IAccountStateDelta Execute(IActionContext context)
var sw = new Stopwatch();
sw.Start();
var started = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Buy exec started", addressesHex);
Log.Verbose("{AddressesHex}Buy exec started", addressesHex);

if (!states.TryGetAvatarState(ctx.Signer, buyerAvatarAddress, out var buyerAvatarState))
{
throw new FailedLoadStateException($"{addressesHex}Aborted as the avatar state of the buyer was failed to load.");
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!buyerAvatarState.worldInformation.IsStageCleared(GameConfig.RequireClearedStageLevel.ActionsInShop))
Expand All @@ -95,10 +95,10 @@ public override IAccountStateDelta Execute(IActionContext context)
}

sw.Stop();
Log.Debug("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

Log.Debug(
Log.Verbose(
"{AddressesHex}Execute Buy; buyer: {Buyer} seller: {Seller}",
addressesHex,
buyerAvatarAddress,
Expand All @@ -122,7 +122,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!states.TryGetAvatarState(sellerAgentAddress, sellerAvatarAddress, out var sellerAvatarState))
Expand All @@ -132,7 +132,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

// 돈은 있냐?
Expand Down Expand Up @@ -213,19 +213,19 @@ public override IAccountStateDelta Execute(IActionContext context)

states = states.SetState(sellerAvatarAddress, sellerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(buyerAvatarAddress, buyerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(ShopState.Address, shopStateDict);
sw.Stop();
var ended = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Debug("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);
Log.Verbose("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);

return states;
}
Expand Down
20 changes: 10 additions & 10 deletions Lib9c/Action/Buy4.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ public override IAccountStateDelta Execute(IActionContext context)
var sw = new Stopwatch();
sw.Start();
var started = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Buy exec started", addressesHex);
Log.Verbose("{AddressesHex}Buy exec started", addressesHex);

if (!states.TryGetAvatarState(ctx.Signer, buyerAvatarAddress, out var buyerAvatarState))
{
throw new FailedLoadStateException($"{addressesHex}Aborted as the avatar state of the buyer was failed to load.");
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Buyer AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!buyerAvatarState.worldInformation.IsStageCleared(GameConfig.RequireClearedStageLevel.ActionsInShop))
Expand All @@ -92,10 +92,10 @@ public override IAccountStateDelta Execute(IActionContext context)
}

sw.Stop();
Log.Debug("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get ShopState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

Log.Debug(
Log.Verbose(
"{AddressesHex}Execute Buy; buyer: {Buyer} seller: {Seller}",
addressesHex,
buyerAvatarAddress,
Expand All @@ -119,7 +119,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Item: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!states.TryGetAvatarState(sellerAgentAddress, sellerAvatarAddress, out var sellerAvatarState))
Expand All @@ -129,7 +129,7 @@ public override IAccountStateDelta Execute(IActionContext context)
);
}
sw.Stop();
Log.Debug("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Get Seller AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

// 돈은 있냐?
Expand Down Expand Up @@ -210,19 +210,19 @@ public override IAccountStateDelta Execute(IActionContext context)

states = states.SetState(sellerAvatarAddress, sellerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Seller AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(buyerAvatarAddress, buyerAvatarState.Serialize());
sw.Stop();
Log.Debug("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Set Buyer AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

states = states.SetState(ShopState.Address, shopStateDict);
sw.Stop();
var ended = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Debug("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);
Log.Verbose("{AddressesHex}Buy Set ShopState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Buy Total Executed Time: {Elapsed}", addressesHex, ended - started);

return states;
}
Expand Down
16 changes: 8 additions & 8 deletions Lib9c/Action/CombinationConsumable.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ public override IAccountStateDelta Execute(IActionContext context)
var sw = new Stopwatch();
sw.Start();
var started = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Combination exec started", addressesHex);
Log.Verbose("{AddressesHex}Combination exec started", addressesHex);

if (!states.TryGetAvatarState(ctx.Signer, AvatarAddress, out AvatarState avatarState))
{
throw new FailedLoadStateException($"{addressesHex}Aborted as the avatar state of the signer was failed to load.");
}

sw.Stop();
Log.Debug("{AddressesHex}Combination Get AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Combination Get AgentAvatarStates: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

if (!avatarState.worldInformation.IsStageCleared(GameConfig.RequireClearedStageLevel.CombinationEquipmentAction))
Expand All @@ -157,7 +157,7 @@ public override IAccountStateDelta Execute(IActionContext context)
$"{addressesHex}Aborted as the slot state is invalid: {slotState} @ {slotIndex}");
}

Log.Debug("{AddressesHex}Execute Combination; player: {Player}", addressesHex, AvatarAddress);
Log.Verbose("{AddressesHex}Execute Combination; player: {Player}", addressesHex, AvatarAddress);
var consumableItemSheet = states.GetSheet<ConsumableItemSheet>();
var recipeRow = states.GetSheet<ConsumableItemRecipeSheet>().Values.FirstOrDefault(r => r.Id == recipeId);
if (recipeRow is null)
Expand All @@ -184,7 +184,7 @@ public override IAccountStateDelta Execute(IActionContext context)
}

sw.Stop();
Log.Debug("{AddressesHex}Combination Remove Materials: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Combination Remove Materials: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

var result = new ResultModel
Expand All @@ -208,7 +208,7 @@ public override IAccountStateDelta Execute(IActionContext context)

var resultConsumableItemId = recipeRow.ResultConsumableItemId;
sw.Stop();
Log.Debug("{AddressesHex}Combination Get Food id: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Combination Get Food id: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();
result.recipeId = recipeRow.Id;

Expand All @@ -233,7 +233,7 @@ public override IAccountStateDelta Execute(IActionContext context)
avatarState.Update(mail);
avatarState.UpdateFromCombination(itemUsable);
sw.Stop();
Log.Debug("{AddressesHex}Combination Update AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Combination Update AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
sw.Restart();

var materialSheet = states.GetSheet<MaterialItemSheet>();
Expand All @@ -244,9 +244,9 @@ public override IAccountStateDelta Execute(IActionContext context)
states = states.SetState(AvatarAddress, avatarState.Serialize());
slotState.Update(result, ctx.BlockIndex, requiredBlockIndex);
sw.Stop();
Log.Debug("{AddressesHex}Combination Set AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
Log.Verbose("{AddressesHex}Combination Set AvatarState: {Elapsed}", addressesHex, sw.Elapsed);
var ended = DateTimeOffset.UtcNow;
Log.Debug("{AddressesHex}Combination Total Executed Time: {Elapsed}", addressesHex, ended - started);
Log.Verbose("{AddressesHex}Combination Total Executed Time: {Elapsed}", addressesHex, ended - started);
return states
.SetState(slotAddress, slotState.Serialize());
}
Expand Down
Loading

0 comments on commit 29a8a10

Please sign in to comment.