From e5bcb4479d34bf8e4aef3b69aef6ea46c06c02b1 Mon Sep 17 00:00:00 2001 From: Willy Date: Fri, 21 Apr 2023 15:42:08 -0500 Subject: [PATCH] 1.0 --- Assets/AdsManager.cs | 119 ----- Assets/AdsManager.cs.meta | 11 - Assets/Scenes/SampleScene.unity | 699 ++++++++++++++++++-------- Assets/Scenes/garage.unity | 41 +- Assets/iconmanager.cs | 39 +- Assets/logic.cs | 4 + Assets/shrek.cs | 18 +- ProjectSettings/ProjectSettings.asset | 6 +- 8 files changed, 525 insertions(+), 412 deletions(-) delete mode 100644 Assets/AdsManager.cs delete mode 100644 Assets/AdsManager.cs.meta diff --git a/Assets/AdsManager.cs b/Assets/AdsManager.cs deleted file mode 100644 index 1eac390..0000000 --- a/Assets/AdsManager.cs +++ /dev/null @@ -1,119 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Advertisements; - -public class AdsManager : MonoBehaviour, IUnityAdsInitializationListener, IUnityAdsLoadListener, IUnityAdsShowListener -{ - [SerializeField] string _AndroidGameId; - [SerializeField] string _iOSGameId; - - [SerializeField] string _AndroidInterId; - [SerializeField] string _iOSInterId; - - [SerializeField] string _AndroidRewardedId; - [SerializeField] string _iOSRewardedId; - - [SerializeField] string _AndroidBannerId; - [SerializeField] string _iOSBannerId; - - [SerializeField] bool _testMode = true; - - private string _gameId; - - private string _InterId; - private string _RewardedId; - private string _BannerId; - - public bool adShowing; - - public int interAdBuffer; - - public iconbuttonmanager iconbuttonmanager; - - void Awake() - { - interAdBuffer = PlayerPrefs.GetInt("interAdBuffer", 0); - InitializeAds(); - } - - public void InitializeAds() - { - #if UNITY_IOS - _gameId = _iOSGameId; - _InterId = _iOSInterId; - _RewardedId = _iOSRewardedId; - _BannerId = _iOSBannerId; - #elif UNITY_ANDROID - _gameId = _AndroidGameId; - _InterId = _AndroidInterId; - _RewardedId = _AndroidRewardedId; - _BannerId = _AndroidBannerId; - #elif UNITY_EDITOR - _gameId = _AndroidGameId; - _InterId = _AndroidInterId; - _RewardedId = _AndroidRewardedId; - _BannerId = _AndroidBannerId; //Only for testing the functionality in the Editor - #endif - if (!Advertisement.isInitialized && Advertisement.isSupported) - { - Advertisement.Initialize(_gameId, _testMode, this); - } - Debug.Log("init ad"); - } - - - public void OnInitializationComplete(){ - Debug.Log("Unity Ads initialization complete."); - } - - public void OnInitializationFailed(UnityAdsInitializationError error, string message){ - Debug.Log($"Unity Ads Initialization Failed: {error.ToString()} - {message}"); - } - - public void LoadInterAd() { - interAdBuffer += 1; - - if (interAdBuffer >= 4) { - Advertisement.Load(_InterId, this); - interAdBuffer = 0; - } - PlayerPrefs.SetInt("interAdBuffer", interAdBuffer); - } - - public void LoadRewardedAd() { - Advertisement.Load(_RewardedId, this); - } - - public void OnUnityAdsAdLoaded(string placementId) { - Debug.Log(" OnUnityAdsAdLoaded"); - Advertisement.Show(placementId, this); - } - - public void OnUnityAdsFailedToLoad(string placementId, UnityAdsLoadError error, string message) { - Debug.Log($"Error showing Ad Unit {placementId} {error.ToString()} - {message}"); - } - - public void OnUnityAdsShowFailure(string placementId, UnityAdsShowError error, string message) { - Debug.Log("OnUnityAdsShowFailure"); - } - - public void OnUnityAdsShowStart(string placementId) { - Debug.Log("OnUnityAdsShowStart"); - Time.timeScale = 0; - adShowing = true; - AudioListener.pause = true; - } - - public void OnUnityAdsShowClick(string placementId) { - Debug.Log("OnUnityAdsShowClick"); - } - - public void OnUnityAdsShowComplete(string placementId, UnityAdsShowCompletionState showCompletionState){ - Debug.Log("OnUnityAdsShowComplete"); - adShowing = false; - AudioListener.pause = false; - - iconbuttonmanager.Start(); - } -} \ No newline at end of file diff --git a/Assets/AdsManager.cs.meta b/Assets/AdsManager.cs.meta deleted file mode 100644 index c33e5fe..0000000 --- a/Assets/AdsManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f8af685b155a8b24a8b39b34d58d1e9e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9e48ffa..cb528cf 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -218,6 +218,170 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &184373907 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 42 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.44, y: 1.44, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 28 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 704 + _typelessdata: ec51b83fec51b8bf000000000000803f000000800000008000000080ec51b83fec51b8bfec51b83fec51b8bfec51b83fec51b83f00000000000000800000803f0000008000000080ec51b83fec51b83fec51b83fec51b83fec51b83f00000000000000000000803f000000800000008000000080ec51b83fec51b83fec51b83fec51b8bf00000000ec51b8bf0000000000000080000080bf0000000000000080ec51b83fec51b8bfec51b8bfec51b8bf00000000ec51b83f00000000000000800000803f0000008000000080ec51b8bfec51b83fec51b83fec51b83fec51b8bfec51b8bf0000000000000080000080bf0000000000000080ec51b8bfec51b8bfec51b8bfec51b8bfec51b8bf0000000000000000000080bf000000800000008000000080ec51b8bfec51b8bfec51b8bfec51b83fec51b8bfec51b83f00000000000080bf000000800000008000000080ec51b8bfec51b83fec51b8bfec51b83fec51b83f00000000000000000000803f000000800000008000000080ec51b83fec51b83fec51b83fec51b8bfec51b83fec51b8bf0000000000000080000080bf0000000000000080ec51b83fec51b8bfec51b83fec51b8bfec51b83fec51b83f000000000000803f000000800000008000000080ec51b83fec51b83fec51b83fec51b83f00000000ec51b83f00000000000000800000803f0000008000000080ec51b8bfec51b83fec51b83fec51b83f00000000ec51b8bf0000000000000080000080bf0000000000000080ec51b83fec51b8bfec51b8bfec51b8bfec51b8bfec51b83f00000000000000800000803f0000008000000080ec51b8bfec51b83fec51b8bfec51b83fec51b8bfec51b8bf00000000000080bf000000800000008000000080ec51b8bfec51b8bfec51b8bfec51b8bfec51b8bf0000000000000000000080bf000000800000008000000080ec51b8bfec51b8bfec51b8bfec51b83f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 1.44, y: 1.44, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &186015734 GameObject: m_ObjectHideFlags: 0 @@ -420,6 +584,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 343865982} m_CullTransparentMesh: 1 +--- !u!1 &386494704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 386494705} + - component: {fileID: 386494709} + - component: {fileID: 386494708} + - component: {fileID: 386494707} + - component: {fileID: 386494706} + m_Layer: 0 + m_Name: quit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &386494705 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386494704} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.45} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1880049403} + m_Father: {fileID: 510418595} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -680.13, y: -295} + m_SizeDelta: {x: 277.68, y: 136.567} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &386494706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386494704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 13, y: 20.68} + m_UseGraphicAlpha: 1 +--- !u!114 &386494707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386494704} + 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: 386494708} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2124333268} + m_TargetAssemblyTypeName: logic, Assembly-CSharp + m_MethodName: quitGame + 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!114 &386494708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386494704} + 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!222 &386494709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386494704} + m_CullTransparentMesh: 1 --- !u!1 &435441261 GameObject: m_ObjectHideFlags: 0 @@ -679,15 +993,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2061707461} - {fileID: 1687610121} - {fileID: 1779783832} + - {fileID: 2061707461} + - {fileID: 386494705} m_Father: {fileID: 2017237636} 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} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -49} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &519420028 @@ -6353,6 +6668,7 @@ RectTransform: - {fileID: 980810073} - {fileID: 1624919204} - {fileID: 1937150793} + - {fileID: 1173473238} m_Father: {fileID: 2017237636} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7243,7 +7559,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2017237640} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: AdsManager, Assembly-CSharp m_MethodName: LoadInterAd m_Mode: 1 @@ -7303,7 +7619,87 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165996333} + m_GameObject: {fileID: 1165996333} + m_CullTransparentMesh: 1 +--- !u!1 &1173473237 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1173473238} + - component: {fileID: 1173473240} + - component: {fileID: 1173473239} + m_Layer: 0 + m_Name: tap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1173473238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173473237} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 998438360} + 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} + m_AnchoredPosition: {x: -5.3321, y: -333} + m_SizeDelta: {x: 1923.5, y: 189} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1173473239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173473237} + 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: b0156a43bfc05fa4e9f73b3178a1244b, type: 3} + m_FontSize: 30 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 289 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: tap/space to start +--- !u!222 &1173473240 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1173473237} m_CullTransparentMesh: 1 --- !u!1 &1205611278 GameObject: @@ -7711,170 +8107,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!43 &1313933062 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 42 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1.44, y: 1.44, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 4 - - stream: 0 - offset: 28 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 704 - _typelessdata: ec51b83fec51b8bf000000000000803f000000800000008000000080ec51b83fec51b8bfec51b83fec51b8bfec51b83fec51b83f00000000000000800000803f0000008000000080ec51b83fec51b83fec51b83fec51b83fec51b83f00000000000000000000803f000000800000008000000080ec51b83fec51b83fec51b83fec51b8bf00000000ec51b8bf0000000000000080000080bf0000000000000080ec51b83fec51b8bfec51b8bfec51b8bf00000000ec51b83f00000000000000800000803f0000008000000080ec51b8bfec51b83fec51b83fec51b83fec51b8bfec51b8bf0000000000000080000080bf0000000000000080ec51b8bfec51b8bfec51b8bfec51b8bfec51b8bf0000000000000000000080bf000000800000008000000080ec51b8bfec51b8bfec51b8bfec51b83fec51b8bfec51b83f00000000000080bf000000800000008000000080ec51b8bfec51b83fec51b8bfec51b83fec51b83f00000000000000000000803f000000800000008000000080ec51b83fec51b83fec51b83fec51b8bfec51b83fec51b8bf0000000000000080000080bf0000000000000080ec51b83fec51b8bfec51b83fec51b8bfec51b83fec51b83f000000000000803f000000800000008000000080ec51b83fec51b83fec51b83fec51b83f00000000ec51b83f00000000000000800000803f0000008000000080ec51b8bfec51b83fec51b83fec51b83f00000000ec51b8bf0000000000000080000080bf0000000000000080ec51b83fec51b8bfec51b8bfec51b8bfec51b8bfec51b83f00000000000000800000803f0000008000000080ec51b8bfec51b83fec51b8bfec51b83fec51b8bfec51b8bf00000000000080bf000000800000008000000080ec51b8bfec51b8bfec51b8bfec51b8bfec51b8bf0000000000000000000080bf000000800000008000000080ec51b8bfec51b8bfec51b8bfec51b83f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1.44, y: 1.44, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1365076835 GameObject: m_ObjectHideFlags: 0 @@ -8170,8 +8402,8 @@ MonoBehaviour: - {x: 1.44, y: 1.44, z: 0} - {x: 1.44, y: -1.44, z: 0} m_ShapePathHash: 0 - m_Mesh: {fileID: 1313933062} - m_InstanceId: 66302 + m_Mesh: {fileID: 184373907} + m_InstanceId: 76102 m_LocalBounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 1.44, y: 1.44, z: 0} @@ -8210,7 +8442,7 @@ RectTransform: 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: 576.83923, y: 475.83304} + m_AnchoredPosition: {x: 561, y: 475.83304} m_SizeDelta: {x: 759.1533, y: 138.0047} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1624919205 @@ -8235,7 +8467,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 52 + m_FontSize: 40 m_FontStyle: 3 m_BestFit: 0 m_MinSize: 4 @@ -8289,7 +8521,7 @@ RectTransform: m_Children: - {fileID: 982058622} m_Father: {fileID: 510418595} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8448,7 +8680,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1772651725} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 26.63, y: -19.27, z: 0.37432247} + m_LocalPosition: {x: 21.5, y: -19.27, z: 0.37432247} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8469,7 +8701,7 @@ GameObject: - component: {fileID: 1779783834} - component: {fileID: 1779783833} m_Layer: 0 - m_Name: lb (1) + m_Name: stats m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8489,7 +8721,7 @@ RectTransform: m_Children: - {fileID: 479569553} m_Father: {fileID: 510418595} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8605,6 +8837,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1779783831} m_CullTransparentMesh: 1 +--- !u!1 &1880049402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1880049403} + - component: {fileID: 1880049405} + - component: {fileID: 1880049404} + m_Layer: 0 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1880049403 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880049402} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 386494705} + 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.00024414062, y: -0.0000076293945} + m_SizeDelta: {x: -0.00048828, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1880049404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880049402} + 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: 12800000, guid: b0156a43bfc05fa4e9f73b3178a1244b, type: 3} + m_FontSize: 54 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 269 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: QUIT +--- !u!222 &1880049405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880049402} + m_CullTransparentMesh: 1 --- !u!1 &1880166046 GameObject: m_ObjectHideFlags: 0 @@ -8849,7 +9161,6 @@ GameObject: - component: {fileID: 2017237639} - component: {fileID: 2017237638} - component: {fileID: 2017237637} - - component: {fileID: 2017237640} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -8945,30 +9256,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &2017237640 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2017237635} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8af685b155a8b24a8b39b34d58d1e9e, type: 3} - m_Name: - m_EditorClassIdentifier: - _AndroidGameId: 5241637 - _iOSGameId: 5241636 - _AndroidInterId: Interstitial_Android - _iOSInterId: Interstitial_iOS - _AndroidRewardedId: Rewarded_Android - _iOSRewardedId: Rewarded_iOS - _AndroidBannerId: Banner_Android - _iOSBannerId: Banner_iOS - _testMode: 1 - adShowing: 0 - interAdBuffer: 0 - iconbuttonmanager: {fileID: 0} --- !u!1 &2027062971 GameObject: m_ObjectHideFlags: 0 @@ -9079,7 +9366,7 @@ RectTransform: m_Children: - {fileID: 343865983} m_Father: {fileID: 510418595} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9157,7 +9444,7 @@ MonoBehaviour: m_StringArgument: garage m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 2017237640} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: AdsManager, Assembly-CSharp m_MethodName: PlayAd m_Mode: 1 @@ -9399,7 +9686,7 @@ PrefabInstance: - target: {fileID: 9188324786680921486, guid: 5f96d4f34e23b59428b3573ec347d2f9, type: 3} propertyPath: adsManager value: - objectReference: {fileID: 2017237640} + objectReference: {fileID: 0} - target: {fileID: 9188324786680921486, guid: 5f96d4f34e23b59428b3573ec347d2f9, type: 3} propertyPath: explodable value: @@ -9497,6 +9784,10 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 5262430550022505275, guid: 9cde5f6298c5c984d98274697bb4cffc, type: 3} + propertyPath: m_LocalPosition.x + value: 12 + objectReference: {fileID: 0} - target: {fileID: 5262430551230432479, guid: 9cde5f6298c5c984d98274697bb4cffc, type: 3} propertyPath: logic value: diff --git a/Assets/Scenes/garage.unity b/Assets/Scenes/garage.unity index a354107..e2ff580 100644 --- a/Assets/Scenes/garage.unity +++ b/Assets/Scenes/garage.unity @@ -385,11 +385,11 @@ RectTransform: - {fileID: 1807116189} - {fileID: 2099970514} m_Father: {fileID: 614600023} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -235.3, y: -256} + m_AnchoredPosition: {x: 208, y: -256} m_SizeDelta: {x: 119.5523, y: 114.6642} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &424213602 @@ -532,11 +532,11 @@ RectTransform: - {fileID: 566795340} - {fileID: 1859634162} m_Father: {fileID: 614600023} - 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} - m_AnchoredPosition: {x: 222.3, y: -256} + m_AnchoredPosition: {x: -236, y: -256} m_SizeDelta: {x: 119.5523, y: 114.6642} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &464085063 @@ -733,7 +733,6 @@ GameObject: - component: {fileID: 614600022} - component: {fileID: 614600021} - component: {fileID: 614600020} - - component: {fileID: 614600024} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -816,8 +815,8 @@ RectTransform: m_Children: - {fileID: 804611405} - {fileID: 638590306} - - {fileID: 424213601} - {fileID: 464085062} + - {fileID: 424213601} - {fileID: 1056433781} - {fileID: 772656575} - {fileID: 1305559057} @@ -829,30 +828,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &614600024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 614600019} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8af685b155a8b24a8b39b34d58d1e9e, type: 3} - m_Name: - m_EditorClassIdentifier: - _AndroidGameId: 5241637 - _iOSGameId: 5241636 - _AndroidInterId: Interstitial_Android - _iOSInterId: Interstitial_iOS - _AndroidRewardedId: Rewarded_Android - _iOSRewardedId: Rewarded_iOS - _AndroidBannerId: Banner_Android - _iOSBannerId: Banner_iOS - _testMode: 1 - adShowing: 0 - interAdBuffer: 0 - iconbuttonmanager: {fileID: 1792928588} --- !u!1 &638590305 GameObject: m_ObjectHideFlags: 0 @@ -1354,7 +1329,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ee27e25883c91e54ea9cee70ad1adf5a, type: 3} m_Name: m_EditorClassIdentifier: - AdsManager: {fileID: 614600024} donkeytxt: {fileID: 1859634164} pusstxt: {fileID: 2099970512} kingtxt: {fileID: 1244521324} @@ -1365,6 +1339,7 @@ MonoBehaviour: adsToWatchPuss: 2 adsToWatchDonkey: 2 top10: 0 + highScore: 0 currentIcon: --- !u!4 &1009080141 Transform: @@ -2340,7 +2315,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Watch \n2 \nMore ads to Unlock" + m_text: Acheive a Highscore of 50 to Unlock m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2524,7 +2499,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Watch \n2 \nMore ads to Unlock" + m_text: Acheive a Highscore of 100 to Unlock m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/iconmanager.cs b/Assets/iconmanager.cs index b35a9e6..4d4e489 100644 --- a/Assets/iconmanager.cs +++ b/Assets/iconmanager.cs @@ -7,8 +7,6 @@ public class iconmanager : MonoBehaviour { - public AdsManager AdsManager; - public TextMeshProUGUI donkeytxt; public TextMeshProUGUI pusstxt; public TextMeshProUGUI kingtxt; @@ -23,6 +21,7 @@ public class iconmanager : MonoBehaviour { public int adsToWatchDonkey = 2; public int top10 = 0; + public float highScore; public string currentIcon; @@ -32,14 +31,16 @@ void Start() { top10 = PlayerPrefs.GetInt("top10", 0); + highScore = PlayerPrefs.GetFloat("highScore"); + kingShrekCheck(); } public void Update() { - if (adsToWatchDonkey == 0) { + if (highScore >= 50) { Destroy(donkeytxtObj); } - if (adsToWatchPuss == 0) { + if (highScore >= 100) { Destroy(pusstxtObj); } } @@ -50,12 +51,12 @@ public void iconSelect(int IconID) { PlayerPrefs.SetString("currentIcon", currentIcon); } - if(IconID == 2 && adsToWatchDonkey == 0) { + if(IconID == 2 && highScore >= 50) { currentIcon = "donkey"; PlayerPrefs.SetString("currentIcon", currentIcon); } - if(IconID == 3 && adsToWatchPuss == 0) { + if(IconID == 3 && highScore >= 100) { currentIcon = "puss"; PlayerPrefs.SetString("currentIcon", currentIcon); } @@ -66,32 +67,6 @@ public void iconSelect(int IconID) { } } - public void adStuffPuss() { - if (adsToWatchPuss > 0) { - AdsManager.LoadRewardedAd(); - adsToWatchPuss -= 1; - - PlayerPrefs.SetInt("adsToWatchPuss", adsToWatchPuss); - - pusstxt.text = "Watch\n" + adsToWatchPuss.ToString() + "\nMore Ads To Unlock"; - } else { - Destroy(pusstxtObj); - } - } - - public void adStuffDonkey() { - if (adsToWatchDonkey > 0) { - AdsManager.LoadRewardedAd(); - adsToWatchDonkey -= 1; - - PlayerPrefs.SetInt("adsToWatchDonkey", adsToWatchDonkey); - - donkeytxt.text = "Watch\n" + adsToWatchDonkey.ToString() + "\nMore Ads To Unlock"; - } else { - Destroy(donkeytxtObj); - } - } - public void kingShrekCheck() { if (top10 == 1) { Destroy(kingtxtObj); diff --git a/Assets/logic.cs b/Assets/logic.cs index eb6ed36..6753537 100644 --- a/Assets/logic.cs +++ b/Assets/logic.cs @@ -42,4 +42,8 @@ public void displayHighScore() { highScoreText.text = "your high score: " + PlayerPrefs.GetFloat("highScore", 0).ToString(); } + public void quitGame() { + Application.Quit(); + Debug.Log("quit"); + } } diff --git a/Assets/shrek.cs b/Assets/shrek.cs index e29a8df..2704bb7 100644 --- a/Assets/shrek.cs +++ b/Assets/shrek.cs @@ -11,7 +11,6 @@ public class shrek : MonoBehaviour public pipe pipeS; public movingpipe movingPipeS; public titlescreen titlescreen; - public AdsManager adsManager; public Sprite shrekSprite; public Sprite donkeySprite; public Sprite pussSprite; @@ -71,11 +70,11 @@ void Start() // Update is called once per frame void Update() { - if(Input.GetKeyDown("space") && !adsManager.adShowing) { + if(Input.GetKeyDown("space")) { jump(); if(j == false) { - titlescreen.startgame(); j = true; + titlescreen.startgame(); } } @@ -106,14 +105,13 @@ void Update() } public void jump() { - if(shrekalive && !pausebutton.isPaused) { - - myRigidbody.velocity = Vector2.up * jumpstrength; - myRigidbody.angularVelocity = 180; - lifeTimeJumps += 1; - source.PlayOneShot(clip); + if(shrekalive && !pausebutton.isPaused) { + myRigidbody.velocity = Vector2.up * jumpstrength; + myRigidbody.angularVelocity = 180; + lifeTimeJumps += 1; + source.PlayOneShot(clip); - Collect(); + Collect(); } } private void OnCollisionEnter2D(Collision2D other) { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2111c38..f290ef6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,7 +8,7 @@ PlayerSettings: AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 - defaultScreenOrientation: 2 + defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 @@ -163,7 +163,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 32 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -258,7 +258,7 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 1 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180