小修改

解决Tile层级显示错误

2格高墙壁, 开发中, 地牢加载部分基本完成

2格高墙壁, 开发中

2格高墙壁, 开发中

2格高墙壁, 开发中

2格高墙壁, 开发中

2格高墙壁, 开发中

修复删除组点击取消也还是会删除的bug

重新生成所有房间, 使其房间墙壁2格高

地牢编辑器2格墙壁支持

2格墙壁开发中

TileSet编辑器配置两格高的墙壁

小修改

小修改

更新readme

弓箭插在墙上和敌人身上的效果, 继续开发中

弓箭插在墙上和敌人身上的效果, 继续开发中

弓箭插在墙上和敌人身上的效果

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

弓, 制作中

子弹2

武器

1

修复导出windows平台运行报错的bug

Merge branch '地图编辑器' of https://gitee.com/xlljc/DungeonShooting into 地图编辑器 ...

# Conflicts:
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0016/gun4.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0017/gun5.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0018/gun6.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0019/gun7.png.import
#	DungeonShooting_Godot/resource/sprite/weapon/weapon0020/gun8.png.import

王晗智

小修改

0011武器制作中

左轮手枪