Delete item layer in render & mail read

planetarium · Jun 24, 2024 · 19c4ed9 · 19c4ed9
1 parent 7d8ac43
commit 19c4ed9
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 212 deletions.
diff --git a/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs b/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs
@@ -1014,11 +1014,6 @@ private void ResponseCombinationEquipment(
                     result.gold);
             });
 
-            LocalLayerModifier.RemoveItem(
-                avatarAddress,
-                result.itemUsable.ItemId,
-                result.itemUsable.RequiredBlockIndex,
-                1);
             LocalLayerModifier.AddNewAttachmentMail(avatarAddress, result.id);
 
             var tableSheets = Game.Game.instance.TableSheets;
@@ -1189,11 +1184,6 @@ private void ResponseCombinationConsumable(
                     result.gold);
             });
 
-            LocalLayerModifier.RemoveItem(
-                avatarAddress,
-                result.itemUsable.ItemId,
-                result.itemUsable.RequiredBlockIndex,
-                1);
             LocalLayerModifier.AddNewAttachmentMail(avatarAddress, result.id);
 
             RenderQuest(avatarAddress, renderArgs.AvatarState.questList.completedQuestIds);
@@ -1246,11 +1236,6 @@ private void ResponseEventConsumableItemCrafts(
                     result.gold);
             });
 
-            LocalLayerModifier.RemoveItem(
-                avatarAddress,
-                itemUsable.ItemId,
-                itemUsable.RequiredBlockIndex,
-                1);
             LocalLayerModifier.AddNewAttachmentMail(avatarAddress, result.id);
 
             // Notify
@@ -1389,20 +1374,6 @@ private void ResponseItemEnhancement(
                 }
             }
 
-            if (itemUsable.ItemSubType == ItemSubType.Aura)
-            {
-                //Because aura is a tradable item, local removal or add fails and an exception is handled.
-                LocalLayerModifier.RemoveNonFungibleItem(avatarAddress, itemUsable.ItemId);
-            }
-            else
-            {
-                LocalLayerModifier.RemoveItem(
-                    avatarAddress,
-                    itemUsable.ItemId,
-                    itemUsable.RequiredBlockIndex,
-                    1);
-            }
-
             LocalLayerModifier.AddNewAttachmentMail(avatarAddress, result.id);
 
             RenderQuest(avatarAddress, renderArgs.AvatarState.questList.completedQuestIds);

diff --git a/nekoyume/Assets/_Scripts/State/LocalLayerModifier.cs b/nekoyume/Assets/_Scripts/State/LocalLayerModifier.cs
@@ -351,56 +351,24 @@ long blockIndex
         /// </summary>
         /// <param name="avatarAddress"></param>
         /// <param name="mailId"></param>
-        /// <param name="resetState"></param>
-        public static async void RemoveNewAttachmentMail(
+        public static void RemoveNewAttachmentMail(
             Address avatarAddress,
-            Guid mailId,
-            bool resetState = true)
+            Guid mailId)
         {
             UnityEngine.Debug.Log($"[MailRead] RemoveNewAttachmentMail mailid : {mailId}");
             var modifier = new AvatarAttachmentMailNewSetter(mailId);
             LocalLayer.Instance.Remove(avatarAddress, modifier);
-
-            if (!resetState)
-            {
-                return;
-            }
-
-            await TryResetLoadedAvatarState(avatarAddress);
         }
 
-        public static async void RemoveNewMail(
+        public static void RemoveNewMail(
             Address avatarAddress,
-            Guid mailId,
-            bool resetState = true)
+            Guid mailId)
         {
             UnityEngine.Debug.Log($"[MailRead] RemoveNewMail mailid : {mailId}");
             var modifier = new AvatarMailNewSetter(mailId);
             LocalLayer.Instance.Remove(avatarAddress, modifier);
-
-            if (!resetState)
-            {
-                return;
-            }
-
-            await TryResetLoadedAvatarState(avatarAddress);
         }
 
-        public static async void RemoveAttachmentResult(
-            Address avatarAddress,
-            Guid mailId,
-            bool resetState = true)
-        {
-            var resultModifier = new AvatarAttachmentMailResultSetter(mailId);
-            LocalLayer.Instance.Remove(avatarAddress, resultModifier);
-
-            if (!resetState)
-            {
-                return;
-            }
-
-            await TryResetLoadedAvatarState(avatarAddress);
-        }
         #endregion
 
         #region Avatar / Quest