替换地牢门素材

门, 更新素材

添加大厅背景

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

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

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

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武器制作中

左轮手枪

宝箱互动, 新的子弹击中逻辑

小修改

金币效果

制作0010武器完成

0010武器制作中

自定义房间生成规则, 开发中

删了txt

收到

武器归类

weapon0011/gun10.png

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

武器0010和武器0011

完成预设随机道具的基本功能

小修改