PineappleTech/MRCS
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：解决从机音效问题

Browse Source
This commit is contained in:
bzx
2025-12-01 12:01:42 +08:00
parent 31fbf427b8
commit fbdca84adf
14 changed files with 326 additions and 15860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/_MrCs/Prefabs/Bullets/ShieldBullet.prefab
View File

@ -187,7 +187,7 @@ SphereCollider:
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.1

97
Assets/_MrCs/Prefabs/Explosions/BombEx.prefab
View File

@ -33899,7 +33899,6 @@ GameObject:
- component: {fileID: 3978124731588384171}
- component: {fileID: 5959433276226261148}
- component: {fileID: -7388417540448664130}
- component: {fileID: 2214334648597619598}
m_Layer: 0
m_Name: BombEx
m_TagString: Untagged
@ -34047,102 +34046,6 @@ MonoBehaviour:
score: 0
radius: 3
damagePerTick: 10
--- !u!82 &2214334648597619598
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8598811773316277785}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 771f3e550c7db6f40bd43bad6caa3a90, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &8674450489468917652
GameObject:
m_ObjectHideFlags: 0

97
Assets/_MrCs/Prefabs/Explosions/HpEx.prefab
View File

@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 3978124731588384171}
- component: {fileID: 5959433276226261148}
- component: {fileID: -7173639317894763746}
- component: {fileID: 7816237120726094769}
m_Layer: 0
m_Name: HpEx
m_TagString: Untagged
@ -134,102 +133,6 @@ MonoBehaviour:
radius: 3
tickInterval: 1
damagePerTick: 10
--- !u!82 &7816237120726094769
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8598811773316277785}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 10194eb64a5044e4d9c80f5818c991e1, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &2699812760280410795
PrefabInstance:
m_ObjectHideFlags: 0

97
Assets/_MrCs/Prefabs/Explosions/PistolEx.prefab
View File

@ -13,7 +13,6 @@ GameObject:
- component: {fileID: 3978124731588384171}
- component: {fileID: 5959433276226261148}
- component: {fileID: -8405436469739022901}
- component: {fileID: 5847809068716181300}
m_Layer: 0
m_Name: PistolEx
m_TagString: Untagged
@ -159,102 +158,6 @@ MonoBehaviour:
curTeam: 0
playerId: 0
score: 0
--- !u!82 &5847809068716181300
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8598811773316277785}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 903899ee15549e741a9562a7287daf4c, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &6372054134322033335
PrefabInstance:
m_ObjectHideFlags: 0

97
Assets/_MrCs/Prefabs/Explosions/PoisonEx.prefab
View File

@ -112053,7 +112053,6 @@ GameObject:
- component: {fileID: 3978124731588384171}
- component: {fileID: 5959433276226261148}
- component: {fileID: 2911346411882355928}
- component: {fileID: 6110006648859385988}
m_Layer: 0
m_Name: PoisonEx
m_TagString: Untagged
@ -112175,102 +112174,6 @@ MonoBehaviour:
radius: 2.5
tickInterval: 1
damagePerTick: 10
--- !u!82 &6110006648859385988
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8598811773316277785}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 10194eb64a5044e4d9c80f5818c991e1, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &8667067287936856415
GameObject:
m_ObjectHideFlags: 0

97
Assets/_MrCs/Prefabs/Explosions/ShieldEx.prefab
View File

@ -1149,7 +1149,6 @@ GameObject:
- component: {fileID: 5791632515063918056}
- component: {fileID: 503544250457667649}
- component: {fileID: 380908065248042481}
- component: {fileID: 5028263857092430686}
m_Layer: 0
m_Name: ShieldEx
m_TagString: Untagged
@ -1946,102 +1945,6 @@ MonoBehaviour:
useLocalTransformOnly: 0
ownerChangeIndicator: 1
receivedStatesCounter: 0
--- !u!82 &5028263857092430686
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8598811773316277785}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: a709a5739c2567243900f64f62dbbb6c, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &8652716887194496297
GameObject:
m_ObjectHideFlags: 0

97
Assets/_MrCs/Prefabs/Explosions/SmokeEx.prefab
View File

@ -13,7 +13,6 @@ GameObject:
- component: {fileID: 3978124731588384171}
- component: {fileID: 5959433276226261148}
- component: {fileID: 1921388366090519226}
- component: {fileID: 6761671744990676456}
m_Layer: 0
m_Name: SmokeEx
m_TagString: Untagged
@ -159,102 +158,6 @@ MonoBehaviour:
curTeam: 0
playerId: 0
score: 0
--- !u!82 &6761671744990676456
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8598811773316277785}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: e1a6411e6f588f349bb634a6f34c2bb1, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &2605678098447021308
PrefabInstance:
m_ObjectHideFlags: 0

9042
Assets/_MrCs/Scenes/Company1Floor.unity
View File

File diff suppressed because it is too large Load Diff

6517
Assets/_MrCs/Scenes/Yunnan_Lincang_Linxiang_Hengji_Dixia.unity
View File

File diff suppressed because it is too large Load Diff

5
Assets/_MrCs/Scripts/Explosions/Explosion.cs
View File

@ -27,10 +27,7 @@ public class Explosion : NetworkBehaviour
{
curTeam = team;
playerId = id;
if (isClient)
{
MasterAudio.PlaySound3DAtVector3(explosionSound, transform.position);
}
GameManager.Ins.PlaySound3D(explosionSound,transform);
switch (type)
{

3
Assets/_MrCs/Scripts/Item/AirdropPlane.cs
View File

@ -27,7 +27,7 @@ public class AirdropPlane : NetworkBehaviour
_totalDistance = Vector3.Distance(_startPos, _targetPos);
_nextDropDistance = _totalDistance / (dropCount + 1);
GameManager.Ins.PlaySound2D("1.0");
_started = true;
}
@ -74,6 +74,7 @@ public class AirdropPlane : NetworkBehaviour
dropCount--;
int itemId=Random.Range(0, GameManager.Ins.airdropItems.Length);
GameManager.Ins.CreateAirDropItem(itemId, transform.position);
GameManager.Ins.PlaySound2D("1.11");
// 计算下一段距离
_nextDropDistance = _totalDistance / (dropCount + 1);
}

29
Assets/_MrCs/Scripts/Manager/GameManager.cs
View File

@ -96,7 +96,7 @@ public class GameManager : NetworkBehaviour
[SyncVar]
public long vistRoundEnd = 0;
// 总游玩时长
private int vistAllTime = (int)(60*3f);
private int vistAllTime = (int)(60*15f);
[NonSerialized]
[SyncVar]
private int roundAllTime;
@ -580,12 +580,34 @@ public class GameManager : NetworkBehaviour
}
#endregion
[ClientRpc]
public void PlaySound2DRPC(string sound)
[TargetRpc]
public void PlaySound2DRPC(NetworkConnection target,string sound)
{
MasterAudio.PlaySound(sound);
}
public void PlaySound2D(string sound)
{
foreach (var item in allPlayers)
{
PlaySound2DRPC(item.connectionToClient,sound);
}
}
[TargetRpc]
public void PlaySound3DRPC(NetworkConnection target,string sound,Transform pos)
{
MasterAudio.PlaySound3DAtTransform(sound,pos);
}
public void PlaySound3D(string sound,Transform target)
{
foreach (var item in allPlayers)
{
PlaySound3DRPC(item.connectionToClient,sound,target);
}
}
[SyncVar]
private int syncRemainingTime;
@ -654,7 +676,6 @@ public class GameManager : NetworkBehaviour
public void StopRound()
{
gameState = GameState.Waiting;
Debug.LogError("本回合结束");
ChangeBgmRpc(0);
if (CurRoundIndex >= 3)
gameState = GameState.Settle;

4
ProjectSettings/EditorBuildSettings.asset
View File

@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 0
- enabled: 1
path: Assets/_MrCs/Scenes/Company1Floor.unity
guid: 386a8fdea01af8a4e8d4a9835407ddec
- enabled: 0
@ -77,7 +77,7 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_MrCs/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao.unity
guid: ab829f8916bb4b543988025289aaf714
- enabled: 1
- enabled: 0
path: Assets/_MrCs/Scenes/Shandong_Jining_Shangchang.unity
guid: 920d9af8630c49c4e8e7a314a3e22880
- enabled: 0

2
ProjectSettings/ProjectSettings.asset
View File

@ -165,7 +165,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.pineappletech.mrcs.shandongjiningshangchang
Android: com.pineappletech.mrcs.gongsi1lou
Standalone: com.DefaultCompany.com.unity.template.ar
buildNumber:
Standalone: 0