feat : music manager v0.1
This commit is contained in:
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 96957698beb0cde40958afe8c82ae312
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 41c7d5fed07c6e94a92f7adc69ee286a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0d1277029ea2a2542ae9d3f57e79d11c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1df8e6ca6d990e64c9916e4c68d45078
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &6521978618824486866
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4395560298612109037}
|
||||
- component: {fileID: 4908846766475971086}
|
||||
m_Layer: 0
|
||||
m_Name: AudioManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4395560298612109037
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6521978618824486866}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 228.87709, y: -0, z: -18.45408}
|
||||
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!114 &4908846766475971086
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6521978618824486866}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 53583b7aad5dc7044bbd6c7946fe6999, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Audio_AudioManager
|
||||
MusicGlobal_Menu:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
groupIdInternal: 0
|
||||
groupGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: eb4dfa45e524daf448fb24b29d5d77c5, type: 2}
|
||||
MusicGlobal_Sane:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
groupIdInternal: 0
|
||||
groupGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: 4789a3fef5f157040949777cea0ed1ea, type: 2}
|
||||
MusicGlobal_Staircase:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
groupIdInternal: 0
|
||||
groupGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: eb0824f00dc43854ba3d7b51ba2df675, type: 2}
|
||||
MusicGlobal_Mad:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
groupIdInternal: 0
|
||||
groupGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: e3fcce2a1fc421a4796cdb37b13bc843, type: 2}
|
||||
MusicGlobal_None:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
groupIdInternal: 0
|
||||
groupGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: 2c9174fc93d599240a7b67774e57a52a, type: 2}
|
||||
PlayMusic:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 0}
|
||||
StopMusic:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 0}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 61f7fe4128138164295ef34aae4f6659
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,100 @@
|
||||
using System.Collections.Generic;
|
||||
using NUnit.Framework;
|
||||
using UnityEngine;
|
||||
|
||||
public enum WwiseMusicState { Menu, Sane, Staircase, Mad, None};
|
||||
public class Audio_AudioManager : MonoBehaviour
|
||||
{
|
||||
public static Audio_AudioManager Instance;
|
||||
|
||||
private bool isInitialized = false;
|
||||
|
||||
|
||||
|
||||
[Header("Music State variables")]
|
||||
[SerializeField] private AK.Wwise.State MusicGlobal_Menu;
|
||||
[SerializeField] private AK.Wwise.State MusicGlobal_Sane;
|
||||
[SerializeField] private AK.Wwise.State MusicGlobal_Staircase;
|
||||
[SerializeField] private AK.Wwise.State MusicGlobal_Mad;
|
||||
[SerializeField] private AK.Wwise.State MusicGlobal_None;
|
||||
|
||||
private WwiseMusicState currentMusicState;
|
||||
|
||||
[Header("Wwise Music Events")]
|
||||
public AK.Wwise.Event PlayMusic;
|
||||
public AK.Wwise.Event StopMusic;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Initialize();
|
||||
}
|
||||
|
||||
// Start is called once before the first execution of Update after the MonoBehaviour is created
|
||||
void Start()
|
||||
{
|
||||
SetWwiseMusicState(WwiseMusicState.Sane); //Need to switch if we have a menu music.
|
||||
|
||||
PlayMusic.Post(gameObject);
|
||||
}
|
||||
|
||||
|
||||
void Initialize()
|
||||
{
|
||||
//Singleton Logic
|
||||
if (Instance == null)
|
||||
{
|
||||
Instance = this;
|
||||
DontDestroyOnLoad(this);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning("AudioManager already exist! Destroying new ibnstance.");
|
||||
Destroy(this);
|
||||
}
|
||||
|
||||
if (isInitialized)
|
||||
{
|
||||
isInitialized = true;
|
||||
}
|
||||
|
||||
SetWwiseMusicState(WwiseMusicState.None);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void SetWwiseMusicState(WwiseMusicState MusicState)
|
||||
{
|
||||
if (MusicState == currentMusicState)
|
||||
{
|
||||
Debug.Log("MusicState is already" + MusicState + ".");
|
||||
return;
|
||||
}
|
||||
switch (MusicState)
|
||||
{
|
||||
default:
|
||||
case (WwiseMusicState.Menu):
|
||||
MusicGlobal_Menu.SetValue();
|
||||
break;
|
||||
case (WwiseMusicState.Sane):
|
||||
MusicGlobal_Sane.SetValue();
|
||||
break;
|
||||
case (WwiseMusicState.Staircase):
|
||||
MusicGlobal_Staircase.SetValue();
|
||||
break;
|
||||
case (WwiseMusicState.Mad):
|
||||
MusicGlobal_Mad.SetValue();
|
||||
break;
|
||||
case (WwiseMusicState.None):
|
||||
MusicGlobal_None.SetValue();
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
Debug.Log("New Wwise MusicState" + MusicState + ".");
|
||||
|
||||
currentMusicState = MusicState;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 53583b7aad5dc7044bbd6c7946fe6999
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1d007b5c796a6f849857373c498520b3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,18 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9491db930667d4846980e5427e434e6f, type: 3}
|
||||
m_Name: 5EE95D9E-014E-4A9E-880A-F1EEF0FE8D8C
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseStateReference
|
||||
objectName: inStaircase
|
||||
id: 3708394339
|
||||
guid: 5EE95D9E-014E-4A9E-880A-F1EEF0FE8D8C
|
||||
WwiseStateGroupReference: {fileID: 0}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: eb0824f00dc43854ba3d7b51ba2df675
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,18 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9491db930667d4846980e5427e434e6f, type: 3}
|
||||
m_Name: 8952F29F-BE73-473A-9D08-8294D37259E7
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseStateReference
|
||||
objectName: inMenu
|
||||
id: 3374585465
|
||||
guid: 8952F29F-BE73-473A-9D08-8294D37259E7
|
||||
WwiseStateGroupReference: {fileID: 0}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: eb4dfa45e524daf448fb24b29d5d77c5
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,18 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9491db930667d4846980e5427e434e6f, type: 3}
|
||||
m_Name: AA82CE06-EC15-4AB6-A59B-BEDE7C5926C7
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseStateReference
|
||||
objectName: None
|
||||
id: 748895195
|
||||
guid: AA82CE06-EC15-4AB6-A59B-BEDE7C5926C7
|
||||
WwiseStateGroupReference: {fileID: 0}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2c9174fc93d599240a7b67774e57a52a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,18 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9491db930667d4846980e5427e434e6f, type: 3}
|
||||
m_Name: D325E2E9-6F95-4BA9-AF05-2C2E653106FA
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseStateReference
|
||||
objectName: inSane
|
||||
id: 3719846035
|
||||
guid: D325E2E9-6F95-4BA9-AF05-2C2E653106FA
|
||||
WwiseStateGroupReference: {fileID: 0}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4789a3fef5f157040949777cea0ed1ea
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,18 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9491db930667d4846980e5427e434e6f, type: 3}
|
||||
m_Name: DD04671B-E8B5-4B1A-986A-579728855F92
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseStateReference
|
||||
objectName: inMad
|
||||
id: 1174700730
|
||||
guid: DD04671B-E8B5-4B1A-986A-579728855F92
|
||||
WwiseStateGroupReference: {fileID: 0}
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e3fcce2a1fc421a4796cdb37b13bc843
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7232e08b392010b45b8b1c1fd25c4d6d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,17 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0aa59343b87f7aa4b869d883949b65c9, type: 3}
|
||||
m_Name: AF6D98B3-10FC-46F3-AFDB-665063E78DF8
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseStateGroupReference
|
||||
objectName: musicGlobal
|
||||
id: 1499314831
|
||||
guid: AF6D98B3-10FC-46F3-AFDB-665063E78DF8
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ea33e74510b6ef84bbdde2121f209e13
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,13 +1,5 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.bezi.sidekick": {
|
||||
"version": "file:com.bezi.sidekick",
|
||||
"depth": 0,
|
||||
"source": "embedded",
|
||||
"dependencies": {
|
||||
"com.unity.nuget.newtonsoft-json": "3.2.1"
|
||||
}
|
||||
},
|
||||
"com.coiriergraphics.octocore": {
|
||||
"version": "file:OctoCore",
|
||||
"depth": 0,
|
||||
@@ -116,13 +108,6 @@
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.nuget.newtonsoft-json": {
|
||||
"version": "3.2.2",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.probuilder": {
|
||||
"version": "6.0.8",
|
||||
"depth": 0,
|
||||
|
||||
@@ -51,36 +51,6 @@
|
||||
"key": "ShapeComponent.SettingsEnabled",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "mesh.newShapesSnapToGrid",
|
||||
"value": "{\"m_Value\":true}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "mesh.meshColliderIsConvex",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.backFaceSelectEnabled",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.showSceneInfo",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.showEditorNotifications",
|
||||
"value": "{\"m_Value\":false}"
|
||||
},
|
||||
{
|
||||
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
|
||||
"key": "editor.extrudeEdgesAsGroup",
|
||||
"value": "{\"m_Value\":true}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "s_SelectMode",
|
||||
@@ -100,46 +70,6 @@
|
||||
"type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "ShapeBuilder.LastRotation.Prism",
|
||||
"value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.userMaterial",
|
||||
"value": "{\"m_Value\":{\"instanceID\":0}}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.shadowCastingMode",
|
||||
"value": "{\"m_Value\":1}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.defaultStaticEditorFlags",
|
||||
"value": "{\"m_Value\":0}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "mesh.newShapeColliderType",
|
||||
"value": "{\"m_Value\":2}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "lightmapping.defaultLightmapUnwrapParameters",
|
||||
"value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "editor.dragSelectRectMode",
|
||||
"value": "{\"m_Value\":0}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "editor.extrudeMethod",
|
||||
"value": "{\"m_Value\":2}"
|
||||
},
|
||||
{
|
||||
"type": "UnityEditor.ProBuilder.Actions.DetachFaces+DetachSetting, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
|
||||
"key": "DetachFaces.target",
|
||||
"value": "{\"m_Value\":0}"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -19,7 +19,21 @@
|
||||
</PropertyList>
|
||||
<ChildrenList>
|
||||
<MusicTransition Name="Transition" ID="{B0454AAD-C0D5-4046-AAA8-E62CA30966DC}">
|
||||
<TransitionInfo/>
|
||||
<PropertyList>
|
||||
<Property Name="EnableSourceFadeOut" Type="bool" Value="True"/>
|
||||
<Property Name="ExitSourceAt" Type="int16" Value="3"/>
|
||||
</PropertyList>
|
||||
<TransitionInfo>
|
||||
<SourceFadeOut>
|
||||
<MusicFade Name="Source Fade-out" ID="{F564948B-2486-4EF9-9062-DDCA0442564B}">
|
||||
<PropertyList>
|
||||
<Property Name="FadeCurve" Type="int16" Value="6"/>
|
||||
<Property Name="FadeTime" Type="Real64" Value="3"/>
|
||||
<Property Name="FadeType" Type="int16" Value="1"/>
|
||||
</PropertyList>
|
||||
</MusicFade>
|
||||
</SourceFadeOut>
|
||||
</TransitionInfo>
|
||||
</MusicTransition>
|
||||
<MusicTransition Name="Transition" ID="{AF1C4B8F-3072-450E-9862-482AF9FDDC6B}">
|
||||
<PropertyList>
|
||||
@@ -1018,7 +1032,7 @@
|
||||
</Point>
|
||||
<Point>
|
||||
<XPos>22.5882291666667</XPos>
|
||||
<YPos>-0</YPos>
|
||||
<YPos>0</YPos>
|
||||
<Flags>37</Flags>
|
||||
</Point>
|
||||
</PointList>
|
||||
@@ -1110,7 +1124,7 @@
|
||||
<PointList>
|
||||
<Point>
|
||||
<XPos>0</XPos>
|
||||
<YPos>-0</YPos>
|
||||
<YPos>0</YPos>
|
||||
<Flags>5</Flags>
|
||||
</Point>
|
||||
<Point>
|
||||
@@ -1278,6 +1292,32 @@
|
||||
</ObjectList>
|
||||
</ObjectLists>
|
||||
</MultiSwitchEntry>
|
||||
<MultiSwitchEntry Name="" ID="{762FE44A-7396-4705-B009-C4123E8346E7}">
|
||||
<ObjectLists>
|
||||
<ObjectList Name="EntryPath">
|
||||
<PluginInnerObject Name="" ID="{ECD605C8-CE69-40D2-98F4-96F1FF264CF2}" PluginName="EntryPathSlot" CompanyID="0" PluginID="88">
|
||||
<ReferenceList>
|
||||
<Reference Name="EntryPathObject">
|
||||
<ObjectRef Name="inMad" ID="{DD04671B-E8B5-4B1A-986A-579728855F92}" WorkUnitID="{9AC99FE9-EDCC-4881-86B6-5AA3A1CB1E57}"/>
|
||||
</Reference>
|
||||
</ReferenceList>
|
||||
</PluginInnerObject>
|
||||
</ObjectList>
|
||||
</ObjectLists>
|
||||
</MultiSwitchEntry>
|
||||
<MultiSwitchEntry Name="" ID="{A7EB4520-333E-481C-9B0B-974CE969635C}">
|
||||
<ObjectLists>
|
||||
<ObjectList Name="EntryPath">
|
||||
<PluginInnerObject Name="" ID="{7B713753-2FC9-4638-8DA7-72FEB3FBC552}" PluginName="EntryPathSlot" CompanyID="0" PluginID="88">
|
||||
<ReferenceList>
|
||||
<Reference Name="EntryPathObject">
|
||||
<ObjectRef Name="inMenu" ID="{8952F29F-BE73-473A-9D08-8294D37259E7}" WorkUnitID="{9AC99FE9-EDCC-4881-86B6-5AA3A1CB1E57}"/>
|
||||
</Reference>
|
||||
</ReferenceList>
|
||||
</PluginInnerObject>
|
||||
</ObjectList>
|
||||
</ObjectLists>
|
||||
</MultiSwitchEntry>
|
||||
</ObjectList>
|
||||
</ObjectLists>
|
||||
</MusicSwitchContainer>
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,49 @@
|
||||
{
|
||||
"SoundBanksInfo": {
|
||||
"Platform": "Mac",
|
||||
"BasePlatform": "Mac",
|
||||
"SchemaVersion": "16",
|
||||
"SoundBankVersion": "172",
|
||||
"SoundBanks": [
|
||||
{
|
||||
"Id": "3725552457",
|
||||
"Type": "Bus",
|
||||
"GUID": "{31504338-4270-4CD2-A923-2ADDE8A9C0E4}",
|
||||
"Language": "SFX",
|
||||
"Hash": "{EE0DA1EC-71E5-0E14-19C2-156D05BFEA0A}",
|
||||
"ObjectPath": "AUX_Music_Demo",
|
||||
"ShortName": "AUX_Music_Demo",
|
||||
"Path": "Bus/AUX_Music_Demo.bnk",
|
||||
"Plugins": {
|
||||
"ShareSets": [
|
||||
{
|
||||
"Id": "3216246379",
|
||||
"Name": "Space_Dreaming",
|
||||
"ObjectPath": "\\Effects\\Factory Effects\\RoomVerb\\Huge Spaces\\Space_Dreaming",
|
||||
"GUID": "{4FF7C4B2-37B0-4DFF-8E8A-1420102AE2DD}",
|
||||
"LibName": "Wwise RoomVerb",
|
||||
"LibId": "7733251"
|
||||
}
|
||||
]
|
||||
},
|
||||
"AuxBusses": [
|
||||
{
|
||||
"Id": "3725552457",
|
||||
"Name": "AUX_Music_Demo",
|
||||
"ObjectPath": "\\Busses\\Default Work Unit\\Main Audio Bus\\MAIN\\AUX\\AUX_Music\\AUX_Music_Demo",
|
||||
"GUID": "{31504338-4270-4CD2-A923-2ADDE8A9C0E4}",
|
||||
"Color": "17",
|
||||
"PluginRefs": {
|
||||
"ShareSets": [
|
||||
{
|
||||
"Id": "3216246379"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"FileHash": "{37A2091E-08D1-AF08-6586-526DFA60B4CA}"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
Auxiliary Bus ID Name Wwise Object Path Notes
|
||||
3725552457 AUX_Music_Demo \Default Work Unit\Main Audio Bus\MAIN\AUX\AUX_Music\AUX_Music_Demo
|
||||
|
||||
Effect plug-ins ID Name Type Notes
|
||||
3216246379 Space_Dreaming Wwise RoomVerb
|
||||
|
||||
Binary file not shown.
@@ -10,7 +10,7 @@
|
||||
"Type": "Event",
|
||||
"GUID": "{8419E167-8376-4134-809D-D888673B4AC1}",
|
||||
"Language": "SFX",
|
||||
"Hash": "{DA473A44-B0AC-6D64-B1F5-E01CF8FC4DE6}",
|
||||
"Hash": "{CD40AEE5-1B1F-3CA4-1594-1B060B3263E6}",
|
||||
"ObjectPath": "Play_Test_Binaural",
|
||||
"ShortName": "Play_Test_Binaural",
|
||||
"Path": "Event/Play_Test_Binaural.bnk",
|
||||
@@ -90,6 +90,6 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"FileHash": "{283C6123-4097-3BDF-6C70-B0D084297186}"
|
||||
"FileHash": "{94E7CBC6-A8EA-3D7B-A364-8E9285A8C2C8}"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@@ -10,7 +10,7 @@
|
||||
"Type": "Event",
|
||||
"GUID": "{CA01D78F-151E-46B3-8B01-209B21D1DCAF}",
|
||||
"Language": "SFX",
|
||||
"Hash": "{2A50C422-11B3-81C0-F409-FFD978682578}",
|
||||
"Hash": "{C10A53D7-643F-2311-886F-A09F827E760E}",
|
||||
"ObjectPath": "Play_playerFootsteps",
|
||||
"ShortName": "Play_playerFootsteps",
|
||||
"Path": "Event/Play_playerFootsteps.bnk",
|
||||
@@ -290,7 +290,7 @@
|
||||
{
|
||||
"Id": "1805011878",
|
||||
"Name": "Play_playerFootsteps",
|
||||
"ObjectPath": "\\Events\\SFX\\PLAYER\\Play_playerFootsteps",
|
||||
"ObjectPath": "\\Events\\SFX\\Player\\Play_playerFootsteps",
|
||||
"GUID": "{CA01D78F-151E-46B3-8B01-209B21D1DCAF}",
|
||||
"Color": "23",
|
||||
"DurationType": "OneShot",
|
||||
@@ -342,7 +342,8 @@
|
||||
"GroupType": "Switch",
|
||||
"GroupId": "520915638",
|
||||
"Id": "1216965916",
|
||||
"GUID": "{C2B3EAC0-49E1-4C4B-A47E-8667C7765937}"
|
||||
"GUID": "{C2B3EAC0-49E1-4C4B-A47E-8667C7765937}",
|
||||
"Default": "true"
|
||||
},
|
||||
"MediaRefs": [
|
||||
{
|
||||
@@ -450,6 +451,6 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"FileHash": "{CF834D85-72FF-73ED-70C6-75CAD5A90A64}"
|
||||
"FileHash": "{B8BB9E17-DBFF-FA2C-967E-E7B3671F07D0}"
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
Event ID Name Wwise Object Path Notes
|
||||
1805011878 Play_playerFootsteps \SFX\PLAYER\Play_playerFootsteps
|
||||
1805011878 Play_playerFootsteps \SFX\Player\Play_playerFootsteps
|
||||
|
||||
Switch Group ID Name Wwise Object Path Notes
|
||||
520915638 footstepsType \Player\Movmement\footstepsType
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea136f04347186cba3175729fa8d26d75e3edf6b9fedd0657aa1f1082379f903
|
||||
size 1121
|
||||
oid sha256:9c63de74873e1832ae60d6b7149c40561c4b05f1099d0c8682c0b14717ea7883
|
||||
size 1618
|
||||
|
||||
@@ -10,21 +10,31 @@
|
||||
"Type": "User",
|
||||
"GUID": "{701ECBBD-9C7B-4030-8CDB-749EE5D1C7B9}",
|
||||
"Language": "SFX",
|
||||
"Hash": "{05F0E1C4-BE89-84AA-795A-5D4403B7CB32}",
|
||||
"Hash": "{F6C7EFD5-BA3F-F19B-09B1-E4E71EF9669D}",
|
||||
"ObjectPath": "Init",
|
||||
"ShortName": "Init",
|
||||
"Path": "Init.bnk",
|
||||
"Plugins": {
|
||||
"Custom": [
|
||||
{
|
||||
"Id": "646362734",
|
||||
"Id": "1039689298",
|
||||
"Name": "Resonance Audio Renderer (Custom)",
|
||||
"ObjectPath": "\\Busses\\Default Work Unit\\Main Audio Bus\\MAIN\\BINAURAL\\[Effect Slot [0]: (Resonance Audio Renderer)]\\Resonance Audio Renderer (Custom)",
|
||||
"GUID": "{876F9274-3696-44C7-B910-29534DBF2F29}",
|
||||
"GUID": "{F6423D6B-D855-4539-981E-65B56A83638A}",
|
||||
"LibName": "Resonance Audio Renderer",
|
||||
"LibId": "6557955"
|
||||
}
|
||||
],
|
||||
"ShareSets": [
|
||||
{
|
||||
"Id": "3216246379",
|
||||
"Name": "Space_Dreaming",
|
||||
"ObjectPath": "\\Effects\\Factory Effects\\RoomVerb\\Huge Spaces\\Space_Dreaming",
|
||||
"GUID": "{4FF7C4B2-37B0-4DFF-8E8A-1420102AE2DD}",
|
||||
"LibName": "Wwise RoomVerb",
|
||||
"LibId": "7733251"
|
||||
}
|
||||
],
|
||||
"AudioDevices": [
|
||||
{
|
||||
"Id": "2317455096",
|
||||
@@ -54,7 +64,7 @@
|
||||
"PluginRefs": {
|
||||
"Custom": [
|
||||
{
|
||||
"Id": "646362734"
|
||||
"Id": "1039689298"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -66,6 +76,13 @@
|
||||
"GUID": "{9C0547B7-3AFB-4D4E-9596-ECC5232513DA}",
|
||||
"Color": "23"
|
||||
},
|
||||
{
|
||||
"Id": "983310469",
|
||||
"Name": "AUX",
|
||||
"ObjectPath": "\\Busses\\Default Work Unit\\Main Audio Bus\\MAIN\\AUX",
|
||||
"GUID": "{4B4B1EC6-9B89-43BD-9AA4-4958D5B9A08F}",
|
||||
"Color": "17"
|
||||
},
|
||||
{
|
||||
"Id": "1069431850",
|
||||
"Name": "PLAYER",
|
||||
@@ -87,6 +104,13 @@
|
||||
"GUID": "{8D84C836-FB26-4544-BD49-6659024EF3F4}",
|
||||
"Color": "20"
|
||||
},
|
||||
{
|
||||
"Id": "1842718300",
|
||||
"Name": "Demo",
|
||||
"ObjectPath": "\\Busses\\Default Work Unit\\Main Audio Bus\\MAIN\\MUSIC\\Demo",
|
||||
"GUID": "{4AC17EC2-032F-4BA0-8F96-06A0482554F3}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "2246998526",
|
||||
"Name": "Main Audio Bus",
|
||||
@@ -100,6 +124,13 @@
|
||||
"GUID": "{41BA22CE-AB13-43B2-8563-3846EB7646A9}",
|
||||
"Color": "10"
|
||||
},
|
||||
{
|
||||
"Id": "3331583377",
|
||||
"Name": "AUX_Music",
|
||||
"ObjectPath": "\\Busses\\Default Work Unit\\Main Audio Bus\\MAIN\\AUX\\AUX_Music",
|
||||
"GUID": "{3F39AA32-996B-4D9D-9F23-BDCA9DFEDBB6}",
|
||||
"Color": "17"
|
||||
},
|
||||
{
|
||||
"Id": "3991942870",
|
||||
"Name": "MUSIC",
|
||||
@@ -115,12 +146,82 @@
|
||||
"Color": "23"
|
||||
}
|
||||
],
|
||||
"AuxBusses": [
|
||||
{
|
||||
"Id": "3725552457",
|
||||
"Name": "AUX_Music_Demo",
|
||||
"ObjectPath": "\\Busses\\Default Work Unit\\Main Audio Bus\\MAIN\\AUX\\AUX_Music\\AUX_Music_Demo",
|
||||
"GUID": "{31504338-4270-4CD2-A923-2ADDE8A9C0E4}",
|
||||
"Color": "17",
|
||||
"PluginRefs": {
|
||||
"ShareSets": [
|
||||
{
|
||||
"Id": "3216246379"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"GameParameters": [
|
||||
{
|
||||
"Id": "2869055261",
|
||||
"Name": "staircaseTransition_Rtpc",
|
||||
"ObjectPath": "\\Game Parameters\\Music\\Demo\\staircaseTransition_Rtpc",
|
||||
"GUID": "{42A3CD1A-C12D-4317-A81A-4A8946C4E920}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "3789916451",
|
||||
"Name": "pianoProximity_Rtpc",
|
||||
"ObjectPath": "\\Game Parameters\\Music\\Demo\\pianoProximity_Rtpc",
|
||||
"GUID": "{CA91714E-37E8-41FB-8FE8-D7AB24E265C3}"
|
||||
"GUID": "{CA91714E-37E8-41FB-8FE8-D7AB24E265C3}",
|
||||
"Color": "26"
|
||||
}
|
||||
],
|
||||
"StateGroups": [
|
||||
{
|
||||
"Id": "1499314831",
|
||||
"Name": "musicGlobal",
|
||||
"ObjectPath": "\\States\\Music\\Demo\\musicGlobal",
|
||||
"GUID": "{AF6D98B3-10FC-46F3-AFDB-665063E78DF8}",
|
||||
"Color": "26",
|
||||
"States": [
|
||||
{
|
||||
"Id": "748895195",
|
||||
"Name": "None",
|
||||
"ObjectPath": "\\States\\Music\\Demo\\musicGlobal\\None",
|
||||
"GUID": "{AA82CE06-EC15-4AB6-A59B-BEDE7C5926C7}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "1174700730",
|
||||
"Name": "inMad",
|
||||
"ObjectPath": "\\States\\Music\\Demo\\musicGlobal\\inMad",
|
||||
"GUID": "{DD04671B-E8B5-4B1A-986A-579728855F92}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "3374585465",
|
||||
"Name": "inMenu",
|
||||
"ObjectPath": "\\States\\Music\\Demo\\musicGlobal\\inMenu",
|
||||
"GUID": "{8952F29F-BE73-473A-9D08-8294D37259E7}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "3708394339",
|
||||
"Name": "inStaircase",
|
||||
"ObjectPath": "\\States\\Music\\Demo\\musicGlobal\\inStaircase",
|
||||
"GUID": "{5EE95D9E-014E-4A9E-880A-F1EEF0FE8D8C}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "3719846035",
|
||||
"Name": "inSane",
|
||||
"ObjectPath": "\\States\\Music\\Demo\\musicGlobal\\inSane",
|
||||
"GUID": "{D325E2E9-6F95-4BA9-AF05-2C2E653106FA}",
|
||||
"Color": "26"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"SwitchGroups": [
|
||||
@@ -153,6 +254,6 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"FileHash": "{2D6B3110-DC8A-19A1-F087-BF95C2CAD1E0}"
|
||||
"FileHash": "{5CD3F051-3705-07BB-A27A-306CB3437D12}"
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,36 @@
|
||||
State Group ID Name Wwise Object Path Notes
|
||||
1499314831 musicGlobal \Music\Demo\musicGlobal
|
||||
|
||||
State ID Name State Group Notes
|
||||
748895195 None musicGlobal
|
||||
1174700730 inMad musicGlobal
|
||||
3374585465 inMenu musicGlobal
|
||||
3708394339 inStaircase musicGlobal
|
||||
3719846035 inSane musicGlobal
|
||||
|
||||
Game Parameter ID Name Wwise Object Path Notes
|
||||
3789916451 pianoProximity_Rtpc \Music\Demo\pianoProximity_Rtpc
|
||||
|
||||
Audio Bus ID Name Wwise Object Path Notes
|
||||
52442795 BINAURAL \Default Work Unit\Main Audio Bus\MAIN\BINAURAL
|
||||
393239870 SFX \Default Work Unit\Main Audio Bus\MAIN\SFX
|
||||
983310469 AUX \Default Work Unit\Main Audio Bus\MAIN\AUX
|
||||
1069431850 PLAYER \Default Work Unit\Main Audio Bus\MAIN\SFX\PLAYER
|
||||
1117531639 AMB \Default Work Unit\Main Audio Bus\MAIN\AMB
|
||||
1551306167 UI \Default Work Unit\Main Audio Bus\MAIN\UI
|
||||
1842718300 Demo \Default Work Unit\Main Audio Bus\MAIN\MUSIC\Demo
|
||||
2246998526 Main Audio Bus \Default Work Unit\Main Audio Bus
|
||||
3161908922 MAIN \Default Work Unit\Main Audio Bus\MAIN
|
||||
3331583377 AUX_Music \Default Work Unit\Main Audio Bus\MAIN\AUX\AUX_Music
|
||||
3991942870 MUSIC \Default Work Unit\Main Audio Bus\MAIN\MUSIC
|
||||
4187181611 SFX MONO \Default Work Unit\Main Audio Bus\MAIN\SFX\SFX MONO
|
||||
|
||||
Auxiliary Bus ID Name Wwise Object Path Notes
|
||||
3725552457 AUX_Music_Demo \Default Work Unit\Main Audio Bus\MAIN\AUX\AUX_Music\AUX_Music_Demo
|
||||
|
||||
Effect plug-ins ID Name Type Notes
|
||||
646362734 Resonance Audio Renderer (Custom) Resonance Audio Renderer
|
||||
1039689298 Resonance Audio Renderer (Custom) Resonance Audio Renderer
|
||||
3216246379 Space_Dreaming Wwise RoomVerb
|
||||
|
||||
Audio Devices ID Name Type Notes
|
||||
2317455096 No_Output No Output
|
||||
|
||||
@@ -200,6 +200,13 @@
|
||||
"GUID": "{DD04671B-E8B5-4B1A-986A-579728855F92}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "3374585465",
|
||||
"Name": "inMenu",
|
||||
"ObjectPath": "\\States\\Music\\Demo\\musicGlobal\\inMenu",
|
||||
"GUID": "{8952F29F-BE73-473A-9D08-8294D37259E7}",
|
||||
"Color": "26"
|
||||
},
|
||||
{
|
||||
"Id": "3708394339",
|
||||
"Name": "inStaircase",
|
||||
@@ -247,6 +254,6 @@
|
||||
]
|
||||
}
|
||||
],
|
||||
"FileHash": "{B5B4DA5B-E287-95A8-6BA3-BDAE3278C838}"
|
||||
"FileHash": "{7DA0A324-0DBD-A106-8FB8-FD56FC8FFBB3}"
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@
|
||||
<State Name="inSane" ID="{D325E2E9-6F95-4BA9-AF05-2C2E653106FA}"/>
|
||||
<State Name="inStaircase" ID="{5EE95D9E-014E-4A9E-880A-F1EEF0FE8D8C}"/>
|
||||
<State Name="inMad" ID="{DD04671B-E8B5-4B1A-986A-579728855F92}"/>
|
||||
<State Name="inMenu" ID="{8952F29F-BE73-473A-9D08-8294D37259E7}"/>
|
||||
</ChildrenList>
|
||||
</StateGroup>
|
||||
</ChildrenList>
|
||||
|
||||
Reference in New Issue
Block a user