diff --git a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx index ab4825e..4eda85d 100644 --- a/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/ActivityObject.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx index 562fb8e..73dc578 100644 --- a/DungeonShooting_Godot/excel/excelFile/Sound.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Sound.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx index 5334d82..675749f 100644 --- a/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx +++ b/DungeonShooting_Godot/excel/excelFile/Weapon.xlsx Binary files differ diff --git a/DungeonShooting_Godot/resource/config/Weapon.json b/DungeonShooting_Godot/resource/config/Weapon.json index 12a6eaf..6855a9c 100644 --- a/DungeonShooting_Godot/resource/config/Weapon.json +++ b/DungeonShooting_Godot/resource/config/Weapon.json @@ -8,8 +8,8 @@ "WeightType": 2, "ContinuousShoot": true, "AmmoCapacity": 30, - "MaxAmmoCapacity": 180, - "StandbyAmmoCapacity": 150, + "MaxAmmoCapacity": 1800, + "StandbyAmmoCapacity": 1500, "ReloadTime": 2.2, "AloneReload": false, "AloneReloadCount": 1, @@ -74,8 +74,8 @@ "WeightType": 2, "ContinuousShoot": false, "AmmoCapacity": 30, - "MaxAmmoCapacity": 180, - "StandbyAmmoCapacity": 150, + "MaxAmmoCapacity": 1800, + "StandbyAmmoCapacity": 1500, "ReloadTime": 2.2, "AloneReload": false, "AloneReloadCount": 1, @@ -602,8 +602,8 @@ "WeightType": 2, "ContinuousShoot": true, "AmmoCapacity": 20, - "MaxAmmoCapacity": 260, - "StandbyAmmoCapacity": 240, + "MaxAmmoCapacity": 2600, + "StandbyAmmoCapacity": 2600, "ReloadTime": 2.2, "AloneReload": false, "AloneReloadCount": 1, diff --git a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs index db52b77..59583fa 100644 --- a/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs +++ b/DungeonShooting_Godot/src/game/activity/weapon/Weapon.cs @@ -1456,6 +1456,7 @@ shell.Rotation = Master.MountPoint.RealRotation; shell.InheritVelocity(Master); shell.Throw(startPos, startHeight, verticalSpeed, velocity, rotate); + Master.AffiliationArea.InsertItem(shell); return shell; } diff --git a/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs b/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs index 0a967f2..196687f 100644 --- a/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs +++ b/DungeonShooting_Godot/src/game/effects/EnemyDebris.cs @@ -30,8 +30,6 @@ yield return new WaitForSeconds(Utils.RandomRangeFloat(1f, 2.5f)); gpuParticles2D.Emitting = false; yield return new WaitForSeconds(1); - gpuParticles2D.QueueFree(); - EnableBehavior = false; - Collision.QueueFree(); + BecomesStaticImage(); } } \ No newline at end of file