Browse code Merge remote-tracking branch 'origin_github/Ui核心功能开发' into 游戏核心功能开发 # Conflicts: # DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs # DungeonShooting_Godot/resource/theme/mainTheme.tres develop
commit 11378ab27c678150a2e5b05789df84a1b5680dec 2 parents 9436416 + e00dd0b 小李xl authored on 12 Mar 2023

Showing 17 changed files

• DungeonShooting_Godot/addons/dungeonShooting_plugin/Automation.cs
• DungeonShooting_Godot/prefab/ui/RoomUI.tscn
• DungeonShooting_Godot/resource/theme/mainTheme.tres
• DungeonShooting_Godot/src/framework/generator/ResourcePathGenerator.cs
• DungeonShooting_Godot/src/framework/generator/RoomPackGenerator.cs
• DungeonShooting_Godot/src/framework/generator/UiGenerator.cs
• DungeonShooting_Godot/src/framework/ui/UiBase.cs
• DungeonShooting_Godot/src/framework/ui/UiLayer.cs
• DungeonShooting_Godot/src/framework/ui/UiManager.cs
• DungeonShooting_Godot/src/framework/ui/UiMode.cs
• DungeonShooting_Godot/src/game/GameApplication.cs
• DungeonShooting_Godot/src/game/ui/ReloadBar.cs
• DungeonShooting_Godot/src/game/ui/RoomUI.cs
• DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs
• DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs
• DungeonShooting_Godot/src/test/TestUi/Test.cs
• DungeonShooting_Godot/src/test/TestUi/TestPanel.cs

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

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

Ignore Space Show notes View DungeonShooting_Godot/resource/theme/mainTheme.tres

Ignore Space Show notes View DungeonShooting_Godot/src/framework/generator/ResourcePathGenerator.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/generator/RoomPackGenerator.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/generator/UiGenerator.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/ui/UiBase.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/ui/UiLayer.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/ui/UiManager.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/framework/ui/UiMode.cs 0 → 100644

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

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

Show notes View DungeonShooting_Godot/src/game/ui/RoomUI.cs 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/roomUI/RoomUI.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/ui/roomUI/RoomUIPanel.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/test/TestUi/Test.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/test/TestUi/TestPanel.cs 0 → 100644

Show line notes below