fix: 微調

Game-as-a-Service · Aug 8, 2023 · 665367d · 665367d
1 parent 4a93d63
commit 665367d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/Domain/Block.cs b/Domain/Block.cs
@@ -78,23 +78,22 @@ public virtual void Upgrade()
         house++;
     }
 
-    public List<DomainEvent> PayToll(Player payer)
+    public DomainEvent PayToll(Player payer)
     {
         // payer 應該付過路費給 payee
         // 計算過路費
 
         Player? payee = landContract.Owner;
-        List<DomainEvent> domainEvents = new();
 
         if (payer.EndRoundFlag)
         {
             //throw new Exception("玩家不需要支付過路費");
-            domainEvents.Add(new PlayerDoesntNeedToPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money));
+            return new PlayerDoesntNeedToPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money);
         }
         else if (payee!.Chess.CurrentBlock.Id == "Jail" || payee.Chess.CurrentBlock.Id == "ParkingLot")
         {
             //throw new Exception("不需要支付過路費：Owner is in the " + payee.Chess.CurrentBlock.Id);
-            domainEvents.Add(new PlayerDoesntNeedToPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money));
+            return new PlayerDoesntNeedToPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money);
         }
         else
         {
@@ -104,15 +103,14 @@ public List<DomainEvent> PayToll(Player payer)
             {
                 payer.EndRoundFlag = true;
                 payer.PayToll(payee, amount);
-                domainEvents.Add(new PlayerPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money, payee.Id, payee.Money));
+                return new PlayerPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money, payee.Id, payee.Money);
             }
             else
             {
                 //throw new Exception("錢包餘額不足！");
-                domainEvents.Add(new PlayerTooPoorToPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money, amount));
+                return new PlayerTooPoorToPayTollEvent(payer.Monopoly.Id, payer.Id, payer.Money, amount);
             }
         }
-        return domainEvents;
     }
 
     public virtual decimal CalcullateToll(Player payee)

diff --git a/Domain/Player.cs b/Domain/Player.cs
@@ -110,15 +110,12 @@ internal DomainEvent MortgageLandContract(string landId)
         }
     }
 
-    #region 測試用
     public void MortgageForTest(string landId)
     {
         var landContract = _landContractList.First(l => l.Land.Id == landId);
         mortgages.Add(new Mortgage(this, landContract));
     }
 
-    #endregion
-
     public void PayToll(Player payee, decimal amount)
     {
         Money -= amount;

diff --git a/Test/ServerTests/AcceptanceTests/BuildHouseTest.cs b/Test/ServerTests/AcceptanceTests/BuildHouseTest.cs
@@ -52,8 +52,8 @@ public async Task 玩家在自己的土地蓋房子()
         // A 蓋房子
         hub.Verify<string, string, decimal, int>(
                        nameof(IMonopolyResponses.PlayerBuildHouseEvent),
-                                  (playId, blockId, playerMoney, house)
-                                  => playId == "A" && blockId == "A1" && playerMoney == 1000 && house == 2);
+                                  (playerId, blockId, playerMoney, house)
+                                  => playerId == "A" && blockId == "A1" && playerMoney == 1000 && house == 2);
         hub.VerifyNoElseEvent();
     }
 
@@ -91,8 +91,8 @@ public async Task 土地最多蓋5間房子()
         // A 蓋房子
         hub.Verify<string, string, int>(
                        nameof(IMonopolyResponses.HouseMaxEvent),
-                                  (playId, blockId, house)
-                                  => playId == "A" && blockId == "A1" && house == 5);
+                                  (playerId, blockId, house)
+                                  => playerId == "A" && blockId == "A1" && house == 5);
         hub.VerifyNoElseEvent();
     }
 
@@ -129,8 +129,8 @@ public async Task 車站不能蓋房子()
         // A 蓋房子
         hub.Verify<string, string>(
                        nameof(IMonopolyResponses.PlayerCannotBuildHouseEvent),
-                                  (playId, blockId)
-                                  => playId == "A" && blockId == "Station1");
+                                  (playerId, blockId)
+                                  => playerId == "A" && blockId == "Station1");
         hub.VerifyNoElseEvent();
     }
 }