Water

Assets/Animations/PickupCoin.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-3377747260944808518
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2380496168706946993}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -2380496168706946993}
+--- !u!1102 &-2380496168706946993
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: coin_anim
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 5cbe1d90687599e4089f303a50a79963, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PickupCoin
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -3377747260944808518}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}

Assets/Animations/PickupCoin.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b4c3f44121462844fa9bddb0eefb323f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/coin_anim.anim

@@ -0,0 +1,213 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: coin_anim
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.1, y: 0.1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.75
+        value: {x: 0, y: 0.1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 1.5
+        value: {x: 0.1, y: 0.1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.5
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.75
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5
+        value: 0.1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.75
+        value: 0.1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5
+        value: 0.1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.75
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Animations/coin_anim.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5cbe1d90687599e4089f303a50a79963
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/SFX/splash_high.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: fccd5ad537dbc07458553d05ecafb3e4
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/SFX/splash_low.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 3800e520855d1244e8220b9ff9d0b0cc
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/SFX/splash_mid.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 8d5c0be24f934e949863bef470058145
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/AdsManager.cs

@@ -80,6 +80,8 @@ public class AdsManager : MonoBehaviour
         }
         StartCoroutine(ReloadAds(false));
 
+
+        DataManager.AddAdImpression();
     }
 
     
@@ -119,11 +121,11 @@ public class AdsManager : MonoBehaviour
 
                 rewardedAd = ad;
 
-                rewardedAd.OnAdPaid += OnRewardSuccess;
+                //rewardedAd.OnAdPaid += OnRewardSuccess;
             });
     }
-
-    private void OnRewardSuccess(AdValue obj)
+ 
+    private void OnRewardSuccess()
     {
         Debug.Log("Rewarded Ad success, code:1032");
         GameManager.AdWatched();
@@ -138,6 +140,7 @@ public class AdsManager : MonoBehaviour
         {
             rewardedAd.Show((Reward reward) =>
             {
+                OnRewardSuccess();
                 // TODO: Reward the user.
                 Debug.Log(String.Format(rewardMsg, reward.Type, reward.Amount));
             });

Assets/Scripts/AudioManager.cs

@@ -20,6 +20,7 @@ public class AudioManager : MonoBehaviour
     [SerializeField]private AudioSource sfxSource;
     [SerializeField]private AudioSource dropSfxSource;
     [SerializeField]private AudioClip[] lowHits, midHits, hardHits;
+    [SerializeField] private AudioClip lowSplash, midSplash, hardSplash;
     [SerializeField]private AudioClip[] drop;
     [SerializeField]private float dropMinPitch = 0.5f;
     [SerializeField]private float dropMaxPitch = 1.5f;
@@ -39,6 +40,19 @@ public class AudioManager : MonoBehaviour
         instance.dropSfx(magnitude);
     }
 
+    public static void SplashSFX(int level)
+    {
+        switch (level)
+        {
+            case 1:
+                instance.sfxSource.PlayOneShot(instance.lowSplash, 0.3f); break;
+            case 2:
+                instance.sfxSource.PlayOneShot(instance.midSplash, 0.3f); break;
+            case 3:
+                instance.sfxSource.PlayOneShot(instance.hardSplash, 0.3f); break;
+        }
+    }
+
     public static bool ToggleMute(){
         isMute = !isMute;
         Refresh();

Assets/Scripts/CheckUpdates.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class CheckUpdates : MonoBehaviour
 {
-    public static int ClientVersion = 2;
+    public static int ClientVersion = 4;
     public static int ServerVersion;
 
     public float interval = 30;

Assets/Scripts/Coin.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Coin : MonoBehaviour
+{
+    void OnTriggerEnter2D(Collider2D col){
+        if(col.tag == "Player"){
+            Destroy(gameObject);
+        }
+    }
+}

Assets/Scripts/Coin.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bc9145681534dfe47a135119b1fee01c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/DataManager.cs

@@ -233,6 +233,50 @@ public static class DataManager{
         // LoadingScreen.LoadLevel("MainMenu");
     }
 
+     public static async void AddAdImpression(){
+        WWWForm form = new WWWForm();
+
+        Debug.Log(userData.ToString());
+
+        form.AddField("username", userData.username);
+        form.AddField("password", userData.password);
+        form.AddField("key", key);
+
+       using (UnityWebRequest request = UnityWebRequest.Post(API_ENDPOINT + "add_impression.php", form))
+        {
+            var operation = request.SendWebRequest();
+            while (!operation.isDone)
+            {
+                await Task.Yield();
+            }
+            Debug.Log("add ad impression response: " +request.downloadHandler.text);
+            
+            if(request.downloadHandler.text.Contains("{")){
+                try{
+                    userData = JsonConvert.DeserializeObject<UserData>(request.downloadHandler.text);
+                    if(userData == null){
+                        throw new NullReferenceException();
+                    }
+                    if(userData.username.Length < 3){
+                        throw new IndexOutOfRangeException();
+                    }
+                    Debug.Log("Success parsing userdata");
+
+
+                }catch(Exception e){
+                    Debug.Log("Error parsing userdata");
+                }
+            }else{
+                
+                MessageBox.ShowMessage("Error Updating add_impression, Server said\n" +request.downloadHandler.text);
+                
+            }
+                      
+        }
+
+        // LoadingScreen.LoadLevel("MainMenu");
+    }
+
     public static async Task RefreshLeaderboard(bool total = false){
         WWWForm form = new WWWForm();
 

Assets/Scripts/GameManager.cs

@@ -140,7 +140,10 @@ public class GameManager : MonoBehaviour
         GameOverUI.SetActive(true);
         adCounter++;
 
-        if(adCounter > 1 || DataManager.userData.faucetId > 0){
+        if(DataManager.userData.faucetId > 0){
+            AdsManager.instance.ShowIntAd();
+        }
+        else if(adCounter > 1){
             adCounter=0;
             AdsManager.instance.ShowIntAd();
         }

Assets/Scripts/LevelGenerator.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.U2D;
 
@@ -10,16 +11,24 @@ public class LevelGenerator : MonoBehaviour
     public int LevelCount = 1000;
     public float groundLevel = -5.5f;
     public float maxHeight = 5;
+    public float waterRequiredHeight = 2f;
     public Vector2 minDiff, maxDiff;
     public Vector3[] points {get; private set;}
 
+    public List<Vector3> absolutePoints = new List<Vector3>();
+
     public GameObject holePrefab;
     public GameObject flagPrefab;
     public GameObject treePrefab;
+    public GameObject coinPrefab;
+    public GameObject waterPrefab;
 
     public static List<GameObject> holes;
 
 
+    public GameObject WaterSplashFX;
+
+
     public int GoalDistance= 10;
     void Awake()
     {
@@ -42,9 +51,11 @@ public class LevelGenerator : MonoBehaviour
         SpriteShapeController spriteShapeController = Instantiate(spriteShapeControllerPrefab, new Vector3(offset,0),Quaternion.identity).GetComponent<SpriteShapeController>();
         spriteShapeController.spline.Clear();
         points = new Vector3[LevelCount+1];
+
         for(int i=0; i < LevelCount; i++){
             if(i ==0){
                 points[i] = new Vector3(0,groundLevel);
+                absolutePoints.Add(points[i] + new Vector3(lastOffset, 0));
                 spriteShapeController.spline.InsertPointAt(i, points[i]);
                 continue;
             }
@@ -59,6 +70,7 @@ public class LevelGenerator : MonoBehaviour
                 newY -= Mathf.Abs(addition.y);
             }
             points[i] = new Vector3(newX, newY);
+            absolutePoints.Add(points[i] + new Vector3(lastOffset,0));
             // spriteShapeController.spline.InsertPointAt(i, points[i]);
             InsertNewPoint(spriteShapeController, points[i]);
 
@@ -73,18 +85,52 @@ public class LevelGenerator : MonoBehaviour
                 newTree.transform.localScale = Vector3.one * Random.Range(0.75f, 1.1f);
             }
             
+           /* if(Random.Range(0f,1f) > 0.8f){
+                Instantiate(coinPrefab, points[i] + new Vector3(0,5), Quaternion.identity);
+            }*/
+            
 
+            
 
             if(i % GoalDistance == 0){
                 InsertNewPoint(spriteShapeController, points[i] + new Vector3(0, -1f));
                 InsertNewPoint(spriteShapeController, points[i] + new Vector3(1f, -1f));
                 InsertNewPoint(spriteShapeController, points[i] + new Vector3(1f, 0f));
-
                 Vector3 newHolePos = points[i]  + new Vector3(lastOffset,0);
+                
+                // if( i > GoalDistance * 2){
+                //     Vector3 prevHolePos = points[i-GoalDistance] + new Vector3(lastOffset,0);
+                //     //Calc between prev-new
+                //     Debug.Log($"{newHolePos}-{prevHolePos} = {newHolePos - prevHolePos}");
+                //     Instantiate(coinPrefab, ((newHolePos - prevHolePos) * 0.5f) + new Vector3(prevHolePos.x,prevHolePos.y + 3),Quaternion.identity);
+                // }
+                
+
 
                 Instantiate(flagPrefab,newHolePos, Quaternion.identity);
                 holes.Add(Instantiate(holePrefab,newHolePos, Quaternion.identity));
             }
+            
+            if (i > 3 && (i-1) % GoalDistance != 0 )
+            {
+                if (points[i].y > points[i - 1].y + waterRequiredHeight && points[i - 2].y > points[i - 1].y + waterRequiredHeight)
+                {
+                    SpriteShapeController waterSprite = Instantiate(waterPrefab, new Vector3(lastOffset, 0), Quaternion.identity).GetComponent<SpriteShapeController>();
+                    waterSprite.spline.Clear();
+
+                    float lowestPoint = points[i].y;
+                    if (lowestPoint > points[i - 2].y)
+                    {
+                        lowestPoint = points[i - 2].y;
+                    }
+
+                    InsertNewPoint(waterSprite, points[i - 1] - new Vector3(1, 1));
+                    InsertNewPoint(waterSprite, new Vector3(points[i].x - 1, lowestPoint - 1));
+                    InsertNewPoint(waterSprite, new Vector3(points[i - 2].x + 1, lowestPoint - 1));
+
+
+                }
+            }
 
         }
 
@@ -117,4 +163,14 @@ public class LevelGenerator : MonoBehaviour
         }
         
     }
+#if UNITY_EDITOR
+    private void OnDrawGizmos()
+    {
+        foreach(Vector3 point in absolutePoints)
+        {
+            Handles.Label(point, point.ToString());
+        }
+    }
+
+#endif
 }

Assets/Scripts/ObjectPool.cs

@@ -0,0 +1,61 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+
+public class ObjectPool : MonoBehaviour
+{
+    public static ObjectPool instance;
+    public static Dictionary<string, List<GameObject>> pool = new Dictionary<string, List<GameObject>>();
+
+    void Awake(){
+        pool = new Dictionary<string, List<GameObject>>();
+        instance= this;
+    }
+
+    public static GameObject Spawn(GameObject obj, Vector3 position, int ttl = 0){
+        if(pool.ContainsKey(obj.name)){
+            // Debug.Log($"Has key : {pool[obj.name].Count}");
+            //use from pool
+            if(pool[obj.name].Count <=0){
+                GameObject go = Instantiate(obj, position, Quaternion.identity);
+                return go;
+            }else{
+                GameObject chosen = pool[obj.name][0].gameObject;
+                chosen.gameObject.SetActive(true);
+                chosen.transform.position = position;
+                pool[obj.name].RemoveAt(0);
+                // Debug.Log("Reusing");
+                if (ttl > 0)
+                {
+                    Deactivate(chosen, ttl);
+                }
+                return chosen;
+            }
+        }else{
+            GameObject go = Instantiate(obj, position, Quaternion.identity);
+            if(ttl > 0) { Deactivate(go, ttl);}
+            return go;
+        }
+    }
+
+    async static void Deactivate(GameObject go, int ttl)
+    {
+        await Task.Delay(ttl);
+
+        Despawn(go);
+    }
+
+    public static void Despawn(GameObject obj){
+        string objName = obj.name.Replace("(Clone)","");
+        if(!pool.ContainsKey(objName)){
+         pool.Add(objName, new List<GameObject>());
+        }
+
+        pool[objName].Add(obj);
+
+        obj.SetActive(false);
+
+        // Debug.Log($"Adding {objName} back to pool, " + pool[objName].Count);
+    } 
+}

Assets/Scripts/ObjectPool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1eb8e8dc4ce00e04886d7fc77aa1ac61
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Water.cs

@@ -0,0 +1,55 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Water : MonoBehaviour
+{
+    Rigidbody2D body;
+    public float effect = 0.05f;
+    public float waterOffset = 0.1f;
+    private void FixedUpdate()
+    {
+        if (body == null) { return; }
+
+        body.velocity = Vector3.Lerp(body.velocity, new Vector2(0, -0.01f), effect);
+    }
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        body = collision.GetComponent<Rigidbody2D>();
+
+      //  GameObject FX = ObjectPool.Spawn(LevelGenerator.instance.WaterSplashFX, new Vector3(collision.transform.position.x, transform.position.y + waterOffset), ttl: 2500) ;
+        GameObject FX = ObjectPool.Spawn(LevelGenerator.instance.WaterSplashFX, collision.transform.position, ttl: 2500);
+
+        FX.GetComponent<ParticleSystem>().Play();
+        FX.transform.eulerAngles = new Vector3(-90, 0, 0);
+
+        int splashHardness = 1;
+
+        if (collision.attachedRigidbody.velocity.sqrMagnitude > 40) splashHardness = 2;
+        if (collision.attachedRigidbody.velocity.sqrMagnitude > 100) splashHardness = 3;
+
+        Debug.Log(collision.attachedRigidbody.velocity.sqrMagnitude);
+
+        AudioManager.SplashSFX(splashHardness);
+
+        if(body.GetComponent<GolfBall>() != null)
+        {
+            body.transform.GetChild(0).gameObject.SetActive(true);
+        }
+    }
+
+    private void OnTriggerExit2D(Collider2D collision)
+    {
+        if (body.GetComponent<GolfBall>() != null)
+        {
+            body.transform.GetChild(0).gameObject.SetActive(true);
+        }
+        body = null;
+    }
+
+    private void OnDrawGizmos()
+    {
+        Gizmos.DrawLine(transform.position + new Vector3(0.5f, waterOffset), transform.position + new Vector3(-0.5f, waterOffset));
+    }
+}

Assets/Scripts/Water.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8ec5c9fc58b8be84989f785dc536397a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Materials/WaterSplash.mat

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: WaterSplash
+  m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 608be8c1250d34f488d6f5f336e9dcf7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/Sprites/Materials/WaterSplash.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 545afe1c5e8a9b047a248120599a3230
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/UI/Component/Icon_ItemIcons(x2)/ItemIcons(x2).unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b725737a4b9f04575bdeb0f9ef00ebc1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/UI/Component/Icon_PictoIcons(x2)/PictoIcons(x2).unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6a8fdd93aa77347e3b4f457596907088
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/UI/Component/Icon_RuneIcons(x2)/RuneIcons(x2).unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 82f7c1592c47c4258afcde1c20a4779a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/coin.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 47b19e7855679104d9f6e6e62c707bd9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/water_drop.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 608be8c1250d34f488d6f5f336e9dcf7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/ProjectSettings.asset

@@ -133,7 +133,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 1.6
+  bundleVersion: 1.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -162,7 +162,7 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 6
+  AndroidBundleVersionCode: 10
   AndroidMinSdkVersion: 22
   AndroidTargetSdkVersion: 33
   AndroidPreferredInstallLocation: 1
@@ -377,6 +377,103 @@ PlayerSettings:
       m_Height: 36
       m_Kind: 1
       m_SubKind: 
+  - m_BuildTarget: iPhone
+    m_Icons:
+    - m_Textures: []
+      m_Width: 180
+      m_Height: 180
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 167
+      m_Height: 167
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 152
+      m_Height: 152
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 76
+      m_Height: 76
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 3
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 80
+      m_Height: 80
+      m_Kind: 3
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 80
+      m_Height: 80
+      m_Kind: 3
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 3
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 87
+      m_Height: 87
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 58
+      m_Height: 58
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 29
+      m_Height: 29
+      m_Kind: 1
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 58
+      m_Height: 58
+      m_Kind: 1
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 29
+      m_Height: 29
+      m_Kind: 1
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 60
+      m_Height: 60
+      m_Kind: 2
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 2
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 40
+      m_Height: 40
+      m_Kind: 2
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 20
+      m_Height: 20
+      m_Kind: 2
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 1024
+      m_Height: 1024
+      m_Kind: 4
+      m_SubKind: App Store
   m_BuildTargetBatching: []
   m_BuildTargetShaderSettings: []
   m_BuildTargetGraphicsJobs: