diff --git a/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json b/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json index 9b89740..f1a2f57 100644 --- a/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json +++ b/DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json @@ -28,6 +28,10 @@ { "ErrorType": 0, "Path": "resource/map/tileMaps/Test1/inlet/Start" + }, + { + "ErrorType": 1, + "Path": "resource/map/tileMaps/Test1/inlet/\u5927\u5385" } ], "OutletList": [ @@ -56,5 +60,17 @@ ], "EventList": [], "Remark": "" + }, + "\u521D\u59CB\u623F\u95F4": { + "GroupName": "\u521D\u59CB\u623F\u95F4", + "TileSet": "TileSet1", + "BattleList": [], + "InletList": [], + "OutletList": [], + "BossList": [], + "RewardList": [], + "ShopList": [], + "EventList": [], + "Remark": "" } } \ No newline at end of file diff --git "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/Preinstall.json" "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/Preinstall.json" new file mode 100644 index 0000000..7f4ab09 --- /dev/null +++ "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/Preinstall.json" @@ -0,0 +1 @@ +[{"Name":"Preinstall1","Weight":100,"Remark":"","AutoFill":true,"WaveList":[[{"Position":{"X":0,"Y":0},"Size":{"X":0,"Y":0},"SpecialMarkType":1,"DelayTime":0,"MarkList":[]}]]}] \ No newline at end of file diff --git "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/RoomInfo.json" "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/RoomInfo.json" new file mode 100644 index 0000000..3487256 --- /dev/null +++ "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/RoomInfo.json" @@ -0,0 +1 @@ +{"Position":{"X":0,"Y":0},"Size":{"X":0,"Y":0},"DoorAreaInfos":[],"GroupName":"Test1","RoomType":2,"RoomName":"\u5927\u5385","Weight":100,"Remark":""} \ No newline at end of file diff --git "a/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/TileInfo.json" "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/TileInfo.json" new file mode 100644 index 0000000..a60a0b2 --- /dev/null +++ "b/DungeonShooting_Godot/resource/map/tileMaps/Test1/inlet/\345\244\247\345\216\205/TileInfo.json" @@ -0,0 +1 @@ +{"NavigationVertices":[],"NavigationPolygon":[],"Floor":[],"Middle":[],"Top":[],"CustomFloor1":[],"CustomFloor2":[],"CustomFloor3":[],"CustomMiddle1":[],"CustomMiddle2":[],"CustomTop":[]} \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0030/weapon0030.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0030/weapon0030.png new file mode 100644 index 0000000..610a7fd --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0030/weapon0030.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0032/weapon0032.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0032/weapon0032.png new file mode 100644 index 0000000..760696c --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0032/weapon0032.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0033/weapon0033-export.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0033/weapon0033-export.png deleted file mode 100644 index e68983d..0000000 --- a/DungeonShooting_Godot/resource/sprite/weapon/weapon0033/weapon0033-export.png +++ /dev/null Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0041/weapon0041.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0041/weapon0041.png new file mode 100644 index 0000000..05fdade --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0041/weapon0041.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0042/weapon0042.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0042/weapon0042.png new file mode 100644 index 0000000..4d265af --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0042/weapon0042.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0043/weapon0043.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0043/weapon0043.png new file mode 100644 index 0000000..6019e03 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0043/weapon0043.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0044/weapon0044.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0044/weapon0044.png new file mode 100644 index 0000000..75d31d7 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0044/weapon0044.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0045/weapon0045.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0045/weapon0045.png new file mode 100644 index 0000000..b9861ff --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0045/weapon0045.png Binary files differ diff --git "a/DungeonShooting_Godot/resource/sprite/weapon/weapon0045/\345\255\220\345\274\271.png" "b/DungeonShooting_Godot/resource/sprite/weapon/weapon0045/\345\255\220\345\274\271.png" new file mode 100644 index 0000000..74ef08e --- /dev/null +++ "b/DungeonShooting_Godot/resource/sprite/weapon/weapon0045/\345\255\220\345\274\271.png" Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon0046/weapon0046.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon0046/weapon0046.png new file mode 100644 index 0000000..04f042d --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon0046/weapon0046.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon29/weapon0029.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon29/weapon0029.png new file mode 100644 index 0000000..455b075 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon29/weapon0029.png Binary files differ diff --git a/DungeonShooting_Godot/resource/sprite/weapon/weapon31/weapon0031.png b/DungeonShooting_Godot/resource/sprite/weapon/weapon31/weapon0031.png new file mode 100644 index 0000000..03369e9 --- /dev/null +++ b/DungeonShooting_Godot/resource/sprite/weapon/weapon31/weapon0031.png Binary files differ