Browse code Merge remote-tracking branch 'remotes/github/develop4.1' into develop # Conflicts: # DungeonShooting_Godot/DungeonShooting.csproj develop
commit 26aa2f79033dc4ff9ea46e8d6d58c646fba87a9b 2 parents 2b086ae + d2fac7d 小李xl authored on 4 Oct 2023

Showing 55 changed files

• DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs
• DungeonShooting_Godot/prefab/ui/Main.tscn
• DungeonShooting_Godot/prefab/ui/PauseMenu.tscn
• DungeonShooting_Godot/project.godot
• DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/Preview.png
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/TileInfo.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preinstall.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preview.png
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/RoomInfo.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/TileInfo.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preinstall.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png.import
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/RoomInfo.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/TileInfo.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/outlet/End1/Preview.png
• DungeonShooting_Godot/resource/sprite/map/WallTransition1.png
• DungeonShooting_Godot/resource/sprite/map/WallTransition1.png.import
• DungeonShooting_Godot/resource/sprite/map/WallTransition2.png
• DungeonShooting_Godot/resource/sprite/map/WallTransition2.png.import
• DungeonShooting_Godot/resource/sprite/map/WallTransition3.png
• DungeonShooting_Godot/resource/sprite/map/WallTransition3.png.import
• DungeonShooting_Godot/scene/Main.tscn
• DungeonShooting_Godot/scene/World.tscn
• DungeonShooting_Godot/scene/test/TestRoomFog.tscn
• DungeonShooting_Godot/src/framework/activity/ActivityMaterial.cs
• DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
• DungeonShooting_Godot/src/framework/activity/ExternalForce.cs
• DungeonShooting_Godot/src/framework/activity/components/MoveController.cs
• DungeonShooting_Godot/src/framework/common/Utils.cs
• DungeonShooting_Godot/src/framework/coroutine/ProxyCoroutineHandler.cs
• DungeonShooting_Godot/src/framework/map/AffiliationArea.cs
• DungeonShooting_Godot/src/framework/map/DungeonGenerator.cs
• DungeonShooting_Godot/src/framework/map/DungeonTileMap.cs
• DungeonShooting_Godot/src/framework/map/TileCellInfo.cs
• DungeonShooting_Godot/src/framework/map/fog/RoomFogMask.cs
• DungeonShooting_Godot/src/framework/map/preinstall/RoomPreinstall.cs
• DungeonShooting_Godot/src/framework/map/room/RoomInfo.cs
• DungeonShooting_Godot/src/framework/ui/grid/IUiGrid.cs
• DungeonShooting_Godot/src/framework/ui/grid/UiGrid.cs
• DungeonShooting_Godot/src/game/GameApplication.cs
• DungeonShooting_Godot/src/game/activity/role/Role.cs
• DungeonShooting_Godot/src/game/activity/role/player/Player.cs
• DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
• DungeonShooting_Godot/src/game/manager/ResourcePath.cs
• DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs
• DungeonShooting_Godot/src/game/room/AutoTileConfig.cs
• DungeonShooting_Godot/src/game/room/DungeonManager.cs
• DungeonShooting_Godot/src/game/room/World.cs
• DungeonShooting_Godot/src/game/ui/main/Main.cs
• DungeonShooting_Godot/src/game/ui/mapEditor/tileView/EditorTileMap.cs
• DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs
• DungeonShooting_Godot/src/game/ui/pauseMenu/PauseMenu.cs
• DungeonShooting_Godot/src/game/ui/pauseMenu/PauseMenuPanel.cs

Ignore Space Show notes View DungeonShooting_Godot/addons/dungeonShooting_plugin/Plugin.cs

Ignore Space Show notes View DungeonShooting_Godot/prefab/ui/Main.tscn

Ignore Space Show notes View DungeonShooting_Godot/prefab/ui/PauseMenu.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/project.godot

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/Preview.png

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/TileInfo.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preinstall.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preview.png

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/RoomInfo.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/TileInfo.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preinstall.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/Preview.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/RoomInfo.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start2/TileInfo.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/outlet/End1/Preview.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/WallTransition1.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/WallTransition1.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/WallTransition2.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/WallTransition2.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/WallTransition3.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/WallTransition3.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/scene/Main.tscn

Ignore Space Show notes View DungeonShooting_Godot/scene/World.tscn

Ignore Space Show notes View DungeonShooting_Godot/scene/test/TestRoomFog.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/activity/ActivityMaterial.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/activity/ActivityObject.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/activity/ExternalForce.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/activity/components/MoveController.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/common/Utils.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/coroutine/ProxyCoroutineHandler.cs

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

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

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

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

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/framework/ui/grid/IUiGrid.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/ui/grid/UiGrid.cs

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/Role.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/player/Player.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs

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

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

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/main/Main.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/mapEditor/tileView/EditorTileMap.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/mapEditorMapMark/MapEditorMapMarkPanel.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/pauseMenu/PauseMenu.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/pauseMenu/PauseMenuPanel.cs 0 → 100644

Show line notes below