Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/uno/mloluyu/desktop/CharacterSelectScreen.java
#	src/main/java/uno/mloluyu/versatile/FighterController.java
This commit is contained in:
2025-09-26 00:20:44 +08:00
44 changed files with 3320 additions and 3538 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 MiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 MiB

View File

@@ -1,24 +0,0 @@
uiskin.png
format: RGBA8888
filter: Nearest,Nearest
repeat: none
button-up
rotate: false
xy: 0, 0
size: 200, 60
split: 10, 10, 10, 10
orig: 200, 60
offset: 0, 0
button-down
rotate: false
xy: 0, 60
size: 200, 60
split: 10, 10, 10, 10
orig: 200, 60
offset: 0, 0
white
rotate: false
xy: 0, 120
size: 1, 1
orig: 1, 1
offset: 0, 0

Binary file not shown.

View File

@@ -1,3 +1,2 @@
uno\mloluyu\network\ConnectServer.class
uno\mloluyu\characters\character\Fighter$1.class
uno\mloluyu\util\SimpleFormatter.class

View File

@@ -1,11 +1,5 @@
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\Action.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\AdvancedFighter.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\character\Action.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\character\Alice.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\character\Fighter.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\character\FighterAnimationManager.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\character\FighterList.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\character\Reimu.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\characters\SimpleFighter.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\desktop\CharacterSelectScreen.java
C:\Users\www\Documents\Game\Game\src\main\java\uno\mloluyu\desktop\DesktopLauncher.java