diff --git a/Assets/Prefab/RespawnCanvas.prefab b/Assets/Prefab/RespawnCanvas.prefab new file mode 100644 index 00000000..0f74c32f --- /dev/null +++ b/Assets/Prefab/RespawnCanvas.prefab @@ -0,0 +1,327 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &712520339275161086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2027685022626523886} + - component: {fileID: 6949887103781095394} + - component: {fileID: 3681477863342587850} + - component: {fileID: 8345586993071746408} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2027685022626523886 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712520339275161086} + 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: 5753595653172594301} + m_Father: {fileID: 3282277863117845392} + 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: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6949887103781095394 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712520339275161086} + m_CullTransparentMesh: 1 +--- !u!114 &3681477863342587850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712520339275161086} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &8345586993071746408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712520339275161086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 1} + 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: 3681477863342587850} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4929565957207649046} + m_TargetAssemblyTypeName: add, 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: 0 + m_CallState: 2 +--- !u!1 &2000339881314694206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3282277863117845392} + - component: {fileID: 836586704568360101} + - component: {fileID: 3434161992126342837} + - component: {fileID: 7140815531378050198} + - component: {fileID: 4929565957207649046} + m_Layer: 5 + m_Name: RespawnCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3282277863117845392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000339881314694206} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 2027685022626523886} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &836586704568360101 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000339881314694206} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3434161992126342837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000339881314694206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 4.82 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &7140815531378050198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000339881314694206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &4929565957207649046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000339881314694206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7c276b4af35fbc4a80539b97e444f32, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5643092443057929538 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5753595653172594301} + - component: {fileID: 926802407146178452} + - component: {fileID: 8555430210322839734} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5753595653172594301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5643092443057929538} + 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: 2027685022626523886} + 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 &926802407146178452 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5643092443057929538} + m_CullTransparentMesh: 1 +--- !u!114 &8555430210322839734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5643092443057929538} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button diff --git a/Assets/Prefab/RespawnCanvas.prefab.meta b/Assets/Prefab/RespawnCanvas.prefab.meta new file mode 100644 index 00000000..73f0b152 --- /dev/null +++ b/Assets/Prefab/RespawnCanvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5460da0df497ae94aace59d1caf7cbdb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Data/add.prefab b/Assets/Prefab/add.prefab similarity index 100% rename from Assets/Resources/Data/add.prefab rename to Assets/Prefab/add.prefab diff --git a/Assets/Resources/Data/add.prefab.meta b/Assets/Prefab/add.prefab.meta similarity index 100% rename from Assets/Resources/Data/add.prefab.meta rename to Assets/Prefab/add.prefab.meta diff --git a/Assets/Resources/1/Character/Prefab/Asvald.prefab b/Assets/Resources/1/Character/Prefab/Asvald.prefab index 22fab7c4..d1cf50c8 100644 --- a/Assets/Resources/1/Character/Prefab/Asvald.prefab +++ b/Assets/Resources/1/Character/Prefab/Asvald.prefab @@ -2937,6 +2937,7 @@ GameObject: - component: {fileID: 8989822822968797088} - component: {fileID: 8911891366586862002} - component: {fileID: 3288245434296440335} + - component: {fileID: 8454664948868524491} m_Layer: 0 m_Name: Asvald m_TagString: Untagged @@ -3043,6 +3044,21 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 126 m_CollisionDetection: 0 +--- !u!114 &8454664948868524491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7527582019267571087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d2f89853800f934f8dce9a6635a97bd, type: 3} + m_Name: + m_EditorClassIdentifier: + canvasPref: {fileID: 2000339881314694206, guid: 5460da0df497ae94aace59d1caf7cbdb, + type: 3} + health: 1 --- !u!1 &7550162364350684268 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ADs/add.cs b/Assets/Scripts/ADs/AdsMob.cs similarity index 80% rename from Assets/Scripts/ADs/add.cs rename to Assets/Scripts/ADs/AdsMob.cs index 0d1303cb..5b899108 100644 --- a/Assets/Scripts/ADs/add.cs +++ b/Assets/Scripts/ADs/AdsMob.cs @@ -5,7 +5,7 @@ using UnityEngine; using GoogleMobileAds.Api; using UnityEditor.PackageManager.Requests; -public class add : MonoBehaviour +public class AdsMob : MonoBehaviour { private string _revardUnitId = "ca-app-pub-3940256099942544/5224354917"; private RewardedAd _ad; @@ -19,13 +19,17 @@ public class add : MonoBehaviour _ad.OnUserEarnedReward += HandleUser; // } - private void Start() { - ShowAd(); - } + // private void Start() { + // ShowAd(); + // } private void HandleUser(object sender, Reward reward) { - return; + //ExtraLife life; + int lifeCount = ExtraLife.lifeCount; + ShowAd(); + lifeCount += 1; + } public void ShowAd() diff --git a/Assets/Scripts/ADs/add.cs.meta b/Assets/Scripts/ADs/AdsMob.cs.meta similarity index 100% rename from Assets/Scripts/ADs/add.cs.meta rename to Assets/Scripts/ADs/AdsMob.cs.meta diff --git a/Assets/Scripts/Data/UIData.cs b/Assets/Scripts/Data/UIData.cs index 204f6e49..b877a4cd 100644 --- a/Assets/Scripts/Data/UIData.cs +++ b/Assets/Scripts/Data/UIData.cs @@ -11,12 +11,12 @@ namespace Data [SerializeField] private List _objectsToSpawn; [SerializeField] private PlayerControlView joystickView; [SerializeField] private PlayerInventoryView inventoryView; - [SerializeField] private add _add; + [SerializeField] private AdsMob _add; public List ObjectsToSpawn => _objectsToSpawn; public PlayerControlView PlayerControlView => joystickView; public PlayerInventoryView InventoryView => inventoryView; - public add Add => _add; + public AdsMob Add => _add; } } \ No newline at end of file diff --git a/Assets/Scripts/GameUI/UIController.cs b/Assets/Scripts/GameUI/UIController.cs index 7ed7fd29..327e0ae9 100644 --- a/Assets/Scripts/GameUI/UIController.cs +++ b/Assets/Scripts/GameUI/UIController.cs @@ -10,11 +10,11 @@ namespace GameUI private readonly UIData _uiData; private PlayerControlView _playerControlView; private PlayerInventoryView _inventoryView; - private add _add; + private AdsMob _add; public PlayerControlView PlayerControlView => _playerControlView; public PlayerInventoryView PlayerInventoryView => _inventoryView; - public add Add => _add; + public AdsMob Add => _add; public UIController(UIData uiData) { @@ -27,7 +27,8 @@ namespace GameUI canvasGroup.AddComponent(); _playerControlView = Object.Instantiate(_uiData.PlayerControlView, canvasGroup.transform); _inventoryView = Object.Instantiate(_uiData.InventoryView, canvasGroup.transform); - //_add = Object.Instantiate(_uiData.Add, canvasGroup.transform); + _add = Object.Instantiate(_uiData.Add, canvasGroup.transform); + //_add.enabled = false; _uiData.ObjectsToSpawn.ForEach(x => Object.Instantiate(x, canvasGroup.transform)); } diff --git a/Assets/Scripts/States/ExtraLife.cs b/Assets/Scripts/States/ExtraLife.cs new file mode 100644 index 00000000..e244d2f5 --- /dev/null +++ b/Assets/Scripts/States/ExtraLife.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExtraLife : MonoBehaviour +{ + [SerializeField] private GameObject canvasPref; + public static int lifeCount = 1; + public int health = 1; + + private void Update() { + if(health <= 0) + { + lifeCount -= 1; + Instantiate(canvasPref);//.GetComponent().ShowAd(); + if(lifeCount < 0) + { + lifeCount = 0; + } + } + + } + + // public void AddLIfe(int count) + // { + + // lifeCount = count; + // if(count < 1) + // { + // //add reward = new add(); + // count++; + // } + + // } + +} diff --git a/Assets/Scripts/States/ExtraLife.cs.meta b/Assets/Scripts/States/ExtraLife.cs.meta new file mode 100644 index 00000000..e766ef51 --- /dev/null +++ b/Assets/Scripts/States/ExtraLife.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2d2f89853800f934f8dce9a6635a97bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: