Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	src/main/java/uno/mloluyu/characters/Alice.java
#	src/main/java/uno/mloluyu/desktop/GameCore.java
#	src/main/java/uno/mloluyu/desktop/Launcher.java
#	target/classes/uno/mloluyu/characters/Alice.class
#	target/classes/uno/mloluyu/characters/Fighter$Action.class
#	target/classes/uno/mloluyu/characters/Fighter.class
#	target/classes/uno/mloluyu/desktop/GameCore.class
#	target/classes/uno/mloluyu/desktop/Launcher.class

...

This commit is contained in:

mloluyu

2025-09-22 14:51:35 +08:00

parent 8723b1354d 053d29398e

commit 3362cacc72

28 changed files with 2493 additions and 3422 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

target/classes/character/alice/alice-0.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.0 MiB

BIN

target/classes/character/alice/alice-1.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 MiB

1669

target/classes/character/alice/alice.atlas

File diff suppressed because it is too large Load Diff

BIN

target/classes/character/alice/精灵1.2-0.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 MiB

BIN

target/classes/character/alice/精灵1.2-1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.2 MiB

BIN

target/classes/character/alice/精灵1.2-2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.9 MiB

1078

target/classes/character/alice/精灵1.2.atlas Normal file

File diff suppressed because it is too large Load Diff

BIN

target/classes/character/alice/精灵1.2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 MiB

BIN

target/classes/uno/mloluyu/Controller/FighterController.class Normal file

Binary file not shown.

BIN

target/classes/uno/mloluyu/characters/AliceAnimationTest.class Normal file

Binary file not shown.

BIN

target/classes/uno/mloluyu/characters/Fighter$Action.class

Binary file not shown.

BIN

target/classes/uno/mloluyu/characters/Fighter.class

Binary file not shown.

BIN

target/classes/uno/mloluyu/desktop/GameCore.class Normal file

Binary file not shown.

BIN

target/classes/uno/mloluyu/desktop/Launcher.class Normal file

Binary file not shown.