Browse code Merge remote-tracking branch 'remotes/origin/master' into 游戏核心功能开发 # Conflicts: # DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/Preview.png # DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/TileInfo.json # DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres develop
commit cb8d97628ea96f707140b3f0ac6e030d7e8698d4 2 parents 4d45e04 + 4ed6c97 小李xl authored on 8 Sep 2023

Showing 63 changed files

• DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
• DungeonShooting_Godot/excel/excelFile/Sound.xlsx
• DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
• DungeonShooting_Godot/export_presets.cfg
• DungeonShooting_Godot/prefab/role/Role0001.tscn
• DungeonShooting_Godot/prefab/ui/BottomTips.tscn
• DungeonShooting_Godot/resource/config/ActivityObject.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/Preview.png
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/TileInfo.json
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0002.png
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0002.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0003.png
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0003.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0004.png
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0004.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0005.png
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0005.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0006.png
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0006.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0007.png
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0007.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0008.png
• DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0008.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0002.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0002.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0003.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0003.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0004.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0004.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0005.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0005.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0006.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0006.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0007.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0007.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0008.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0008.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0009.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0009.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0010.png
• DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0010.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0002.png
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0002.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0003.png
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0003.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0004.png
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0004.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0005.png
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0005.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0006.png
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0006.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0007.png
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0007.png.import
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0008.png
• DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0008.png.import
• DungeonShooting_Godot/resource/spriteFrames/role/Role0001.tres
• DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres
• DungeonShooting_Godot/src/framework/map/serialize/DungeonRoomSplit.cs
• DungeonShooting_Godot/src/framework/ui/UiBase.cs
• DungeonShooting_Godot/src/game/GameApplication.cs
• DungeonShooting_Godot/src/game/camera/GameCamera.cs
• DungeonShooting_Godot/src/game/manager/MapProjectManager.cs
• DungeonShooting_Godot/src/game/ui/bottomTips/BottomTipsPanel.cs

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/Sound.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
Not supported

Ignore Space Show notes View DungeonShooting_Godot/export_presets.cfg

Ignore Space Show notes View DungeonShooting_Godot/prefab/role/Role0001.tscn

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

Ignore Space Show notes View DungeonShooting_Godot/resource/config/ActivityObject.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/sprite/role/role0001/idle/Sprite-0002.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0002.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0003.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0003.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0004.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0004.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0005.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0005.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0006.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0006.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0007.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0007.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0008.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/idle/Sprite-0008.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0002.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0002.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0003.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0003.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0004.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0004.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0005.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0005.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0006.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0006.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0007.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0007.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0008.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0008.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0009.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0009.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0010.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/roll/Sprite-0010.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0002.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0002.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0003.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0003.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0004.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0004.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0005.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0005.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0006.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0006.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0007.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0007.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0008.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/role/role0001/run/Sprite-0008.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/role/Role0001.tres

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/camera/GameCamera.cs

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

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

Show line notes below