Merge Journal audio into main

This commit is contained in:
2023-07-09 17:24:10 +02:00
parent 243fddc069
commit e103b23b4a

View File

@@ -1146,6 +1146,7 @@ GameObject:
- component: {fileID: 243041995}
- component: {fileID: 243041994}
- component: {fileID: 243041993}
- component: {fileID: 243041998}
m_Layer: 0
m_Name: Journal
m_TagString: Untagged
@@ -1166,6 +1167,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
journal: {fileID: 22208185}
m_pageSound: {fileID: 8300000, guid: 9f4b6c8a11388384cbce1b85d03f053a, type: 3}
m_openSound: {fileID: 8300000, guid: fd39bd6850cc59d4caec9846abe40cb7, type: 3}
m_closeSound: {fileID: 8300000, guid: 451bd7638e5a31249b6fbcbfa1ed524a, type: 3}
adventurerPage: {fileID: 219076562}
questPage: {fileID: 137465973}
--- !u!65 &243041994
@@ -1254,6 +1258,102 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 138.73, y: 0, z: 180}
--- !u!82 &243041998
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 243041992}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
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 &270949401
GameObject:
m_ObjectHideFlags: 0
@@ -2247,7 +2347,7 @@ Light:
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.013
m_Bias: 0
m_NormalBias: 0.4
m_NearPlane: 0.1
m_CullingMatrixOverride:
@@ -5615,7 +5715,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!108 &1782138141
Light:
m_ObjectHideFlags: 0
@@ -6250,8 +6350,8 @@ Light:
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.013
m_NormalBias: 0.4
m_Bias: 0
m_NormalBias: 0.43
m_NearPlane: 0.1
m_CullingMatrixOverride:
e00: 1