Skip to content

Commit

Permalink
Merge pull request #1399 from planetarium/rc-v100230
Browse files Browse the repository at this point in the history
Merge v100230 into development
  • Loading branch information
hskim authored Jun 27, 2022
2 parents 42d276b + fa68396 commit 45062a5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Lib9c
Submodule Lib9c updated 74 files
+26 −6 .Lib9c.Tests/Action/BattleArenaTest.cs
+3 −3 .Lib9c.Tests/Action/GrindingTest.cs
+2 −2 .Lib9c.Tests/Action/ItemEnhancementTest.cs
+65 −21 .Lib9c.Tests/Action/JoinArenaTest.cs
+9 −1 .Lib9c.Tests/Action/Scenario/WorldUnlockScenarioTest.cs
+5 −5 .Lib9c.Tests/Action/UnlockEquipmentRecipeTest.cs
+2 −2 .Lib9c.Tests/Action/UnlockWorldTest.cs
+25 −25 .Lib9c.Tests/CrystalCalculatorTest.cs
+2 −0 .Lib9c.Tests/Model/Arena/ArenaInformationTest.cs
+0 −17 .Lib9c.Tests/TableCSV/Arena/ArenaSheet.csv
+0 −401 .Lib9c.Tests/TableCSV/Character/CharacterLevelSheet.csv
+0 −60 .Lib9c.Tests/TableCSV/Character/CharacterSheet.csv
+0 −251 .Lib9c.Tests/TableCSV/Cost/EnhancementCostSheet.csv
+0 −526 .Lib9c.Tests/TableCSV/Cost/EnhancementCostSheetV2.csv
+0 −163 .Lib9c.Tests/TableCSV/Crystal/CrystalEquipmentGrindingSheet.csv
+0 −2 .Lib9c.Tests/TableCSV/Crystal/CrystalFluctuationSheet.csv
+0 −110 .Lib9c.Tests/TableCSV/Crystal/CrystalMaterialCostSheet.csv
+0 −9 .Lib9c.Tests/TableCSV/Crystal/CrystalMonsterCollectionMultiplierSheet.csv
+0 −13 .Lib9c.Tests/TableCSV/Crystal/CrystalRandomBuffSheet.csv
+0 −251 .Lib9c.Tests/TableCSV/Crystal/CrystalStageBuffGachaSheet.csv
+0 −6 .Lib9c.Tests/TableCSV/GameConfigSheet.csv
+0 −23 .Lib9c.Tests/TableCSV/Item/ConsumableItemRecipeSheet.csv
+0 −27 .Lib9c.Tests/TableCSV/Item/ConsumableItemSheet.csv
+0 −56 .Lib9c.Tests/TableCSV/Item/CostumeItemSheet.csv
+0 −22 .Lib9c.Tests/TableCSV/Item/CostumeStatSheet.csv
+0 −1,729 .Lib9c.Tests/TableCSV/Item/EquipmentItemOptionSheet.csv
+0 −158 .Lib9c.Tests/TableCSV/Item/EquipmentItemRecipeSheet.csv
+0 −61 .Lib9c.Tests/TableCSV/Item/EquipmentItemSetEffectSheet.csv
+0 −163 .Lib9c.Tests/TableCSV/Item/EquipmentItemSheet.csv
+0 −373 .Lib9c.Tests/TableCSV/Item/EquipmentItemSubRecipeSheet.csv
+0 −472 .Lib9c.Tests/TableCSV/Item/EquipmentItemSubRecipeSheetV2.csv
+0 −6 .Lib9c.Tests/TableCSV/Item/ItemConfigForGradeSheet.csv
+0 −238 .Lib9c.Tests/TableCSV/Item/ItemRequirementSheet.csv
+0 −147 .Lib9c.Tests/TableCSV/Item/MaterialItemSheet.csv
+0 −15 .Lib9c.Tests/TableCSV/MonsterCollectionRewardSheet.csv
+0 −8 .Lib9c.Tests/TableCSV/MonsterCollectionSheet.csv
+0 −15 .Lib9c.Tests/TableCSV/Quest/CollectQuestSheet.csv
+0 −158 .Lib9c.Tests/TableCSV/Quest/CombinationEquipmentQuestSheet.csv
+0 −31 .Lib9c.Tests/TableCSV/Quest/CombinationQuestSheet.csv
+0 −31 .Lib9c.Tests/TableCSV/Quest/GeneralQuestSheet.csv
+0 −7 .Lib9c.Tests/TableCSV/Quest/GoldQuestSheet.csv
+0 −11 .Lib9c.Tests/TableCSV/Quest/ItemEnhancementQuestSheet.csv
+0 −6 .Lib9c.Tests/TableCSV/Quest/ItemGradeQuestSheet.csv
+0 −5 .Lib9c.Tests/TableCSV/Quest/ItemTypeCollectQuestSheet.csv
+0 −5 .Lib9c.Tests/TableCSV/Quest/MonsterQuestSheet.csv
+0 −61 .Lib9c.Tests/TableCSV/Quest/QuestItemRewardSheet.csv
+0 −79 .Lib9c.Tests/TableCSV/Quest/QuestRewardSheet.csv
+0 −9 .Lib9c.Tests/TableCSV/Quest/TradeQuestSheet.csv
+0 −251 .Lib9c.Tests/TableCSV/Quest/WorldQuestSheet.csv
+0 −30,201 .Lib9c.Tests/TableCSV/RedeemCodeListSheet.csv
+0 −35 .Lib9c.Tests/TableCSV/RedeemRewardSheet.csv
+0 −35 .Lib9c.Tests/TableCSV/Skill/BuffSheet.csv
+0 −181 .Lib9c.Tests/TableCSV/Skill/EnemySkillSheet.csv
+0 −47 .Lib9c.Tests/TableCSV/Skill/SkillBuffSheet.csv
+0 −71 .Lib9c.Tests/TableCSV/Skill/SkillSheet.csv
+0 −17 .Lib9c.Tests/TableCSV/StakeAchievementRewardSheet.csv
+0 −6 .Lib9c.Tests/TableCSV/StakeRegularFixedRewardSheet.csv
+0 −12 .Lib9c.Tests/TableCSV/StakeRegularRewardSheet.csv
+0 −251 .Lib9c.Tests/TableCSV/SweepRequiredCPSheet.csv
+0 −23 .Lib9c.Tests/TableCSV/WeeklyArenaRewardSheet.csv
+0 −21 .Lib9c.Tests/TableCSV/WorldAndStage/MimisbrunnrSheet.csv
+0 −64 .Lib9c.Tests/TableCSV/WorldAndStage/StageDialogSheet.csv
+0 −312 .Lib9c.Tests/TableCSV/WorldAndStage/StageSheet.csv
+0 −811 .Lib9c.Tests/TableCSV/WorldAndStage/StageWaveSheet.csv
+0 −7 .Lib9c.Tests/TableCSV/WorldAndStage/WorldSheet.csv
+0 −6 .Lib9c.Tests/TableCSV/WorldAndStage/WorldUnlockSheet.csv
+7 −10 .Lib9c.Tests/TableData/Crystal/CrystalEquipmentGrindingSheetTest.cs
+1 −1 .Lib9c.Tests/TableSheetsImporter.cs
+4 −2 Lib9c/Action/BattleArena.cs
+15 −0 Lib9c/Action/JoinArena.cs
+4 −4 Lib9c/Arena/ArenaHelper.cs
+13 −2 Lib9c/Helper/CrystalCalculator.cs
+5 −1 Lib9c/Model/Arena/ArenaInformation.cs
+2 −2 Lib9c/Model/Arena/ArenaScore.cs
5 changes: 5 additions & 0 deletions NineChronicles.Headless/ActionEvaluationPublisher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ await client.ReportReorgEndAsync(
{
extra[nameof(BattleArena.ExtraEnemyArenaPlayerDigest)] = enemyDigest.Serialize();
}

if (ba.ExtraPreviousMyScore is { } myScore)
{
extra[nameof(BattleArena.ExtraPreviousMyScore)] = myScore.Serialize();
}
}

if (ev.Action is Buy buy)
Expand Down

0 comments on commit 45062a5

Please sign in to comment.