Merge remote-tracking branch 'origin/master'

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

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "java.configuration.updateBuildConfiguration": "interactive"
+    "java.configuration.updateBuildConfiguration": "interactive",
+    "java.debug.settings.onBuildFailureProceed": true
 }

pom.xml

@@ -1,32 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0">
+      
   <modelVersion>4.0.0</modelVersion>
+      
   <groupId>uno.mloluyu</groupId>
+      
   <artifactId>game</artifactId>
+      
   <version>1.0-SNAPSHOT</version>
+      
   <packaging>jar</packaging>
       
   <dependencies>
     <dependency>
       <groupId>com.badlogicgames.gdx</groupId>
       <artifactId>gdx</artifactId>
-            <version>1.12.1</version>
+      <version>${gdx.version}</version>
     </dependency>
     <dependency>
       <groupId>com.badlogicgames.gdx</groupId>
       <artifactId>gdx-backend-lwjgl3</artifactId>
-            <version>1.12.1</version>
+      <version>${gdx.version}</version>
     </dependency>
     <dependency>
       <groupId>com.badlogicgames.gdx</groupId>
       <artifactId>gdx-platform</artifactId>
-            <version>1.12.1</version>
+      <version>${gdx.version}</version>
       <classifier>natives-desktop</classifier>
     </dependency>
-        <dependency>
-            <groupId>com.badlogicgames.gdx</groupId>
-            <artifactId>gdx-tools</artifactId>
-            <version>1.13.5</version>
-        </dependency>
   </dependencies>
       
   <build>
@@ -36,17 +37,36 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.13.0</version>
         <configuration>
-                    <source>21</source>
-                    <target>21</target>
-                    <compilerArgs>--enable-preview</compilerArgs>
+          <!-- 建议使用与LibGDX兼容的JDK版本，11或17比较合适 -->
+          <source>17</source>
+          <target>17</target>
+          <!-- 移除不必要的预览特性，除非确实需要 -->
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <version>3.1.0</version>
         <configuration>
-                    <mainClass>uno.mloluyu.desktop.Launcher</mainClass> <!-- 替换为你的桌面启动器完整类名 -->
+          <!-- 确保这个类路径与你实际的Launcher类位置一致 -->
+          <!-- 例如：如果你的类文件在src/main/java/uno/mloluyu/Launcher.java -->
+          <mainClass>uno.mloluyu.Launcher</mainClass>
+        </configuration>
+      </plugin>
+      
+      <!-- 添加运行时类路径配置，解决类找不到问题 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.3.0</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>uno.mloluyu.Launcher</mainClass>
+            </manifest>
+          </archive>
         </configuration>
       </plugin>
     </plugins>

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) {