From 27526deda600fa7344a988d0e17bdcacb3309b7f Mon Sep 17 00:00:00 2001 From: DyatelO Date: Fri, 26 Nov 2021 11:31:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D1=80=D0=B8=D1=81=D1=82=D0=B0=D0=BB?= =?UTF-8?q?=D0=BB=D1=8B=20=D1=81=20=D1=88=D0=B0=D1=80=D0=B8=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC.=20=D0=97=D0=B2=D1=83=D0=BA=D0=B8=20=D0=BA=D0=BD=D0=BE?= =?UTF-8?q?=D0=BF=D0=BE=D0=BA=20=D0=B2=20=D0=BF=D0=B5=D1=80=D0=B2=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=81=D1=86=D0=B5=D0=BD=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs_NEW/Towers/CrystallTower.prefab | 25 + Assets/Scenes/Level_1.unity | 464 ++++++++++++++++++ Assets/Scripts/Audio/Die.cs | 2 +- 3 files changed, 490 insertions(+), 1 deletion(-) diff --git a/Assets/Prefabs_NEW/Towers/CrystallTower.prefab b/Assets/Prefabs_NEW/Towers/CrystallTower.prefab index df614f63..ab057c08 100644 --- a/Assets/Prefabs_NEW/Towers/CrystallTower.prefab +++ b/Assets/Prefabs_NEW/Towers/CrystallTower.prefab @@ -558,6 +558,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8834890311105204222} m_Modifications: + - target: {fileID: 772873969996633363, guid: cd3a6e7cd307230459efab7793f89144, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1340557858584807726, guid: cd3a6e7cd307230459efab7793f89144, type: 3} propertyPath: m_Name @@ -713,6 +718,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8834890311105204222} m_Modifications: + - target: {fileID: 864987177325504702, guid: 6a709e09a5df18740b3bf6709d4c445b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7123911558665044000, guid: 6a709e09a5df18740b3bf6709d4c445b, type: 3} propertyPath: m_RootOrder @@ -793,6 +803,11 @@ PrefabInstance: propertyPath: m_Name value: PowerupGlow objectReference: {fileID: 0} + - target: {fileID: 8998066517073135031, guid: a6e69add579ce85468c8a53493ee5f2d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8998066517073430615, guid: a6e69add579ce85468c8a53493ee5f2d, type: 3} propertyPath: m_RootOrder @@ -908,6 +923,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8834890311105204222} m_Modifications: + - target: {fileID: 2313046354239542925, guid: ebf1f3df6cc165e45a6d7b7070a8254b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3665624539438581465, guid: ebf1f3df6cc165e45a6d7b7070a8254b, type: 3} propertyPath: m_Name @@ -988,6 +1008,11 @@ PrefabInstance: propertyPath: m_Name value: CrystaGreen objectReference: {fileID: 0} + - target: {fileID: 6440895841354935100, guid: cf18b2edcc8f55240b200e3dde713ec6, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6589153021179780257, guid: cf18b2edcc8f55240b200e3dde713ec6, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index 129e178c..1279cf00 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -311,6 +311,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 295356002} m_PrefabAsset: {fileID: 0} +--- !u!222 &137246472 stripped +CanvasRenderer: + m_CorrespondingSourceObject: {fileID: 442264230403889227, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + m_PrefabInstance: {fileID: 7117637457801964012} + m_PrefabAsset: {fileID: 0} --- !u!1 &142144178 GameObject: m_ObjectHideFlags: 0 @@ -2690,6 +2696,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 972268607} m_PrefabAsset: {fileID: 0} +--- !u!222 &1050798115 stripped +CanvasRenderer: + m_CorrespondingSourceObject: {fileID: 1437722344243985991, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + m_PrefabInstance: {fileID: 7117637457801964012} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1084554679 PrefabInstance: m_ObjectHideFlags: 0 @@ -5655,6 +5667,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4105327572352019167} m_PrefabAsset: {fileID: 0} +--- !u!222 &1945078541 stripped +CanvasRenderer: + m_CorrespondingSourceObject: {fileID: 5183094602645692183, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + m_PrefabInstance: {fileID: 7117637457801964012} + m_PrefabAsset: {fileID: 0} --- !u!1 &1953386679 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4991598031878838981, guid: fa5ecf8ffbe22c7459c44494cee176d9, @@ -5821,6 +5839,12 @@ Transform: m_Father: {fileID: 905416317} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!222 &2100717884 stripped +CanvasRenderer: + m_CorrespondingSourceObject: {fileID: 2757651571204649628, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + m_PrefabInstance: {fileID: 7117637457801964012} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2113430681 PrefabInstance: m_ObjectHideFlags: 0 @@ -55622,6 +55646,116 @@ PrefabInstance: propertyPath: m_Volume value: 1 objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1050798115} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 137246472} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1945078541} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + 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: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3195387928025807443, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: m_AnchorMax.y @@ -55687,6 +55821,116 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1945078541} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 2100717884} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1050798115} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_FloatArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + 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: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5643681897723592864, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 5861359707769992997, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: playerHealth @@ -55722,6 +55966,116 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 137246472} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 2100717884} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1050798115} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + 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: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6305254851413763415, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7117637457801964014, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: health @@ -55897,6 +56251,116 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2100717884} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 137246472} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1945078541} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetAlpha + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: UnityEngine.CanvasRenderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_FloatArgument + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_FloatArgument + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + 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: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8859217425696434122, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} --- !u!1 &7121823489171206717 diff --git a/Assets/Scripts/Audio/Die.cs b/Assets/Scripts/Audio/Die.cs index e87e5f44..72eafd29 100644 --- a/Assets/Scripts/Audio/Die.cs +++ b/Assets/Scripts/Audio/Die.cs @@ -17,7 +17,7 @@ public class Die : MonoBehaviour // Update is called once per frame void Update() { - if(heakth.enabled == false) + if(heakth != null && heakth.enabled == false) { source.volume = volume; source.Play();