diff --git a/Desktop/App.xaml.cs b/Desktop/App.xaml.cs
index 5f34680..3401239 100644
--- a/Desktop/App.xaml.cs
+++ b/Desktop/App.xaml.cs
@@ -1,4 +1,5 @@
 using Oshima.FunGame.OshimaModules;
+using Oshima.FunGame.OshimaModules.Models;
 using Oshima.FunGame.OshimaServers.Service;
 using Application = System.Windows.Application;
 
@@ -14,7 +15,7 @@ namespace Milimoe.FunGame.Testing.Desktop
             sm.Load();
             ItemModule im = new();
             im.Load();
-            FunGameService.InitFunGame();
+            FunGameConstant.InitFunGame();
             FunGameSimulation.InitFunGameSimulation();
         }
     }
diff --git a/Library/Main.cs b/Library/Main.cs
index bea2f39..218e0f4 100644
--- a/Library/Main.cs
+++ b/Library/Main.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Milimoe.FunGame.Core.Api.Utility;
 using Milimoe.FunGame.Core.Entity;
-using Milimoe.FunGame.Core.Library.Constant;
 using Milimoe.FunGame.Core.Model;
 using Oshima.FunGame.OshimaMaps;
 using Oshima.FunGame.OshimaModules;
@@ -24,7 +23,7 @@ sm.Load();
 ItemModule im = new();
 im.Load();
 
-FunGameService.InitFunGame();
+FunGameConstant.InitFunGame();
 FunGameSimulation.InitFunGameSimulation();
 FunGameController controller = new(new Logger<FunGameController>(new LoggerFactory()));
 
@@ -124,7 +123,7 @@ while (true)
 {
     FunGameSimulation.IsDebug = true;
     DateTime start = DateTime.Now;
-    await FunGameSimulation.StartSimulationGame(true, false, true, false, useStore: false, hasMap: true);
+    await FunGameSimulation.StartSimulationGame(true, false, true, false, useStore: false, hasMap: false);
     DateTime end = DateTime.Now;
     Console.WriteLine("模拟时长" + (end - start).TotalSeconds + "秒");
     ConsoleKeyInfo key = Console.ReadKey();
@@ -134,7 +133,7 @@ while (true)
     }
     await Task.Delay(1);
     start = DateTime.Now;
-    await FunGameSimulation.StartSimulationGame(true, false, false, false, hasMap: true);
+    await FunGameSimulation.StartSimulationGame(true, false, false, false, hasMap: false);
     end = DateTime.Now;
     Console.WriteLine("模拟时长" + (end - start).TotalSeconds + "秒");
     key = Console.ReadKey();
diff --git a/Library/Tests/FunGameBO5.cs b/Library/Tests/FunGameBO5.cs
index 8ed151f..5549d49 100644
--- a/Library/Tests/FunGameBO5.cs
+++ b/Library/Tests/FunGameBO5.cs
@@ -15,7 +15,7 @@ namespace Milimoe.FunGame.Testing.Tests
             while (userlist.Count != 10)
             {
                 User user = Factory.GetUser();
-                user.Username = FunGameService.GenerateRandomChineseUserName();
+                user.Username = FunGameConstant.GenerateRandomChineseUserName();
                 userlist.Add(user);
             }
 
@@ -38,7 +38,7 @@ namespace Milimoe.FunGame.Testing.Tests
                     u1.Add(x);
                     if (u1.Count == 1)
                     {
-                        userTeams[u1] = FunGameService.GenerateRandomChineseUserName();
+                        userTeams[u1] = FunGameConstant.GenerateRandomChineseUserName();
                     }
                     Console.WriteLine($"{x} 加入了 {userTeams[u1]}");
                 }
@@ -47,7 +47,7 @@ namespace Milimoe.FunGame.Testing.Tests
                     u2.Add(x);
                     if (u2.Count == 1)
                     {
-                        userTeams[u2] = FunGameService.GenerateRandomChineseUserName();
+                        userTeams[u2] = FunGameConstant.GenerateRandomChineseUserName();
                     }
                     Console.WriteLine($"{x} 加入了 {userTeams[u2]}");
                 }
diff --git a/Library/Tests/HorseTest.cs b/Library/Tests/HorseTest.cs
index cfce2f8..ab1f8fd 100644
--- a/Library/Tests/HorseTest.cs
+++ b/Library/Tests/HorseTest.cs
@@ -1,7 +1,7 @@
 using Milimoe.FunGame.Core.Api.Utility;
 using Milimoe.FunGame.Core.Entity;
+using Oshima.FunGame.OshimaModules.Models;
 using Oshima.FunGame.OshimaServers.Model;
-using Oshima.FunGame.OshimaServers.Service;
 
 namespace Milimoe.FunGame.Testing.Tests
 {
@@ -17,7 +17,7 @@ namespace Milimoe.FunGame.Testing.Tests
             {
                 User user = Factory.GetUser();
                 user.Id = i;
-                user.Username = FunGameService.GenerateRandomChineseUserName();
+                user.Username = FunGameConstant.GenerateRandomChineseUserName();
                 room.UserAndIsReady.Add(user, true);
                 points[user] = 0;
                 if (i == 0) room.RoomMaster = user;