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

Fork: 0

root / DungeonShooting

Browse code Merge branch '地图编辑器' of https://gitee.com/xlljc/DungeonShooting into 地图编辑器 # Conflicts: # DungeonShooting_Godot/resource/map/tileMaps/Test1/reward/Award1/Preview.png.import develop
commit 0d765f2cbc572f61c96d3cd997b769f531e3df19 2 parents 9d19424 + faff39f 王晗智 authored on 24 Jan 2024

Patch

Unified Split

Showing 21 changed files

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json
         "ErrorType": 0,
        "Path": "resource/map/tileMaps/Test1/outlet/End1"
      }
    ],
    "BossList": [],
    "BossList": [
      {
        "ErrorType": 0,
        "Path": "resource/map/tileMaps/Test1/boss/Boss1"
      }
    ],
    "RewardList": [
      {
        "ErrorType": 0,
        "Path": "resource/map/tileMaps/Test1/reward/Award1"
         "ErrorType": 0,
         "Path": "resource/map/tileMaps/Test1/outlet/End1"
       }
     ],
+    "BossList": [],
+    "BossList": [
+      {
+        "ErrorType": 0,
+        "Path": "resource/map/tileMaps/Test1/boss/Boss1"
+      }
+    ],
     "RewardList": [
       {
         "ErrorType": 0,
         "Path": "resource/map/tileMaps/Test1/reward/Award1"

Ignore Space Show notes View

■■■■■

DungeonShooting_Godot/resource/map/tileMaps/Test1/boss/Boss1/Preinstall.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/boss/Boss1/Preview.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/boss/Boss1/Preview.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/boss/Boss1/RoomInfo.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/boss/Boss1/TileInfo.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/Test1/reward/Award1/Preview.png.import

Ignore Space Show notes View DungeonShooting_Godot/src/framework/map/DungeonConfig.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/map/DungeonGenerator.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/map/DungeonRule.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/GameApplication.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/common/ui/EditorGridBg.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/manager/MapProjectManager.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/room/DefaultDungeonRule.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/room/DungeonManager.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/editorTileImage/ImageBg.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/mapEditorMapTile/FreeTileTab.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/tileSetEditorCombination/leftBottom/TileEditArea.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/tileSetEditorCombination/leftTop/TileEditCombination.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/tileSetEditorTerrain/down/TileEditArea.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/tileSetEditorTerrain/up/TileEditTerrain.cs

Show line notes below