Merge tag 'v100361-3' into pandora89

osamadeep · Feb 28, 2023 · 148e2d1 · 148e2d1
2 parents 262fe94 + cd057ea
commit 148e2d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,6 @@ jobs:
           - 2021.3.5f1
         targetPlatform:
           - Windows
-          - macOS
           - Linux
     steps:
       - name: Set environment variables
@@ -95,7 +94,6 @@ jobs:
       matrix:
         targetPlatform:
           - Windows
-          - macOS
           - Linux
     needs: build-unity
     if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/development' || startsWith(github.ref, 'refs/heads/rc-') || github.ref == 'refs/heads/previewnet' || github.ref == 'refs/heads/2022q2' }}

diff --git a/nekoyume/Assets/_Scripts/BlockChain/ActionRenderHandler.cs b/nekoyume/Assets/_Scripts/BlockChain/ActionRenderHandler.cs
@@ -1297,8 +1297,17 @@ await Task.WhenAll(
                     skillsOnWaveStart.Add(skill);
                 }
 
+                var tempPlayer = (AvatarState)States.Instance.CurrentAvatarState.Clone();
+                if (LocalMailHelper.Instance.TryGetAllLocalMail(tempPlayer.address, out var mails))
+                {
+                    foreach (var mail in mails)
+                    {
+                        tempPlayer.mailBox.Remove(mail);
+                    }
+                }
+
                 var resultModel = eval.GetHackAndSlashReward(
-                    new AvatarState((Dictionary)States.Instance.CurrentAvatarState.Serialize()),
+                    new AvatarState((Dictionary)tempPlayer.Serialize()),
                     States.Instance.GetEquippedRuneStates(BattleType.Adventure),
                     skillsOnWaveStart,
                     tableSheets,

diff --git a/nekoyume/Assets/_Scripts/Helper/LocalMailHelper.cs b/nekoyume/Assets/_Scripts/Helper/LocalMailHelper.cs
@@ -63,5 +63,8 @@ public void CleanupAndDispose(Address address)
             _localMailDictionary[address].Clear();
             _disposables.DisposeAllAndClear();
         }
+
+        public bool TryGetAllLocalMail(Address address, out List<Mail> localMails) =>
+            _localMailDictionary.TryGetValue(address, out localMails);
     }
 }