Merge remote-tracking branch 'origin/master'

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

src/main/java/uno/mloluyu/characters/Character.java

@@ -0,0 +1,19 @@
+package uno.mloluyu.characters;
+
+/**
+ * @author mloluyu
+ * 玩家操作角色类的基类
+ */
+
+public class Character {
+    private int health;
+    public Character() {
+
+    }
+
+    //操纵人物移动
+    public void move(){}
+
+    //操作人物攻击
+    public void attack(){}
+}

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

@@ -13,7 +13,7 @@ public class GameCore implements ApplicationListener {
     @Override
     public void create() {
         batch = new SpriteBatch();
-        img = new Texture(Gdx.files.internal(""));
+        img = new Texture(Gdx.files.internal("src\\main\\resources\\assets\\badlogic.jpg"));
     }
 
     @Override

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

@@ -0,0 +1,5 @@
+package uno.mloluyu.desktop;
+
+public class Gaming {
+
+}

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

@@ -4,10 +4,12 @@ import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
 
 public class Launcher {
+    private static int width;
+    private static int height;
     public static void main(String[] args) {
         Lwjgl3ApplicationConfiguration configuration = new Lwjgl3ApplicationConfiguration();
         configuration.setTitle("Test Game");
-        configuration.setWindowedMode(800, 600);
+        configuration.setWindowedMode(1200, 800);
         configuration.setForegroundFPS(60);
         configuration.useVsync(true);
         new Lwjgl3Application(new GameCore(), configuration);

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

@@ -1,4 +1,5 @@
 package uno.mloluyu.network;
 
 public class ConnectServer {
+
 }