完成武器轮盘

修复进入第一个房间小地图不刷新的bug

1

1

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

# Conflicts:
#	DungeonShooting_Godot/resource/map/tileMaps/Test1/shop/Shop1/Preview.png
#	DungeonShooting_Godot/resource/map/tileMaps/Test1/shop/Shop1/TileInfo.json

1

修复从大厅带的武器进入地牢后扔在敌人敌人不会主动拾起的bug, 修复新创建的地牢房间在地图编辑器中无法正常编辑的bug

替换地牢门素材

结束房间生成出口标记, 并保存标记数据 (地牢中下一层的功能还未开发)

从大厅进入地牢保留玩家数据

大厅进入地牢流程开发中

大厅进入地牢

敌人正常使用弓箭

地牢生成器如果创建地牢失败会尝试10次重新创建, 弓箭回收效果

解决Tile层级显示错误

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

2格高墙壁, 开发中

2格高墙壁, 开发中

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

弓, 制作中

1

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

小修改

0011武器制作中