diff --git a/Assets/Prefabs_NEW/Towers/CrystallTower.prefab b/Assets/Prefabs_NEW/Towers/CrystallTower.prefab index 068c6af9..df614f63 100644 --- a/Assets/Prefabs_NEW/Towers/CrystallTower.prefab +++ b/Assets/Prefabs_NEW/Towers/CrystallTower.prefab @@ -367,8 +367,10 @@ MonoBehaviour: - {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3} - {fileID: 8300000, guid: 4af8bb0096e5d15489b02be84b6ce2a4, type: 3} - {fileID: 8300000, guid: dbba45d74994bff4e8b406722fc8f468, type: 3} - _controller: {fileID: 8834890311105204220} bonusSound: {fileID: 8300000, guid: e9d3f46b0b5ba9f4cada050219138aac, type: 3} + _startGame: {fileID: 0} + _controller: {fileID: 8834890311105204220} + aSourse: {fileID: 0} --- !u!114 &8834890311105204220 MonoBehaviour: m_ObjectHideFlags: 0 @@ -400,9 +402,9 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: e9d3f46b0b5ba9f4cada050219138aac, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.3 + m_Volume: 0.25 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Prefabs_NEW/UI/GameCanvas.prefab b/Assets/Prefabs_NEW/UI/GameCanvas.prefab index 0bc5e89c..3cb04cd2 100644 --- a/Assets/Prefabs_NEW/UI/GameCanvas.prefab +++ b/Assets/Prefabs_NEW/UI/GameCanvas.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 26229771} - component: {fileID: 26229770} - component: {fileID: 26229769} + - component: {fileID: 8547728616116173884} m_Layer: 5 m_Name: ExtraLifeFake m_TagString: Untagged @@ -33,7 +34,7 @@ RectTransform: - {fileID: 530642963} - {fileID: 957244794} m_Father: {fileID: 586528190} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -123,6 +124,51 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &8547728616116173884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26229767} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 151664124} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1530404643} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &62152442 GameObject: m_ObjectHideFlags: 0 @@ -135,6 +181,7 @@ GameObject: - component: {fileID: 62152446} - component: {fileID: 62152445} - component: {fileID: 62152444} + - component: {fileID: 970225257} m_Layer: 5 m_Name: ExtraLifeButton m_TagString: Untagged @@ -153,10 +200,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1559963583} - {fileID: 139923872} m_Father: {fileID: 586528190} - m_RootOrder: 2 + 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} @@ -246,6 +292,35 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &970225257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62152442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 151664124} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &129141347 GameObject: m_ObjectHideFlags: 0 @@ -352,7 +427,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 62152443} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -401,6 +476,133 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: RESUME +--- !u!1 &151664122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 151664123} + - component: {fileID: 151664124} + m_Layer: 0 + m_Name: Extralife + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &151664123 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151664122} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -509.1169, y: -1018.2338, z: 0} + m_LocalScale: {x: 0.9428091, y: 0.9428091, z: 0.9428091} + m_Children: [] + m_Father: {fileID: 822347132} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &151664124 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151664122} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1f729b2fab399f847b64e6da9de449d8, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.481 + 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 &195587185 GameObject: m_ObjectHideFlags: 0 @@ -412,7 +614,6 @@ GameObject: - component: {fileID: 195587186} - component: {fileID: 195587188} - component: {fileID: 195587187} - - component: {fileID: 7382954402493043111} m_Layer: 5 m_Name: GreyHeart m_TagString: Untagged @@ -433,7 +634,7 @@ RectTransform: m_Children: - {fileID: 1754245631} m_Father: {fileID: 586528190} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -479,21 +680,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 1 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7382954402493043111 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 195587185} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8dc4cc07f3bed18489377bd6a954befc, type: 3} - m_Name: - m_EditorClassIdentifier: - victorySound: {fileID: 8300000, guid: c5d6f7a31e8ea824a8e65927b92b86f8, type: 3} - defeatSound: {fileID: 8300000, guid: 8e59fee47fa858a419bdc652dc2a9a71, type: 3} - audioSource: {fileID: 0} --- !u!1 &252584711 GameObject: m_ObjectHideFlags: 0 @@ -1277,6 +1463,7 @@ RectTransform: m_Children: - {fileID: 1696696517} - {fileID: 702947553} + - {fileID: 1559963583} - {fileID: 62152443} - {fileID: 836943122} - {fileID: 195587186} @@ -1339,6 +1526,7 @@ GameObject: - component: {fileID: 702947556} - component: {fileID: 702947555} - component: {fileID: 702947554} + - component: {fileID: 3434762662623442801} m_Layer: 5 m_Name: No Thanks Button m_TagString: Untagged @@ -1461,6 +1649,51 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &3434762662623442801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 702947552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 151664124} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1530404643} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &719771333 GameObject: m_ObjectHideFlags: 0 @@ -1553,6 +1786,44 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 1, b: 1, a: 1} m_EffectDistance: {x: -43.57, y: 52.66} m_UseGraphicAlpha: 1 +--- !u!1 &822347131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 822347132} + m_Layer: 5 + m_Name: ButtonSound + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &822347132 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822347131} + 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: 151664123} + - {fileID: 1530404642} + - {fileID: 1705319699} + m_Father: {fileID: 7117637459326710719} + m_RootOrder: 7 + 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: -278.83582, y: -534.1013} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &836943121 GameObject: m_ObjectHideFlags: 0 @@ -1584,7 +1855,7 @@ RectTransform: m_Children: - {fileID: 1104730212} m_Father: {fileID: 586528190} - m_RootOrder: 3 + 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} @@ -2268,6 +2539,133 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1530404641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530404642} + - component: {fileID: 1530404643} + m_Layer: 0 + m_Name: Exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1530404642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530404641} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -509.1169, y: -1018.2338, z: 0} + m_LocalScale: {x: 0.9428091, y: 0.9428091, z: 0.9428091} + m_Children: [] + m_Father: {fileID: 822347132} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1530404643 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530404641} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 8a514ad4296562240ba6cc304ce2681e, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.481 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 0 + MinDistance: 1 + MaxDistance: 1.01 + Pan2D: 0 + rolloffMode: 2 + 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 &1559963582 GameObject: m_ObjectHideFlags: 0 @@ -2280,6 +2678,7 @@ GameObject: - component: {fileID: 1559963586} - component: {fileID: 1559963585} - component: {fileID: 1559963584} + - component: {fileID: 2272035603379506085} m_Layer: 5 m_Name: ExtraLife m_TagString: Untagged @@ -2299,12 +2698,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 578766030} - m_Father: {fileID: 62152443} - m_RootOrder: 0 + m_Father: {fileID: 586528190} + 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -224} m_SizeDelta: {x: 485, y: 125} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1559963586 @@ -2474,18 +2873,35 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - - m_Target: {fileID: 7382954402493043111} - m_TargetAssemblyTypeName: VictoryOrNot, Assembly-CSharp - m_MethodName: Play - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 +--- !u!114 &2272035603379506085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1559963582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 151664124} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1645799291 GameObject: m_ObjectHideFlags: 0 @@ -2659,6 +3075,154 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: -10, y: 10} m_UseGraphicAlpha: 1 +--- !u!1 &1705319698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1705319699} + - component: {fileID: 1705319701} + - component: {fileID: 1705319700} + m_Layer: 5 + m_Name: Die + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1705319699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705319698} + 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: 822347132} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!82 &1705319701 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705319698} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 158e2b6cd6cdcba49bc9f9c1cb29d84b, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.417 + 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!114 &1705319700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705319698} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e51389e09a2874442b3b6116ade51ff7, type: 3} + m_Name: + m_EditorClassIdentifier: + heakth: {fileID: 0} + deadClip: {fileID: 8300000, guid: 158e2b6cd6cdcba49bc9f9c1cb29d84b, type: 3} + source: {fileID: 1705319701} --- !u!1 &1754245630 GameObject: m_ObjectHideFlags: 0 @@ -4259,6 +4823,7 @@ RectTransform: - {fileID: 7117637457422693167} - {fileID: 586528190} - {fileID: 1645799292} + - {fileID: 822347132} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4371,6 +4936,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _extraLife: {fileID: 0} + health: {fileID: 0} --- !u!1 &7117637459335731026 GameObject: m_ObjectHideFlags: 0 @@ -5079,6 +5645,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3212349966214319352, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3212349966214319352, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3212349966214319352, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3212349966214319352, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 3212349966214319352, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3212349966214319352, guid: 97a03d914d2e6ea40a905290ce13f5b0, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 3212349966214319353, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_Enabled @@ -5419,6 +6015,12 @@ PrefabInstance: m_RemovedComponents: - {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} +--- !u!224 &1415495981690910128 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, + type: 3} + m_PrefabInstance: {fileID: 7117637457990202416} + m_PrefabAsset: {fileID: 0} --- !u!224 &1415495983658094506 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, @@ -5431,12 +6033,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7117637457990202416} m_PrefabAsset: {fileID: 0} ---- !u!224 &1415495981690910128 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, - type: 3} - m_PrefabInstance: {fileID: 7117637457990202416} - m_PrefabAsset: {fileID: 0} --- !u!1 &1415495982521125429 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, diff --git a/Assets/Prefabs_NEW/VFX/CrystalProgectile.prefab b/Assets/Prefabs_NEW/VFX/CrystalProgectile.prefab index af3324c8..7fa47fbd 100644 --- a/Assets/Prefabs_NEW/VFX/CrystalProgectile.prefab +++ b/Assets/Prefabs_NEW/VFX/CrystalProgectile.prefab @@ -164,6 +164,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5675810155637013921, guid: dabd2db5af864be40b33d846618cd372, + type: 3} + propertyPath: m_Volume + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dabd2db5af864be40b33d846618cd372, type: 3} --- !u!4 &5834686163564528828 stripped @@ -179,6 +184,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8121987183708165574} m_Modifications: + - target: {fileID: 7042033215317480297, guid: cf0b8eee8b981b04b963961eded1ee9c, + type: 3} + propertyPath: m_Volume + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 7042033215325559829, guid: cf0b8eee8b981b04b963961eded1ee9c, type: 3} propertyPath: m_RootOrder @@ -394,6 +404,11 @@ PrefabInstance: propertyPath: m_Name value: FireballMissileGreen objectReference: {fileID: 0} + - target: {fileID: 8186924384101499655, guid: ae7ae5ea0ae7cd34abc05e19304d5600, + type: 3} + propertyPath: m_Volume + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ae7ae5ea0ae7cd34abc05e19304d5600, type: 3} --- !u!4 &3387702041049523021 stripped @@ -409,6 +424,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8121987183708165574} m_Modifications: + - target: {fileID: 1899256003540832681, guid: e433f487ec2dc67409795011e08dd4dc, + type: 3} + propertyPath: m_Volume + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 1899256003546321141, guid: e433f487ec2dc67409795011e08dd4dc, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index 587daf80..129e178c 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -2797,6 +2797,7 @@ GameObject: - component: {fileID: 1102420994} - component: {fileID: 1102420995} - component: {fileID: 1102420996} + - component: {fileID: 1102421000} - component: {fileID: 1102420997} - component: {fileID: 1102420999} - component: {fileID: 1102420998} @@ -2998,11 +2999,11 @@ AudioSource: Spatialize: 0 SpatializePostEffects: 0 Priority: 128 - DopplerLevel: 1 + DopplerLevel: 0 MinDistance: 1 - MaxDistance: 500 + MaxDistance: 1.01 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -3104,6 +3105,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b5dadb9684306343863ce74df4f19db, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1102421000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102420987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8dc4cc07f3bed18489377bd6a954befc, type: 3} + m_Name: + m_EditorClassIdentifier: + greyHeart: {fileID: 1289410420} + extralife: {fileID: 1801060037} + victorySound: {fileID: 8300000, guid: c5d6f7a31e8ea824a8e65927b92b86f8, type: 3} + defeatSound: {fileID: 8300000, guid: 192ca0b7d7d54cd43bc2df85cf441905, type: 3} + audioSource: {fileID: 1102420997} --- !u!114 &1105100998 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5359326301570881751, guid: a72be70db1163c14b8b7a3cb1c00a59d, @@ -3590,6 +3608,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1252010335} m_PrefabAsset: {fileID: 0} +--- !u!1 &1289410420 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 195587185, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + m_PrefabInstance: {fileID: 7117637457801964012} + m_PrefabAsset: {fileID: 0} --- !u!1 &1289717989 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4991598031878838981, guid: fa5ecf8ffbe22c7459c44494cee176d9, @@ -4710,7 +4734,6 @@ GameObject: - component: {fileID: 1801060033} - component: {fileID: 1801060039} - component: {fileID: 1801060035} - - component: {fileID: 1801060038} - component: {fileID: 1801060029} m_Layer: 0 m_Name: Player @@ -4852,16 +4875,16 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 0 - m_Volume: 0.5 + m_Volume: 0.75 m_Pitch: 1 Loop: 0 Mute: 0 Spatialize: 0 SpatializePostEffects: 0 Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 1.01 + DopplerLevel: 0 + MinDistance: 0 + MaxDistance: 0.01 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 @@ -5055,22 +5078,6 @@ MonoBehaviour: m_EditorClassIdentifier: life: 2 menu: {fileID: 104479278} ---- !u!114 &1801060038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801060021} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8dc4cc07f3bed18489377bd6a954befc, type: 3} - m_Name: - m_EditorClassIdentifier: - extralife: {fileID: 1801060037} - victorySound: {fileID: 8300000, guid: c5d6f7a31e8ea824a8e65927b92b86f8, type: 3} - defeatSound: {fileID: 8300000, guid: 8e59fee47fa858a419bdc652dc2a9a71, type: 3} - audioSource: {fileID: 1801060029} --- !u!114 &1801060039 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27327,9 +27334,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tilePosition: {x: 0, y: 0, z: 0} - canMove: 0 - canBeAttacked: 0 - canBuildHere: 0 + canMove: 1 + canBeAttacked: 1 + canBuildHere: 1 buildingOnTile: {fileID: 0} tileOwnerIndex: 0 easyCaptureFor: @@ -50484,9 +50491,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tilePosition: {x: 0, y: 0, z: 0} - canMove: 1 - canBeAttacked: 1 - canBuildHere: 1 + canMove: 0 + canBeAttacked: 0 + canBuildHere: 0 buildingOnTile: {fileID: 0} tileOwnerIndex: 0 easyCaptureFor: @@ -55607,6 +55614,14 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1801060021} + - target: {fileID: 1705319700, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} + propertyPath: heakth + value: + objectReference: {fileID: 0} + - target: {fileID: 1705319701, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} + propertyPath: m_Volume + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: m_AnchorMax.y @@ -55707,6 +55722,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7117637457801964014, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: health + value: + objectReference: {fileID: 1801060027} - target: {fileID: 7117637457801964014, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: _extraLife @@ -55847,11 +55867,6 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 185995048} - - target: {fileID: 7382954402493043111, guid: a72be70db1163c14b8b7a3cb1c00a59d, - type: 3} - propertyPath: audioSource - value: - objectReference: {fileID: 1102420997} - target: {fileID: 8859217424454144084, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Scripts/AdMob/RewardExtraLife.cs b/Assets/Scripts/AdMob/RewardExtraLife.cs index 4374cd1c..f0fe1ea5 100644 --- a/Assets/Scripts/AdMob/RewardExtraLife.cs +++ b/Assets/Scripts/AdMob/RewardExtraLife.cs @@ -10,6 +10,7 @@ public class RewardExtraLife : MonoBehaviour private string RewardUnitId = "ca-app-pub-3940256099942544/5224354917"; //ca-app-pub-6397060103571541~3496155288 private RewardedAd rewardedAd; [SerializeField] private Extralife _extraLife; + [SerializeField] private HealthController health; private int lifeCount; @@ -25,7 +26,7 @@ public class RewardExtraLife : MonoBehaviour } private void Update() { - + if(health.currentHealth <= 0) _extraLife.life = lifeCount - 1; } @@ -35,7 +36,7 @@ public class RewardExtraLife : MonoBehaviour //extralife--; //_extraLife.life--; lifeCount -= 1; - _extraLife.life = lifeCount; + _extraLife.life = lifeCount ; } public void ShowAd() diff --git a/Assets/Scripts/Audio/AudioChanger.cs b/Assets/Scripts/Audio/AudioChanger.cs index 97ceb5a7..8abfbb4b 100644 --- a/Assets/Scripts/Audio/AudioChanger.cs +++ b/Assets/Scripts/Audio/AudioChanger.cs @@ -21,6 +21,7 @@ public class AudioChanger : MonoBehaviour private void Awake() { //if(state.defaultAction.name == "LaserAttack")/* + if(aSourse != null) { //aSourse = GetComponent(); @@ -29,6 +30,7 @@ public class AudioChanger : MonoBehaviour else { aSourse = GetComponent(); + _startVolume = aSourse.volume; } @@ -40,10 +42,11 @@ public class AudioChanger : MonoBehaviour if(_startGame != null) { - aSourse.volume = _startVolume ; + aSourse.volume = - 0.25f + _startVolume ; aSourse.PlayOneShot(_startGame); + //aSourse.volume = _startVolume; } - + //aSourse.volume = _startVolume ; hit_Audio = _controller.hit_SFX; throw_Audio = _controller.throw_SFX; @@ -71,6 +74,10 @@ public class AudioChanger : MonoBehaviour } + private void Update() { + //aSourse.volume = _startVolume ; + } + private void OnTriggerEnter(Collider other) { aSourse.volume = _startVolume ; if(other.gameObject.GetComponent() != null) diff --git a/Assets/Scripts/Audio/Die.cs b/Assets/Scripts/Audio/Die.cs new file mode 100644 index 00000000..e87e5f44 --- /dev/null +++ b/Assets/Scripts/Audio/Die.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Die : MonoBehaviour +{ + [SerializeField] private HealthController heakth; + [SerializeField] private AudioClip deadClip; + [SerializeField] private AudioSource source; + private float volume; + // Start is called before the first frame update + void Start() + { + volume = source.volume; + } + + // Update is called once per frame + void Update() + { + if(heakth.enabled == false) + { + source.volume = volume; + source.Play(); + } + } +} diff --git a/Assets/Scripts/Audio/Die.cs.meta b/Assets/Scripts/Audio/Die.cs.meta new file mode 100644 index 00000000..d28b13b5 --- /dev/null +++ b/Assets/Scripts/Audio/Die.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e51389e09a2874442b3b6116ade51ff7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Audio/VictoryOrNot.cs b/Assets/Scripts/Audio/VictoryOrNot.cs index a78b55fd..1a9b961f 100644 --- a/Assets/Scripts/Audio/VictoryOrNot.cs +++ b/Assets/Scripts/Audio/VictoryOrNot.cs @@ -5,42 +5,81 @@ using UnityEngine.UI; public class VictoryOrNot : MonoBehaviour { - //[SerializeField] private GameObject greyHeart; + [SerializeField] private GameObject greyHeart; + //[SerializeField] private Text text; [SerializeField] private Extralife extralife; - //private string zero = "0"; + private string zero = "0"; [SerializeField] private AudioClip victorySound; [SerializeField] private AudioClip defeatSound; [SerializeField] private AudioSource audioSource; + public static AudioClip changeSound; private float volume; private void Awake() { //if(extralife.life < 0) - volume = 0.5f * audioSource.volume; + volume = audioSource.volume; + changeSound = defeatSound; //PlayGameOver(); } private void Update() { - if(extralife.life < -1) + audioSource.volume = volume; + if(extralife.life < 2 ) { - PlayGameOver(); + audioSource.clip = changeSound; } + + else if(greyHeart.activeSelf == true) + { + PlayGameOver(extralife.life); + audioSource.clip = changeSound; + } + + + } + +/* private void LateUpdate() { //volume = 0.5f * audioSource.volume; + //audioSource.volume = volume ; + //PlayGameOver(extralife.life); + }*/ + + private void OnTriggerEnter(Collider other) { + //PlayGameOver(extralife.life); + } - - - - - public void PlayGameOver() + public void PlayGameOver( int life ) { - - - audioSource.volume = 0.5f * volume ; - //audioSource.clip = defeatSound; + //if(extralife = null) + //return; + if(life <= 2) + { + //audioSource.volume = volume; + + audioSource.clip = defeatSound; + changeSound = defeatSound; + //audioSource.PlayOneShot(defeatSound); + return ; //audioSource.PlayOneShot(audioSource.clip); - audioSource.PlayOneShot(defeatSound); - + + //audioSource.clip = defeatSound; + //audioSource.PlayOneShot(defeatSound); + } + return; + //return defeatSound; } +/* + private void OnDisable(int count) { + count = extralife.life; + if(count <= 0) + { + audioSource.volume = 0.5f * volume ; + audioSource.PlayOneShot(defeatSound); + } + + } + */ } diff --git a/Assets/Sound Pack 01.09/NewSounds/Game Over+.mp3 b/Assets/Sound Pack 01.09/NewSounds/Game Over+.mp3 new file mode 100644 index 00000000..3edbc092 Binary files /dev/null and b/Assets/Sound Pack 01.09/NewSounds/Game Over+.mp3 differ diff --git a/Assets/Sound Pack 01.09/NewSounds/Game Over+.mp3.meta b/Assets/Sound Pack 01.09/NewSounds/Game Over+.mp3.meta new file mode 100644 index 00000000..cd267853 --- /dev/null +++ b/Assets/Sound Pack 01.09/NewSounds/Game Over+.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 192ca0b7d7d54cd43bc2df85cf441905 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta b/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta index afb68324..9381c7a0 100644 --- a/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta +++ b/Assets/Sound Pack 01.09/NewSounds/Game Over.mp3.meta @@ -5,15 +5,15 @@ AudioImporter: serializedVersion: 6 defaultSettings: loadType: 0 - sampleRateSetting: 0 + sampleRateSetting: 2 sampleRateOverride: 44100 - compressionFormat: 1 + compressionFormat: 0 quality: 1 conversionMode: 0 platformSettingOverrides: 7: loadType: 0 - sampleRateSetting: 1 + sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 quality: 1