sound update and roof

This commit is contained in:
2023-05-29 14:07:36 +02:00
parent c6b6287052
commit b331868005
8 changed files with 436 additions and 95 deletions

View File

@@ -657,7 +657,7 @@ RectTransform:
- {fileID: 1000889012}
- {fileID: 936857003}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -702,7 +702,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 504}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &273343684
@@ -749,8 +749,8 @@ MonoBehaviour:
m_FillRect: {fileID: 2107745304}
m_HandleRect: {fileID: 1089285132}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 1
m_MinValue: -80
m_MaxValue: 0
m_WholeNumbers: 0
m_Value: 0
m_OnValueChanged:
@@ -759,7 +759,7 @@ MonoBehaviour:
- m_Target: {fileID: 1201779188}
m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp
m_MethodName: SetMainVolume
m_Mode: 4
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1786,7 +1786,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 601898925}
m_LocalRotation: {x: 0.050798737, y: -0.7004526, z: 0.050106958, w: 0.7101232}
m_LocalRotation: {x: 0.05079872, y: -0.7004526, z: 0.05010694, w: 0.7101232}
m_LocalPosition: {x: 2.27, y: 4.16525, z: 3.82}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -1894,7 +1894,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6266817390742658039, guid: 5822b88e98887c34383505b33c58d6da, type: 3}
propertyPath: m_RootOrder
value: 11
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6266817390742658039, guid: 5822b88e98887c34383505b33c58d6da, type: 3}
propertyPath: m_LocalPosition.z
@@ -2400,7 +2400,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6266817390742658039, guid: 5822b88e98887c34383505b33c58d6da, type: 3}
propertyPath: m_RootOrder
value: 12
value: 11
objectReference: {fileID: 0}
- target: {fileID: 6266817390742658039, guid: 5822b88e98887c34383505b33c58d6da, type: 3}
propertyPath: m_LocalPosition.z
@@ -2724,7 +2724,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -400}
m_AnchoredPosition: {x: 0, y: 104}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &808351076
@@ -2771,8 +2771,8 @@ MonoBehaviour:
m_FillRect: {fileID: 1063379714}
m_HandleRect: {fileID: 1474369646}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 1
m_MinValue: -80
m_MaxValue: 0
m_WholeNumbers: 0
m_Value: 0
m_OnValueChanged:
@@ -2781,7 +2781,7 @@ MonoBehaviour:
- m_Target: {fileID: 1201779188}
m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp
m_MethodName: SetSfxVolume
m_Mode: 4
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -3361,6 +3361,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 43069913}
- {fileID: 1755630382}
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0}
@@ -3576,11 +3577,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 936985375}
<<<<<<< HEAD
m_LocalRotation: {x: 0.17622611, y: 0.76960397, z: -0.240131, w: 0.56479305}
=======
m_LocalRotation: {x: 0.1019345, y: 0.69441885, z: -0.100375146, w: 0.7052068}
>>>>>>> afa4e4b50c78e5198ef9b8ffd1d9924923594530
m_LocalRotation: {x: 0.17622612, y: 0.769604, z: -0.24013099, w: 0.56479305}
m_LocalPosition: {x: 4.61, y: 3.52, z: -1.96}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -4330,7 +4327,7 @@ MonoBehaviour:
boby: {fileID: 7398140401948337837}
scoreText: {fileID: 702512603}
timerText: {fileID: 1890329291}
audioMixer: {fileID: 0}
audioMixer: {fileID: 24100000, guid: 911068ff86e0a0b4d8dae92436b938fa, type: 2}
--- !u!114 &1201779189
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4491,8 +4488,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1219467652}
m_Mesh: {fileID: -5495902117074765545, guid: 15f50b6494f632e40bdc081ecf2a2ad4, type: 3}
<<<<<<< HEAD
=======
--- !u!1 &1227195890
GameObject:
m_ObjectHideFlags: 0
@@ -4567,63 +4562,6 @@ RectTransform:
m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &1265567512
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8284425857235584851, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_Name
value: module2 (2)
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalPosition.z
value: 157.2
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 8769601115213192681, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f3082b8b00f0a10c48efb4c099b66852, type: 3}
--- !u!1 &1359326123
GameObject:
m_ObjectHideFlags: 0
@@ -4700,7 +4638,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1359326123}
m_CullTransparentMesh: 1
>>>>>>> afa4e4b50c78e5198ef9b8ffd1d9924923594530
--- !u!1 &1361965985
GameObject:
m_ObjectHideFlags: 3
@@ -4820,15 +4757,9 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
<<<<<<< HEAD
m_GameObject: {fileID: 1513686735}
m_LocalRotation: {x: 0.22590087, y: 0.003049637, z: -0.00070720003, w: 0.9741453}
m_LocalPosition: {x: -0.28647116, y: 6.2664723, z: 2.074831}
=======
m_GameObject: {fileID: 1473008034}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
>>>>>>> afa4e4b50c78e5198ef9b8ffd1d9924923594530
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -4978,8 +4909,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513686735}
m_LocalRotation: {x: 0.22590086, y: 0.0030496058, z: -0.0007071928, w: 0.9741453}
m_LocalPosition: {x: -0.28647116, y: 6.2664723, z: 2.6748314}
m_LocalRotation: {x: 0.22590086, y: 0.0030496013, z: -0.0007071918, w: 0.9741453}
m_LocalPosition: {x: -0.28647116, y: 6.2664723, z: 2.074831}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -5210,7 +5141,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -200}
m_AnchoredPosition: {x: 0, y: 304}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1556327751
@@ -5257,8 +5188,8 @@ MonoBehaviour:
m_FillRect: {fileID: 1987176745}
m_HandleRect: {fileID: 4394851}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 1
m_MinValue: -80
m_MaxValue: 0
m_WholeNumbers: 0
m_Value: 0
m_OnValueChanged:
@@ -5267,7 +5198,7 @@ MonoBehaviour:
- m_Target: {fileID: 1201779188}
m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp
m_MethodName: SetMusicVolume
m_Mode: 4
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -5610,7 +5541,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1615993234}
m_LocalRotation: {x: -0.0003370659, y: 0.9991459, z: -0.040474083, w: -0.008320832}
m_LocalRotation: {x: -0.00033706616, y: 0.9991459, z: -0.04047412, w: -0.008320832}
m_LocalPosition: {x: -0.26, y: 4, z: 13.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -5618,7 +5549,7 @@ Transform:
- {fileID: 502161548}
m_Father: {fileID: 1603739812}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 7.048, y: 180, z: 0}
m_LocalEulerAnglesHint: {x: 4.7, y: 180.954, z: 0}
--- !u!114 &1615993236
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5642,7 +5573,7 @@ MonoBehaviour:
m_Lens:
FieldOfView: 70
OrthographicSize: 5
NearClipPlane: 0.3
NearClipPlane: 4.22
FarClipPlane: 200
Dutch: 0
ModeOverride: 0
@@ -5899,6 +5830,103 @@ Transform:
m_Father: {fileID: 7917514869596290071}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1755630381
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1755630382}
- component: {fileID: 1755630385}
- component: {fileID: 1755630384}
- component: {fileID: 1755630383}
m_Layer: 0
m_Name: Teto
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1755630382
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755630381}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.01, y: 7.4, z: 0.45}
m_LocalScale: {x: 17.03, y: 1, z: 19.6}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 897475396}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1755630383
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755630381}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1755630384
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755630381}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 97cabee3711df3b4b944878d6d30edda, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1755630385
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755630381}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1785035080 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6609493762104327279, guid: 97320e10a4ea94a5085e5bf6fd4a2921, type: 3}
@@ -6344,6 +6372,8 @@ GameObject:
- component: {fileID: 1895677328}
- component: {fileID: 1895677327}
- component: {fileID: 1895677329}
- component: {fileID: 1895677331}
- component: {fileID: 1895677330}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -6374,7 +6404,7 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 0.3
near clip plane: 4.22
far clip plane: 200
field of view: 70
orthographic: 0
@@ -6401,7 +6431,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1895677325}
m_LocalRotation: {x: -0.0003370659, y: 0.9991459, z: -0.040474083, w: -0.008320832}
m_LocalRotation: {x: -0.00033706616, y: 0.9991459, z: -0.04047412, w: -0.008320832}
m_LocalPosition: {x: 0.016471177, y: 2.8035278, z: -12.784832}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -6443,6 +6473,110 @@ MonoBehaviour:
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!82 &1895677330
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1895677325}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -8278190956376925970, guid: 911068ff86e0a0b4d8dae92436b938fa, type: 2}
m_audioClip: {fileID: 8300000, guid: bf33ceb4e70e33349bba9e70519c57e2, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 1
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!81 &1895677331
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1895677325}
m_Enabled: 1
--- !u!1 &1926637271
GameObject:
m_ObjectHideFlags: 0