Skip to content

Commit

Permalink
Merge pull request #1675 from planetarium/rc-v100321
Browse files Browse the repository at this point in the history
Rc v100321
  • Loading branch information
ipdae authored Nov 7, 2022
2 parents 208a143 + efb6e55 commit 3f2b772
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Lib9c
Submodule Lib9c updated 53 files
+8 −2 .Lib9c.Tests/Action/ArenahelperTest.cs
+2 −2 .Lib9c.Tests/Action/BattleArena2Test.cs
+2 −2 .Lib9c.Tests/Action/BattleArena3Test.cs
+3 −3 .Lib9c.Tests/Action/BattleArena4Test.cs
+1,009 −0 .Lib9c.Tests/Action/BattleArena5Test.cs
+95 −13 .Lib9c.Tests/Action/BattleArenaTest.cs
+164 −0 .Lib9c.Tests/Action/ClaimStakeReward3Test.cs
+40 −7 .Lib9c.Tests/Action/ClaimStakeRewardTest.cs
+1 −0 .Lib9c.Tests/Action/ExceptionTest.cs
+12 −0 .Lib9c.Tests/Action/RuneHelperTest.cs
+941 −0 .Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward3ScenarioTest.cs
+34 −23 .Lib9c.Tests/Action/Scenario/StakeAndClaimStakeRewardScenarioTest.cs
+393 −0 .Lib9c.Tests/Action/UpdateSell3Test.cs
+44 −0 .Lib9c.Tests/Action/UpdateSellTest.cs
+10 −0 .Lib9c.Tests/Model/State/StakeStateTest.cs
+21 −3 .Lib9c.Tests/TableData/ArenaSheetTest.cs
+38 −0 .Lib9c.Tests/TableData/StakeRegularRewardSheetTest.cs
+1 −1 .Libplanet
+674 −0 LICENSE
+8 −0 Lib9c/Action/ActionBase.cs
+21 −0 Lib9c/Action/ActionUnavailableException.cs
+26 −11 Lib9c/Action/BattleArena.cs
+1 −1 Lib9c/Action/BattleArena2.cs
+1 −1 Lib9c/Action/BattleArena3.cs
+4 −1 Lib9c/Action/BattleArena4.cs
+377 −0 Lib9c/Action/BattleArena5.cs
+3 −1 Lib9c/Action/ClaimStakeReward.cs
+168 −0 Lib9c/Action/ClaimStakeReward3.cs
+26 −2 Lib9c/Action/HackAndSlash.cs
+25 −1 Lib9c/Action/MimisbrunnrBattle.cs
+6 −1 Lib9c/Action/UpdateSell.cs
+207 −0 Lib9c/Action/UpdateSell3.cs
+1 −0 Lib9c/Arena/ArenaHelper.cs
+7 −0 Lib9c/Helper/RuneHelper.cs
+14 −0 Lib9c/Model/Arena/ArenaExceptions.cs
+3 −4 Lib9c/Model/Arena/ArenaInformation.cs
+45 −0 Lib9c/Model/Character/CharacterBase.cs
+18 −0 Lib9c/Model/Character/Player.cs
+12 −1 Lib9c/Model/State/GameConfigState.cs
+13 −2 Lib9c/Model/State/StakeState.cs
+7 −12 Lib9c/Model/State/StateExtensions.cs
+6 −6 Lib9c/Policy/BlockPolicySource.cs
+17 −17 Lib9c/TableCSV/Arena/ArenaSheet.csv
+1 −0 Lib9c/TableCSV/GameConfigSheet.csv
+2 −1 Lib9c/TableCSV/Item/CostumeItemSheet.csv
+2 −1 Lib9c/TableCSV/Item/CostumeStatSheet.csv
+1 −0 Lib9c/TableCSV/Item/ItemRequirementSheet.csv
+16 −11 Lib9c/TableCSV/StakeRegularRewardSheet.csv
+1 −1 Lib9c/TableCSV/WeeklyArenaRewardSheet.csv
+35 −35 Lib9c/TableCSV/WorldAndStage/StageSheet.csv
+3 −2 Lib9c/TableCSV/WorldBoss/WorldBossListSheet.csv
+33 −7 Lib9c/TableData/ArenaSheet.cs
+15 −0 Lib9c/TableData/StakeRegularRewardSheet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ public void ActivateAccount(bool invalid, int expectedCode)
}

[Theory]
[InlineData(false, 0, 192)]
[InlineData(false, 5_000_000, 192)]
[InlineData(true, 0, 192)]
[InlineData(true, 5_000_000, 67)]
[InlineData(false, 0, 195)]
[InlineData(false, 5_000_000, 195)]
[InlineData(true, 0, 195)]
[InlineData(true, 5_000_000, 70)]
public void List(bool excludeObsolete, long blockIndex, int expectedCommandCount)
{
var commandList = _command.List(excludeObsolete, blockIndex);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public async Task Query()
StakeRegularFixedRewardSheet.Row fixedRewardRow = Fixtures.TableSheetsFX.StakeRegularFixedRewardSheet[level]!;
StakeRegularRewardSheet.RewardInfo[] rewards = rewardRow.Rewards.ToArray();
StakeRegularFixedRewardSheet.RewardInfo[] bonusRewards = fixedRewardRow.Rewards.ToArray();
Assert.Equal(2, rewards.Length);
Assert.Equal(3, rewards.Length);
Assert.Single(bonusRewards);
var queryResult = await ExecuteQueryAsync<StakeRegularRewardsType>(
query,
Expand All @@ -58,6 +58,11 @@ public async Task Query()
["itemId"] = rewards[1].ItemId,
["rate"] = rewards[1].Rate,
},
new Dictionary<string, object>
{
["itemId"] = rewards[2].ItemId,
["rate"] = rewards[2].Rate,
},
},
["bonusRewards"] = new object[]
{
Expand Down

0 comments on commit 3f2b772

Please sign in to comment.