Merge remote-tracking branch 'origin/地图编辑器' into 地图编辑器

Fork: 0

root / DungeonShooting

Browse code Merge remote-tracking branch 'origin/地图编辑器' into 地图编辑器 # Conflicts: # DungeonShooting_Godot/resource/sprite/weapon/weapon0016/weapon0016.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0017/seapon0017t.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0018/weapon0018.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0019/weapon0019.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0020/weapon0020-export.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0020/weapon0020.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0021/weapon0021.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0022/weapon0022.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0023/weapon0023.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0033/weapon0033.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0034/weapon0034.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0035/weapon0035.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0036/weapon0036.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0037/weapon0037.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0038/weapon0038.1.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0038/weapon0038.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0039/weapon0039.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0039/weapon0039（1）.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0040/weapon0040,1.png.import # DungeonShooting_Godot/resource/sprite/weapon/weapon0040/weapon0040.png.import develop
commit daed47ffa6a0e0dd25ba1bce3d883c8ec28f1e7b 2 parents 5202aae + 14364d2 小李xl authored on 4 Feb 2024

Browse code

# Conflicts:
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0016/weapon0016.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0017/seapon0017t.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0018/weapon0018.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0019/weapon0019.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0020/weapon0020-export.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0020/weapon0020.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0021/weapon0021.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0022/weapon0022.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0023/weapon0023.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0033/weapon0033.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0034/weapon0034.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0035/weapon0035.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0036/weapon0036.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0037/weapon0037.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0038/weapon0038.1.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0038/weapon0038.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0039/weapon0039.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0039/weapon0039（1）.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0040/weapon0040,1.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0040/weapon0040.png.import

develop

commit daed47ffa6a0e0dd25ba1bce3d883c8ec28f1e7b

2 parents 5202aae + 14364d2

小李xl authored on 4 Feb 2024

Patch

Unified Split

Showing 16 changed files

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/大厅/Preinstall.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/大厅/RoomInfo.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/大厅/TileInfo.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0030/weapon0030.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0032/weapon0032.png 0 → 100644

Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0033/weapon0033-export.png 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0041/weapon0041.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0042/weapon0042.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0043/weapon0043.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0044/weapon0044.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0045/weapon0045.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0045/子弹.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon0046/weapon0046.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon29/weapon0029.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/weapon/weapon31/weapon0031.png 0 → 100644

Show line notes below