Merge pull request #184 from asdawej/dev

fix: 🐛 fix wrong comment line
eesast · Apr 6, 2024 · 7e02a1c · 7e02a1c
2 parents 889e553 + 32684d7
commit 7e02a1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/logic/GameClass/GameObj/Team.cs b/logic/GameClass/GameObj/Team.cs
@@ -35,12 +35,14 @@ public Team(Home home)
                     ship.CanMove.SetROri(false);
                     ship.IsRemoved.SetROri(true);
                 });
+            /*
             ShipPool.Initiate(ShipType.CivilShip, GameData.MaxCivilShipNum,
                               () => new(GameData.ShipRadius, ShipType.CivilShip, MoneyPool));
             ShipPool.Initiate(ShipType.WarShip, GameData.MaxWarShipNum,
                               () => new(GameData.ShipRadius, ShipType.WarShip, MoneyPool));
             ShipPool.Initiate(ShipType.FlagShip, GameData.MaxFlagShipNum,
                               () => new(GameData.ShipRadius, ShipType.FlagShip, MoneyPool));
+            */
         }
         public void AddMoney(long add)
         {

diff --git a/logic/Gaming/Game.cs b/logic/Gaming/Game.cs
@@ -37,7 +37,7 @@ public long AddPlayer(PlayerInitInfo playerInitInfo)
                 {
                     return GameObj.invalidID;
                 }
-                //teamList[(int)playerInitInfo.teamID].AddShip(newShip);
+                teamList[(int)playerInitInfo.teamID].ShipPool.Append(newShip);
                 return newShip.PlayerID;
             }
             else