diff --git a/logic/Client/Model/MapPatch.cs b/logic/Client/Model/MapPatch.cs
index 97c9730f..1a22f728 100644
--- a/logic/Client/Model/MapPatch.cs
+++ b/logic/Client/Model/MapPatch.cs
@@ -9,16 +9,16 @@ namespace Client.Model
 {
     public enum MapPatchType
     {
-        Space = 0,
+        Ground = 0,
         RedHome = 1,
         BlueHome = 2,
         Ruin = 3,
-        Shadow = 4,
-        Asteroid = 5,
-        Resource = 6,
-        Factory = 7,
-        Community = 8,
-        Fort = 9,
+        Grass = 4,
+        River = 5,
+        Garbage = 6,
+        RecycleBank = 7,
+        ChargeStation = 8,
+        SignalTower = 9,
         WormHole = 10,
         Null = 11
     };
diff --git a/logic/Client/Model/Player.cs b/logic/Client/Model/Player.cs
index 85f107f6..a6ac7fb5 100644
--- a/logic/Client/Model/Player.cs
+++ b/logic/Client/Model/Player.cs
@@ -9,8 +9,8 @@ namespace Client.Model
 {
     public class Player : BindableObject
     {
-        private bool team;
-        public bool Team
+        private long team;
+        public long Team
         {
             get => team;
             set
@@ -39,12 +39,24 @@ public int Money
                 OnPropertyChanged();
             }
         }
-        private ObservableCollection<Ship> ships;
-        public ObservableCollection<Ship> Ships
+
+        private int score;
+        public int Score
+        {
+            get => score;
+            set
+            {
+                score = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private ObservableCollection<Sweeper> ships;
+        public ObservableCollection<Sweeper> Sweepers
         {
             get
             {
-                return ships ?? (ships = new ObservableCollection<Ship>());
+                return ships ?? (ships = new ObservableCollection<Sweeper>());
             }
             set
             {
diff --git a/logic/Client/Model/Ship.cs b/logic/Client/Model/Ship.cs
index 739634cc..ab208650 100644
--- a/logic/Client/Model/Ship.cs
+++ b/logic/Client/Model/Ship.cs
@@ -1,4 +1,6 @@
-using System;
+using Client.Util;
+using Protobuf;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,84 +8,86 @@
 
 namespace Client.Model
 {
-    public enum TeamEnum
-    {
-        Red,
-        Blue
-    }
+    //public enum TeamEnum
+    //{
+    //    Red,
+    //    Blue
+    //}
 
-    public enum TypeEnum
-    {
-        CivilShip,
-        WarShip,
-        FlagShip
-    }
+    //public enum TypeEnum
+    //{
+    //    CivilSweeper,
+    //    WarSweeper,
+    //    FlagSweeper
+    //}
 
-    public enum StateEnum
-    {
-        Idle,
-        Producing,
-        Constructing,
-        Recovering,
-        Recycling,
-        Attacking,
-        Swinging,
-        Deceased
-    }
+    //public enum StateEnum
+    //{
+    //    Idle,
+    //    Producing,
+    //    Constructing,
+    //    Recovering,
+    //    Recycling,
+    //    Attacking,
+    //    Swinging,
+    //    Deceased
+    //}
 
-    public enum ProducerModuleEnum
-    {
+    //public enum ProducerModuleEnum
+    //{
 
-    }
+    //}
 
-    public enum ConstuctorModuleEnum
-    {
+    //public enum ConstuctorModuleEnum
+    //{
 
-    }
+    //}
 
-    public enum ArmorModuleEnum
-    {
+    //public enum ArmorModuleEnum
+    //{
 
-    }
+    //}
 
-    public enum ShieldModuleEnum
-    {
+    //public enum ShieldModuleEnum
+    //{
 
-    }
+    //}
 
-    public enum AttackerModuleEnum
-    {
+    //public enum AttackerModuleEnum
+    //{
 
-    }
+    //}
 
-    public class Ship : BindableObject
+    public class Sweeper : BindableObject
     {
-        private TeamEnum team;
-        private TypeEnum type;
-        private StateEnum state;
+        private long teamID;
+        private SweeperType type;
+        private SweeperState state;
         private int Hp;
-        private ProducerModuleEnum producerModule;
-        private ConstuctorModuleEnum constuctorModule;
-        private ArmorModuleEnum armorModule;
-        private ShieldModuleEnum shieldModule;
-        private AttackerModuleEnum attackerModule;
+        private ProducerType producerModule;
+        private ConstructorType constuctorModule;
+        private ArmorType armorModule;
+        private ShieldType shieldModule;
+        private WeaponType weaponModule;
         private string type_s;
         private string state_s;
         private string producerModule_s;
         private string constuctorModule_s;
         private string armorModule_s;
         private string shieldModule_s;
-        private string attackerModule_s;
-        public TeamEnum Team
+        private string weaponModule_s;
+
+
+        public long TeamID
         {
-            get => team;
+            get => teamID;
             set
             {
-                team = value;
+                teamID = value;
                 OnPropertyChanged();
             }
         }
-        public TypeEnum Type
+        public SweeperType Type
         {
             get => type;
             set
@@ -92,7 +96,7 @@ public TypeEnum Type
                 OnPropertyChanged();
             }
         }
-        public StateEnum State
+        public SweeperState State
         {
             get => state;
             set
@@ -110,7 +114,7 @@ public int HP
                 OnPropertyChanged();
             }
         }
-        public ProducerModuleEnum ProducerModule
+        public ProducerType ProducerModule
         {
             get => producerModule;
             set
@@ -119,7 +123,7 @@ public ProducerModuleEnum ProducerModule
                 OnPropertyChanged();
             }
         }
-        public ConstuctorModuleEnum ConstuctorModule
+        public ConstructorType ConstuctorModule
         {
             get => constuctorModule;
             set
@@ -128,7 +132,7 @@ public ConstuctorModuleEnum ConstuctorModule
                 OnPropertyChanged();
             }
         }
-        public ArmorModuleEnum ArmorModule
+        public ArmorType ArmorModule
         {
             get => armorModule;
             set
@@ -137,7 +141,7 @@ public ArmorModuleEnum ArmorModule
                 OnPropertyChanged();
             }
         }
-        public ShieldModuleEnum ShieldModule
+        public ShieldType ShieldModule
         {
             get => shieldModule;
             set
@@ -146,18 +150,18 @@ public ShieldModuleEnum ShieldModule
                 OnPropertyChanged();
             }
         }
-        public AttackerModuleEnum AttackerModule
+        public WeaponType WeaponModule
         {
-            get => attackerModule;
+            get => weaponModule;
             set
             {
-                attackerModule = value;
+                weaponModule = value;
                 OnPropertyChanged();
             }
         }
         public string Type_s
         {
-            get => type_s;
+            get => UtilInfo.SweeperTypeNameDict[Type];
             set
             {
                 type_s = value;
@@ -166,7 +170,7 @@ public string Type_s
         }
         public string State_s
         {
-            get => state_s;
+            get => UtilInfo.SweeperStateNameDict[State];
             set
             {
                 state_s = value;
@@ -209,12 +213,12 @@ public string ShieldModule_s
                 OnPropertyChanged();
             }
         }
-        public string AttackerModule_s
+        public string WeaponModule_s
         {
-            get => attackerModule_s;
+            get => weaponModule_s;
             set
             {
-                attackerModule_s = value;
+                weaponModule_s = value;
                 OnPropertyChanged();
             }
         }
diff --git a/logic/Client/Old/GameStatusBar.xaml.cs b/logic/Client/Old/GameStatusBar.xaml.cs
index 32f24370..e3e775a0 100644
--- a/logic/Client/Old/GameStatusBar.xaml.cs
+++ b/logic/Client/Old/GameStatusBar.xaml.cs
@@ -1,3 +1,4 @@
+using Client.Util;
 using Protobuf;
 
 namespace Client;
diff --git a/logic/Client/Old/PlayerStatusBar.xaml b/logic/Client/Old/PlayerStatusBar.xaml
index 2bd2daa2..51d8e08e 100644
--- a/logic/Client/Old/PlayerStatusBar.xaml
+++ b/logic/Client/Old/PlayerStatusBar.xaml
@@ -34,7 +34,7 @@
             <Label x:Name="MyMoney" Grid.Row="0" Grid.Column="3" Grid.ColumnSpan="3" Text="  💰总经济：" Style="{StaticResource littleAttributes}" />
         </Grid>
 
-        <Grid x:Name="ShipStatusAttributesGrid" Grid.Row="1">
+        <Grid x:Name="SweeperStatusAttributesGrid" Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -45,16 +45,16 @@
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
 
-            <Label x:Name="ShipItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
-            <Label x:Name="ShipMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
-            <Label x:Name="ShipBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
-            <Label x:Name="ShipArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
-            <Label x:Name="ShipShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
-            <Label x:Name="ShipAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
-            <Label x:Name="ShipState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
+            <Label x:Name="SweeperItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
+            <Label x:Name="SweeperMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
+            <Label x:Name="SweeperBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
+            <Label x:Name="SweeperArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
+            <Label x:Name="SweeperShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
+            <Label x:Name="SweeperAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
+            <Label x:Name="SweeperState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
         </Grid>
 
-        <Grid x:Name="ShipAllAttributesGrid" Grid.Row="2" >
+        <Grid x:Name="SweeperAllAttributesGrid" Grid.Row="2" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
diff --git a/logic/Client/Old/PlayerStatusBar.xaml.cs b/logic/Client/Old/PlayerStatusBar.xaml.cs
index b9ec0966..243e8651 100644
--- a/logic/Client/Old/PlayerStatusBar.xaml.cs
+++ b/logic/Client/Old/PlayerStatusBar.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using Client.Util;
 using Protobuf;
 
 namespace Client
@@ -13,7 +14,7 @@ enum PlayerRole
         };
         PlayerRole myRole;
         private double lengthOfHpSlide = 240;
-        List<ShipLabel> shipLabels = new List<ShipLabel>();
+        List<SweeperLabel> shipLabels = new List<SweeperLabel>();
         public PlayerStatusBar(Grid parent, int Row, int Column, int role)
         {
             InitializeComponent();
@@ -29,11 +30,11 @@ public PlayerStatusBar(Grid parent, int Row, int Column, int role)
             parent.Children.Add(this);
             parent.SetColumn(this, Column);
             parent.SetRow(this, Row);
-            shipLabels.Add(new ShipLabel());
-            shipLabels.Add(new ShipLabel());
-            shipLabels.Add(new ShipLabel());
+            shipLabels.Add(new SweeperLabel());
+            shipLabels.Add(new SweeperLabel());
+            shipLabels.Add(new SweeperLabel());
             DrawSelfInfo();
-            DrawShipTable();
+            DrawSweeperTable();
         }
 
         private void DrawSelfInfo()
@@ -53,7 +54,7 @@ private void DrawSelfInfo()
             }
         }
 
-        private void DrawShipTable()
+        private void DrawSweeperTable()
         {
             for (int shipCounter = 0; shipCounter < shipLabels.Count; shipCounter++)
             {
@@ -72,32 +73,32 @@ private void DrawShipTable()
                 shipLabels[shipCounter].shipStatusGrid.SetRow(shipLabels[shipCounter].status, 0);
                 shipLabels[shipCounter].shipStatusGrid.SetRow(shipLabels[shipCounter].hpSlide, 1);
 
-                ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].name);
-                ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].producer);
-                ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].constructor);
-                ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].armor);
-                ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].shield);
-                ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].weapon);
-                ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].shipStatusGrid);
-                //ShipAllAttributesGrid.Children.Add(shipLabels[shipCounter].status);
+                SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].name);
+                SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].producer);
+                SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].constructor);
+                SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].armor);
+                SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].shield);
+                SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].weapon);
+                SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].shipStatusGrid);
+                //SweeperAllAttributesGrid.Children.Add(shipLabels[shipCounter].status);
 
-                ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].name, shipCounter);
-                ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].producer, shipCounter);
-                ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].constructor, shipCounter);
-                ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].armor, shipCounter);
-                ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].shield, shipCounter);
-                ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].weapon, shipCounter);
-                ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].shipStatusGrid, shipCounter);
-                //ShipAllAttributesGrid.SetRow(shipLabels[shipCounter].status, shipCounter);
+                SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].name, shipCounter);
+                SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].producer, shipCounter);
+                SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].constructor, shipCounter);
+                SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].armor, shipCounter);
+                SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].shield, shipCounter);
+                SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].weapon, shipCounter);
+                SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].shipStatusGrid, shipCounter);
+                //SweeperAllAttributesGrid.SetRow(shipLabels[shipCounter].status, shipCounter);
 
-                ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].name, 0);
-                ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].producer, 1);
-                ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].constructor, 2);
-                ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].armor, 3);
-                ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].shield, 4);
-                ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].weapon, 5);
-                ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].shipStatusGrid, 6);
-                //ShipAllAttributesGrid.SetColumn(shipLabels[shipCounter].status, 6);
+                SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].name, 0);
+                SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].producer, 1);
+                SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].constructor, 2);
+                SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].armor, 3);
+                SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].shield, 4);
+                SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].weapon, 5);
+                SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].shipStatusGrid, 6);
+                //SweeperAllAttributesGrid.SetColumn(shipLabels[shipCounter].status, 6);
             }
         }
 
@@ -111,11 +112,11 @@ public void SetPlayerValue(MessageOfHome player)
             }
         }
 
-        public void SetShipValue(MessageOfSweeper ship)
+        public void SetSweeperValue(MessageOfSweeper ship)
         {
             if (ship.TeamId == (long)PlayerTeam.Red && myRole == PlayerRole.Red || ship.TeamId == (long)PlayerTeam.Blue && myRole == PlayerRole.Blue)
             {
-                ShipLabel shipLabel = new ShipLabel();
+                SweeperLabel shipLabel = new SweeperLabel();
                 shipLabel.name.Text = ship.SweeperType.ToString() + ship.PlayerId.ToString();
                 shipLabel.producer.Text = ship.ProducerType.ToString();
                 shipLabel.armor.Text = ship.ArmorType.ToString();
@@ -130,14 +131,14 @@ public void SetShipValue(MessageOfSweeper ship)
         public void SlideLengthSet()
         {
             UtilFunctions.SlideLengthSet(MyHpSlide, ref haveSetSlideLength, ref lengthOfHpSlide, PlayerRoleInfoGrid.Width);
-            foreach (ShipLabel shiplabel in shipLabels)
+            foreach (SweeperLabel shiplabel in shipLabels)
             {
-                UtilFunctions.SlideLengthSet(shiplabel.hpSlide, ref haveSetSlideLength, ref shiplabel.lengthOfShipHpSlide, shiplabel.shipStatusGrid.Width);
+                UtilFunctions.SlideLengthSet(shiplabel.hpSlide, ref haveSetSlideLength, ref shiplabel.lengthOfSweeperHpSlide, shiplabel.shipStatusGrid.Width);
             }
             haveSetSlideLength = true;
         }
     }
-    public class ShipLabel
+    public class SweeperLabel
     {
         public Label name = new Label() { Text = "name" };
         public Label producer = new Label() { Text = "producer" };
@@ -146,7 +147,7 @@ public class ShipLabel
         public Label shield = new Label() { Text = "shield" };
         public Label weapon = new Label() { Text = "weapon" };
         public Label status = new Label() { Text = "IDLE" };
-        public double lengthOfShipHpSlide = 80;
+        public double lengthOfSweeperHpSlide = 80;
         public BoxView hpSlide = new BoxView() { Color = Colors.Red, WidthRequest = 80, HeightRequest = 3, HorizontalOptions = LayoutOptions.Start, VerticalOptions = LayoutOptions.End };
         public Grid shipStatusGrid = new Grid();
     };
diff --git a/logic/Client/Properties/PlayerBarGrid_new.xml b/logic/Client/Properties/PlayerBarGrid_new.xml
index e661f071..5a2d00a6 100755
--- a/logic/Client/Properties/PlayerBarGrid_new.xml
+++ b/logic/Client/Properties/PlayerBarGrid_new.xml
@@ -30,7 +30,7 @@
                 <Label x:Name="MyMoney" Grid.Row="0" Grid.Column="3" Grid.ColumnSpan="3" Text="  💰总经济：" Style="{StaticResource littleAttributes}" />
         </Grid>
 
-        <Grid x:Name="ShipStatusAttributesGrid" Grid.Row="1">
+        <Grid x:Name="SweeperStatusAttributesGrid" Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
@@ -41,13 +41,13 @@
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
 
-            <Label x:Name="ShipItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
-            <Label x:Name="ShipMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
-            <Label x:Name="ShipBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
-            <Label x:Name="ShipArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
-            <Label x:Name="ShipShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
-            <Label x:Name="ShipAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
-            <Label x:Name="ShipState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
+            <Label x:Name="SweeperItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
+            <Label x:Name="SweeperMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
+            <Label x:Name="SweeperBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
+            <Label x:Name="SweeperArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
+            <Label x:Name="SweeperShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
+            <Label x:Name="SweeperAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
+            <Label x:Name="SweeperState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
         </Grid>
 
     </Grid>
diff --git a/logic/Client/UtilFunctions.cs b/logic/Client/Util/UtilFunctions.cs
old mode 100755
new mode 100644
similarity index 94%
rename from logic/Client/UtilFunctions.cs
rename to logic/Client/Util/UtilFunctions.cs
index 0d7f3292..9a08b78f
--- a/logic/Client/UtilFunctions.cs
+++ b/logic/Client/Util/UtilFunctions.cs
@@ -1,40 +1,38 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Client
-{
-    public class UtilFunctions
-    {
-        public static void SlideLengthSet(BoxView slide, ref bool haveSetSlideLength, ref double lengthOfSlide, double parentGridWidth)
-        {
-            if (parentGridWidth < 0)
-            {
-                return;
-            }
-            if (haveSetSlideLength == false)
-            {
-                lengthOfSlide = parentGridWidth;
-                slide.WidthRequest = lengthOfSlide;
-            }
-            else
-            {
-                slide.WidthRequest = slide.WidthRequest / lengthOfSlide * parentGridWidth;
-                lengthOfSlide = parentGridWidth;
-            }
-        }
-        public static int getIndex(int i, int j)
-        {
-            return 50 * i + j;
-        }
-
-        public static PointF getMapCenter(float i, float j)
-        {
-            return new PointF(10 * i + 5, 10 * j + 5);
-        }
-    }
-
-
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Client.Util
+{
+    public class UtilFunctions
+    {
+        public static void SlideLengthSet(BoxView slide, ref bool haveSetSlideLength, ref double lengthOfSlide, double parentGridWidth)
+        {
+            if (parentGridWidth < 0)
+            {
+                return;
+            }
+            if (haveSetSlideLength == false)
+            {
+                lengthOfSlide = parentGridWidth;
+                slide.WidthRequest = lengthOfSlide;
+            }
+            else
+            {
+                slide.WidthRequest = slide.WidthRequest / lengthOfSlide * parentGridWidth;
+                lengthOfSlide = parentGridWidth;
+            }
+        }
+        public static int getIndex(int i, int j)
+        {
+            return 50 * i + j;
+        }
+
+        public static PointF getMapCenter(float i, float j)
+        {
+            return new PointF(10 * i + 5, 10 * j + 5);
+        }
+    }
+}
diff --git a/logic/Client/Util/UtilInfo.cs b/logic/Client/Util/UtilInfo.cs
new file mode 100644
index 00000000..699ea954
--- /dev/null
+++ b/logic/Client/Util/UtilInfo.cs
@@ -0,0 +1,75 @@
+using Protobuf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Client.Util
+{
+    public static class UtilInfo
+    {
+        public static Dictionary<SweeperType, string> SweeperTypeNameDict = new Dictionary<SweeperType, string>{
+            { SweeperType.NullSweeperType, "NullSweeperType" },
+            { SweeperType.CivilianSweeper, "CivilianSweeper" },
+            { SweeperType.MilitarySweeper, "MilitarySweeper" },
+            { SweeperType.FlagSweeper, "FlagSweeper" }
+        };
+
+        public static Dictionary<SweeperState, string> SweeperStateNameDict = new Dictionary<SweeperState, string>
+        {
+            { SweeperState.Idle, "Idle" },
+            { SweeperState.Producing, "Producing" },
+            { SweeperState.Constructing, "Constructing" },
+            { SweeperState.Recovering, "Recovering" },
+            { SweeperState.Recycling, "Recycling" },
+            { SweeperState.Attacking, "Attacking" },
+            { SweeperState.Swinging, "Swinging" },
+            { SweeperState.Moving, "Moving" }
+        };
+
+        public static Dictionary<ArmorType, string> SweeperArmorTypeNameDict = new Dictionary<ArmorType, string>
+        {
+            { ArmorType.NullArmorType, "NullArmorType" },
+            { ArmorType.Armor1, "Armor1" },
+            { ArmorType.Armor2, "Armor2" },
+            { ArmorType.Armor3, "Armor3" }
+        };
+
+        public static Dictionary<ShieldType, string> SweeperShieldTypeNameDict = new Dictionary<ShieldType, string>
+        {
+            { ShieldType.NullShieldType, "NullShieldType" },
+            { ShieldType.Shield1, "Shield1" },
+            { ShieldType.Shield2, "Shield2" },
+            { ShieldType.Shield3, "Shield3" }
+        };
+
+        public static Dictionary<ConstructorType, string> SweeperConstructorNameDict = new Dictionary<ConstructorType, string>
+        {
+            { ConstructorType.NullConstructorType, "NullConstructorType" },
+            { ConstructorType.Constructor1, "Constructor1" },
+            { ConstructorType.Constructor2, "Constructor2" },
+            { ConstructorType.Constructor3, "Constructor3" }
+        };
+
+        public static Dictionary<ProducerType, string> SweeperProducerTypeNameDict = new Dictionary<ProducerType, string>
+        {
+            { ProducerType.NullProducerType, "NullProducerType" },
+            { ProducerType.Producer1, "Producer1" },
+            { ProducerType.Producer2, "Producer2" },
+            { ProducerType.Producer3, "Producer3" }
+        };
+
+        public static Dictionary<WeaponType, string> SweeperWeaponTypeNameDict = new Dictionary<WeaponType, string>
+        {
+            { WeaponType.NullWeaponType, "NullWeaponType" },
+            { WeaponType.Lasergun, "Lasergun" },
+            { WeaponType.Arcgun, "Arcgun" },
+            { WeaponType.Plasmagun, "Plasmagun" },
+            { WeaponType.Missilegun, "Missilegun" },
+            { WeaponType.Shellgun, "Shellgun" }
+        };
+    }
+
+
+}
diff --git a/logic/Client/View/MainPage.xaml b/logic/Client/View/MainPage.xaml
index 4b6b15bc..4f66bc06 100644
--- a/logic/Client/View/MainPage.xaml
+++ b/logic/Client/View/MainPage.xaml
@@ -82,7 +82,7 @@
                         <Label x:Name="RedMoney" Grid.Row="0" Grid.Column="3" Grid.ColumnSpan="3" Text="{Binding RedPlayer.Money, StringFormat='💰总经济： {0}'}" Style="{StaticResource littleAttributes}" />
                     </Grid>
 
-                    <Grid x:Name="RedShipStatusAttributesGrid" Grid.Row="1">
+                    <Grid x:Name="RedSweeperStatusAttributesGrid" Grid.Row="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
                             <ColumnDefinition />
@@ -93,19 +93,19 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
 
-                        <Label x:Name="RedShipItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
-                        <Label x:Name="RedShipMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
-                        <Label x:Name="RedShipBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
-                        <Label x:Name="RedShipArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
-                        <Label x:Name="RedShipShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
-                        <Label x:Name="RedShipAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
-                        <Label x:Name="RedShipState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
+                        <Label x:Name="RedSweeperItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
+                        <Label x:Name="RedSweeperMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
+                        <Label x:Name="RedSweeperBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
+                        <Label x:Name="RedSweeperArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
+                        <Label x:Name="RedSweeperShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
+                        <Label x:Name="RedSweeperAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
+                        <Label x:Name="RedSweeperState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
                     </Grid>
 
 
-                    <CollectionView ItemsSource="{Binding RedPlayer.Ships}" Grid.Row="2">
+                    <CollectionView ItemsSource="{Binding RedPlayer.Sweepers}" Grid.Row="2">
                         <CollectionView.ItemTemplate>
-                            <DataTemplate x:DataType="model:Ship">
+                            <DataTemplate x:DataType="model:Sweeper">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition />
@@ -121,7 +121,7 @@
                                     <Label Grid.Column="2" Text="{Binding ConstuctorModule_s}"></Label>
                                     <Label Grid.Column="3" Text="{Binding ArmorModule_s}"></Label>
                                     <Label Grid.Column="4" Text="{Binding ShieldModule_s}"></Label>
-                                    <Label Grid.Column="5" Text="{Binding AttackerModule_s}"></Label>
+                                    <Label Grid.Column="5" Text="{Binding WeaponModule_s}"></Label>
                                     <Label Grid.Column="6" Text="{Binding State_s}"></Label>
                                 </Grid>
                             </DataTemplate>
@@ -162,7 +162,7 @@
                         <Label x:Name="BlueMoney" Grid.Row="0" Grid.Column="3" Grid.ColumnSpan="3" Text="{Binding BluePlayer.Money, StringFormat='💰总经济： {0}'}" Style="{StaticResource littleAttributes}" />
                     </Grid>
 
-                    <Grid x:Name="BlueShipStatusAttributesGrid" Grid.Row="1">
+                    <Grid x:Name="BlueSweeperStatusAttributesGrid" Grid.Row="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
                             <ColumnDefinition />
@@ -173,18 +173,18 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
 
-                        <Label x:Name="BlueShipItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
-                        <Label x:Name="BlueShipMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
-                        <Label x:Name="BlueShipBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
-                        <Label x:Name="BlueShipArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
-                        <Label x:Name="BlueShipShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
-                        <Label x:Name="BlueShipAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
-                        <Label x:Name="BlueShipState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
+                        <Label x:Name="BlueSweeperItem" Grid.Row="1" Grid.Column="0" Text="单位👾" FontSize="Micro"/>
+                        <Label x:Name="BlueSweeperMining" Grid.Row="1" Grid.Column="1" Text="采集模块" FontSize="Micro"/>
+                        <Label x:Name="BlueSweeperBuild" Grid.Row="1" Grid.Column="2" Text="建造模块" FontSize="Micro"/>
+                        <Label x:Name="BlueSweeperArmor" Grid.Row="1" Grid.Column="3" Text="装甲模块" FontSize="Micro"/>
+                        <Label x:Name="BlueSweeperShield" Grid.Row="1" Grid.Column="4" Text="护盾模块" FontSize="Micro"/>
+                        <Label x:Name="BlueSweeperAttack" Grid.Row="1" Grid.Column="5" Text="攻击模块" FontSize="Micro"/>
+                        <Label x:Name="BlueSweeperState" Grid.Row="1" Grid.Column="6" Text="状态✨️" FontSize="Micro"/>
                     </Grid>
 
-                    <CollectionView ItemsSource="{Binding BluePlayer.Ships}" Grid.Row="2">
+                    <CollectionView ItemsSource="{Binding BluePlayer.Sweepers}" Grid.Row="2">
                         <CollectionView.ItemTemplate>
-                            <DataTemplate x:DataType="model:Ship">
+                            <DataTemplate x:DataType="model:Sweeper">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition />
@@ -200,7 +200,7 @@
                                     <Label Grid.Column="2" Text="{Binding ConstuctorModule_s}"></Label>
                                     <Label Grid.Column="3" Text="{Binding ArmorModule_s}"></Label>
                                     <Label Grid.Column="4" Text="{Binding ShieldModule_s}"></Label>
-                                    <Label Grid.Column="5" Text="{Binding AttackerModule_s}"></Label>
+                                    <Label Grid.Column="5" Text="{Binding WeaponModule_s}"></Label>
                                     <Label Grid.Column="6" Text="{Binding State_s}"></Label>
                                 </Grid>
                             </DataTemplate>
diff --git a/logic/Client/View/MainPage.xaml.cs b/logic/Client/View/MainPage.xaml.cs
index 855fec5e..e4b1b167 100644
--- a/logic/Client/View/MainPage.xaml.cs
+++ b/logic/Client/View/MainPage.xaml.cs
@@ -86,18 +86,18 @@ private void TestRefresh(object sender, EventArgs e)
         //                    mapPatches_[i, j].BackgroundColor = Colors.Blue; break; //Blue Home
         //                case MapPatchType.Ruin:
         //                    mapPatches_[i, j].BackgroundColor = Colors.Black; break; // Ruin
-        //                case MapPatchType.Shadow:
-        //                    mapPatches_[i, j].BackgroundColor = Colors.Gray; break; // Shadow
-        //                case MapPatchType.Asteroid:
-        //                    mapPatches_[i, j].BackgroundColor = Colors.Brown; break; // Asteroid
+        //                case MapPatchType.Grass:
+        //                    mapPatches_[i, j].BackgroundColor = Colors.Gray; break; // Grass
+        //                case MapPatchType.River:
+        //                    mapPatches_[i, j].BackgroundColor = Colors.Brown; break; // River
         //                case MapPatchType.Resource:
         //                    mapPatches_[i, j].BackgroundColor = Colors.Yellow; break; //Resource
-        //                case MapPatchType.Factory:
+        //                case MapPatchType.RecycleBank:
         //                    mapPatches_[i, j].BackgroundColor = Colors.Orange; break; //Factiry
-        //                case MapPatchType.Community:
-        //                    mapPatches_[i, j].BackgroundColor = Colors.Chocolate; break; //Community
-        //                case MapPatchType.Fort:
-        //                    mapPatches_[i, j].BackgroundColor = Colors.Azure; break; //Fort
+        //                case MapPatchType.ChargeStation:
+        //                    mapPatches_[i, j].BackgroundColor = Colors.Chocolate; break; //ChargeStation
+        //                case MapPatchType.SignalTower:
+        //                    mapPatches_[i, j].BackgroundColor = Colors.Azure; break; //SignalTower
         //                default:
         //                    break;
         //            }
@@ -110,18 +110,18 @@ private void TestRefresh(object sender, EventArgs e)
         //{
         //    resourceArray = new Label[countMap[(int)MapPatchType.Resource]];
         //    resourcePositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Resource]];
-        //    factoryArray = new Label[countMap[(int)MapPatchType.Factory]];
-        //    factoryPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Factory]];
-        //    communityArray = new Label[countMap[(int)MapPatchType.Community]];
-        //    communityPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Community]];
-        //    fortArray = new Label[countMap[(int)MapPatchType.Fort]];
-        //    fortPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Fort]];
+        //    RecycleBankArray = new Label[countMap[(int)MapPatchType.RecycleBank]];
+        //    RecycleBankPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.RecycleBank]];
+        //    ChargeStationArray = new Label[countMap[(int)MapPatchType.ChargeStation]];
+        //    ChargeStationPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.ChargeStation]];
+        //    signaltowerArray = new Label[countMap[(int)MapPatchType.SignalTower]];
+        //    signaltowerPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.SignalTower]];
 
 
         //    int counterOfResource = 0;
-        //    int counterOfFactory = 0;
-        //    int counterOfCommunity = 0;
-        //    int counterOfFort = 0;
+        //    int counterOfRecycleBank = 0;
+        //    int counterOfChargeStation = 0;
+        //    int counterOfSignalTower = 0;
 
 
         //    int[,] todrawMap;
@@ -147,10 +147,10 @@ private void TestRefresh(object sender, EventArgs e)
         //                    mapPatches[i, j].Color = Colors.Blue; break; //Blue Home
         //                case MapPatchType.Ruin:
         //                    mapPatches[i, j].Color = Colors.Black; break; // Ruin
-        //                case MapPatchType.Shadow:
-        //                    mapPatches[i, j].Color = Colors.Gray; break; // Shadow
-        //                case MapPatchType.Asteroid:
-        //                    mapPatches[i, j].Color = Colors.Brown; break; // Asteroid
+        //                case MapPatchType.Grass:
+        //                    mapPatches[i, j].Color = Colors.Gray; break; // Grass
+        //                case MapPatchType.River:
+        //                    mapPatches[i, j].Color = Colors.Brown; break; // River
         //                case MapPatchType.Resource:
         //                    mapPatches[i, j].Color = Colors.Yellow; //Resource
         //                    resourcePositionIndex[counterOfResource] = (i, j);
@@ -169,10 +169,10 @@ private void TestRefresh(object sender, EventArgs e)
         //                    counterOfResource++;
         //                    break;
 
-        //                case MapPatchType.Factory:
-        //                    mapPatches[i, j].Color = Colors.Orange; //Factory
-        //                    factoryPositionIndex[counterOfFactory] = (i, j);
-        //                    factoryArray[counterOfFactory] = new Label()
+        //                case MapPatchType.RecycleBank:
+        //                    mapPatches[i, j].Color = Colors.Orange; //RecycleBank
+        //                    RecycleBankPositionIndex[counterOfRecycleBank] = (i, j);
+        //                    RecycleBankArray[counterOfRecycleBank] = new Label()
         //                    {
         //                        FontSize = unitFontSize,
         //                        WidthRequest = unitWidth,
@@ -184,13 +184,13 @@ private void TestRefresh(object sender, EventArgs e)
         //                        VerticalTextAlignment = TextAlignment.Center,
         //                        BackgroundColor = Colors.Transparent
         //                    };
-        //                    counterOfFactory++;
+        //                    counterOfRecycleBank++;
         //                    break;
 
-        //                case MapPatchType.Community:
-        //                    mapPatches[i, j].Color = Colors.Chocolate; //Community
-        //                    factoryPositionIndex[counterOfCommunity] = (i, j);
-        //                    factoryArray[counterOfCommunity] = new Label()
+        //                case MapPatchType.ChargeStation:
+        //                    mapPatches[i, j].Color = Colors.Chocolate; //ChargeStation
+        //                    RecycleBankPositionIndex[counterOfChargeStation] = (i, j);
+        //                    RecycleBankArray[counterOfChargeStation] = new Label()
         //                    {
         //                        FontSize = unitFontSize,
         //                        WidthRequest = unitWidth,
@@ -202,13 +202,13 @@ private void TestRefresh(object sender, EventArgs e)
         //                        VerticalTextAlignment = TextAlignment.Center,
         //                        BackgroundColor = Colors.Transparent
         //                    };
-        //                    counterOfCommunity++;
+        //                    counterOfChargeStation++;
         //                    break;
 
-        //                case MapPatchType.Fort:
-        //                    mapPatches[i, j].Color = Colors.Azure; //Fort
-        //                    factoryPositionIndex[counterOfFort] = (i, j);
-        //                    factoryArray[counterOfFort] = new Label()
+        //                case MapPatchType.SignalTower:
+        //                    mapPatches[i, j].Color = Colors.Azure; //SignalTower
+        //                    RecycleBankPositionIndex[counterOfSignalTower] = (i, j);
+        //                    RecycleBankArray[counterOfSignalTower] = new Label()
         //                    {
         //                        FontSize = unitFontSize,
         //                        WidthRequest = unitWidth,
@@ -220,7 +220,7 @@ private void TestRefresh(object sender, EventArgs e)
         //                        VerticalTextAlignment = TextAlignment.Center,
         //                        BackgroundColor = Colors.Transparent
         //                    };
-        //                    counterOfFort++;
+        //                    counterOfSignalTower++;
         //                    break;
 
         //                default:
@@ -240,7 +240,7 @@ private void TestRefresh(object sender, EventArgs e)
         //        {
         //            lock (drawPicLock)
         //            {
-        //                listOfShip.Clear();
+        //                listOfSweeper.Clear();
         //                //listOfBuilding.Clear();
         //                listOfBullet.Clear();
         //                listOfResource.Clear();
@@ -256,8 +256,8 @@ private void TestRefresh(object sender, EventArgs e)
         //                        {
         //                            switch (obj.MessageOfObjCase)
         //                            {
-        //                                case MessageOfObj.MessageOfObjOneofCase.ShipMessage:
-        //                                    listOfShip.Add(obj.ShipMessage);
+        //                                case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
+        //                                    listOfSweeper.Add(obj.SweeperMessage);
         //                                    break;
 
         //                                //case MessageOfObj.MessageOfObjOneofCase.BuildingMessage:
@@ -273,15 +273,15 @@ private void TestRefresh(object sender, EventArgs e)
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
-        //                                    listOfFactory.Add(obj.RecyclebankMessage);
+        //                                    listOfRecycleBank.Add(obj.RecyclebankMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
-        //                                    listOfCommunity.Add(obj.ChargestationMessage);
+        //                                    listOfChargeStation.Add(obj.ChargestationMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
-        //                                    listOfFort.Add(obj.SignaltowerMessage);
+        //                                    listOfSignalTower.Add(obj.SignaltowerMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.GarbageMessage:
@@ -300,9 +300,9 @@ private void TestRefresh(object sender, EventArgs e)
         //                        listOfAll.Add(content.AllMessage);
         //                        countMap.Clear();
         //                        countMap.Add((int)MapPatchType.Resource, listOfResource.Count);
-        //                        countMap.Add((int)MapPatchType.Factory, listOfFactory.Count);
-        //                        countMap.Add((int)MapPatchType.Community, listOfCommunity.Count);
-        //                        countMap.Add((int)MapPatchType.Fort, listOfFort.Count);
+        //                        countMap.Add((int)MapPatchType.RecycleBank, listOfRecycleBank.Count);
+        //                        countMap.Add((int)MapPatchType.ChargeStation, listOfChargeStation.Count);
+        //                        countMap.Add((int)MapPatchType.SignalTower, listOfSignalTower.Count);
         //                        //countMap.Add((int)MapPatchType.Building, listOfBuilding.Count);
         //                        GetMap(mapMassage);
         //                        break;
@@ -311,20 +311,20 @@ private void TestRefresh(object sender, EventArgs e)
         //                        {
         //                            switch (obj.MessageOfObjCase)
         //                            {
-        //                                case MessageOfObj.MessageOfObjOneofCase.ShipMessage:
-        //                                    listOfShip.Add(obj.ShipMessage);
+        //                                case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
+        //                                    listOfSweeper.Add(obj.SweeperMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
-        //                                    listOfFactory.Add(obj.RecyclebankMessage);
+        //                                    listOfRecycleBank.Add(obj.RecyclebankMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
-        //                                    listOfCommunity.Add(obj.ChargestationMessage);
+        //                                    listOfChargeStation.Add(obj.ChargestationMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
-        //                                    listOfFort.Add(obj.SignaltowerMessage);
+        //                                    listOfSignalTower.Add(obj.SignaltowerMessage);
         //                                    break;
 
         //                                //case MessageOfObj.MessageOfObjOneofCase.BuildingMessage:
@@ -358,9 +358,9 @@ private void TestRefresh(object sender, EventArgs e)
         //                        {
         //                            countMap.Clear();
         //                            countMap.Add((int)MapPatchType.Resource, listOfResource.Count);
-        //                            countMap.Add((int)MapPatchType.Factory, listOfFactory.Count);
-        //                            countMap.Add((int)MapPatchType.Community, listOfCommunity.Count);
-        //                            countMap.Add((int)MapPatchType.Fort, listOfFort.Count);
+        //                            countMap.Add((int)MapPatchType.RecycleBank, listOfRecycleBank.Count);
+        //                            countMap.Add((int)MapPatchType.ChargeStation, listOfChargeStation.Count);
+        //                            countMap.Add((int)MapPatchType.SignalTower, listOfSignalTower.Count);
         //                            GetMap(mapMassage);
         //                            mapMessageExist = false;
         //                        }
@@ -372,8 +372,8 @@ private void TestRefresh(object sender, EventArgs e)
         //                        {
         //                            switch (obj.MessageOfObjCase)
         //                            {
-        //                                case MessageOfObj.MessageOfObjOneofCase.ShipMessage:
-        //                                    listOfShip.Add(obj.ShipMessage);
+        //                                case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
+        //                                    listOfSweeper.Add(obj.SweeperMessage);
         //                                    break;
 
         //                                //case MessageOfObj.MessageOfObjOneofCase.BuildingMessage:
@@ -381,15 +381,15 @@ private void TestRefresh(object sender, EventArgs e)
         //                                //    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
-        //                                    listOfFactory.Add(obj.RecyclebankMessage);
+        //                                    listOfRecycleBank.Add(obj.RecyclebankMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
-        //                                    listOfCommunity.Add(obj.ChargestationMessage);
+        //                                    listOfChargeStation.Add(obj.ChargestationMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
-        //                                    listOfFort.Add(obj.SignaltowerMessage);
+        //                                    listOfSignalTower.Add(obj.SignaltowerMessage);
         //                                    break;
 
         //                                case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
@@ -444,11 +444,11 @@ private void TestRefresh(object sender, EventArgs e)
         //    return -1;
         //}
 
-        //private int FindIndexOfFactory(MessageOfRecycleBank obj)
+        //private int FindIndexOfRecycleBank(MessageOfRecycleBank obj)
         //{
-        //    for (int i = 0; i < listOfFactory.Count; i++)
+        //    for (int i = 0; i < listOfRecycleBank.Count; i++)
         //    {
-        //        if (factoryPositionIndex[i].x == obj.X && factoryPositionIndex[i].y == obj.Y)
+        //        if (RecycleBankPositionIndex[i].x == obj.X && RecycleBankPositionIndex[i].y == obj.Y)
         //        {
         //            return i;
         //        }
@@ -456,11 +456,11 @@ private void TestRefresh(object sender, EventArgs e)
         //    return -1;
         //}
 
-        //private int FindIndexOfCommunity(MessageOfChargeStation obj)
+        //private int FindIndexOfChargeStation(MessageOfChargeStation obj)
         //{
-        //    for (int i = 0; i < listOfCommunity.Count; i++)
+        //    for (int i = 0; i < listOfChargeStation.Count; i++)
         //    {
-        //        if (communityPositionIndex[i].x == obj.X && communityPositionIndex[i].y == obj.Y)
+        //        if (ChargeStationPositionIndex[i].x == obj.X && ChargeStationPositionIndex[i].y == obj.Y)
         //        {
         //            return i;
         //        }
@@ -468,11 +468,11 @@ private void TestRefresh(object sender, EventArgs e)
         //    return -1;
         //}
 
-        //private int FindIndexOfFort(MessageOfSignalTower obj)
+        //private int FindIndexOfSignalTower(MessageOfSignalTower obj)
         //{
-        //    for (int i = 0; i < listOfFort.Count; i++)
+        //    for (int i = 0; i < listOfSignalTower.Count; i++)
         //    {
-        //        if (fortPositionIndex[i].x == obj.X && fortPositionIndex[i].y == obj.Y)
+        //        if (signaltowerPositionIndex[i].x == obj.X && signaltowerPositionIndex[i].y == obj.Y)
         //        {
         //            return i;
         //        }
@@ -536,18 +536,18 @@ private void Refresh(object sender, EventArgs e)
                         //{
                         //    DrawResource(data);
                         //}
-                        ////foreach (var data in listOfShip)
+                        ////foreach (var data in listOfSweeper)
                         //{
                         //    if (data.TeamId == (long)PlayerTeam.Red)
                         //    {
-                        //        redPlayer.SetShipValue(data);
+                        //        redPlayer.SetSweeperValue(data);
                         //    }
                         //    else
                         //    {
-                        //        bluePlayer.SetShipValue(data);
+                        //        bluePlayer.SetSweeperValue(data);
                         //    }
                         //    // TODO: Dynamic change the ships' label
-                        //    DrawShip(data);
+                        //    DrawSweeper(data);
                         //}
                     }
                 }
@@ -579,46 +579,46 @@ private void Refresh(object sender, EventArgs e)
         //    //MapGrid.Children.Add(iconOfHome);
         //}
 
-        //private void DrawFactory(MessageOfRecycleBank data)
+        //private void DrawRecycleBank(MessageOfRecycleBank data)
         //{
         //    int hp = data.Hp;
         //    //TODO: calculate the percentage of Hp
-        //    int idx = FindIndexOfFactory(data);
-        //    factoryArray[idx].FontSize = unitFontSize;
-        //    factoryArray[idx].WidthRequest = unitWidth;
-        //    factoryArray[idx].HeightRequest = unitHeight;
-        //    factoryArray[idx].Text = Convert.ToString(hp);
-        //    factoryArray[idx].Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0);
-        //    factoryArray[idx].BackgroundColor = Colors.Chocolate;
-        //    //MapGrid.Children.Add(factoryArray[idx]);
+        //    int idx = FindIndexOfRecycleBank(data);
+        //    RecycleBankArray[idx].FontSize = unitFontSize;
+        //    RecycleBankArray[idx].WidthRequest = unitWidth;
+        //    RecycleBankArray[idx].HeightRequest = unitHeight;
+        //    RecycleBankArray[idx].Text = Convert.ToString(hp);
+        //    RecycleBankArray[idx].Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0);
+        //    RecycleBankArray[idx].BackgroundColor = Colors.Chocolate;
+        //    //MapGrid.Children.Add(RecycleBankArray[idx]);
         //}
 
-        //private void DrawCommunity(MessageOfChargeStation data)
+        //private void DrawChargeStation(MessageOfChargeStation data)
         //{
         //    int hp = data.Hp;
         //    //TODO: calculate the percentage of Hp
-        //    int idx = FindIndexOfCommunity(data);
-        //    communityArray[idx].FontSize = unitFontSize;
-        //    communityArray[idx].WidthRequest = unitWidth;
-        //    communityArray[idx].HeightRequest = unitHeight;
-        //    communityArray[idx].Text = Convert.ToString(hp);
-        //    communityArray[idx].Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0);
-        //    communityArray[idx].BackgroundColor = Colors.Green;
-        //    //MapGrid.Children.Add(communityArray[idx]);
+        //    int idx = FindIndexOfChargeStation(data);
+        //    ChargeStationArray[idx].FontSize = unitFontSize;
+        //    ChargeStationArray[idx].WidthRequest = unitWidth;
+        //    ChargeStationArray[idx].HeightRequest = unitHeight;
+        //    ChargeStationArray[idx].Text = Convert.ToString(hp);
+        //    ChargeStationArray[idx].Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0);
+        //    ChargeStationArray[idx].BackgroundColor = Colors.Green;
+        //    //MapGrid.Children.Add(ChargeStationArray[idx]);
         //}
 
-        //private void DrawFort(MessageOfSignalTower data)
+        //private void DrawSignalTower(MessageOfSignalTower data)
         //{
         //    int hp = data.Hp;
         //    //TODO: calculate the percentage of Hp
-        //    int idx = FindIndexOfFort(data);
-        //    fortArray[idx].FontSize = unitFontSize;
-        //    fortArray[idx].WidthRequest = unitWidth;
-        //    fortArray[idx].HeightRequest = unitHeight;
-        //    fortArray[idx].Text = Convert.ToString(hp);
-        //    fortArray[idx].Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0);
-        //    fortArray[idx].BackgroundColor = Colors.Azure;
-        //    //MapGrid.Children.Add(fortArray[idx]);
+        //    int idx = FindIndexOfSignalTower(data);
+        //    signaltowerArray[idx].FontSize = unitFontSize;
+        //    signaltowerArray[idx].WidthRequest = unitWidth;
+        //    signaltowerArray[idx].HeightRequest = unitHeight;
+        //    signaltowerArray[idx].Text = Convert.ToString(hp);
+        //    signaltowerArray[idx].Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0);
+        //    signaltowerArray[idx].BackgroundColor = Colors.Azure;
+        //    //MapGrid.Children.Add(signaltowerArray[idx]);
         //}
         //private void DrawBullet(MessageOfBullet data)
         //{
@@ -689,9 +689,9 @@ private void Refresh(object sender, EventArgs e)
         //    //MapGrid.Children.Add(resourceArray[idx]);
         //}
 
-        //private void DrawShip(MessageOfShip data)
+        //private void DrawSweeper(MessgaeOfSweeper data)
         //{
-        //    //Ellipse iconOfShip = new()
+        //    //Ellipse iconOfSweeper = new()
         //    //{
         //    //    WidthRequest = 2 * characterRadiusTimes * unitWidth,
         //    //    HeightRequest = 2 * characterRadiusTimes * unitHeight,
@@ -700,12 +700,12 @@ private void Refresh(object sender, EventArgs e)
         //    //    Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0),
         //    //    Fill = (data.TeamId == (long)PlayerTeam.Red) ? Colors.Red : Colors.Blue
         //    //};
-        //    Label nameOfShip = new()
+        //    Label nameOfSweeper = new()
         //    {
         //        FontSize = unitFontSize,
         //        WidthRequest = unitWidth,
         //        HeightRequest = unitHeight,
-        //        Text = data.ShipType.ToString()[0] + data.PlayerId.ToString(),
+        //        Text = data.SweeperType.ToString()[0] + data.PlayerId.ToString(),
         //        HorizontalOptions = LayoutOptions.Start,
         //        VerticalOptions = LayoutOptions.Start,
         //        HorizontalTextAlignment = TextAlignment.Center,
@@ -713,8 +713,8 @@ private void Refresh(object sender, EventArgs e)
         //        BackgroundColor = Colors.Transparent,
         //        Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0)
         //    };
-        //    //MapGrid.Children.Add(iconOfShip);
-        //    //MapGrid.Children.Add(nameOfShip);
+        //    //MapGrid.Children.Add(iconOfSweeper);
+        //    //MapGrid.Children.Add(nameOfSweeper);
         //}
 
 
diff --git a/logic/Client/ViewModel/GeneralViewModel.cs b/logic/Client/ViewModel/GeneralViewModel.cs
index 8548ee56..5f9531c5 100644
--- a/logic/Client/ViewModel/GeneralViewModel.cs
+++ b/logic/Client/ViewModel/GeneralViewModel.cs
@@ -8,7 +8,7 @@
 using Protobuf;
 using Grpc.Core;
 using System.Diagnostics.Metrics;
-using CommunityToolkit.Mvvm.ComponentModel;
+using Client.Util;
 
 namespace Client.ViewModel
 {
@@ -60,12 +60,12 @@ public List<Link> Links
         }
 
         private long playerID;
-        private SweeperType shipType;
+        private SweeperType SweeperType;
         private long teamID;
         AvailableService.AvailableServiceClient? client;
         AsyncServerStreamingCall<MessageToClient>? responseStream;
         bool isSpectatorMode = false;
-        // 连接Server,comInfo[]的格式：0-ip 1- port 2-playerID 3-teamID 4-shipType
+        // 连接Server,comInfo[]的格式：0-ip 1- port 2-playerID 3-teamID 4-SweeperType
         public void ConnectToServer(string[] comInfo)
         {
             if (!isSpectatorMode && comInfo.Length != 5 || isSpectatorMode && comInfo.Length != 4)
@@ -86,7 +86,7 @@ public void ConnectToServer(string[] comInfo)
             //playerMsg.Y = 0;
             if (!isSpectatorMode)
             {
-                shipType = Convert.ToInt64(comInfo[4]) switch
+                SweeperType = Convert.ToInt64(comInfo[4]) switch
                 {
                     0 => SweeperType.NullSweeperType,
                     1 => SweeperType.CivilianSweeper,
@@ -94,19 +94,340 @@ public void ConnectToServer(string[] comInfo)
                     3 => SweeperType.FlagSweeper,
                     _ => SweeperType.NullSweeperType
                 };
-                playerMsg.SweeperType = shipType;
+                playerMsg.SweeperType = SweeperType;
             }
             responseStream = client.AddPlayer(playerMsg);
             isClientStocked = false;
         }
 
         int testcounter = 0;
+
+        private async void OnReceive()
+        {
+            try
+            {
+                while (responseStream != null && await responseStream.ResponseStream.MoveNext())
+                {
+                    lock (drawPicLock)
+                    {
+                        ballX += 20;
+                        ballY += 20;
+
+                        listOfAll.Clear();
+                        listOfSweeper.Clear();
+                        listOfBullet.Clear();
+                        listOfBombedBullet.Clear();
+                        listOfRecycleBank.Clear();
+                        listOfChargeStation.Clear();
+                        listOfSignalTower.Clear();
+                        listOfGarbage.Clear();
+                        listOfHome.Clear();
+                        listOfBridge.Clear();
+                        MessageToClient content = responseStream.ResponseStream.Current;
+                        MessageOfMap mapMassage = new();
+                        bool mapMessageExist = false;
+                        switch (content.GameState)
+                        {
+                            case GameState.GameStart:
+                                foreach (var obj in content.ObjMessage)
+                                {
+                                    switch (obj.MessageOfObjCase)
+                                    {
+                                        case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
+                                            listOfSweeper.Add(obj.SweeperMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
+                                            listOfBullet.Add(obj.BulletMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage:
+                                            listOfBombedBullet.Add(obj.BombedBulletMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
+                                            listOfRecycleBank.Add(obj.RecyclebankMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
+                                            listOfChargeStation.Add(obj.ChargestationMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
+                                            listOfSignalTower.Add(obj.SignaltowerMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.GarbageMessage:
+                                            listOfGarbage.Add(obj.GarbageMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.HomeMessage:
+                                            listOfHome.Add(obj.HomeMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.MapMessage:
+                                            mapMassage = obj.MapMessage;
+                                            break;
+                                    }
+                                }
+                                listOfAll.Add(content.AllMessage);
+                                countMap.Clear();
+                                countMap.Add((int)MapPatchType.Garbage, listOfGarbage.Count);
+                                countMap.Add((int)MapPatchType.RecycleBank, listOfRecycleBank.Count);
+                                countMap.Add((int)MapPatchType.ChargeStation, listOfChargeStation.Count);
+                                countMap.Add((int)MapPatchType.SignalTower, listOfSignalTower.Count);
+                                GetMap(mapMassage);
+                                break;
+                            case GameState.GameRunning:
+                                foreach (var obj in content.ObjMessage)
+                                {
+                                    switch (obj.MessageOfObjCase)
+                                    {
+                                        case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
+                                            listOfSweeper.Add(obj.SweeperMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
+                                            listOfRecycleBank.Add(obj.RecyclebankMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
+                                            listOfChargeStation.Add(obj.ChargestationMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
+                                            listOfSignalTower.Add(obj.SignaltowerMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
+                                            listOfBullet.Add(obj.BulletMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage:
+                                            listOfBombedBullet.Add(obj.BombedBulletMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.GarbageMessage:
+                                            listOfGarbage.Add(obj.GarbageMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.HomeMessage:
+                                            listOfHome.Add(obj.HomeMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.MapMessage:
+                                            mapMassage = obj.MapMessage;
+                                            mapMessageExist = true;
+                                            break;
+                                    }
+                                }
+                                listOfAll.Add(content.AllMessage);
+                                if (mapMessageExist)
+                                {
+                                    countMap.Clear();
+                                    countMap.Add((int)MapPatchType.Garbage, listOfGarbage.Count);
+                                    countMap.Add((int)MapPatchType.RecycleBank, listOfRecycleBank.Count);
+                                    countMap.Add((int)MapPatchType.ChargeStation, listOfChargeStation.Count);
+                                    countMap.Add((int)MapPatchType.SignalTower, listOfSignalTower.Count);
+                                    GetMap(mapMassage);
+                                    mapMessageExist = false;
+                                }
+                                break;
+
+                            case GameState.GameEnd:
+                                //DisplayAlert("Info", "Game End", "OK");
+                                foreach (var obj in content.ObjMessage)
+                                {
+                                    switch (obj.MessageOfObjCase)
+                                    {
+                                        case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
+                                            listOfSweeper.Add(obj.SweeperMessage);
+                                            break;
+
+                                        //case MessageOfObj.MessageOfObjOneofCase.BuildingMessage:
+                                        //    listOfBuilding.Add(obj.BuildingMessage);
+                                        //    break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
+                                            listOfRecycleBank.Add(obj.RecyclebankMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
+                                            listOfChargeStation.Add(obj.ChargestationMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
+                                            listOfSignalTower.Add(obj.SignaltowerMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
+                                            listOfBullet.Add(obj.BulletMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage:
+                                            listOfBombedBullet.Add(obj.BombedBulletMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.GarbageMessage:
+                                            listOfGarbage.Add(obj.GarbageMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.HomeMessage:
+                                            listOfHome.Add(obj.HomeMessage);
+                                            break;
+
+                                        case MessageOfObj.MessageOfObjOneofCase.MapMessage:
+                                            mapMassage = obj.MapMessage;
+                                            break;
+                                    }
+                                }
+                                listOfAll.Add(content.AllMessage);
+                                break;
+                        }
+                    }
+                    if (responseStream == null)
+                    {
+                        throw new Exception("Unconnected");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                /* 
+                    #TODO
+                    Show the error message
+                */
+            }
+        }
+
+        private void Refresh(object sender, EventArgs e)
+        {
+            try
+            {
+                lock (drawPicLock)
+                {
+                    //if (UIinitiated)
+                    //{
+                    //    redPlayer.SlideLengthSet();
+                    //    bluePlayer.SlideLengthSet();
+                    //    gameStatusBar.SlideLengthSet();
+                    //}
+                    if (!isClientStocked)
+                    {
+                        if (!hasDrawn && getMapFlag)
+                        {
+                            //PureDrawMap(defaultMap);
+                            hasDrawn = true;
+                        }
+
+                        foreach (var data in listOfAll)
+                        {
+                            RedPlayer.Money = data.RedTeamEnergy;
+                            RedPlayer.Hp = data.RedHomeHp;
+                            RedPlayer.Score = data.RedTeamScore;
+                            BluePlayer.Money = data.BlueTeamEnergy;
+                            BluePlayer.Hp = data.BlueHomeHp;
+                            BluePlayer.Score = data.BlueTeamScore;
+                        }
+
+                        foreach (var data in listOfHome)
+                        {
+                            DrawHome(data);
+                            if (data.TeamId == (long)PlayerTeam.Red)
+                            {
+                                RedPlayer.Team = data.TeamId;
+                            }
+                            else if (data.TeamId == (long)PlayerTeam.Blue)
+                            {
+                                BluePlayer.Team = data.TeamId;
+                            }
+                        }
+
+                        foreach (var data in listOfSweeper)
+                        {
+                            if (data.TeamId == (long)PlayerTeam.Red)
+                            {
+                                Sweeper ship = new Sweeper
+                                {
+                                    Type = data.SweeperType,
+                                    State = data.SweeperState,
+                                    ArmorModule = data.ArmorType,
+                                    ShieldModule = data.ShieldType,
+                                    WeaponModule = data.WeaponType,
+                                    ProducerModule = data.ProducerType,
+                                    ConstuctorModule = data.ConstructorType,
+                                    Type_s = UtilInfo.SweeperTypeNameDict[data.SweeperType],
+                                    State_s = UtilInfo.SweeperStateNameDict[data.SweeperState],
+                                    ArmorModule_s = UtilInfo.SweeperArmorTypeNameDict[data.ArmorType],
+                                    ShieldModule_s = UtilInfo.SweeperShieldTypeNameDict[data.ShieldType],
+                                    WeaponModule_s = UtilInfo.SweeperWeaponTypeNameDict[data.WeaponType],
+                                    ConstuctorModule_s = UtilInfo.SweeperConstructorNameDict[data.ConstructorType],
+                                    ProducerModule_s = UtilInfo.SweeperProducerTypeNameDict[data.ProducerType]
+                                };
+                                RedPlayer.Sweepers.Add(ship);
+                            }
+                            else if (data.TeamId == (long)PlayerTeam.Blue)
+                            {
+                                Sweeper ship = new Sweeper
+                                {
+                                    Type = data.SweeperType,
+                                    State = data.SweeperState,
+                                    ArmorModule = data.ArmorType,
+                                    ShieldModule = data.ShieldType,
+                                    WeaponModule = data.WeaponType,
+                                    ProducerModule = data.ProducerType,
+                                    ConstuctorModule = data.ConstructorType,
+                                    Type_s = UtilInfo.SweeperTypeNameDict[data.SweeperType],
+                                    State_s = UtilInfo.SweeperStateNameDict[data.SweeperState],
+                                    ArmorModule_s = UtilInfo.SweeperArmorTypeNameDict[data.ArmorType],
+                                    ShieldModule_s = UtilInfo.SweeperShieldTypeNameDict[data.ShieldType],
+                                    WeaponModule_s = UtilInfo.SweeperWeaponTypeNameDict[data.WeaponType],
+                                    ConstuctorModule_s = UtilInfo.SweeperConstructorNameDict[data.ConstructorType],
+                                    ProducerModule_s = UtilInfo.SweeperProducerTypeNameDict[data.ProducerType]
+                                };
+                                BluePlayer.Sweepers.Add(ship);
+                            }
+                        }
+
+                        foreach (var data in listOfChargeStation)
+                        {
+                            DrawChargeStation(data);
+                        }
+
+                        foreach (var data in listOfRecycleBank)
+                        {
+                            DrawRecycleBank(data);
+                        }
+
+                        foreach (var data in listOfBridge)
+                        {
+                            DrawWormHole(data);
+                        }
+
+                        foreach (var data in listOfSignalTower)
+                        {
+                            DrawSignalTower(data);
+                        }
+
+                        foreach (var data in listOfGarbage)
+                        {
+                            DrawResource(data);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+
+            }
+            //counter++;
+        }
         private void UpdateTest(object sender, EventArgs e)
         {
             counterViewModelTest++;
-            if (!hasDrawn)
+            if (!hasDrawn && getMapFlag)
             {
-                PureDrawMap(GameMap.GameMapArray);
+                PureDrawMap(defaultMap);
                 hasDrawn = true;
             }
             if (testcounter < 30)
@@ -114,14 +435,14 @@ private void UpdateTest(object sender, EventArgs e)
                 testcounter++;
                 if (testcounter % 3 == 0)
                 {
-                    Ship ship = new Ship
+                    Sweeper ship = new Sweeper
                     {
-                        Type_s = "CivilShip",
+                        Type_s = "CivilSweeper",
                         State_s = "Idle",
                         ArmorModule_s = "LightArmor"
                     };
-                    RedPlayer.Ships.Add(ship);
-                    BluePlayer.Ships.Add(ship);
+                    RedPlayer.Sweepers.Add(ship);
+                    BluePlayer.Sweepers.Add(ship);
                 }
             }
             DrawHome(new MessageOfHome
@@ -132,7 +453,7 @@ private void UpdateTest(object sender, EventArgs e)
                 TeamId = 1
             });
 
-            //DrawFactory(new MessageOfRecycleBank
+            //DrawRecycleBank(new MessageOfRecycleBank
             //{
             //    X = 11,
             //    Y = 11,
@@ -147,12 +468,13 @@ private void UpdateTest(object sender, EventArgs e)
                 Hp = 100
             });
 
-            ballX += 1;
-            ballY += 1;
+            //ballX += 1;
+            //ballY += 1;
         }
 
         public GeneralViewModel()
         {
+            InitiateObjects();
             Title = "THUAI7";
             Links = [
                 new Link { Name = "天梯信息", Url = "" },
@@ -163,13 +485,13 @@ public GeneralViewModel()
             RedPlayer.Hp = 100;
             RedPlayer.Money = 1000;
 
-            Ship ship = new Ship
+            Sweeper ship = new Sweeper
             {
-                Type_s = "CivilShip",
+                Type_s = "CivilSweeper",
                 State_s = "Idle",
                 ArmorModule_s = "LightArmor"
             };
-            RedPlayer.Ships.Add(ship);
+            RedPlayer.Sweepers.Add(ship);
 
             WormHole1HP = 100;
             WormHole2HP = 100;
@@ -185,13 +507,22 @@ public GeneralViewModel()
                     });
                 }
             }
+            PureDrawMap(GameMap.GameMapArray);
 
-
+            ConnectToServer(new string[]{
+                "127.0.0.1",
+                "8888",
+                "1",
+                "1",
+                "1"
+            });
 
             timerViewModel = Dispatcher.CreateTimer();
             timerViewModel.Interval = TimeSpan.FromMilliseconds(5);
             timerViewModel.Tick += new EventHandler(UpdateTest);
             timerViewModel.Start();
+
+            OnReceive();
         }
     }
 }
diff --git a/logic/Client/ViewModel/MapViewModel.cs b/logic/Client/ViewModel/MapViewModel.cs
index b264a160..4a7497be 100644
--- a/logic/Client/ViewModel/MapViewModel.cs
+++ b/logic/Client/ViewModel/MapViewModel.cs
@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Dispatching;
 using Grpc.Core;
+using Client.Util;
 
 
 namespace Client.ViewModel
@@ -28,35 +29,35 @@ public partial class GeneralViewModel : BindableObject, IDrawable
     {
 
         private List<MessageOfAll> listOfAll;
-        private List<MessageOfSweeper> listOfShip;
+        private List<MessageOfSweeper> listOfSweeper;
         private List<MessageOfBullet> listOfBullet;
         private List<MessageOfBombedBullet> listOfBombedBullet;
-        private List<MessageOfRecycleBank> listOfFactory;
-        private List<MessageOfChargeStation> listOfCommunity;
-        private List<MessageOfSignalTower> listOfFort;
-        private List<MessageOfBridge> listOfWormhole;
-        private List<MessageOfGarbage> listOfResource;
+        private List<MessageOfRecycleBank> listOfRecycleBank;
+        private List<MessageOfSignalTower> listOfSignalTower;
+        private List<MessageOfChargeStation> listOfChargeStation;
+        private List<MessageOfBridge> listOfBridge;
+        private List<MessageOfGarbage> listOfGarbage;
         private List<MessageOfHome> listOfHome;
 
         /* initiate the Lists of Objects and CountList */
         private void InitiateObjects()
         {
             listOfAll = new List<MessageOfAll>();
-            listOfShip = new List<MessageOfSweeper>(); ;
+            listOfSweeper = new List<MessageOfSweeper>(); ;
             listOfBullet = new List<MessageOfBullet>();
             listOfBombedBullet = new List<MessageOfBombedBullet>();
-            listOfFactory = new List<MessageOfRecycleBank>();
-            listOfCommunity = new List<MessageOfChargeStation>();
-            listOfFort = new List<MessageOfSignalTower>();
-            listOfResource = new List<MessageOfGarbage>();
+            listOfRecycleBank = new List<MessageOfRecycleBank>();
+            listOfChargeStation = new List<MessageOfChargeStation>();
+            listOfSignalTower = new List<MessageOfSignalTower>();
+            listOfGarbage = new List<MessageOfGarbage>();
             listOfHome = new List<MessageOfHome>();
-            listOfWormhole = new List<MessageOfBridge>();
+            listOfBridge = new List<MessageOfBridge>();
             countMap = new Dictionary<int, int>();
         }
         private (int x, int y)[] resourcePositionIndex;
-        private (int x, int y)[] factoryPositionIndex;
-        private (int x, int y)[] communityPositionIndex;
-        private (int x, int y)[] fortPositionIndex;
+        private (int x, int y)[] RecycleBankPositionIndex;
+        private (int x, int y)[] ChargeStationPositionIndex;
+        private (int x, int y)[] SignalTowerPositionIndex;
         private (int x, int y)[] wormHolePositionIndex;
         private Dictionary<int, int> countMap;
 
@@ -103,7 +104,7 @@ public void Draw(ICanvas canvas, RectF dirtyRect)
                 BombRange = 5
             }, canvas);
 
-            DrawShip(new MessageOfSweeper
+            DrawSweeper(new MessageOfSweeper
             {
                 X = 10,
                 Y = 11,
@@ -119,13 +120,45 @@ public void Draw(ICanvas canvas, RectF dirtyRect)
                 BombRange = 5
             }, canvas);
 
-            DrawShip(new MessageOfSweeper
+            DrawSweeper(new MessageOfSweeper
             {
                 X = 10,
                 Y = 12,
                 Hp = 100,
                 TeamId = 1
             }, canvas);
+
+            listOfBullet.Add(new MessageOfBullet
+            {
+                X = 20,
+                Y = 20,
+                Type = BulletType.NullBulletType,
+                BombRange = 5
+            });
+
+            listOfSweeper.Add(new MessageOfSweeper
+            {
+                X = 10,
+                Y = 12,
+                Hp = 100,
+                TeamId = 1
+            });
+
+            if (listOfBullet.Count > 0)
+            {
+                foreach (var data in listOfBullet)
+                {
+                    DrawBullet(data, canvas);
+                }
+            }
+
+            if (listOfBullet.Count > 0)
+            {
+                foreach (var data in listOfSweeper)
+                {
+                    DrawSweeper(data, canvas);
+                }
+            }
         }
 
         private Dictionary<MapPatchType, Color> PatchColorDict = new Dictionary<MapPatchType, Color>
@@ -133,12 +166,12 @@ public void Draw(ICanvas canvas, RectF dirtyRect)
             {MapPatchType.RedHome, Colors.Red},
             {MapPatchType.BlueHome, Colors.Blue},
             {MapPatchType.Ruin, Colors.Black},
-            {MapPatchType.Shadow, Colors.Gray},
-            {MapPatchType.Asteroid, Colors.Brown},
-            {MapPatchType.Resource, Colors.Yellow},
-            {MapPatchType.Factory, Colors.Orange},
-            {MapPatchType.Community, Colors.Chocolate},
-            {MapPatchType.Fort, Colors.Azure},
+            {MapPatchType.Grass, Colors.Gray},
+            {MapPatchType.River, Colors.Brown},
+            {MapPatchType.Garbage, Colors.Yellow},
+            {MapPatchType.RecycleBank, Colors.Orange},
+            {MapPatchType.ChargeStation, Colors.Chocolate},
+            {MapPatchType.SignalTower, Colors.Azure},
             {MapPatchType.WormHole, Colors.Purple},
             {MapPatchType.Null, Colors.White}
         };
@@ -157,18 +190,18 @@ private void PureDrawMap(int[,] Map)
                             MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Blue; break; //Blue Home
                         case MapPatchType.Ruin:
                             MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Black; break; // Ruin
-                        case MapPatchType.Shadow:
-                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Gray; break; // Shadow
-                        case MapPatchType.Asteroid:
-                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Brown; break; // Asteroid
-                        case MapPatchType.Resource:
+                        case MapPatchType.Grass:
+                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Gray; break; // Grass
+                        case MapPatchType.River:
+                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Brown; break; // River
+                        case MapPatchType.Garbage:
                             MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Yellow; break; //Resource
-                        case MapPatchType.Factory:
-                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Orange; break; //Factory
-                        case MapPatchType.Community:
-                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Chocolate; break; //Community
-                        case MapPatchType.Fort:
-                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Azure; break; //Fort
+                        case MapPatchType.RecycleBank:
+                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Orange; break; //RecycleBank
+                        case MapPatchType.ChargeStation:
+                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Chocolate; break; //ChargeStation
+                        case MapPatchType.SignalTower:
+                            MapPatchesList[UtilFunctions.getIndex(i, j)].PatchColor = Colors.Azure; break; //SignalTower
                         default:
                             break;
                     }
@@ -180,18 +213,18 @@ private void PureDrawMap(int[,] Map)
         //{
         //    //resourceArray = new Label[countMap[(int)MapPatchType.Resource]];
         //    resourcePositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Resource]];
-        //    //factoryArray = new Label[countMap[(int)MapPatchType.Factory]];
-        //    factoryPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Factory]];
-        //    //communityArray = new Label[countMap[(int)MapPatchType.Community]];
-        //    communityPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Community]];
-        //    //fortArray = new Label[countMap[(int)MapPatchType.Fort]];
-        //    fortPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.Fort]];
+        //    //RecycleBankArray = new Label[countMap[(int)MapPatchType.RecycleBank]];
+        //    RecycleBankPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.RecycleBank]];
+        //    //ChargeStationArray = new Label[countMap[(int)MapPatchType.ChargeStation]];
+        //    ChargeStationPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.ChargeStation]];
+        //    //SignalTowerArray = new Label[countMap[(int)MapPatchType.SignalTower]];
+        //    SignalTowerPositionIndex = new (int x, int y)[countMap[(int)MapPatchType.SignalTower]];
 
 
         //    int counterOfResource = 0;
-        //    int counterOfFactory = 0;
-        //    int counterOfCommunity = 0;
-        //    int counterOfFort = 0;
+        //    int counterOfRecycleBank = 0;
+        //    int counterOfChargeStation = 0;
+        //    int counterOfSignalTower = 0;
 
 
         //    int[,] todrawMap;
@@ -209,10 +242,10 @@ private void PureDrawMap(int[,] Map)
         //                    mapPatches[i, j].PatchColor = Colors.Blue; break; //Blue Home
         //                case MapPatchType.Ruin:
         //                    mapPatches[i, j].PatchColor = Colors.Black; break; // Ruin
-        //                case MapPatchType.Shadow:
-        //                    mapPatches[i, j].PatchColor = Colors.Gray; break; // Shadow
-        //                case MapPatchType.Asteroid:
-        //                    mapPatches[i, j].PatchColor = Colors.Brown; break; // Asteroid
+        //                case MapPatchType.Grass:
+        //                    mapPatches[i, j].PatchColor = Colors.Gray; break; // Grass
+        //                case MapPatchType.River:
+        //                    mapPatches[i, j].PatchColor = Colors.Brown; break; // River
         //                case MapPatchType.Resource:
         //                    mapPatches[i, j].PatchColor = Colors.Yellow; //Resource
         //                    resourcePositionIndex[counterOfResource] = (i, j);
@@ -232,11 +265,11 @@ private void PureDrawMap(int[,] Map)
         //                    counterOfResource++;
         //                    break;
 
-        //                case MapPatchType.Factory:
-        //                    mapPatches[i, j].PatchColor = Colors.Orange; //Factory
-        //                    factoryPositionIndex[counterOfFactory] = (i, j);
+        //                case MapPatchType.RecycleBank:
+        //                    mapPatches[i, j].PatchColor = Colors.Orange; //RecycleBank
+        //                    RecycleBankPositionIndex[counterOfRecycleBank] = (i, j);
         //                    mapPatches[i, j].Text = "F";
-        //                    //factoryArray[counterOfFactory] = new Label()
+        //                    //RecycleBankArray[counterOfRecycleBank] = new Label()
         //                    //{
         //                    //    FontSize = unitFontSize,
         //                    //    WidthRequest = unitWidth,
@@ -248,14 +281,14 @@ private void PureDrawMap(int[,] Map)
         //                    //    VerticalTextAlignment = TextAlignment.Center,
         //                    //    BackgroundColor = Colors.Transparent
         //                    //};
-        //                    counterOfFactory++;
+        //                    counterOfRecycleBank++;
         //                    break;
 
-        //                case MapPatchType.Community:
-        //                    mapPatches[i, j].PatchColor = Colors.Chocolate; //Community
-        //                    communityPositionIndex[counterOfCommunity] = (i, j);
+        //                case MapPatchType.ChargeStation:
+        //                    mapPatches[i, j].PatchColor = Colors.Chocolate; //ChargeStation
+        //                    ChargeStationPositionIndex[counterOfChargeStation] = (i, j);
         //                    mapPatches[i, j].Text = "C";
-        //                    //factoryArray[counterOfCommunity] = new Label()
+        //                    //RecycleBankArray[counterOfChargeStation] = new Label()
         //                    //{
         //                    //    FontSize = unitFontSize,
         //                    //    WidthRequest = unitWidth,
@@ -267,14 +300,14 @@ private void PureDrawMap(int[,] Map)
         //                    //    VerticalTextAlignment = TextAlignment.Center,
         //                    //    BackgroundColor = Colors.Transparent
         //                    //};
-        //                    counterOfCommunity++;
+        //                    counterOfChargeStation++;
         //                    break;
 
-        //                case MapPatchType.Fort:
-        //                    mapPatches[i, j].PatchColor = Colors.Azure; //Fort
-        //                    fortPositionIndex[counterOfFort] = (i, j);
+        //                case MapPatchType.SignalTower:
+        //                    mapPatches[i, j].PatchColor = Colors.Azure; //SignalTower
+        //                    SignalTowerPositionIndex[counterOfSignalTower] = (i, j);
         //                    mapPatches[i, j].Text = "Fo";
-        //                    //fortArray[counterOfFort] = new Label()
+        //                    //SignalTowerArray[counterOfSignalTower] = new Label()
         //                    //{
         //                    //    FontSize = unitFontSize,
         //                    //    WidthRequest = unitWidth,
@@ -286,7 +319,7 @@ private void PureDrawMap(int[,] Map)
         //                    //    VerticalTextAlignment = TextAlignment.Center,
         //                    //    BackgroundColor = Colors.Transparent
         //                    //};
-        //                    counterOfFort++;
+        //                    counterOfSignalTower++;
         //                    break;
 
         //                default:
@@ -297,203 +330,9 @@ private void PureDrawMap(int[,] Map)
         //    }
         //}
 
-        private async void OnReceive()
-        {
-            try
-            {
-                CancellationToken cts = new CancellationToken();
-                while (responseStream != null && await responseStream.ResponseStream.MoveNext(cts))
-                {
-                    lock (drawPicLock)
-                    {
-                        listOfAll.Clear();
-                        listOfShip.Clear();
-                        listOfBullet.Clear();
-                        listOfBombedBullet.Clear();
-                        listOfFactory.Clear();
-                        listOfCommunity.Clear();
-                        listOfFort.Clear();
-                        listOfResource.Clear();
-                        listOfHome.Clear();
-                        listOfWormhole.Clear();
-                        MessageToClient content = responseStream.ResponseStream.Current;
-                        MessageOfMap mapMassage = new();
-                        bool mapMessageExist = false;
-                        switch (content.GameState)
-                        {
-                            case GameState.GameStart:
-                                foreach (var obj in content.ObjMessage)
-                                {
-                                    switch (obj.MessageOfObjCase)
-                                    {
-                                        case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
-                                            listOfShip.Add(obj.SweeperMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
-                                            listOfBullet.Add(obj.BulletMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage:
-                                            listOfBombedBullet.Add(obj.BombedBulletMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
-                                            listOfFactory.Add(obj.RecyclebankMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
-                                            listOfCommunity.Add(obj.ChargestationMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
-                                            listOfFort.Add(obj.SignaltowerMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.GarbageMessage:
-                                            listOfResource.Add(obj.GarbageMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.HomeMessage:
-                                            listOfHome.Add(obj.HomeMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.MapMessage:
-                                            mapMassage = obj.MapMessage;
-                                            break;
-                                    }
-                                }
-                                listOfAll.Add(content.AllMessage);
-                                countMap.Clear();
-                                countMap.Add((int)MapPatchType.Resource, listOfResource.Count);
-                                countMap.Add((int)MapPatchType.Factory, listOfFactory.Count);
-                                countMap.Add((int)MapPatchType.Community, listOfCommunity.Count);
-                                countMap.Add((int)MapPatchType.Fort, listOfFort.Count);
-                                GetMap(mapMassage);
-                                break;
-                            case GameState.GameRunning:
-                                foreach (var obj in content.ObjMessage)
-                                {
-                                    switch (obj.MessageOfObjCase)
-                                    {
-                                        case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
-                                            listOfShip.Add(obj.SweeperMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
-                                            listOfFactory.Add(obj.RecyclebankMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
-                                            listOfCommunity.Add(obj.ChargestationMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
-                                            listOfFort.Add(obj.SignaltowerMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
-                                            listOfBullet.Add(obj.BulletMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage:
-                                            listOfBombedBullet.Add(obj.BombedBulletMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.GarbageMessage:
-                                            listOfResource.Add(obj.GarbageMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.HomeMessage:
-                                            listOfHome.Add(obj.HomeMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.MapMessage:
-                                            mapMassage = obj.MapMessage;
-                                            mapMessageExist = true;
-                                            break;
-                                    }
-                                }
-                                listOfAll.Add(content.AllMessage);
-                                if (mapMessageExist)
-                                {
-                                    countMap.Clear();
-                                    countMap.Add((int)MapPatchType.Resource, listOfResource.Count);
-                                    countMap.Add((int)MapPatchType.Factory, listOfFactory.Count);
-                                    countMap.Add((int)MapPatchType.Community, listOfCommunity.Count);
-                                    countMap.Add((int)MapPatchType.Fort, listOfFort.Count);
-                                    GetMap(mapMassage);
-                                    mapMessageExist = false;
-                                }
-                                break;
-
-                            case GameState.GameEnd:
-                                //DisplayAlert("Info", "Game End", "OK");
-                                foreach (var obj in content.ObjMessage)
-                                {
-                                    switch (obj.MessageOfObjCase)
-                                    {
-                                        case MessageOfObj.MessageOfObjOneofCase.SweeperMessage:
-                                            listOfShip.Add(obj.SweeperMessage);
-                                            break;
-
-                                        //case MessageOfObj.MessageOfObjOneofCase.BuildingMessage:
-                                        //    listOfBuilding.Add(obj.BuildingMessage);
-                                        //    break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.RecyclebankMessage:
-                                            listOfFactory.Add(obj.RecyclebankMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.ChargestationMessage:
-                                            listOfCommunity.Add(obj.ChargestationMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.SignaltowerMessage:
-                                            listOfFort.Add(obj.SignaltowerMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.BulletMessage:
-                                            listOfBullet.Add(obj.BulletMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.BombedBulletMessage:
-                                            listOfBombedBullet.Add(obj.BombedBulletMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.GarbageMessage:
-                                            listOfResource.Add(obj.GarbageMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.HomeMessage:
-                                            listOfHome.Add(obj.HomeMessage);
-                                            break;
-
-                                        case MessageOfObj.MessageOfObjOneofCase.MapMessage:
-                                            mapMassage = obj.MapMessage;
-                                            break;
-                                    }
-                                }
-                                listOfAll.Add(content.AllMessage);
-                                break;
-                        }
-                    }
-                    if (responseStream == null)
-                    {
-                        throw new Exception("Unconnected");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                /* 
-                    #TODO
-                    Show the error message
-                */
-            }
-        }
 
-        //private int FindIndexOfResource(MessageOfGarbage obj)
+
+        //private int FindIndexOfResource(MessageOfResource obj)
         //{
         //    for (int i = 0; i < listOfResource.Count; i++)
         //    {
@@ -505,11 +344,11 @@ Show the error message
         //    return -1;
         //}
 
-        //private int FindIndexOfFactory(MessageOfRecycleBank obj)
+        //private int FindIndexOfRecycleBank(MessageOfRecycleBank obj)
         //{
-        //    for (int i = 0; i < listOfFactory.Count; i++)
+        //    for (int i = 0; i < listOfRecycleBank.Count; i++)
         //    {
-        //        if (factoryPositionIndex[i].x == obj.X && factoryPositionIndex[i].y == obj.Y)
+        //        if (RecycleBankPositionIndex[i].x == obj.X && RecycleBankPositionIndex[i].y == obj.Y)
         //        {
         //            return i;
         //        }
@@ -517,11 +356,11 @@ Show the error message
         //    return -1;
         //}
 
-        //private int FindIndexOfCommunity(MessageOfChargeStation obj)
+        //private int FindIndexOfChargeStation(MessageOfChargeStation obj)
         //{
-        //    for (int i = 0; i < listOfCommunity.Count; i++)
+        //    for (int i = 0; i < listOfChargeStation.Count; i++)
         //    {
-        //        if (communityPositionIndex[i].x == obj.X && communityPositionIndex[i].y == obj.Y)
+        //        if (ChargeStationPositionIndex[i].x == obj.X && ChargeStationPositionIndex[i].y == obj.Y)
         //        {
         //            return i;
         //        }
@@ -529,11 +368,11 @@ Show the error message
         //    return -1;
         //}
 
-        //private int FindIndexOfFort(MessageOfSignalTower obj)
+        //private int FindIndexOfSignalTower(MessgaeOfSignalTower obj)
         //{
-        //    for (int i = 0; i < listOfFort.Count; i++)
+        //    for (int i = 0; i < listOfSignalTower.Count; i++)
         //    {
-        //        if (fortPositionIndex[i].x == obj.X && fortPositionIndex[i].y == obj.Y)
+        //        if (SignalTowerPositionIndex[i].x == obj.X && SignalTowerPositionIndex[i].y == obj.Y)
         //        {
         //            return i;
         //        }
@@ -541,84 +380,7 @@ Show the error message
         //    return -1;
         //}
 
-        //private void Refresh(object sender, EventArgs e)
-        //{
-        //    try
-        //    {
-        //        lock (drawPicLock)
-        //        {
-        //            //if (UIinitiated)
-        //            //{
-        //            //    redPlayer.SlideLengthSet();
-        //            //    bluePlayer.SlideLengthSet();
-        //            //    gameStatusBar.SlideLengthSet();
-        //            //}
-        //            if (!isClientStocked)
-        //            {
-        //                /* For Debug */
-        //                //if (MapGrid.Children.Count > 0)
-        //                //{
-        //                //    MapGrid.Children.Clear();
-        //                //}
-        //                //foreach (var data in listOfAll)
-        //                //{
-        //                //    gameStatusBar.SetGameTimeValue(data);
-        //                //}
-        //                /* For Debug */
-        //                //if (!hasDrawed && mapFlag)
-        //                //{ 
-        //                //    DrawMap();
-        //                //}
-        //                if (!hasDrawed)
-        //                {
-        //                    PureDrawMap();
-        //                }
-        //                //foreach (var data in listOfHome)
-        //                //{
-        //                //    if (data.TeamId == (long)PlayerTeam.Red)
-        //                //    {
-        //                //        redPlayer.SetPlayerValue(data);
-        //                //    }
-        //                //    else
-        //                //    {
-        //                //        bluePlayer.SetPlayerValue(data);
-        //                //    }
-        //                //    DrawHome(data);
-        //                //}
-        //                foreach (var data in listOfBombedBullet)
-        //                {
-        //                    DrawBombedBullet(data);
-        //                }
-        //                foreach (var data in listOfBullet)
-        //                {
-        //                    DrawBullet(data);
-        //                }
-        //                foreach (var data in listOfResource)
-        //                {
-        //                    DrawResource(data);
-        //                }
-        //                //foreach (var data in listOfShip)
-        //                //{
-        //                //    if (data.TeamId == (long)PlayerTeam.Red)
-        //                //    {
-        //                //        redPlayer.SetShipValue(data);
-        //                //    }
-        //                //    else
-        //                //    {
-        //                //        bluePlayer.SetShipValue(data);
-        //                //    }
-        //                //    // TODO: Dynamic change the ships' label
-        //                //    DrawShip(data);
-        //                //}
-        //            }
-        //        }
-        //    }
-        //    finally
-        //    {
 
-        //    }
-        //    //counter++;
-        //}
 
         private void DrawHome(MessageOfHome data)
         {
@@ -647,7 +409,7 @@ private void DrawHome(MessageOfHome data)
             }
         }
 
-        private void DrawFactory(MessageOfRecycleBank data)
+        private void DrawRecycleBank(MessageOfRecycleBank data)
         {
             int x = data.X;
             int y = data.Y;
@@ -658,12 +420,12 @@ private void DrawFactory(MessageOfRecycleBank data)
             switch (team_id)
             {
                 case (long)PlayerTeam.Red:
-                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Factory];
+                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.RecycleBank];
                     MapPatchesList[index].TextColor = Colors.Red;
                     break;
 
                 case (long)PlayerTeam.Blue:
-                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Factory];
+                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.RecycleBank];
                     MapPatchesList[index].TextColor = Colors.Blue;
                     break;
 
@@ -674,7 +436,7 @@ private void DrawFactory(MessageOfRecycleBank data)
             }
         }
 
-        private void DrawCommunity(MessageOfChargeStation data)
+        private void DrawChargeStation(MessageOfChargeStation data)
         {
             int x = data.X;
             int y = data.Y;
@@ -685,12 +447,12 @@ private void DrawCommunity(MessageOfChargeStation data)
             switch (team_id)
             {
                 case (long)PlayerTeam.Red:
-                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Community];
+                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.ChargeStation];
                     MapPatchesList[index].TextColor = Colors.Red;
                     break;
 
                 case (long)PlayerTeam.Blue:
-                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Community];
+                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.ChargeStation];
                     MapPatchesList[index].TextColor = Colors.Blue;
                     break;
 
@@ -701,7 +463,7 @@ private void DrawCommunity(MessageOfChargeStation data)
             }
         }
 
-        private void DrawFort(MessageOfSignalTower data)
+        private void DrawSignalTower(MessageOfSignalTower data)
         {
             int x = data.X;
             int y = data.Y;
@@ -712,12 +474,12 @@ private void DrawFort(MessageOfSignalTower data)
             switch (team_id)
             {
                 case (long)PlayerTeam.Red:
-                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Fort];
+                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.SignalTower];
                     MapPatchesList[index].TextColor = Colors.Red;
                     break;
 
                 case (long)PlayerTeam.Blue:
-                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Fort];
+                    MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.SignalTower];
                     MapPatchesList[index].TextColor = Colors.Blue;
                     break;
 
@@ -746,7 +508,7 @@ private void DrawResource(MessageOfGarbage data)
             int hp = data.Progress;
             int index = UtilFunctions.getIndex(x, y);
             MapPatchesList[index].Text = Convert.ToString(hp);
-            MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Resource];
+            MapPatchesList[index].PatchColor = PatchColorDict[MapPatchType.Garbage];
             MapPatchesList[index].TextColor = Colors.White;
         }
 
@@ -779,7 +541,7 @@ private void DrawBullet(MessageOfBullet data, ICanvas canvas)
             canvas.FillCircle(x, y, 2);
         }
 
-        private void DrawShip(MessageOfSweeper data, ICanvas canvas)
+        private void DrawSweeper(MessageOfSweeper data, ICanvas canvas)
         {
             PointF point = UtilFunctions.getMapCenter(data.X, data.Y);
             float x = point.X;
@@ -806,104 +568,6 @@ private void DrawShip(MessageOfSweeper data, ICanvas canvas)
             canvas.DrawString(Convert.ToString(hp), x - 5, y - 5, 10, 10, HorizontalAlignment.Left, VerticalAlignment.Top);
         }
 
-        //private void DrawBullet(MessageOfBullet data)
-        //{
-        //    //Ellipse iconOfBullet = new()
-        //    //{
-        //    //    WidthRequest = 2 * bulletRadiusTimes * unitWidth,
-        //    //    HeightRequest = 2 * bulletRadiusTimes * unitHeight,
-        //    //    HorizontalOptions = LayoutOptions.Start,
-        //    //    VerticalOptions = LayoutOptions.Start,
-        //    //    Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * bulletRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * bulletRadiusTimes, 0, 0),
-        //    //    Fill = (data.TeamId == (long)PlayerTeam.Red) ? Colors.Red : Colors.Blue
-        //    //};
-        //    //switch (data.Type)
-        //    //{
-        //    //    case BulletType.Plasma:
-        //    //        iconOfBullet.Fill = Colors.Yellow;
-        //    //        break;
-        //    //    case BulletType.Laser:
-        //    //        iconOfBullet.Fill = Colors.Orange;
-        //    //        break;
-        //    //    case BulletType.Missile:
-        //    //        iconOfBullet.Fill = Colors.Purple;
-        //    //        break;
-        //    //    case BulletType.Arc:
-        //    //        iconOfBullet.Fill = Colors.Green;
-        //    //        break;
-        //    //}
-        //    //MapGrid.Children.Add(iconOfBullet);
-        //}
-
-        //private void DrawBombedBullet(MessageOfBombedBullet data)
-        //{
-        //    //Ellipse iconOfBombedBullet = new()
-        //    //{
-        //    //    WidthRequest = 2 * bulletRadiusTimes * unitWidth,
-        //    //    HeightRequest = 2 * bulletRadiusTimes * unitHeight,
-        //    //    HorizontalOptions = LayoutOptions.Start,
-        //    //    VerticalOptions = LayoutOptions.Start,
-        //    //    Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * bulletRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * bulletRadiusTimes, 0, 0),
-        //    //    Fill = (data.MappingId == (long)PlayerTeam.Red) ? Colors.Red : Colors.Blue
-        //    //};
-        //    //switch (data.Type)
-        //    //{
-        //    //    case BulletType.Plasma:
-        //    //        iconOfBombedBullet.Fill = Colors.Yellow;
-        //    //        break;
-        //    //    case BulletType.Laser:
-        //    //        iconOfBombedBullet.Fill = Colors.Orange;
-        //    //        break;
-        //    //    case BulletType.Missile:
-        //    //        iconOfBombedBullet.Fill = Colors.Purple;
-        //    //        break;
-        //    //    case BulletType.Arc:
-        //    //        iconOfBombedBullet.Fill = Colors.Green;
-        //    //        break;
-        //    //}
-        //    //MapGrid.Children.Add(iconOfBombedBullet);
-        //}
-
-        //private void DrawResource(MessageOfGarbage data)
-        //{
-        //    int idx = FindIndexOfResource(data);
-        //    //resourceArray[idx].FontSize = unitFontSize;
-        //    //resourceArray[idx].WidthRequest = unitWidth;
-        //    //resourceArray[idx].HeightRequest = unitHeight;
-        //    //resourceArray[idx].Text = Convert.ToString(data.Progress);
-        //    //resourceArray[idx].Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0);
-        //    //MapGrid.Children.Add(resourceArray[idx]);
-        //}
-
-        //private void DrawShip(MessageOfShip data)
-        //{
-        //    //Ellipse iconOfShip = new()
-        //    //{
-        //    //    WidthRequest = 2 * characterRadiusTimes * unitWidth,
-        //    //    HeightRequest = 2 * characterRadiusTimes * unitHeight,
-        //    //    HorizontalOptions = LayoutOptions.Start,
-        //    //    VerticalOptions = LayoutOptions.Start,
-        //    //    Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0),
-        //    //    Fill = (data.TeamId == (long)PlayerTeam.Red) ? Colors.Red : Colors.Blue
-        //    //};
-        //    Label nameOfShip = new()
-        //    {
-        //        FontSize = unitFontSize,
-        //        WidthRequest = unitWidth,
-        //        HeightRequest = unitHeight,
-        //        Text = data.ShipType.ToString()[0] + data.PlayerId.ToString(),
-        //        HorizontalOptions = LayoutOptions.Start,
-        //        VerticalOptions = LayoutOptions.Start,
-        //        HorizontalTextAlignment = TextAlignment.Center,
-        //        VerticalTextAlignment = TextAlignment.Center,
-        //        BackgroundColor = Colors.Transparent,
-        //        Margin = new Thickness(unitHeight * data.Y / 1000.0 - unitWidth * characterRadiusTimes, unitWidth * data.X / 1000.0 - unitWidth * characterRadiusTimes, 0, 0)
-        //    };
-        //    //MapGrid.Children.Add(iconOfShip);
-        //    //MapGrid.Children.Add(nameOfShip);
-        //}
-
-
         private bool isClientStocked = false;
         private bool hasDrawn = false;
         private bool getMapFlag = false;