Merge branch 'feature/audio-integration' into 'main'

Feature/audio integration

See merge request kernel-panic/revival!36
This commit is contained in:
Cinder Foster-Smith 2021-03-05 19:47:45 +00:00
commit 08c1efb0ae
24 changed files with 1793 additions and 627 deletions

BIN
game/Assets/Audio/VO/PA_BOOST.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/PA_DASH.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_ALPHA_COMPLETE.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_BOOST_0.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_DASH_0.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_DASH_1.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_DASH_2.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_DASH_3.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_FIND_WA_0.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/SD_LANDED.wav (Stored with Git LFS)

Binary file not shown.

BIN
game/Assets/Audio/VO/WA_0.wav (Stored with Git LFS)

Binary file not shown.

View File

@ -12,6 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bbf8d803b740a954fbfd10443ef1afdf, type: 3} m_Script: {fileID: 11500000, guid: bbf8d803b740a954fbfd10443ef1afdf, type: 3}
m_Name: Physical Artefact m_Name: Physical Artefact
m_EditorClassIdentifier: m_EditorClassIdentifier:
_power: {fileID: 0}
_artefactID: 0 _artefactID: 0
_dialogueKey: _dialogueKey:
_name:

File diff suppressed because one or more lines are too long

View File

@ -402,7 +402,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1496223292 --- !u!224 &1496223292
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -123,6 +123,140 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &25751814
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 25751815}
- component: {fileID: 25751817}
- component: {fileID: 25751816}
m_Layer: 5
m_Name: Text (TMP) (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &25751815
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 25751814}
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_Children: []
m_Father: {fileID: 1348733605}
m_RootOrder: 1
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: 44, y: -34}
m_SizeDelta: {x: 927.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &25751816
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 25751814}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: panic!
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_sharedMaterial: {fileID: -8698840645647610257, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4288311551
m_fontColor: {r: 1, g: 0.44025153, b: 0.6029186, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 144
m_fontSizeBase: 144
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &25751817
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 25751814}
m_CullTransparentMesh: 1
--- !u!1 &158618255 --- !u!1 &158618255
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -152,6 +286,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1925336492} - {fileID: 1925336492}
- {fileID: 1348733605}
m_Father: {fileID: 1634742204} m_Father: {fileID: 1634742204}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -172,6 +307,140 @@ CanvasGroup:
m_Interactable: 1 m_Interactable: 1
m_BlocksRaycasts: 1 m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0 m_IgnoreParentGroups: 0
--- !u!1 &298732011
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 298732012}
- component: {fileID: 298732014}
- component: {fileID: 298732013}
m_Layer: 5
m_Name: Text (TMP) (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &298732012
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 298732011}
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_Children: []
m_Father: {fileID: 1348733605}
m_RootOrder: 0
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: -282.76, y: 0}
m_SizeDelta: {x: 927.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &298732013
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 298732011}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: a
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_sharedMaterial: {fileID: -8698840645647610257, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 144
m_fontSizeBase: 144
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &298732014
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 298732011}
m_CullTransparentMesh: 1
--- !u!1 &515681031 --- !u!1 &515681031
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -319,6 +588,215 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519025935} m_GameObject: {fileID: 519025935}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &621575131
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 621575132}
- component: {fileID: 621575134}
- component: {fileID: 621575133}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &621575132
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 621575131}
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_Children: []
m_Father: {fileID: 1348733605}
m_RootOrder: 3
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: 40}
m_SizeDelta: {x: 927.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &621575133
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 621575131}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: kernel
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_sharedMaterial: {fileID: -8698840645647610257, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4288311551
m_fontColor: {r: 1, g: 0.44025153, b: 0.6029186, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 144
m_fontSizeBase: 144
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &621575134
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 621575131}
m_CullTransparentMesh: 1
--- !u!1 &1089011468
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1089011469}
- component: {fileID: 1089011471}
- component: {fileID: 1089011470}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1089011469
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1089011468}
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_Children: []
m_Father: {fileID: 1348733605}
m_RootOrder: 2
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: 123.9, y: 12.3}
m_SizeDelta: {x: 32.2, y: 35.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1089011470
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1089011468}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1089011471
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1089011468}
m_CullTransparentMesh: 1
--- !u!1 &1095441760 --- !u!1 &1095441760
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -394,6 +872,224 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1095441760} m_GameObject: {fileID: 1095441760}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1143282528
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1143282529}
- component: {fileID: 1143282531}
- component: {fileID: 1143282530}
m_Layer: 5
m_Name: Text (TMP) (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1143282529
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143282528}
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_Children: []
m_Father: {fileID: 1348733605}
m_RootOrder: 4
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: 473.9, y: 0}
m_SizeDelta: {x: 927.9, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1143282530
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143282528}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: game
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_sharedMaterial: {fileID: -8698840645647610257, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 144
m_fontSizeBase: 144
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1143282531
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143282528}
m_CullTransparentMesh: 1
--- !u!1 &1348733604
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1348733605}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1348733605
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348733604}
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_Children:
- {fileID: 298732012}
- {fileID: 25751815}
- {fileID: 1089011469}
- {fileID: 621575132}
- {fileID: 1143282529}
m_Father: {fileID: 158618256}
m_RootOrder: 1
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: -138.7, y: 0}
m_SizeDelta: {x: 1265.8, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1629863937
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1629863938}
- component: {fileID: 1629863939}
m_Layer: 0
m_Name: Disclaimer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1629863938
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1629863937}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6.7594604, y: 6.348572, z: 366.31305}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2027890783}
m_Father: {fileID: 1634742204}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!225 &1629863939
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1629863937}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &1634742200 --- !u!1 &1634742200
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -453,7 +1149,7 @@ Canvas:
m_OverrideSorting: 0 m_OverrideSorting: 0
m_OverridePixelPerfect: 0 m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_TargetDisplay: 0 m_TargetDisplay: 0
@ -471,6 +1167,7 @@ RectTransform:
- {fileID: 519025936} - {fileID: 519025936}
- {fileID: 158618256} - {fileID: 158618256}
- {fileID: 1907637422} - {fileID: 1907637422}
- {fileID: 1629863938}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -497,6 +1194,7 @@ MonoBehaviour:
_fadeGroups: _fadeGroups:
- {fileID: 158618257} - {fileID: 158618257}
- {fileID: 1907637423} - {fileID: 1907637423}
- {fileID: 1629863939}
_loader: {fileID: 1658038039} _loader: {fileID: 1658038039}
--- !u!1 &1658038038 --- !u!1 &1658038038
GameObject: GameObject:
@ -609,7 +1307,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1925336492 --- !u!224 &1925336492
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -667,3 +1365,138 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1925336491} m_GameObject: {fileID: 1925336491}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &2027890782
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2027890783}
- component: {fileID: 2027890785}
- component: {fileID: 2027890784}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2027890783
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2027890782}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -366.31305}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1629863938}
m_RootOrder: 0
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_SizeDelta: {x: 985.14, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2027890784
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2027890782}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: This game is a work of fiction. Any similarity to real life persons (living
or dead) or events is purely coincidental.
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_sharedMaterial: {fileID: -8698840645647610257, guid: 16f4efa1cbbabe745b17245fbc69d5d8, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &2027890785
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2027890782}
m_CullTransparentMesh: 1

View File

@ -2538,11 +2538,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0.017264409 value: -0.017264403
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0.009297729 value: 0.009297725
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -2558,19 +2558,19 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.9688833 value: 0.9680315
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0.24676809 value: 0.24655113
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0.018657798 value: 0.044697862
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0.004752016 value: -0.011384245
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -2642,31 +2642,31 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0.001642333 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0.8443586 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -0.49695835 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.9936794 value: 0.9997964
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0.1105299 value: 0.0047718585
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0.016183712 value: -0.017264403
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0.011072202 value: 0.009297725
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_XAxis.m_InvertInput propertyPath: m_XAxis.m_InvertInput
@ -2702,19 +2702,19 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.9999886 value: 0.9996367
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0.0047727674 value: 0.0047711134
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0.0003129728 value: 0.023356276
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0.00016855123 value: -0.0125784995
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
@ -2733,6 +2733,50 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 3060674078300009146} m_PrefabInstance: {fileID: 3060674078300009146}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &784513058
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 784513059}
- component: {fileID: 784513060}
m_Layer: 0
m_Name: MusicManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &784513059
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 784513058}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 953.24054, y: 546.3486, z: 366.31305}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &784513060
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 784513058}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 27f3f5345a3cb684195f070b3d44bc05, type: 3}
m_Name:
m_EditorClassIdentifier:
_musicId: event:/Music/WIPMusic
--- !u!1 &797647646 stripped --- !u!1 &797647646 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c0da1dab89beefe4097416b015f6025a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,21 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using FMOD;
using FMOD.Studio;
using FMODUnity;
public class MusicManager : MonoBehaviour
{
[SerializeField]
[EventRef]
private string _musicId;
private EventInstance _musicInstance;
void Start()
{
_musicInstance = RuntimeManager.CreateInstance( _musicId );
_musicInstance.start();
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 27f3f5345a3cb684195f070b3d44bc05
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9,6 +9,7 @@ using UnityEngine;
using UnityEngine.Animations.Rigging; using UnityEngine.Animations.Rigging;
using UnityEngine.Networking; using UnityEngine.Networking;
using Debug = UnityEngine.Debug; using Debug = UnityEngine.Debug;
using STOP_MODE = FMOD.Studio.STOP_MODE;
#if UNITY_EDITOR #if UNITY_EDITOR
using UnityEditor; using UnityEditor;
@ -26,6 +27,7 @@ public partial class DialogueSystem : ScriptableObject
private readonly List<string> _usedClips = new List<string>(); private readonly List<string> _usedClips = new List<string>();
private EVENT_CALLBACK _dialogueCallback; private EVENT_CALLBACK _dialogueCallback;
private EventInstance _currentInstance;
private void OnEnable() private void OnEnable()
{ {
@ -118,11 +120,17 @@ public partial class DialogueSystem : ScriptableObject
_usedClips.Add(key); _usedClips.Add(key);
} }
if ( _currentInstance.isValid() )
{
_currentInstance.stop( STOP_MODE.IMMEDIATE );
_currentInstance.release();
}
var dialogueInstance = RuntimeManager.CreateInstance(_settings.RadioDialogueKey); _currentInstance = RuntimeManager.CreateInstance(_settings.RadioDialogueKey);
GCHandle stringHandle = GCHandle.Alloc(key, GCHandleType.Pinned); GCHandle stringHandle = GCHandle.Alloc(key, GCHandleType.Pinned);
dialogueInstance.setUserData(GCHandle.ToIntPtr(stringHandle)); _currentInstance.setUserData(GCHandle.ToIntPtr(stringHandle));
DialogueLine dl; DialogueLine dl;
dl.text = DialogueDatabase.ReadDialogue(key); dl.text = DialogueDatabase.ReadDialogue(key);
@ -130,9 +138,8 @@ public partial class DialogueSystem : ScriptableObject
var clip = _settings.GetDialogueClip(key); var clip = _settings.GetDialogueClip(key);
dl.duration = clip.length; dl.duration = clip.length;
dialogueInstance.setCallback(_dialogueCallback); _currentInstance.setCallback(_dialogueCallback);
dialogueInstance.start(); _currentInstance.start();
dialogueInstance.release();
onDialogueLine?.Invoke(this, dl); onDialogueLine?.Invoke(this, dl);
} }

BIN
game/FMOD Project/Build/Desktop/Music.bank (Stored with Git LFS)

Binary file not shown.

BIN
game/FMOD Project/Build/Desktop/SFX.bank (Stored with Git LFS)

Binary file not shown.

BIN
game/FMOD Project/Build/Desktop/VO.bank (Stored with Git LFS)

Binary file not shown.

View File

@ -23,7 +23,7 @@ The placeholder VO is from NASA's public library of space mission sounds.
https://soundcloud.com/nasa</value> https://soundcloud.com/nasa</value>
</property> </property>
<property name="name"> <property name="name">
<value>Radio Dialogue</value> <value>Radio Dialogue Line</value>
</property> </property>
<property name="outputFormat"> <property name="outputFormat">
<value>0</value> <value>0</value>
@ -142,10 +142,10 @@ https://soundcloud.com/nasa</value>
<value>true</value> <value>true</value>
</property> </property>
<property name="start"> <property name="start">
<value>0.050000000000000003</value> <value>0.029999999999999999</value>
</property> </property>
<property name="length"> <property name="length">
<value>0.31775368245585678</value> <value>0.32000000000000001</value>
</property> </property>
<property name="voiceStealing"> <property name="voiceStealing">
<value>3</value> <value>3</value>
@ -158,6 +158,9 @@ https://soundcloud.com/nasa</value>
</relationship> </relationship>
</object> </object>
<object class="EventMixerGroup" id="{d556481e-938e-4f38-8dab-06f7be43216e}"> <object class="EventMixerGroup" id="{d556481e-938e-4f38-8dab-06f7be43216e}">
<property name="volume">
<value>-18.5</value>
</property>
<property name="name"> <property name="name">
<value>VO</value> <value>VO</value>
</property> </property>
@ -184,7 +187,7 @@ https://soundcloud.com/nasa</value>
<value>true</value> <value>true</value>
</property> </property>
<property name="length"> <property name="length">
<value>0.36775368245585677</value> <value>0.47000000000000003</value>
</property> </property>
<property name="voiceStealing"> <property name="voiceStealing">
<value>3</value> <value>3</value>
@ -218,10 +221,10 @@ https://soundcloud.com/nasa</value>
</object> </object>
<object class="LoopRegion" id="{843e0827-55ef-4445-890a-67f6b480f5f6}"> <object class="LoopRegion" id="{843e0827-55ef-4445-890a-67f6b480f5f6}">
<property name="position"> <property name="position">
<value>0.20999999999999999</value> <value>0.28999999999999998</value>
</property> </property>
<property name="length"> <property name="length">
<value>0.13916042463760309</value> <value>0.029999999999999999</value>
</property> </property>
<relationship name="timeline"> <relationship name="timeline">
<destination>{c09ccfa7-4bb6-45be-86fb-5dd0ef8db779}</destination> <destination>{c09ccfa7-4bb6-45be-86fb-5dd0ef8db779}</destination>
@ -244,6 +247,7 @@ https://soundcloud.com/nasa</value>
<object class="MixerBusFader" id="{dda6bbc3-2949-4e20-b45e-d4422b0d2b81}" /> <object class="MixerBusFader" id="{dda6bbc3-2949-4e20-b45e-d4422b0d2b81}" />
<object class="MixerBusEffectChain" id="{84cd0f51-2b01-4b94-ba40-3b5d187d95fd}"> <object class="MixerBusEffectChain" id="{84cd0f51-2b01-4b94-ba40-3b5d187d95fd}">
<relationship name="effects"> <relationship name="effects">
<destination>{103c95a6-83e8-4150-be98-0d2c63549fd0}</destination>
<destination>{5f4416ee-bd11-47fa-81df-afe55b0d5550}</destination> <destination>{5f4416ee-bd11-47fa-81df-afe55b0d5550}</destination>
<destination>{ebf609a3-1683-4b21-9b12-d49b35315615}</destination> <destination>{ebf609a3-1683-4b21-9b12-d49b35315615}</destination>
</relationship> </relationship>
@ -288,6 +292,14 @@ https://soundcloud.com/nasa</value>
</property> </property>
</object> </object>
<object class="MixerBusFader" id="{bb7231cc-053a-4201-af64-7278e94947d2}" /> <object class="MixerBusFader" id="{bb7231cc-053a-4201-af64-7278e94947d2}" />
<object class="ThreeEQEffect" id="{103c95a6-83e8-4150-be98-0d2c63549fd0}">
<property name="lowGain">
<value>-26</value>
</property>
<property name="highGain">
<value>-10.5</value>
</property>
</object>
<object class="MixerBusFader" id="{5f4416ee-bd11-47fa-81df-afe55b0d5550}" /> <object class="MixerBusFader" id="{5f4416ee-bd11-47fa-81df-afe55b0d5550}" />
<object class="Sidechain" id="{ebf609a3-1683-4b21-9b12-d49b35315615}" /> <object class="Sidechain" id="{ebf609a3-1683-4b21-9b12-d49b35315615}" />
<object class="AutomationCurve" id="{448bd0e8-1a2d-44e4-b8d9-de2990e728ba}"> <object class="AutomationCurve" id="{448bd0e8-1a2d-44e4-b8d9-de2990e728ba}">
@ -297,9 +309,9 @@ https://soundcloud.com/nasa</value>
<relationship name="automationPoints"> <relationship name="automationPoints">
<destination>{95cada1c-d263-43ea-992b-1aa431d52faa}</destination> <destination>{95cada1c-d263-43ea-992b-1aa431d52faa}</destination>
<destination>{0e535cab-77db-4ded-b322-fac64590c903}</destination> <destination>{0e535cab-77db-4ded-b322-fac64590c903}</destination>
<destination>{3178433b-ba9b-4ab2-9ac7-6fb913e52357}</destination>
<destination>{c6abd634-cff9-421f-ad1b-cdcbb0482f8f}</destination> <destination>{c6abd634-cff9-421f-ad1b-cdcbb0482f8f}</destination>
<destination>{16fa31d8-2e53-4f2e-af11-bfa67d21f851}</destination> <destination>{16fa31d8-2e53-4f2e-af11-bfa67d21f851}</destination>
<destination>{8a14d0db-4387-4b70-9f5d-b23e4d58fb81}</destination>
</relationship> </relationship>
</object> </object>
<object class="MixerBusFader" id="{61c7f89e-aa0e-4e74-9937-6dc7017f21e7}" /> <object class="MixerBusFader" id="{61c7f89e-aa0e-4e74-9937-6dc7017f21e7}" />
@ -308,7 +320,7 @@ https://soundcloud.com/nasa</value>
<value>0</value> <value>0</value>
</property> </property>
<property name="value"> <property name="value">
<value>0</value> <value>-7.5</value>
</property> </property>
</object> </object>
<object class="AutomationPoint" id="{0e535cab-77db-4ded-b322-fac64590c903}"> <object class="AutomationPoint" id="{0e535cab-77db-4ded-b322-fac64590c903}">
@ -316,23 +328,15 @@ https://soundcloud.com/nasa</value>
<value>0.14117499999999999</value> <value>0.14117499999999999</value>
</property> </property>
<property name="value"> <property name="value">
<value>-20</value> <value>-31</value>
</property>
</object>
<object class="AutomationPoint" id="{3178433b-ba9b-4ab2-9ac7-6fb913e52357}">
<property name="position">
<value>0.61576500000000001</value>
</property>
<property name="value">
<value>-20</value>
</property> </property>
</object> </object>
<object class="AutomationPoint" id="{c6abd634-cff9-421f-ad1b-cdcbb0482f8f}"> <object class="AutomationPoint" id="{c6abd634-cff9-421f-ad1b-cdcbb0482f8f}">
<property name="position"> <property name="position">
<value>0.61876900000000001</value> <value>0.35000000000000003</value>
</property> </property>
<property name="value"> <property name="value">
<value>0</value> <value>-7.5</value>
</property> </property>
</object> </object>
<object class="AutomationPoint" id="{16fa31d8-2e53-4f2e-af11-bfa67d21f851}"> <object class="AutomationPoint" id="{16fa31d8-2e53-4f2e-af11-bfa67d21f851}">
@ -340,7 +344,15 @@ https://soundcloud.com/nasa</value>
<value>0.114893</value> <value>0.114893</value>
</property> </property>
<property name="value"> <property name="value">
<value>0</value> <value>-7.5</value>
</property>
</object>
<object class="AutomationPoint" id="{8a14d0db-4387-4b70-9f5d-b23e4d58fb81}">
<property name="position">
<value>0.33000000000000002</value>
</property>
<property name="value">
<value>-31</value>
</property> </property>
</object> </object>
</objects> </objects>