Merge remote-tracking branch 'gitee/develop' into develop

Fork: 0

root / DungeonShooting

Browse code Merge remote-tracking branch 'gitee/develop' into develop # Conflicts: # DungeonShooting_Godot/resource/sprite/role/enemy0002/enemy0001.png.import # DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0005_Icon.png.import # DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0006_Debris.png.import # DungeonShooting_Godot/resource/sprite/role/enemy0007/dle.png.import # DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0005_Icon.png.import # DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0006_Debris.png.import # DungeonShooting_Godot/resource/sprite/role/role0002/eat/eat.png.import # DungeonShooting_Godot/resource/sprite/role/role0002/idle/idle.png.import # DungeonShooting_Godot/resource/sprite/role/role0002/run/Sprite.png.import develop
commit 402dfd92ce0d9b1dab6b6cef3a90b26ab3357af2 2 parents 575281a + 9912301 小李xl authored on 11 Apr 2024

Browse code

# Conflicts:
#	DungeonShooting_Godot/resource/sprite/role/enemy0002/enemy0001.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0005_Icon.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0006_Debris.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0007/dle.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0005_Icon.png.import
#	DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0006_Debris.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0002/eat/eat.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0002/idle/idle.png.import
#	DungeonShooting_Godot/resource/sprite/role/role0002/run/Sprite.png.import

develop

commit 402dfd92ce0d9b1dab6b6cef3a90b26ab3357af2

2 parents 575281a + 9912301

小李xl authored on 11 Apr 2024

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/bullet/normal/bullet0005.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0002/enemy0001.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0005_Icon.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0006/enemy0006_Debris.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0007/dle.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0005_Icon.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/enemy0007/enemy0006_Debris.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0002/eat/eat.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0002/idle/idle.png.import

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0002/run/Sprite.png.import

Show line notes below