From 88029add792330b07fd42c62e790f7c3e93e98c8 Mon Sep 17 00:00:00 2001 From: DyatelO Date: Wed, 24 Nov 2021 15:07:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BC=D0=B5=D0=BD=D1=8E.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GoogleMobileAds.Common.dll | Bin 18944 -> 18432 bytes Assets/GoogleMobileAds/Resources.meta | 8 + .../Resources/GoogleMobileAdsSettings.asset | 17 + .../GoogleMobileAdsSettings.asset.meta | 8 + Assets/Prefabs_NEW/UI/GameCanvas.prefab | 702 ++++++++++++++++-- Assets/Prefabs_NEW/VFX/LaserPrefab 1.prefab | 4 +- Assets/Scenes/Level_1.unity | 190 ++--- Assets/Scenes/Levels/InitAd.cs | 11 + Assets/Scenes/Levels/InitAd.cs.meta | 11 + Assets/Scenes/MainMenu.unity | 13 + Assets/Scripts/AdMob.meta | 8 + Assets/Scripts/AdMob/Extralife.cs | 16 + Assets/Scripts/AdMob/Extralife.cs.meta | 11 + Assets/Scripts/AdMob/RewardExtraLife.cs | 41 + Assets/Scripts/AdMob/RewardExtraLife.cs.meta | 11 + Assets/Scripts/Global/DeathChecker.cs | 9 +- Assets/Scripts/UI/DeactivateButton.cs | 18 + Assets/Scripts/UI/DeactivateButton.cs.meta | 11 + Assets/Scripts/UI/DeathMenu.cs | 28 +- Assets/Scripts/UI/SwitchButtons.cs | 24 + Assets/Scripts/UI/SwitchButtons.cs.meta | 11 + 21 files changed, 938 insertions(+), 214 deletions(-) create mode 100644 Assets/GoogleMobileAds/Resources.meta create mode 100644 Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset create mode 100644 Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset.meta create mode 100644 Assets/Scenes/Levels/InitAd.cs create mode 100644 Assets/Scenes/Levels/InitAd.cs.meta create mode 100644 Assets/Scripts/AdMob.meta create mode 100644 Assets/Scripts/AdMob/Extralife.cs create mode 100644 Assets/Scripts/AdMob/Extralife.cs.meta create mode 100644 Assets/Scripts/AdMob/RewardExtraLife.cs create mode 100644 Assets/Scripts/AdMob/RewardExtraLife.cs.meta create mode 100644 Assets/Scripts/UI/DeactivateButton.cs create mode 100644 Assets/Scripts/UI/DeactivateButton.cs.meta create mode 100644 Assets/Scripts/UI/SwitchButtons.cs create mode 100644 Assets/Scripts/UI/SwitchButtons.cs.meta diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll index 0ce9d04a8b5b04f55c153a420bec064f61decab7..f67cd1f3cf2cb4220ae7ad35d64022ddc7c5b1c9 100644 GIT binary patch literal 18432 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 literal 18944 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 diff --git a/Assets/GoogleMobileAds/Resources.meta b/Assets/GoogleMobileAds/Resources.meta new file mode 100644 index 00000000..a67cc008 --- /dev/null +++ b/Assets/GoogleMobileAds/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf829f726cdddce48b9c1a35c37ccb2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset b/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset new file mode 100644 index 00000000..4b03356d --- /dev/null +++ b/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a187246822bbb47529482707f3e0eff8, type: 3} + m_Name: GoogleMobileAdsSettings + m_EditorClassIdentifier: + adMobAndroidAppId: + adMobIOSAppId: + delayAppMeasurementInit: 0 diff --git a/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset.meta b/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset.meta new file mode 100644 index 00000000..ff6ba81f --- /dev/null +++ b/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65bdc750efb7c4c44bda92063a5a6c8f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs_NEW/UI/GameCanvas.prefab b/Assets/Prefabs_NEW/UI/GameCanvas.prefab index ccd6478c..5678e313 100644 --- a/Assets/Prefabs_NEW/UI/GameCanvas.prefab +++ b/Assets/Prefabs_NEW/UI/GameCanvas.prefab @@ -1,5 +1,128 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &26229767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 26229768} + - component: {fileID: 26229771} + - component: {fileID: 26229770} + - component: {fileID: 26229769} + m_Layer: 5 + m_Name: ExtraLifeFake + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &26229768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26229767} + 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: 530642963} + - {fileID: 957244794} + m_Father: {fileID: 586528190} + 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} + m_AnchoredPosition: {x: 0, y: -224} + m_SizeDelta: {x: 485, y: 125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &26229771 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26229767} + m_CullTransparentMesh: 1 +--- !u!114 &26229770 +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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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: 4004639816688566790, guid: 12670c6426fbb78408a26a384ba06c67, + type: 3} + 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!114 &26229769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 26229767} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 0} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.2784314} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.45490196} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 26229770} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &62152442 GameObject: m_ObjectHideFlags: 0 @@ -33,7 +156,7 @@ RectTransform: - {fileID: 1559963583} - {fileID: 139923872} m_Father: {fileID: 586528190} - m_RootOrder: 3 + 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} @@ -122,19 +245,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 62152445} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!1 &139923871 GameObject: m_ObjectHideFlags: 0 @@ -187,7 +298,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 139923871} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -244,7 +355,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 586528190} - m_RootOrder: 5 + 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} @@ -290,6 +401,279 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 1 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &252584711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 252584712} + - component: {fileID: 252584714} + - component: {fileID: 252584713} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &252584712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252584711} + 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: 530642963} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &252584714 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252584711} + m_CullTransparentMesh: 1 +--- !u!114 &252584713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252584711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 105 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 125 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: RESUME +--- !u!1 &530642962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 530642963} + - component: {fileID: 530642966} + - component: {fileID: 530642965} + - component: {fileID: 530642964} + m_Layer: 5 + m_Name: ExtraLife + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &530642963 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530642962} + 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: 252584712} + m_Father: {fileID: 26229768} + 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: 485, y: 125} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &530642966 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530642962} + m_CullTransparentMesh: 1 +--- !u!114 &530642965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530642962} + 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: 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_Sprite: {fileID: 4004639816688566790, guid: 12670c6426fbb78408a26a384ba06c67, + type: 3} + 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!114 &530642964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 530642962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 0.53333336} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 530642965} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 586528189} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 836943121} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 195587185} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 7117637457801964014} + m_TargetAssemblyTypeName: RewardExtraLife, Assembly-CSharp + m_MethodName: ShowAd + 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 + - m_Target: {fileID: 530642962} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 &578766029 GameObject: m_ObjectHideFlags: 0 @@ -386,7 +770,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &586528190 RectTransform: m_ObjectHideFlags: 0 @@ -399,11 +783,11 @@ RectTransform: m_LocalScale: {x: 0.9428091, y: 0.9428091, z: 0.9428091} m_Children: - {fileID: 1696696517} - - {fileID: 1053227491} - {fileID: 702947553} - {fileID: 62152443} - {fileID: 836943122} - {fileID: 195587186} + - {fileID: 26229768} m_Father: {fileID: 7117637459326710719} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -482,7 +866,7 @@ RectTransform: m_Children: - {fileID: 1307326297} m_Father: {fileID: 586528190} - m_RootOrder: 2 + 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} @@ -572,13 +956,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 5861359707769992997} + m_TargetAssemblyTypeName: DeathMenu, Assembly-CSharp + m_MethodName: LoadMenu m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -612,9 +996,10 @@ RectTransform: 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_Children: + - {fileID: 1104730212} m_Father: {fileID: 586528190} - m_RootOrder: 4 + 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} @@ -660,7 +1045,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 1 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1053227490 +--- !u!1 &957244793 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -668,73 +1053,156 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1053227491} - - component: {fileID: 1053227493} - - component: {fileID: 1053227492} + - component: {fileID: 957244794} + - component: {fileID: 957244796} + - component: {fileID: 957244795} m_Layer: 5 - m_Name: BGRef + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1053227491 + m_IsActive: 0 +--- !u!224 &957244794 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1053227490} + m_GameObject: {fileID: 957244793} 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: 586528190} + m_Father: {fileID: 26229768} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1053227493 +--- !u!222 &957244796 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1053227490} + m_GameObject: {fileID: 957244793} m_CullTransparentMesh: 1 ---- !u!114 &1053227492 +--- !u!114 &957244795 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1053227490} - m_Enabled: 1 + m_GameObject: {fileID: 957244793} + m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.70980394} + 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_Sprite: {fileID: 21300000, guid: b16237ede6ec3a04f8768852b8ede77e, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 1 - m_PixelsPerUnitMultiplier: 1 + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 105 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 125 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: RESUME +--- !u!1 &1104730211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1104730212} + - component: {fileID: 1104730214} + - component: {fileID: 1104730213} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1104730212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104730211} + 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: 836943122} + 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: 505, y: 466} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1104730214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104730211} + m_CullTransparentMesh: 1 +--- !u!114 &1104730213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1104730211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: a0b51ef8f0abb43aab0e92dd6b5c3d35, type: 3} + m_FontSize: 195 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 5 --- !u!1 &1307326296 GameObject: m_ObjectHideFlags: 0 @@ -937,17 +1405,89 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 586528189} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 836943121} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 195587185} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 7117637457801964014} + m_TargetAssemblyTypeName: RewardExtraLife, Assembly-CSharp + m_MethodName: ShowAd + 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 + - m_Target: {fileID: 1559963585} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + 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 + - m_Target: {fileID: 26229767} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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!1 &1696696516 GameObject: m_ObjectHideFlags: 0 @@ -2412,7 +2952,9 @@ GameObject: - component: {fileID: 7117637459326710718} - component: {fileID: 7117637459326710717} - component: {fileID: 7117637459326710716} + - component: {fileID: 1764073850865194055} - component: {fileID: 5861359707769992997} + - component: {fileID: 7117637457801964014} m_Layer: 5 m_Name: GameCanvas m_TagString: Untagged @@ -2506,6 +3048,20 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!114 &1764073850865194055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7117637459326710691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4c1f3b4787dd0ab4cbe0e56219c56d3f, type: 3} + m_Name: + m_EditorClassIdentifier: + button1: {fileID: 26229767} + button2: {fileID: 1559963582} --- !u!114 &5861359707769992997 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2519,8 +3075,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerHealth: {fileID: 0} - extralife: 1 + button: {fileID: 1559963582} + heart: {fileID: 836943121} deathMenuUI: {fileID: 586528189} +--- !u!114 &7117637457801964014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7117637459326710691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bca2f155792b2db44833603fb7bedad1, type: 3} + m_Name: + m_EditorClassIdentifier: + _extraLife: {fileID: 0} --- !u!1 &7117637459335731026 GameObject: m_ObjectHideFlags: 0 @@ -3372,7 +3942,7 @@ PrefabInstance: - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} propertyPath: m_AnchoredPosition.y - value: 129.99908 + value: -950.0009 objectReference: {fileID: 0} - target: {fileID: 3858971544782492865, guid: 97a03d914d2e6ea40a905290ce13f5b0, type: 3} @@ -3569,9 +4139,9 @@ PrefabInstance: m_RemovedComponents: - {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} ---- !u!1 &1415495982521125429 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, +--- !u!224 &1415495981690910128 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} m_PrefabInstance: {fileID: 7117637457990202416} m_PrefabAsset: {fileID: 0} @@ -3581,9 +4151,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7117637457990202416} m_PrefabAsset: {fileID: 0} ---- !u!224 &1415495981690910128 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, +--- !u!1 &1415495982521125429 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} m_PrefabInstance: {fileID: 7117637457990202416} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs_NEW/VFX/LaserPrefab 1.prefab b/Assets/Prefabs_NEW/VFX/LaserPrefab 1.prefab index 3ae16311..eecc95c7 100644 --- a/Assets/Prefabs_NEW/VFX/LaserPrefab 1.prefab +++ b/Assets/Prefabs_NEW/VFX/LaserPrefab 1.prefab @@ -72,7 +72,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8121987183708165570} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6ac3eebbbbc00ae408e546b1023dd451, type: 3} m_Name: @@ -93,7 +93,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: owner: 0 - velocity: 25 + velocity: 10 damage: 360 --- !u!1001 &6893609786012621583 PrefabInstance: diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index 1865daa2..1d2f9d77 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -293,6 +293,18 @@ MonoBehaviour: _camExpandSmoothness: 0.01 _trackingPlayer: 1 _cam: {fileID: 95433828} +--- !u!114 &104479278 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5861359707769992997, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + m_PrefabInstance: {fileID: 7117637457801964012} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec6ea01ae722df64c91475339c635a80, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &112562703 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4991598031878838981, guid: fa5ecf8ffbe22c7459c44494cee176d9, @@ -910,18 +922,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 325094786} m_PrefabAsset: {fileID: 0} ---- !u!114 &332865075 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5861359707769992997, guid: a72be70db1163c14b8b7a3cb1c00a59d, - type: 3} - m_PrefabInstance: {fileID: 7117637457801964012} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec6ea01ae722df64c91475339c635a80, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &339213304 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4991598031878838981, guid: fa5ecf8ffbe22c7459c44494cee176d9, @@ -2958,6 +2958,7 @@ MonoBehaviour: deathYellow_VFX: {fileID: 7140011676602114744, guid: 6d9f179a27798c248b3c35df9139eb85, type: 3} deathMenu: {fileID: 1911892886} + extralife: {fileID: 1801060037} deathSrc: {fileID: 1102420997} resurrectTime: 7 tilesLeftForDeath: 1 @@ -4682,6 +4683,7 @@ GameObject: m_Component: - component: {fileID: 1801060022} - component: {fileID: 1801060032} + - component: {fileID: 1801060037} - component: {fileID: 1801060036} - component: {fileID: 1801060026} - component: {fileID: 1801060023} @@ -5025,6 +5027,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 24318c8c1ca83a54ba0ec54a5fe253e7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1801060037 +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: c28907a55ddab394181b1f36158f88f8, type: 3} + m_Name: + m_EditorClassIdentifier: + life: 2 + menu: {fileID: 104479278} --- !u!54 &1801060038 Rigidbody: m_ObjectHideFlags: 0 @@ -5298,7 +5314,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1911892882 RectTransform: m_ObjectHideFlags: 0 @@ -5392,7 +5408,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerHealth: {fileID: 1801060027} - extralife: 1 + button: {fileID: 0} + heart: {fileID: 0} deathMenuUI: {fileID: 586528189} --- !u!1 &1923264931 GameObject: @@ -61755,142 +61772,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1968512146} m_Modifications: - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1801060021} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 1801060021} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + - target: {fileID: 26229770, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} + propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument - value: 1 + - target: {fileID: 26229770, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} + propertyPath: m_Color.b + value: 0.4245283 objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + - target: {fileID: 26229770, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} + propertyPath: m_Color.g + value: 0.4245283 objectReference: {fileID: 0} - - target: {fileID: 62152444, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + - target: {fileID: 26229770, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} + propertyPath: m_Color.r + value: 0.4245283 objectReference: {fileID: 0} - - target: {fileID: 702947554, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 332865075} - - target: {fileID: 702947554, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: LoadMenu - objectReference: {fileID: 0} - - target: {fileID: 702947554, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: DeathMenu, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 702947554, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} + - target: {fileID: 530642964, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1801060021} - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 586528189} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1559963584, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1559963584, 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} + objectReference: {fileID: 1801060021} - target: {fileID: 3195387929267588557, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: m_AnchorMax.y @@ -61991,6 +61896,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7117637457801964014, guid: a72be70db1163c14b8b7a3cb1c00a59d, + type: 3} + propertyPath: _extraLife + value: + objectReference: {fileID: 1801060037} - target: {fileID: 7117637458793366621, guid: a72be70db1163c14b8b7a3cb1c00a59d, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target diff --git a/Assets/Scenes/Levels/InitAd.cs b/Assets/Scenes/Levels/InitAd.cs new file mode 100644 index 00000000..b9b10022 --- /dev/null +++ b/Assets/Scenes/Levels/InitAd.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using GoogleMobileAds.Api; + +public class InitAd : MonoBehaviour +{ + private void Awake() { + MobileAds.Initialize(initStatus => { }); + } +} diff --git a/Assets/Scenes/Levels/InitAd.cs.meta b/Assets/Scenes/Levels/InitAd.cs.meta new file mode 100644 index 00000000..330c2b37 --- /dev/null +++ b/Assets/Scenes/Levels/InitAd.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7e0768a135ae4f546a0bb2ee23271594 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 43486b00..7283e5d9 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1459,6 +1459,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 874603978} + - component: {fileID: 874603979} m_Layer: 0 m_Name: -- GAME -- m_TagString: Untagged @@ -1482,6 +1483,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &874603979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874603977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e0768a135ae4f546a0bb2ee23271594, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &962136215 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AdMob.meta b/Assets/Scripts/AdMob.meta new file mode 100644 index 00000000..0e721e24 --- /dev/null +++ b/Assets/Scripts/AdMob.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76d4f00bc04443643883f4910299f501 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AdMob/Extralife.cs b/Assets/Scripts/AdMob/Extralife.cs new file mode 100644 index 00000000..26c87a94 --- /dev/null +++ b/Assets/Scripts/AdMob/Extralife.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Extralife : MonoBehaviour +{ + public int life = 2; + [SerializeField] private DeathMenu menu; + void Update() + { + if(life == 0) + { + menu.LoadMenu(); + } + } +} diff --git a/Assets/Scripts/AdMob/Extralife.cs.meta b/Assets/Scripts/AdMob/Extralife.cs.meta new file mode 100644 index 00000000..b8184621 --- /dev/null +++ b/Assets/Scripts/AdMob/Extralife.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c28907a55ddab394181b1f36158f88f8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AdMob/RewardExtraLife.cs b/Assets/Scripts/AdMob/RewardExtraLife.cs new file mode 100644 index 00000000..13c8d82f --- /dev/null +++ b/Assets/Scripts/AdMob/RewardExtraLife.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using GoogleMobileAds.Api; +using System; + +public class RewardExtraLife : MonoBehaviour +{ + private string RewardUnitId = "ca-app-pub-3940256099942544/5224354917"; + private RewardedAd rewardedAd; + [SerializeField] private Extralife _extraLife; + private int extralife; + + + private void OnEnable() { + this.rewardedAd = new RewardedAd(RewardUnitId); + AdRequest adRequest = new AdRequest.Builder().Build(); + this.rewardedAd.LoadAd(adRequest); + this.rewardedAd.OnUserEarnedReward += HandleEarnedReward; + } + + private void Update() { + //extralife =_extraLife.life; + } + + private void HandleEarnedReward(object sender, Reward e) + { + extralife = _extraLife.life ; + //extralife--; + _extraLife.life--; + } + + public void ShowAd() + { + if(rewardedAd.IsLoaded()) + { + rewardedAd.Show(); + } + } + +} diff --git a/Assets/Scripts/AdMob/RewardExtraLife.cs.meta b/Assets/Scripts/AdMob/RewardExtraLife.cs.meta new file mode 100644 index 00000000..b589bba7 --- /dev/null +++ b/Assets/Scripts/AdMob/RewardExtraLife.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bca2f155792b2db44833603fb7bedad1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Global/DeathChecker.cs b/Assets/Scripts/Global/DeathChecker.cs index 7d4f98e1..bec6817b 100644 --- a/Assets/Scripts/Global/DeathChecker.cs +++ b/Assets/Scripts/Global/DeathChecker.cs @@ -9,6 +9,7 @@ public class DeathChecker : MonoBehaviour public GameObject deathParticles, resParticles; public GameObject deathBlue_VFX, deathRed_VFX, deathGreen_VFX, deathYellow_VFX; public DeathMenu deathMenu; + public Extralife extralife; public AudioSource deathSrc; @@ -221,7 +222,13 @@ public class DeathChecker : MonoBehaviour { Destroy(player.gameObject.GetComponent()); } - +/* + if(extralife.life < 0) + { + deathMenu.LoadMenu(); + //SceneLoader.LoadScene(0); + } +*/ /* Destroy(player.gameObject); //for test purp */ diff --git a/Assets/Scripts/UI/DeactivateButton.cs b/Assets/Scripts/UI/DeactivateButton.cs new file mode 100644 index 00000000..a291e28a --- /dev/null +++ b/Assets/Scripts/UI/DeactivateButton.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DeactivateButton : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/UI/DeactivateButton.cs.meta b/Assets/Scripts/UI/DeactivateButton.cs.meta new file mode 100644 index 00000000..5551e80b --- /dev/null +++ b/Assets/Scripts/UI/DeactivateButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2c915daa2afa0aa48a2c91a44f8a6309 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/DeathMenu.cs b/Assets/Scripts/UI/DeathMenu.cs index 13d72014..28f9df46 100644 --- a/Assets/Scripts/UI/DeathMenu.cs +++ b/Assets/Scripts/UI/DeathMenu.cs @@ -7,9 +7,23 @@ public class DeathMenu : MonoBehaviour { public static bool playerIsDead = false; [SerializeField] private HealthController playerHealth; - public int extralife = 1; + [SerializeField] private GameObject button; + [SerializeField] private GameObject heart; + private bool isActive; + //[SerializeField] private Extralife lifes; + //public int extralife = 1; public GameObject deathMenuUI; + /* + private void Update() { + + if(lifes.life <= 0) + { + Quit(lifes.life); + LoadMenu(); + } + } + */ /* void Update() @@ -49,11 +63,15 @@ public class DeathMenu : MonoBehaviour SceneManager.LoadScene("MainMenu"); } - public void Resurect() + public void Quit(int extra) { + /* for(int i = extra; i > 0; i--) + { + lifes.life = i + extra; + } //extralife -= lifes; - Debug.Log("Comertial"); - playerHealth.currentHealth = 4200; - + //Debug.Log("Comertial"); + //playerHealth.currentHealth = 4200; +*/ } } diff --git a/Assets/Scripts/UI/SwitchButtons.cs b/Assets/Scripts/UI/SwitchButtons.cs new file mode 100644 index 00000000..19b88cbd --- /dev/null +++ b/Assets/Scripts/UI/SwitchButtons.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SwitchButtons : MonoBehaviour +{ + [SerializeField] private GameObject button1; + [SerializeField] private GameObject button2; + + // Update is called once per frame + void Update() + { + if(button2 != null) + { + button1.SetActive(true); + button2.SetActive(false); + } + else + { + button1.SetActive(false); + button2.SetActive(true); + } + } +} diff --git a/Assets/Scripts/UI/SwitchButtons.cs.meta b/Assets/Scripts/UI/SwitchButtons.cs.meta new file mode 100644 index 00000000..a85f8a6c --- /dev/null +++ b/Assets/Scripts/UI/SwitchButtons.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4c1f3b4787dd0ab4cbe0e56219c56d3f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: