Merge remote-tracking branch 'remotes/origin/master' into 游戏核心功能开发

Fork: 0

root / DungeonShooting

Browse code Merge remote-tracking branch 'remotes/origin/master' into 游戏核心功能开发 # Conflicts: # DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/Preinstall.json # DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/RoomInfo.json develop
commit 0e4139371e44971955bda83c5c58aec35d3726ad 2 parents cb8d976 + b66da6c 小李xl authored on 10 Sep 2023

Patch

Unified Split

Showing 25 changed files

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle1/Preinstall.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle1/Preview.png

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle1/TileInfo.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle2/Preinstall.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/Preinstall.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/RoomInfo.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/battle/Battle3/TileInfo.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/Start1/Preview.png

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/RoomInfo.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/TileInfo.json

Ignore Space Show notes View DungeonShooting_Godot/resource/material/Blend.gdshader

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/bullet/bullet0001.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/bullet/bullet0002.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/bullet/bullet0003.png

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/bullet/bullet2.png

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

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/Player.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/Role.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs

Show line notes below