Browse code Merge branch 'develop' of https://gitee.com/xlljc/DungeonShooting into develop # Conflicts: # DungeonShooting_Godot/scene/Hall.tscn develop
commit 86c3e8d7fb23935ae6bef3a705233e2ea1665fb0 2 parents 1601af6 + 1f008f0 王晗智 authored on 9 Mar 2024

Showing 13 changed files

• DungeonShooting_Godot/prefab/ui/Encyclopedia.tscn
• DungeonShooting_Godot/prefab/ui/PauseMenu.tscn
• DungeonShooting_Godot/prefab/ui/WeaponRoulette.tscn
• DungeonShooting_Godot/src/game/manager/ResourcePath.cs
• DungeonShooting_Godot/src/game/manager/UiManager_Methods.cs
• DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs
• DungeonShooting_Godot/src/game/ui/encyclopedia/Encyclopedia.cs
• DungeonShooting_Godot/src/game/ui/encyclopedia/EncyclopediaPanel.cs
• DungeonShooting_Godot/src/game/ui/pauseMenu/PauseMenu.cs
• DungeonShooting_Godot/src/game/ui/pauseMenu/PauseMenuPanel.cs
• DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulette.cs
• DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulettePanel.cs
• DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponSlot.cs

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

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

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

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/ui/editorTools/EditorToolsPanel.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/encyclopedia/Encyclopedia.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/encyclopedia/EncyclopediaPanel.cs 0 → 100644

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulette.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponRoulettePanel.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/weaponRoulette/WeaponSlot.cs

Show line notes below