Browse code !11 合并近期开发功能 Merge pull request !11 from 小李/develop develop
commit 6bb39517f878fc424c63d458e5a63d71b19a99e2 2 parents c3923d4 + e8f66ff 小李 authored on 20 Oct 2023 Gitee committed on 20 Oct 2023

Showing 63 changed files

• DungeonShooting_Document/开发日志.md
• DungeonShooting_ExcelTool/DungeonShooting_ExcelTool.csproj
• DungeonShooting_ExcelTool/ExcelGenerator.cs
• DungeonShooting_Godot/DungeonShooting.csproj
• DungeonShooting_Godot/DungeonShooting.csproj.old
• DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.deps.json
• DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.dll
• DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.exe
• DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.pdb
• DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.runtimeconfig.json
• DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
• DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx
• DungeonShooting_Godot/excel/excelFile/Sound.xlsx
• DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
• DungeonShooting_Godot/prefab/bullet/Bullet0001.tscn
• DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn
• DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn
• DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn
• DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn
• DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn
• DungeonShooting_Godot/prefab/role/Enemy0001.tscn
• DungeonShooting_Godot/prefab/ui/Setting.tscn
• DungeonShooting_Godot/prefab/weapon/WeaponTemplate.tscn
• DungeonShooting_Godot/resource/config/AiAttackAttr.json
• DungeonShooting_Godot/resource/config/Weapon.json
• DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preinstall.json
• DungeonShooting_Godot/resource/material/Blend.gdshader
• DungeonShooting_Godot/resource/sprite/map/door.png
• DungeonShooting_Godot/resource/sprite/map/door.png.import
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_EW.tres
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Down.tres
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_NS.tres
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_S.tres
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Down.tres
• DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Up.tres
• DungeonShooting_Godot/src/config/ExcelConfig.cs
• DungeonShooting_Godot/src/config/ExcelConfig_AiAttackAttr.cs
• DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs
• DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
• DungeonShooting_Godot/src/framework/activity/ActivityObject_Init.cs
• DungeonShooting_Godot/src/framework/activity/Component.cs
• DungeonShooting_Godot/src/framework/activity/components/MoveController.cs
• DungeonShooting_Godot/src/framework/activity/components/StateController.cs
• DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs
• DungeonShooting_Godot/src/framework/map/preinstall/RoomPreinstall.cs
• DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs
• DungeonShooting_Godot/src/game/activity/package/Package.cs
• DungeonShooting_Godot/src/game/activity/role/Role.cs
• DungeonShooting_Godot/src/game/activity/role/SubLine.cs
• DungeonShooting_Godot/src/game/activity/role/enemy/AiAttackState.cs
• DungeonShooting_Godot/src/game/activity/role/enemy/Enemy.cs
• DungeonShooting_Godot/src/game/activity/role/enemy/state/AiFollowUpState.cs
• DungeonShooting_Godot/src/game/activity/role/enemy/state/AiSurroundState.cs
• DungeonShooting_Godot/src/game/activity/role/enemy/state/AiTailAfterState.cs
• DungeonShooting_Godot/src/game/activity/role/player/Player.cs
• DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
• DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs
• DungeonShooting_Godot/src/game/manager/ResourcePath.cs
• DungeonShooting_Godot/src/game/room/RoomDoor.cs
• README.md

Ignore Space Show notes View DungeonShooting_Document/开发日志.md

Ignore Space Show notes View DungeonShooting_ExcelTool/DungeonShooting_ExcelTool.csproj

Ignore Space Show notes View DungeonShooting_ExcelTool/ExcelGenerator.cs

Ignore Space Show notes View DungeonShooting_Godot/DungeonShooting.csproj

Ignore Space Show notes View DungeonShooting_Godot/DungeonShooting.csproj.old 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.deps.json

Ignore Space Show notes View DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.dll
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.exe
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.pdb
Not supported

Ignore Space Show notes View DungeonShooting_Godot/excel/DungeonShooting_ExcelTool.runtimeconfig.json

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

Ignore Space Show notes View DungeonShooting_Godot/excel/excelFile/AiAttackAttr.xlsx 0 → 100644
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/prefab/bullet/Bullet0001.tscn

Ignore Space Show notes View DungeonShooting_Godot/prefab/bullet/Bullet0002.tscn

Ignore Space Show notes View DungeonShooting_Godot/prefab/map/RoomDoor_E.tscn

Ignore Space Show notes View DungeonShooting_Godot/prefab/map/RoomDoor_N.tscn

Ignore Space Show notes View DungeonShooting_Godot/prefab/map/RoomDoor_S.tscn

Ignore Space Show notes View DungeonShooting_Godot/prefab/map/RoomDoor_W.tscn

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

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

Ignore Space Show notes View DungeonShooting_Godot/prefab/weapon/WeaponTemplate.tscn

Ignore Space Show notes View DungeonShooting_Godot/resource/config/AiAttackAttr.json 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/config/Weapon.json

Ignore Space Show notes View DungeonShooting_Godot/resource/map/tileMaps/GroupConfig.json

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

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

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/door.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/map/door.png.import 0 → 100644

Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_EW.tres 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Down.tres 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_E_Up.tres 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_N.tres 0 → 100644

Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_NS.tres 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_S.tres 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Down.tres 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/other/RoomDoor_W_Up.tres 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/config/ExcelConfig.cs

Ignore Space Show notes View DungeonShooting_Godot/src/config/ExcelConfig_AiAttackAttr.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs

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

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

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/framework/generator/ExcelGenerator.cs

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/package/Package.cs

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/SubLine.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/enemy/AiAttackState.cs 0 → 100644

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/enemy/state/AiFollowUpState.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/enemy/state/AiSurroundState.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/enemy/state/AiTailAfterState.cs

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

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/room/RoomDoor.cs

Ignore Space Show notes View README.md

Show line notes below