Browse code Merge remote-tracking branch 'remotes/origin/master' into 地图编辑器 # Conflicts: # DungeonShooting_Godot/DungeonShooting.csproj # DungeonShooting_Godot/addons/dungeonShooting_plugin/generator/ExcelGenerator.cs develop
commit 0c480d8a7fca62832e4d6c8bb958351798530e79 2 parents 027d51c + 81114f5 小李xl authored on 18 Dec 2023

Showing 14 changed files

• .gitignore
• DungeonShooting_Godot/.gitignore
• DungeonShooting_Godot/DungeonShooting.csproj
• DungeonShooting_Godot/DungeonShooting.sln.DotSettings.user
• DungeonShooting_Godot/addons/dungeonShooting_plugin/generator/ExcelGenerator.cs
• DungeonShooting_Godot/excelTool/ExcelGenerator.cs
• DungeonShooting_Godot/excelTool/ExcelTool.csproj
• DungeonShooting_Godot/excelTool/Program.cs
• DungeonShooting_Godot/excelTool/serialize/SerializeColor.cs
• DungeonShooting_Godot/excelTool/serialize/SerializeVector2.cs
• DungeonShooting_Godot/excelTool/serialize/SerializeVector3.cs
• DungeonShooting_Godot/excelTool/version
• DungeonShooting_Godot/export_presets.cfg
• DungeonShooting_Godot/src/game/ui/editorTools/EditorToolsPanel.cs

Ignore Space Show notes View .gitignore

Ignore Space Show notes View DungeonShooting_Godot/.gitignore

Ignore Space Show notes View DungeonShooting_Godot/DungeonShooting.csproj

Show notes View DungeonShooting_Godot/DungeonShooting.sln.DotSettings.user 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/addons/dungeonShooting_plugin/generator/ExcelGenerator.cs

Ignore Space Show notes View DungeonShooting_Godot/excelTool/ExcelGenerator.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/excelTool/ExcelTool.csproj 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/excelTool/Program.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/excelTool/serialize/SerializeColor.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/excelTool/serialize/SerializeVector2.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/excelTool/serialize/SerializeVector3.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/excelTool/version 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/export_presets.cfg

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

Show line notes below