diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..d70cd98 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/Scripts/AdsManager.cs b/Assets/Scripts/AdsManager.cs index 7ead8d1..d670baf 100644 --- a/Assets/Scripts/AdsManager.cs +++ b/Assets/Scripts/AdsManager.cs @@ -125,6 +125,7 @@ public class AdsManager : MonoBehaviour private void OnRewardSuccess(AdValue obj) { + Debug.Log("Rewarded Ad success, code:1032"); GameManager.AdWatched(); } diff --git a/Assets/Scripts/DataManager.cs b/Assets/Scripts/DataManager.cs index 094c445..c70117d 100644 --- a/Assets/Scripts/DataManager.cs +++ b/Assets/Scripts/DataManager.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityEngine.Networking; public static class DataManager{ - public const string API_ENDPOINT = "http://vps.playpoolstudios.com/faucet/golf/api/"; + public const string API_ENDPOINT = "https://vps.playpoolstudios.com/faucet/golf/api/"; public const string key = "#2CuV1Bit^S!sW1ZcgRv8BhrO"; public static UserData userData{get; private set;} public static List Leaderboard{get; private set;} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 9e3d73b..252303f 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; @@ -253,16 +254,20 @@ public class GameManager : MonoBehaviour } public void WatchAd(){ +#if UNITY_EDITOR + AdWatched(); +#else AdsManager.instance.ShowRewardedAd(); - +#endif } public static void AdWatched(){ try{ instance.GameOverUI.SetActive(false); instance.CurStrokes= (int)((float)instance.MaxStrokes/2f); - }catch{ - + }catch(Exception e){ + Debug.LogError("Error giving rewarded strokes, code:1038"); + Debug.LogError(e); } } diff --git a/Assets/Sprites/UI/Component/Icon_ItemIcons(x2)/ItemIcons(x2).unitypackage.meta b/Assets/Sprites/UI/Component/Icon_ItemIcons(x2)/ItemIcons(x2).unitypackage.meta deleted file mode 100644 index f9d8f55..0000000 --- a/Assets/Sprites/UI/Component/Icon_ItemIcons(x2)/ItemIcons(x2).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b725737a4b9f04575bdeb0f9ef00ebc1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/UI/Component/Icon_PictoIcons(x2)/PictoIcons(x2).unitypackage.meta b/Assets/Sprites/UI/Component/Icon_PictoIcons(x2)/PictoIcons(x2).unitypackage.meta deleted file mode 100644 index b6485fe..0000000 --- a/Assets/Sprites/UI/Component/Icon_PictoIcons(x2)/PictoIcons(x2).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6a8fdd93aa77347e3b4f457596907088 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/UI/Component/Icon_RuneIcons(x2)/RuneIcons(x2).unitypackage.meta b/Assets/Sprites/UI/Component/Icon_RuneIcons(x2)/RuneIcons(x2).unitypackage.meta deleted file mode 100644 index 5a18091..0000000 --- a/Assets/Sprites/UI/Component/Icon_RuneIcons(x2)/RuneIcons(x2).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 82f7c1592c47c4258afcde1c20a4779a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..b21943a --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + 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: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60