Skip to content

Commit

Permalink
changed volume button
Browse files Browse the repository at this point in the history
  • Loading branch information
@linxchxn
linxchxn committed Jan 5, 2023
1 parent a52ca65 commit bcbbe3a
Show file tree
Hide file tree
Showing 8 changed files with 1,107 additions and 231 deletions.
462 changes: 446 additions & 16 deletions Assets/Scenes/Home Scene.unity
View file

Large diffs are not rendered by default.

442 changes: 436 additions & 6 deletions Assets/Scenes/Play Scene.unity
View file

Large diffs are not rendered by default.

80 changes: 48 additions & 32 deletions Assets/Script/UserInput.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,94 +361,110 @@ void Stack(GameObject selected)

if (minute < 3)
{
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
{
score += 50;
score += 5000;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
{
score += 300;
score += 2500;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 7)
{
score += 500;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
{
score += 2500;
score += 300;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
{
score += 5000;
score += 50;
}
else
{
score+= 10;
}
}
else if (minute < 5)
{
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
{
score += 25;
score += 2500;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
{
score += 150;
score += 1000;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 7)
{
score += 500;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
{
score += 1000;
score += 150;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
{
score += 2500;
score += 25;
}
else
{
score+= 10;
}
}
else if (minute < 7)
{
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
{
score += 20;
score += 1000;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
{
score += 75;
score += 500;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 7)
{
score += 350;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
{
score += 500;
score += 75;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
{
score += 1000;
score += 20;
}
else
{
score += 10;
}
}
else
{
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
{
score += 10;
score += 500;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
{
score += 25;
score += 250;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 7)
{
score += 100;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 10)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 5)
{
score += 250;
score += 25;
}
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 12)
if (solitaire.topPos[s1.row].GetComponent<Selectable>().value > 3)
{
score += 500;
score += 10;
}
else
{
score += 10;
}
}

Expand Down
28 changes: 14 additions & 14 deletions Packages/packages-lock.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"dependencies": {
"com.unity.2d.animation": {
"version": "7.0.9",
"version": "7.0.6",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "6.0.6",
"com.unity.2d.common": "6.0.3",
"com.unity.2d.sprite": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.common": {
"version": "6.0.6",
"version": "6.0.3",
"depth": 2,
"source": "registry",
"dependencies": {
Expand All @@ -32,19 +32,19 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.pixel-perfect": {
"version": "5.0.3",
"version": "5.0.1",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.2d.psdimporter": {
"version": "6.0.6",
"version": "6.0.4",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.2d.animation": "7.0.8",
"com.unity.2d.common": "6.0.5",
"com.unity.2d.animation": "7.0.6",
"com.unity.2d.common": "6.0.3",
"com.unity.2d.sprite": "1.0.0"
},
"url": "https://packages.unity.com"
Expand All @@ -56,12 +56,12 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "7.0.6",
"version": "7.0.5",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "6.0.4",
"com.unity.2d.common": "6.0.3",
"com.unity.2d.path": "5.0.2",
"com.unity.modules.physics2d": "1.0.0"
},
Expand Down Expand Up @@ -115,11 +115,11 @@
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.2d.animation": "7.0.9",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.psdimporter": "6.0.6",
"com.unity.2d.animation": "7.0.6",
"com.unity.2d.pixel-perfect": "5.0.1",
"com.unity.2d.psdimporter": "6.0.4",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "7.0.6",
"com.unity.2d.spriteshape": "7.0.5",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "2.2.3"
}
Expand Down Expand Up @@ -164,7 +164,7 @@
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.6.0",
"version": "1.4.2",
"depth": 1,
"source": "registry",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.16f1
m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f)
m_EditorVersion: 2021.3.9f1
m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536)
6 changes: 3 additions & 3 deletions UserSettings/EditorUserSettings.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ EditorUserSettings:
value: 5b08050057545c0f5d585b7044250c4417154c2e7f2e71622c284a63e4e5616d
flags: 0
RecentlyUsedSceneGuid-7:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
value: 0055575701560a085d580f23452659441515482f7b7820617c2f1832e4b1603a
flags: 0
RecentlyUsedSceneGuid-8:
value: 05035700540d50590f5a592012705c44174f1b7a2a702436797b4f35b6b96c6c
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
flags: 0
RecentlyUsedSceneGuid-9:
value: 0055575701560a085d580f23452659441515482f7b7820617c2f1832e4b1603a
value: 05035700540d50590f5a592012705c44174f1b7a2a702436797b4f35b6b96c6c
flags: 0
UnityRemoteDevice:
value: 500156575c56515f095c592016765942404640727b707531297f1e64b1e36761e4b361bee46b3b3a
Expand Down
Loading

0 comments on commit bcbbe3a

Please sign in to comment.