diff --git a/DungeonShooting_Godot/excel/Sound.xlsx b/DungeonShooting_Godot/excel/Sound.xlsx index 517fc08..47c6585 100644 --- a/DungeonShooting_Godot/excel/Sound.xlsx +++ b/DungeonShooting_Godot/excel/Sound.xlsx Binary files differ diff --git a/DungeonShooting_Godot/excel/WeaponBase.xlsx b/DungeonShooting_Godot/excel/WeaponBase.xlsx index 99dcc44..cfa23bb 100644 --- a/DungeonShooting_Godot/excel/WeaponBase.xlsx +++ b/DungeonShooting_Godot/excel/WeaponBase.xlsx Binary files differ diff --git a/DungeonShooting_Godot/resource/config/Sound.json b/DungeonShooting_Godot/resource/config/Sound.json index a79ef6a..76bbf8c 100644 --- a/DungeonShooting_Godot/resource/config/Sound.json +++ b/DungeonShooting_Godot/resource/config/Sound.json @@ -72,6 +72,12 @@ "Remark": "\u6FC0\u5149\u6B66\u5668" }, { + "Id": "shooting0013", + "Path": "res://resource/sound/sfx/shooting/Shooting0013.ogg", + "Volume": 0.6, + "Remark": "P90" + }, + { "Id": "reloading0001", "Path": "res://resource/sound/sfx/reloading/Reloading0001.ogg", "Volume": 1, @@ -117,7 +123,13 @@ "Id": "reloadBegin0006", "Path": "res://resource/sound/sfx/reloading/Reloading_begin0006.ogg", "Volume": 1, - "Remark": "" + "Remark": "\u6C64\u59C6\u900A\u51B2\u950B\u67AA" + }, + { + "Id": "reloadBegin0007", + "Path": "res://resource/sound/sfx/reloading/Reloading_begin0007.ogg", + "Volume": 1, + "Remark": "P90" }, { "Id": "reloadBegin0009", @@ -230,8 +242,8 @@ { "Id": "beLoaded0010", "Path": "res://resource/sound/sfx/beLoaded/BeLoaded0010.ogg", - "Volume": 1, - "Remark": "\u6B65\u67AA" + "Volume": 0.7, + "Remark": "P90" }, { "Id": "beLoaded0011", @@ -298,5 +310,11 @@ "Path": "res://resource/sound/sfx/collision/Collision0001.ogg", "Volume": 0.7, "Remark": "\u78B0\u649E" + }, + { + "Id": "gold", + "Path": "res://resource/sound/sfx/common/gold.ogg", + "Volume": 1.5, + "Remark": "\u91D1\u5E01" } ] \ No newline at end of file diff --git a/DungeonShooting_Godot/resource/config/WeaponBase.json b/DungeonShooting_Godot/resource/config/WeaponBase.json index dc5948d..9d8e8e0 100644 --- a/DungeonShooting_Godot/resource/config/WeaponBase.json +++ b/DungeonShooting_Godot/resource/config/WeaponBase.json @@ -1548,7 +1548,7 @@ "AmmoCapacity": 50, "MaxAmmoCapacity": 500, "StandbyAmmoCapacity": 350, - "ReloadTime": 1.8, + "ReloadTime": 2, "AloneReload": false, "AloneReloadCount": 1, "AloneReloadBeginIntervalTime": 0, @@ -1563,8 +1563,8 @@ 1 ], "TriggerInterval": 0, - "StartFiringSpeed": 1000, - "FinalFiringSpeed": 1000, + "StartFiringSpeed": 900, + "FinalFiringSpeed": 900, "FiringSpeedAddSpeed": 0, "FiringSpeedBackSpeed": 0, "FiringSpeedBackTime": 0.5, @@ -1602,13 +1602,13 @@ "MeleeAttackRepelRange": [ 100 ], - "__ShootSound": "shooting0007", - "__BeginReloadSound": "reloadBegin0006", - "BeginReloadSoundDelayTime": 0.2, + "__ShootSound": "shooting0013", + "__BeginReloadSound": "reloadBegin0007", + "BeginReloadSoundDelayTime": 0, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "beLoaded0017", - "ReloadFinishSoundAdvanceTime": 0.65, + "__ReloadFinishSound": "beLoaded0010", + "ReloadFinishSoundAdvanceTime": 0.35, "__BeLoadedSound": "", "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, @@ -1625,7 +1625,7 @@ "AmmoCapacity": 50, "MaxAmmoCapacity": 500, "StandbyAmmoCapacity": 350, - "ReloadTime": 1.8, + "ReloadTime": 2, "AloneReload": false, "AloneReloadCount": 1, "AloneReloadBeginIntervalTime": 0, @@ -1679,13 +1679,13 @@ "MeleeAttackRepelRange": [ 100 ], - "__ShootSound": "shooting0007", - "__BeginReloadSound": "reloadBegin0006", - "BeginReloadSoundDelayTime": 0.2, + "__ShootSound": "shooting0013", + "__BeginReloadSound": "reloadBegin0007", + "BeginReloadSoundDelayTime": 0, "__ReloadSound": "", "ReloadSoundDelayTime": 0, - "__ReloadFinishSound": "beLoaded0017", - "ReloadFinishSoundAdvanceTime": 0.65, + "__ReloadFinishSound": "beLoaded0010", + "ReloadFinishSoundAdvanceTime": 0.35, "__BeLoadedSound": "", "BeLoadedSoundDelayTime": 0, "__OtherSoundMap": null, diff --git a/DungeonShooting_Godot/resource/sound/sfx/common/gold.ogg b/DungeonShooting_Godot/resource/sound/sfx/common/gold.ogg new file mode 100644 index 0000000..b4b2a02 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/common/gold.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/common/gold.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/common/gold.ogg.import new file mode 100644 index 0000000..e57b929 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/common/gold.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://c7u5cykgimrd4" +path="res://.godot/imported/gold.ogg-d06a726cc6fb4031ede1140774780273.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/common/gold.ogg" +dest_files=["res://.godot/imported/gold.ogg-d06a726cc6fb4031ede1140774780273.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0013.ogg b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0013.ogg new file mode 100644 index 0000000..32b39ff --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0013.ogg Binary files differ diff --git a/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0013.ogg.import b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0013.ogg.import new file mode 100644 index 0000000..ea34494 --- /dev/null +++ b/DungeonShooting_Godot/resource/sound/sfx/shooting/Shooting0013.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://b7dnq60ppy3rt" +path="res://.godot/imported/Shooting0013.ogg-f68af44d2b878523bfde72871d459a6a.oggvorbisstr" + +[deps] + +source_file="res://resource/sound/sfx/shooting/Shooting0013.ogg" +dest_files=["res://.godot/imported/Shooting0013.ogg-f68af44d2b878523bfde72871d459a6a.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/DungeonShooting_Godot/src/game/activity/role/Role.cs b/DungeonShooting_Godot/src/game/activity/role/Role.cs index ddbad02..4dbfcc6 100644 --- a/DungeonShooting_Godot/src/game/activity/role/Role.cs +++ b/DungeonShooting_Godot/src/game/activity/role/Role.cs @@ -1,6 +1,7 @@  using System.Collections; using System.Collections.Generic; +using Config; using Godot; /// @@ -1243,6 +1244,8 @@ public virtual void AddGold(int goldCount) { RoleState.Gold += goldCount; + //播放音效 + SoundManager.PlaySoundByConfig(ExcelConfig.Sound_Map["gold"], Position, this); } ///