klaviatuur parandatud
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -60,15 +60,13 @@ public class AlarmTrigger : MonoBehaviour
|
|||||||
RoomHum.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
|
RoomHum.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
|
||||||
AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
|
AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
|
||||||
|
|
||||||
if (hasAlarm && !AudioManager.IsPlaying(AlarmSound)) // If alarm state has ended.
|
|
||||||
{
|
|
||||||
VentilationSequence.Play(); // Return to normal.
|
|
||||||
|
|
||||||
RoomHum.start();
|
VentilationSequence.Play(); // Return to normal.
|
||||||
AlarmSound.stop(FMOD.Studio.STOP_MODE.ALLOWFADEOUT);
|
|
||||||
|
|
||||||
hasAlarm = false;
|
RoomHum.start();
|
||||||
}
|
AlarmSound.stop(FMOD.Studio.STOP_MODE.ALLOWFADEOUT);
|
||||||
|
|
||||||
|
hasAlarm = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ MonoBehaviour:
|
|||||||
_componentIndexCache: 0
|
_componentIndexCache: 0
|
||||||
_addedNetworkObject: {fileID: 4318509465820511600}
|
_addedNetworkObject: {fileID: 4318509465820511600}
|
||||||
_networkObjectCache: {fileID: 4318509465820511600}
|
_networkObjectCache: {fileID: 4318509465820511600}
|
||||||
vrPlayerPrefab: {fileID: 3865165877314776266, guid: a82c8ed92875c7d4185d79d68468bfab,
|
vrPlayerPrefab: {fileID: 1455409453530882256, guid: a82c8ed92875c7d4185d79d68468bfab,
|
||||||
type: 3}
|
type: 3}
|
||||||
kbmPlayerPrefab: {fileID: 8146527781413792986, guid: b0c478e5f07e4ab47af03d6f29f1302a,
|
kbmPlayerPrefab: {fileID: 8146527781413792986, guid: b0c478e5f07e4ab47af03d6f29f1302a,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|||||||
@@ -4854,6 +4854,7 @@ GameObject:
|
|||||||
- component: {fileID: 412610394335443936}
|
- component: {fileID: 412610394335443936}
|
||||||
- component: {fileID: 7884199987669606180}
|
- component: {fileID: 7884199987669606180}
|
||||||
- component: {fileID: 215482987}
|
- component: {fileID: 215482987}
|
||||||
|
- component: {fileID: 6487605284439918203}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Left Thin Frame
|
m_Name: Left Thin Frame
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -4949,6 +4950,33 @@ MeshCollider:
|
|||||||
m_Convex: 1
|
m_Convex: 1
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!54 &6487605284439918203
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8583638621924436570}
|
||||||
|
serializedVersion: 4
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||||
|
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||||
|
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ImplicitCom: 1
|
||||||
|
m_ImplicitTensor: 1
|
||||||
|
m_UseGravity: 0
|
||||||
|
m_IsKinematic: 1
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
--- !u!1 &8645113319109209617
|
--- !u!1 &8645113319109209617
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user