Merge remote-tracking branch 'origin/master'

# Conflicts:
#	target/classes/uno/mloluyu/characters/Alice.class
#	target/classes/uno/mloluyu/network/CreateServer$1.class
#	target/classes/uno/mloluyu/network/CreateServer.class

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

@@ -14,8 +14,7 @@ public class Alice extends Fighter {
         speed = 350f; // 速度更快
         maxHealth = 90; // 生命值较低
         health = maxHealth;
-        attackPower = 12; // 攻击力中等\
-
+        attackPower = 12; // 攻击力中等
     }
 
     @Override

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

@@ -2,16 +2,12 @@ package uno.mloluyu.characters;
 
 import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
-import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
 
-import uno.mloluyu.characters.Alice;
-import uno.mloluyu.characters.Fighter;
 
 public class AliceAnimationTest extends ApplicationAdapter {
 

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

@@ -18,7 +18,8 @@ public abstract class Fighter implements Disposable {
     public enum Action {
         IDLE, WALK, JUMP, FALL,
         ATTACK1, ATTACK2, ATTACK3, ATTACK4,
-        HIT, DEFEND,
+        HIT,
+        DEFEND,
         SPECIAL1, SPECIAL2,
         DEATH
     }

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

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