Browse code Merge remote-tracking branch 'remotes/origin/develop4.1' into develop develop
commit 2b086ae760b1978f04b18018794740e1a16017b0 2 parents 2c34908 + d4ec476 小李xl authored on 19 Sep 2023

Showing 40 changed files

• DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx
• DungeonShooting_Godot/excel/excelFile/Sound.xlsx
• DungeonShooting_Godot/excel/excelFile/Weapon.xlsx
• DungeonShooting_Godot/prefab/FanCollisionShape.tscn
• DungeonShooting_Godot/prefab/effect/weapon/BulletDisappear.tscn
• DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack1.tscn
• DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack2.tscn
• DungeonShooting_Godot/prefab/role/Enemy0001.tscn
• DungeonShooting_Godot/prefab/role/Role0001.tscn
• DungeonShooting_Godot/prefab/role/RoleTemplate.tscn
• DungeonShooting_Godot/prefab/weapon/Weapon0001.tscn
• DungeonShooting_Godot/prefab/weapon/Weapon0002.tscn
• DungeonShooting_Godot/prefab/weapon/Weapon0003.tscn
• DungeonShooting_Godot/prefab/weapon/Weapon0004.tscn
• DungeonShooting_Godot/prefab/weapon/Weapon0005.tscn
• DungeonShooting_Godot/prefab/weapon/Weapon0006.tscn
• DungeonShooting_Godot/prefab/weapon/Weapon0007.tscn
• DungeonShooting_Godot/prefab/weapon/WeaponTemplate.tscn
• DungeonShooting_Godot/resource/config/Weapon.json
• DungeonShooting_Godot/resource/map/tileMaps/TestGroup1/inlet/Start1/Preinstall.json
• DungeonShooting_Godot/resource/sprite/effects/weapon/MeleeAttack1.png
• DungeonShooting_Godot/resource/spriteFrames/effect/KnifeHit1.tres
• DungeonShooting_Godot/scene/test/TestCreateSector.tscn
• DungeonShooting_Godot/src/config/ExcelConfig_Weapon.cs
• DungeonShooting_Godot/src/framework/activity/ActivityObject.cs
• DungeonShooting_Godot/src/framework/activity/ExternalForce.cs
• DungeonShooting_Godot/src/framework/activity/components/MoveController.cs
• DungeonShooting_Godot/src/framework/common/Utils.cs
• DungeonShooting_Godot/src/game/activity/ForceNames.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/RoleState.cs
• DungeonShooting_Godot/src/game/activity/role/Role_Animation.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/AutoDestroySprite.cs
• DungeonShooting_Godot/src/game/manager/SpecialEffectManager.cs
• DungeonShooting_Godot/src/test/TestCreateSector.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/FanCollisionShape.tscn 100644 → 0

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

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

Ignore Space Show notes View DungeonShooting_Godot/prefab/effect/weapon/MeleeAttack2.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/prefab/weapon/Weapon0001.tscn

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View DungeonShooting_Godot/scene/test/TestCreateSector.tscn 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/ExternalForce.cs

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

Ignore Space Show notes View DungeonShooting_Godot/src/framework/common/Utils.cs

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

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/RoleState.cs

Ignore Space Show notes View DungeonShooting_Godot/src/game/activity/role/Role_Animation.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/activity/weapon/knife/Knife.cs

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

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

Ignore Space Show notes View DungeonShooting_Godot/src/test/TestCreateSector.cs 0 → 100644

Show line notes below