New Version 1.61

Fixed the bugs.

Gutterball 3/Assembly-CSharp-Editor-firstpass.csproj

@@ -313,6 +313,9 @@
  <Reference Include="UnityEditor.iOS.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
  </Reference>
+ <Reference Include="UnityEditor.AppleTV.Extensions">
+ <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/AppleTVSupport/UnityEditor.AppleTV.Extensions.dll</HintPath>
+ </Reference>
  <Reference Include="UnityEditor.WebGL.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll</HintPath>
  </Reference>
@@ -338,7 +341,7 @@
  <HintPath>C:/Users/Asus/Documents/GitHub/gutterball-3/Gutterball 3/Library/PackageCache/com.unity.purchasing@2.0.3/Editor/UnityEditor.Purchasing.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.iOS.Extensions.Xcode">
- <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
+ <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/AppleTVSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.iOS.Extensions.Common">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll</HintPath>

Gutterball 3/Assembly-CSharp-Editor.csproj

@@ -310,6 +310,9 @@
  <Reference Include="UnityEditor.iOS.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
  </Reference>
+ <Reference Include="UnityEditor.AppleTV.Extensions">
+ <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/AppleTVSupport/UnityEditor.AppleTV.Extensions.dll</HintPath>
+ </Reference>
  <Reference Include="UnityEditor.WebGL.Extensions">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll</HintPath>
  </Reference>
@@ -335,7 +338,7 @@
  <HintPath>C:/Users/Asus/Documents/GitHub/gutterball-3/Gutterball 3/Library/PackageCache/com.unity.purchasing@2.0.3/Editor/UnityEditor.Purchasing.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.iOS.Extensions.Xcode">
- <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
+ <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/AppleTVSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
  </Reference>
  <Reference Include="UnityEditor.iOS.Extensions.Common">
  <HintPath>C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll</HintPath>

Gutterball 3/Assets/Particles/Explode01.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3.6
+      scalar: 4.5
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/Explode02.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 2.5
+      scalar: 3.75
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/Explode03.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.6
+      scalar: 3
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/Explode04.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.6
+      scalar: 3
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/Explode05.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 3.6
+      scalar: 4.5
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/Fireworks.prefab

@@ -117,7 +117,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 2
+      scalar: 3
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -170,8 +170,8 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 125
+      scalar: 75
-      minScalar: 12.5
+      minScalar: 0
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -608,7 +608,7 @@ ParticleSystem:
     gravityModifier:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0.01
+      scalar: 0
       minScalar: 0
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/Sparks.prefab

@@ -4873,7 +4873,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.28
+      scalar: 3
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/StarHit.prefab

@@ -116,7 +116,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1.28
+      scalar: 3
       minScalar: 5
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Particles/WaterSplash.prefab

@@ -115,7 +115,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 1.5
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -168,7 +168,7 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 50
+      scalar: 45
       minScalar: 0
       maxCurve:
         serializedVersion: 2
@@ -4871,7 +4871,7 @@ ParticleSystem:
     startLifetime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 4
+      scalar: 4.5
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -4924,7 +4924,7 @@ ParticleSystem:
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 37.5
+      scalar: 45
       minScalar: 0
       maxCurve:
         serializedVersion: 2

Gutterball 3/Assets/Resources/Sound/Foo06.wav.meta

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

Gutterball 3/Assets/Resources/Sound/Foo07.wav.meta

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

Gutterball 3/Assets/Resources/Sound/Foo08.wav.meta

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

Gutterball 3/Assets/Resources/Sound/Foo09.wav.meta

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

Gutterball 3/Assets/Resources/Sound/Yea06.wav.meta

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

Gutterball 3/Assets/Resources/Sound/Yea07.wav.meta

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

Gutterball 3/Assets/Scenes/Splash.unity

@@ -5781,37 +5781,7 @@ MonoBehaviour:
     spares: 0
     gutters: 0
   lockRegistered: 1
-  urlInfoScreen:
+  urlInfoScreen: []
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200392.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200394.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200393.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200552.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200034.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/201021.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200093.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200130.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200009.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200702.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/201265.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200860.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/201464.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200324.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200931.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/2451.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/201164.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200885.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200942.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200950.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/201410.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/2769.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/248.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200068.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200066.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200251.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200210.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200211.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200982.jpg
-  - https://cdn.ghstatic.com/images/deluxe/300x150/200208.jpg
   lockBallMat: {fileID: 2100000, guid: 7995fe228353e6c4f92b8a1c95feee1f, type: 2}
   bowler: []
   r_hs: []

Gutterball 3/Assets/Scripts/Game.cs

@@ -75,6 +75,7 @@ public class Game : MonoBehaviour
     private int wins = 1;
     private int stage = 1;
     private int spareBalls = 5;
+    private int spareCombos = 1;
 
     public GameObject[] alleys = new GameObject[8];
     public GameObject[] alleyScores = new GameObject[8];
@@ -434,7 +435,7 @@ public class Game : MonoBehaviour
             StartChargeBalls();
             opening.Play();
         }
-        if (!music.isPlaying && !GameManager.isOpening && type == GameState.Menu)
+        if (!music.isPlaying && GameManager.isMusic && !GameManager.isOpening && type == GameState.Menu)
         {
             music.clip = Resources.Load<AudioClip>("Music/menu");
             music.Play();
@@ -618,7 +619,7 @@ public class Game : MonoBehaviour
         winBallRender4.material = gameManager.chooseBalls[GameManager.turnBalls4].ballMat;
         winBallRenderCPU.material = gameManager.chooseBalls[gameManager.compuObj[GameManager.turnBallsCPU].cpuIndex].ballMat;
         AlleyRegister();
-        if (GameManager.isOpening && opening.time >= 14)
+        if (GameManager.isMusic && GameManager.isOpening && opening.time >= 14)
         {
             music.Play();
             GameManager.isOpening = false;
@@ -1236,8 +1237,11 @@ public class Game : MonoBehaviour
             }
             if (crowdType == Crowds.Firework)
             {
-                winCrowd.Play();
+                if (GameManager.isCrowd)
-                fireworksMulti.Play();
+                {
+                    winCrowd.Play();
+                    fireworksMulti.Play();
+                }
             }
             commentatorIndex = 0;
         }
@@ -1792,11 +1796,31 @@ public class Game : MonoBehaviour
             {
                 CrowdCrap();
                 spareBalls--;
+                if (spareCombos == 1)
+                {
+                    hintCount++;
+                }
+                spareCombos = 1;
+                if (hintCount == 2 || hintCount == 3 || hintCount == 5)
+                {
+                    gutterHintUI.SetActive(true);
+                    foreach (GameObject scoreCardUI in falseScoreCardsUI)
+                    {
+                        scoreCardUI.SetActive(false);
+                    }
+                }
+                else if (hintCount == 6)
+                {
+                    hintCount = 4;
+                }
             }
             else
             {
                 CheerMed();
                 stage++;
+                addCash += 10 * spareCombos;
+                spareCombos++;
+                hintCount = 0;
             }
             if (spareBalls < 0)
             {
@@ -2477,28 +2501,28 @@ public class Game : MonoBehaviour
                     }
                 }
             }
-        }
+            if (pinFall == 0 && !isComputer)
-        if (pinFall == 0 && !isComputer)
-        {
-            hintCount++;
-            if (hintCount == 2 || hintCount == 3 || hintCount == 5)
             {
-                gutterHintUI.SetActive(true);
+                hintCount++;
-                foreach (GameObject scoreCardUI in falseScoreCardsUI)
+                if (hintCount == 2 || hintCount == 3 || hintCount == 5)
                 {
-                    scoreCardUI.SetActive(false);
+                    gutterHintUI.SetActive(true);
+                    foreach (GameObject scoreCardUI in falseScoreCardsUI)
+                    {
+                        scoreCardUI.SetActive(false);
+                    }
+                }
+                else if (hintCount == 6)
+                {
+                    hintCount = 4;
                 }
             }
-            else if (hintCount == 6)
+            else if (pinFall != 0)
             {
-                hintCount = 4;
+                hintCount = 0;
             }
+            pinCounts = pinFall;
         }
-        else if (pinFall != 0)
-        {
-            hintCount = 0;
-        }
-        pinCounts = pinFall;
         if (throwBall == 1)
         {
             if (isSplit)
@@ -4934,7 +4958,10 @@ public class Game : MonoBehaviour
         if (GameManager.isOpening)
         {
             opening.Stop();
-            music.Play();
+            if (GameManager.isMusic)
+            {
+                music.Play();
+            }
             GameManager.isOpening = false;
         }
     }

Gutterball 3/Assets/Scripts/Pin.cs

@@ -23,10 +23,6 @@ public class Pin : MonoBehaviour
     void Start ()
 	{
         pinStartPos = transform.position;
-        transform.position = pinStartPos;
-        transform.rotation = Quaternion.identity;
-        GetComponent<Rigidbody>().velocity = Vector3.zero;
-        GetComponent<Rigidbody>().angularVelocity = Vector3.zero;
         GetComponent<Rigidbody>().Sleep();
         ball = GameObject.FindObjectOfType<Ball>();
         isSplash = GameObject.FindObjectOfType<PinSetter>().isSplash;

Gutterball 3/ProjectSettings/ProjectSettings.asset

@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.6
+  bundleVersion: 1.61
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -268,7 +268,105 @@ PlayerSettings:
       m_Width: 128
       m_Height: 128
       m_Kind: 0
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: WindowsStandaloneSupport

Gutterball 3/ProjectSettings/TimeManager.asset

@@ -4,6 +4,6 @@
 TimeManager:
   m_ObjectHideFlags: 0
   Fixed Timestep: 0.01
-  Maximum Allowed Timestep: 0.0333
+  Maximum Allowed Timestep: 0.0666
   m_TimeScale: 3
   Maximum Particle Timestep: 0.03