mirror of
https://github.com/imperialsushi/gutterball-3.git
synced 2025-06-15 05:07:42 +00:00
New Version 1.61
Fixed the bugs.
This commit is contained in:
parent
7520ed7142
commit
dc91559837
30 changed files with 641 additions and 2744 deletions
File diff suppressed because one or more lines are too long
|
@ -116,7 +116,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 3.6
|
||||
scalar: 4.5
|
||||
minScalar: 5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -116,7 +116,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 2.5
|
||||
scalar: 3.75
|
||||
minScalar: 5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -116,7 +116,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 1.6
|
||||
scalar: 3
|
||||
minScalar: 5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -116,7 +116,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 1.6
|
||||
scalar: 3
|
||||
minScalar: 5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -116,7 +116,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 3.6
|
||||
scalar: 4.5
|
||||
minScalar: 5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -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
|
||||
minScalar: 12.5
|
||||
scalar: 75
|
||||
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
|
||||
|
|
|
@ -4873,7 +4873,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 1.28
|
||||
scalar: 3
|
||||
minScalar: 5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -116,7 +116,7 @@ ParticleSystem:
|
|||
startLifetime:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 1.28
|
||||
scalar: 3
|
||||
minScalar: 5
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -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
|
||||
|
|
BIN
Gutterball 3/Assets/Resources/Sound/Foo06.wav
Normal file
BIN
Gutterball 3/Assets/Resources/Sound/Foo06.wav
Normal file
Binary file not shown.
22
Gutterball 3/Assets/Resources/Sound/Foo06.wav.meta
Normal file
22
Gutterball 3/Assets/Resources/Sound/Foo06.wav.meta
Normal file
|
@ -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:
|
BIN
Gutterball 3/Assets/Resources/Sound/Foo07.wav
Normal file
BIN
Gutterball 3/Assets/Resources/Sound/Foo07.wav
Normal file
Binary file not shown.
22
Gutterball 3/Assets/Resources/Sound/Foo07.wav.meta
Normal file
22
Gutterball 3/Assets/Resources/Sound/Foo07.wav.meta
Normal file
|
@ -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:
|
BIN
Gutterball 3/Assets/Resources/Sound/Foo08.wav
Normal file
BIN
Gutterball 3/Assets/Resources/Sound/Foo08.wav
Normal file
Binary file not shown.
22
Gutterball 3/Assets/Resources/Sound/Foo08.wav.meta
Normal file
22
Gutterball 3/Assets/Resources/Sound/Foo08.wav.meta
Normal file
|
@ -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:
|
BIN
Gutterball 3/Assets/Resources/Sound/Foo09.wav
Normal file
BIN
Gutterball 3/Assets/Resources/Sound/Foo09.wav
Normal file
Binary file not shown.
22
Gutterball 3/Assets/Resources/Sound/Foo09.wav.meta
Normal file
22
Gutterball 3/Assets/Resources/Sound/Foo09.wav.meta
Normal file
|
@ -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:
|
BIN
Gutterball 3/Assets/Resources/Sound/Yea06.wav
Normal file
BIN
Gutterball 3/Assets/Resources/Sound/Yea06.wav
Normal file
Binary file not shown.
22
Gutterball 3/Assets/Resources/Sound/Yea06.wav.meta
Normal file
22
Gutterball 3/Assets/Resources/Sound/Yea06.wav.meta
Normal file
|
@ -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:
|
BIN
Gutterball 3/Assets/Resources/Sound/Yea07.wav
Normal file
BIN
Gutterball 3/Assets/Resources/Sound/Yea07.wav
Normal file
Binary file not shown.
22
Gutterball 3/Assets/Resources/Sound/Yea07.wav.meta
Normal file
22
Gutterball 3/Assets/Resources/Sound/Yea07.wav.meta
Normal file
|
@ -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:
|
File diff suppressed because it is too large
Load diff
|
@ -5781,37 +5781,7 @@ MonoBehaviour:
|
|||
spares: 0
|
||||
gutters: 0
|
||||
lockRegistered: 1
|
||||
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
|
||||
urlInfoScreen: []
|
||||
lockBallMat: {fileID: 2100000, guid: 7995fe228353e6c4f92b8a1c95feee1f, type: 2}
|
||||
bowler: []
|
||||
r_hs: []
|
||||
|
|
|
@ -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();
|
||||
fireworksMulti.Play();
|
||||
if (GameManager.isCrowd)
|
||||
{
|
||||
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)
|
||||
{
|
||||
hintCount++;
|
||||
if (hintCount == 2 || hintCount == 3 || hintCount == 5)
|
||||
if (pinFall == 0 && !isComputer)
|
||||
{
|
||||
gutterHintUI.SetActive(true);
|
||||
foreach (GameObject scoreCardUI in falseScoreCardsUI)
|
||||
hintCount++;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue