yeahweregames/UnityTowerDefense
4
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'unified-audio-manager' into main

Browse source 
# Conflicts:
#	Assets/_Project/Definitions/Towers/TeslaCoilTower.asset
This commit is contained in:
Ian Woods 2026-06-30 21:39:09 -07:00
commit a7b2d1854d
11 changed files with 197 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Assets/_Project/Scenes/Levels/9Player.unity
View file

@ -2222,6 +2222,63 @@ Transform:
m_Children: []
m_Father: {fileID: 1097152085}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &176580460
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 176580462}
- component: {fileID: 176580461}
m_Layer: 0
m_Name: AudioManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &176580461
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176580460}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ec21c01769ef58d1ac26ba89668eeaa, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TD.Audio.AudioManager
categories:
- category: 0
maxVoices: 4
volume: 0.5
- category: 1
maxVoices: 4
volume: 0.5
- category: 2
maxVoices: 4
volume: 0.5
- category: 3
maxVoices: 4
volume: 0.5
--- !u!4 &176580462
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 176580460}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!43 &203092944
Mesh:
m_ObjectHideFlags: 0
@ -28714,3 +28771,4 @@ SceneRoots:
- {fileID: 1097152085}
- {fileID: 1889390964}
- {fileID: 2139601601}
- {fileID: 176580462}