diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll index 0ce9d04a..f67cd1f3 100644 Binary files a/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll and b/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll differ 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: