Merge branch 'development' into bugfix/stage-circle

planetarium · Oct 11, 2024 · 1b622b3 · 1b622b3
2 parents 8ad11e1 + a2e1702
commit 1b622b3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/Lib9c.Abstractions/IRapidCombinationV2.cs b/Lib9c.Abstractions/IRapidCombinationV2.cs
@@ -0,0 +1,13 @@
+#nullable enable
+
+using System.Collections.Generic;
+using Libplanet.Crypto;
+
+namespace Lib9c.Abstractions
+{
+    public interface IRapidCombinationV2
+    {
+        Address AvatarAddress { get; }
+        List<int> SlotIndexList { get; }
+    }
+}
diff --git a/Lib9c.Abstractions/Lib9c.Abstractions.csproj b/Lib9c.Abstractions/Lib9c.Abstractions.csproj
@@ -6,7 +6,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <OutputPath>.bin</OutputPath>
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
-    <VersionPrefix>1.18.0</VersionPrefix>
+    <VersionPrefix>1.19.0</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Lib9c.MessagePack/Lib9c.MessagePack.csproj b/Lib9c.MessagePack/Lib9c.MessagePack.csproj
@@ -8,7 +8,7 @@
     <Platforms>AnyCPU</Platforms>
     <OutputPath>.bin</OutputPath>
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
-    <VersionPrefix>1.18.0</VersionPrefix>
+    <VersionPrefix>1.19.0</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Lib9c.Renderers/Lib9c.Renderers.csproj b/Lib9c.Renderers/Lib9c.Renderers.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <OutputPath>.bin</OutputPath>
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
-    <VersionPrefix>1.18.0</VersionPrefix>
+    <VersionPrefix>1.19.0</VersionPrefix>
     <RootNamespace>Lib9c</RootNamespace>
   </PropertyGroup>
 

diff --git a/Lib9c/Action/RapidCombination.cs b/Lib9c/Action/RapidCombination.cs
@@ -3,6 +3,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Bencodex.Types;
+using Lib9c.Abstractions;
 using Libplanet.Action;
 using Libplanet.Action.State;
 using Libplanet.Crypto;
@@ -22,11 +23,14 @@ namespace Nekoyume.Action
     /// </summary>
     [Serializable]
     [ActionType("rapid_combination10")]
-    public class RapidCombination : GameAction
+    public class RapidCombination : GameAction, IRapidCombinationV2
     {
         public Address avatarAddress;
         public List<int> slotIndexList = new();
 
+        Address IRapidCombinationV2.AvatarAddress => avatarAddress;
+        List<int> IRapidCombinationV2.SlotIndexList => slotIndexList;
+
         public override IWorld Execute(IActionContext context)
         {
             context.UseGas(1);

diff --git a/Lib9c/Lib9c.csproj b/Lib9c/Lib9c.csproj
@@ -9,7 +9,7 @@
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
     <RootNamespace>Nekoyume</RootNamespace>
     <LangVersion>9</LangVersion>
-    <VersionPrefix>1.18.0</VersionPrefix>
+    <VersionPrefix>1.19.0</VersionPrefix>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <Configurations>Debug;Release</Configurations>
     <Platforms>AnyCPU</Platforms>