Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
#	src/main/java/uno/mloluyu/desktop/GameCore.java

src/main/java/uno/mloluyu/desktop/Launcher.java

@@ -15,3 +15,4 @@ public class Launcher {
         new Lwjgl3Application(new GameCore(), configuration);
     }
 }
+

src/main/java/uno/mloluyu/desktop/character/Alice.java

@@ -0,0 +1,11 @@
+package uno.mloluyu.desktop.character;
+
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.Sprite;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+
+public class Alice {
+    private SpriteBatch batch;
+    private Texture texture;
+    private Sprite sprite;
+}

src/main/java/uno/mloluyu/network/CreateServer.java

@@ -23,6 +23,7 @@ public class CreateServer {
             public void run() {
                 try {
                     clientSocket = serverSocket.accept(null);
+                    System.out.println("玩家连接"+clientSocket);
                     //连接上后在这里编写进入游戏界面的代码
                 } catch (Exception e) {