Browse code Merge remote-tracking branch 'remotes/gitee/master' into develop # Conflicts: # DungeonShooting_Godot/prefab/effect/ShotFire.tscn # DungeonShooting_Godot/prefab/effect/enemy/Effect0001.tscn # DungeonShooting_Godot/prefab/effect/enemy/EnemyBloodEffect.tscn # DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs develop
commit 2c3490895f86876ca305f8fe342d957486a11f79 2 parents f4e744a + ccd0251 小李xl authored on 14 Sep 2023

Showing 80 changed files

• DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
• DungeonShooting_Godot/excel/excelFile/Sound.xlsx
• DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
• DungeonShooting_Godot/prefab/effect/BulletDisappear.tscn
• DungeonShooting_Godot/prefab/effect/BulletSmoke.tscn
• DungeonShooting_Godot/prefab/effect/Effect1.tscn
• DungeonShooting_Godot/prefab/effect/FirePart.tscn
• DungeonShooting_Godot/prefab/effect/ShotFire.tscn
• DungeonShooting_Godot/prefab/effect/activityObject/Effect0001.tscn
• DungeonShooting_Godot/prefab/effect/activityObject/EnemyBloodEffect.tscn
• DungeonShooting_Godot/prefab/effect/common/Effect1.tscn
• DungeonShooting_Godot/prefab/effect/enemy/Effect0001.tscn
• DungeonShooting_Godot/prefab/effect/enemy/EnemyBloodEffect.tscn
• DungeonShooting_Godot/prefab/effect/weapon/BulletDisappear.tscn
• DungeonShooting_Godot/prefab/effect/weapon/BulletSmoke.tscn
• DungeonShooting_Godot/prefab/effect/weapon/FirePart.tscn
• DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack1.tscn
• DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn
• DungeonShooting_Godot/prefab/role/Enemy0001.tscn
• DungeonShooting_Godot/prefab/role/Role0001.tscn
• DungeonShooting_Godot/prefab/role/RoleTemplate.tscn
• DungeonShooting_Godot/project.godot
• DungeonShooting_Godot/resource/config/ActivityObject.json
• DungeonShooting_Godot/resource/config/Weapon.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preinstall.json
• DungeonShooting_Godot/resource/sprite/effects/Collision.png
• DungeonShooting_Godot/resource/sprite/effects/Collision.png.import
• DungeonShooting_Godot/resource/sprite/effects/Effect1.png
• DungeonShooting_Godot/resource/sprite/effects/Effect1.png.import
• DungeonShooting_Godot/resource/sprite/effects/KnifeHit1.png
• DungeonShooting_Godot/resource/sprite/effects/KnifeHit1.png.import
• DungeonShooting_Godot/resource/sprite/effects/ShotFire.png
• DungeonShooting_Godot/resource/sprite/effects/ShotFire.png.import
• DungeonShooting_Godot/resource/sprite/effects/Smoke.png
• DungeonShooting_Godot/resource/sprite/effects/Smoke.png.import
• DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png
• DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png.import
• DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png
• DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png.import
• DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png
• DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png.import
• DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png
• DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png.import
• DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png
• DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png.import
• DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png
• DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png.import
• DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres
• DungeonShooting_Godot/resource/spriteFrames/role/Role0001.tres
• DungeonShooting_Godot/resource/spriteFrames/role/Role1001.tres
• 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/common/SeedRandom.cs
• DungeonShooting_Godot/src/framework/common/Utils.cs
• DungeonShooting_Godot/src/framework/map/preinstall/RoomPreinstall.cs
• DungeonShooting_Godot/src/game/activity/bullet/Bullet.cs
• DungeonShooting_Godot/src/game/activity/prop/active/ActiveProp.cs
• DungeonShooting_Godot/src/game/activity/role/Player.cs
• DungeonShooting_Godot/src/game/activity/role/Role.cs
• DungeonShooting_Godot/src/game/activity/role/RoleState.cs
• DungeonShooting_Godot/src/game/activity/role/Role_Animation.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/player/Player.cs
• DungeonShooting_Godot/src/game/activity/role/player/state/PlayerIdleState.cs
• DungeonShooting_Godot/src/game/activity/role/player/state/PlayerMoveState.cs
• DungeonShooting_Godot/src/game/activity/role/player/state/PlayerRollState.cs
• DungeonShooting_Godot/src/game/activity/role/player/state/PlayerStateEnum.cs
• DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs
• DungeonShooting_Godot/src/game/activity/weapon/gun/Gun.cs
• DungeonShooting_Godot/src/game/activity/weapon/knife/Knife.cs
• DungeonShooting_Godot/src/game/effects/AutoDestroyEffect.cs
• DungeonShooting_Godot/src/game/effects/AutoDestroyParticles.cs
• DungeonShooting_Godot/src/game/effects/AutoDestroySprite.cs
• DungeonShooting_Godot/src/game/effects/Effect1.cs
• DungeonShooting_Godot/src/game/manager/InputManager.cs
• DungeonShooting_Godot/src/game/manager/ResourcePath.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

Show notes View DungeonShooting_Godot/prefab/effect/BulletDisappear.tscn 100644 → 0

Show notes View DungeonShooting_Godot/prefab/effect/BulletSmoke.tscn 100644 → 0

Show notes View DungeonShooting_Godot/prefab/effect/Effect1.tscn 100644 → 0

Show notes View DungeonShooting_Godot/prefab/effect/FirePart.tscn 100644 → 0

Show notes View DungeonShooting_Godot/prefab/effect/ShotFire.tscn 100644 → 0

Show notes View DungeonShooting_Godot/prefab/effect/activityObject/Effect0001.tscn 100644 → 0

Show notes View DungeonShooting_Godot/prefab/effect/activityObject/EnemyBloodEffect.tscn 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/common/Effect1.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/enemy/Effect0001.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/enemy/EnemyBloodEffect.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/weapon/BulletDisappear.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/weapon/BulletSmoke.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/weapon/FirePart.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack1.tscn 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/weapon/ShotFire.tscn 0 → 100644

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/project.godot

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

Ignore Space Show notes View DungeonShooting_Godot/resource/config/Weapon.json
Too large (Show diff)

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

Show notes View DungeonShooting_Godot/resource/sprite/effects/Collision.png 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/Collision.png.import 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/Effect1.png 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/Effect1.png.import 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/KnifeHit1.png 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/KnifeHit1.png.import 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/ShotFire.png 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/ShotFire.png.import 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/Smoke.png 100644 → 0

Show notes View DungeonShooting_Godot/resource/sprite/effects/Smoke.png.import 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/common/Effect1.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/common/Smoke.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/Collision1.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/KnifeHit1.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/sprite/effects/weapon/ShotFire.png.import 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres

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/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/common/SeedRandom.cs

Ignore Space Show notes View DungeonShooting_Godot/src/framework/common/Utils.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/prop/active/ActiveProp.cs

Show notes View DungeonShooting_Godot/src/game/activity/role/Player.cs 100644 → 0

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/Role_Animation.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/player/Player.cs 0 → 100644

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

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

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

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

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/activity/weapon/knife/Knife.cs

Show notes View DungeonShooting_Godot/src/game/effects/AutoDestroyEffect.cs 100644 → 0

Ignore Space Show notes View DungeonShooting_Godot/src/game/effects/AutoDestroyParticles.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/effects/AutoDestroySprite.cs 0 → 100644

Ignore Space Show notes View DungeonShooting_Godot/src/game/effects/Effect1.cs

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

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

Show line notes below