Browse code Merge remote-tracking branch 'remotes/origin_gitee/develop4.1' into develop develop
commit 954e0a3bd1dcd86fa4417cc892c7c022aae69df0 2 parents 6c9eb3f + 65f0392 小李xl authored on 21 Sep 2023

Showing 25 changed files

• DungeonShooting_Godot/prefab/ui/PauseMenu.tscn
• DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preinstall.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/src/framework/activity/ActivityObject.cs
• DungeonShooting_Godot/src/framework/activity/components/MoveController.cs
• DungeonShooting_Godot/src/framework/coroutine/ProxyCoroutineHandler.cs
• DungeonShooting_Godot/src/framework/map/DungeonTileMap.cs
• DungeonShooting_Godot/src/framework/map/preinstall/RoomPreinstall.cs
• DungeonShooting_Godot/src/framework/ui/grid/UiGrid.cs
• DungeonShooting_Godot/src/game/GameApplication.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/DungeonManager.cs
• DungeonShooting_Godot/src/game/room/World.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/prefab/ui/PauseMenu.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.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/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/src/framework/activity/ActivityObject.cs

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/framework/map/preinstall/RoomPreinstall.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/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/DungeonManager.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/room/World.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