Skip to content

Commit ef21595

Browse files
committed
White ball respawns on sinking
1 parent 9def242 commit ef21595

File tree

69 files changed

+48
-38
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+48
-38
lines changed

Assets/Resources.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

Assets/Scripts/GameController.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,20 @@ private void CountSunkBall(string sunkColour) {
4848
// For white ball
4949

5050
// Create new White Ball
51-
// GameObject newWhiteBall = (GameObject)Instantiate(Resources.Load("WhiteBall"));
51+
Instantiate(Resources.Load("WhiteBall"), Vector3.zero, Quaternion.identity);
5252

53-
// Change Turns
53+
// TODO Change Turns
5454
}
5555
else if (sunkColour == "black") {
5656
// For black ball
5757

58+
// TODO
5859
// If all other balls have been sunk by current player
5960
// Set current player as winner
6061
// Else
6162
// Set other player as winner
6263

64+
// TODO
6365
// End Game
6466
}
6567
else {
@@ -89,7 +91,7 @@ private void AddBallToScore(string sunkColour) {
8991
}
9092

9193
private void UpdateUI() {
92-
// Update UI elements to show scores and player colours
94+
// TODO Update UI elements to show scores and player colours
9395
}
9496

9597
}

Library/AssetImportState

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5;0;6;0;0
1+
4;0;196608;0;0

Library/CurrentMaximizeLayout.dwlt

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ MonoBehaviour:
2020
y: 30
2121
width: 1440
2222
height: 850
23-
m_MinSize: {x: 913, y: 542}
24-
m_MaxSize: {x: 22008, y: 14021}
23+
m_MinSize: {x: 917, y: 542}
24+
m_MaxSize: {x: 22012, y: 14042}
2525
vertical: 1
26-
controlID: 216
26+
controlID: 1504
2727
--- !u!114 &2
2828
MonoBehaviour:
2929
m_ObjectHideFlags: 52
@@ -122,10 +122,10 @@ MonoBehaviour:
122122
y: 0
123123
width: 1440
124124
height: 694
125-
m_MinSize: {x: 913, y: 442}
126-
m_MaxSize: {x: 22008, y: 10021}
125+
m_MinSize: {x: 917, y: 421}
126+
m_MaxSize: {x: 22012, y: 10021}
127127
vertical: 0
128-
controlID: 217
128+
controlID: 1505
129129
--- !u!114 &4
130130
MonoBehaviour:
131131
m_ObjectHideFlags: 52
@@ -146,10 +146,10 @@ MonoBehaviour:
146146
y: 0
147147
width: 711
148148
height: 694
149-
m_MinSize: {x: 202, y: 442}
150-
m_MaxSize: {x: 4002, y: 8042}
149+
m_MinSize: {x: 202, y: 421}
150+
m_MaxSize: {x: 4002, y: 8021}
151151
vertical: 1
152-
controlID: 218
152+
controlID: 1506
153153
--- !u!114 &5
154154
MonoBehaviour:
155155
m_ObjectHideFlags: 52
@@ -168,8 +168,8 @@ MonoBehaviour:
168168
y: 0
169169
width: 711
170170
height: 363
171-
m_MinSize: {x: 200, y: 200}
172-
m_MaxSize: {x: 4000, y: 4000}
171+
m_MinSize: {x: 202, y: 221}
172+
m_MaxSize: {x: 4002, y: 4021}
173173
m_ActualView: {fileID: 6}
174174
m_Panes:
175175
- {fileID: 6}
@@ -292,8 +292,8 @@ MonoBehaviour:
292292
y: 0
293293
width: 204
294294
height: 694
295-
m_MinSize: {x: 200, y: 200}
296-
m_MaxSize: {x: 4000, y: 4000}
295+
m_MinSize: {x: 204, y: 221}
296+
m_MaxSize: {x: 4004, y: 4021}
297297
m_ActualView: {fileID: 9}
298298
m_Panes:
299299
- {fileID: 9}
@@ -327,9 +327,9 @@ MonoBehaviour:
327327
height: 673
328328
m_TreeViewState:
329329
scrollPos: {x: 0, y: 0}
330-
m_SelectedIDs:
330+
m_SelectedIDs: fa040000
331331
m_LastClickedID: 0
332-
m_ExpandedIDs: 6efaffff00000000
332+
m_ExpandedIDs: 6cfaffff00000000
333333
m_RenameOverlay:
334334
m_UserAcceptedRename: 0
335335
m_Name:
@@ -451,8 +451,8 @@ MonoBehaviour:
451451
m_ResourceFile:
452452
m_AssetTreeState:
453453
scrollPos: {x: 0, y: 0}
454-
m_SelectedIDs:
455-
m_LastClickedID: 0
454+
m_SelectedIDs: fa040000
455+
m_LastClickedID: 1274
456456
m_ExpandedIDs: 00000000ec250000142600001826000026260000
457457
m_RenameOverlay:
458458
m_UserAcceptedRename: 0
@@ -478,8 +478,8 @@ MonoBehaviour:
478478
m_Icon: {fileID: 0}
479479
m_ResourceFile:
480480
m_ListAreaState:
481-
m_SelectedInstanceIDs:
482-
m_LastClickedInstanceID: 0
481+
m_SelectedInstanceIDs: fa040000
482+
m_LastClickedInstanceID: 1274
483483
m_HadKeyboardFocusLastEvent: 0
484484
m_ExpandedInstanceIDs:
485485
m_RenameOverlay:
@@ -584,8 +584,8 @@ MonoBehaviour:
584584
y: 694
585585
width: 1440
586586
height: 156
587-
m_MinSize: {x: 100, y: 100}
588-
m_MaxSize: {x: 4000, y: 4000}
587+
m_MinSize: {x: 100, y: 121}
588+
m_MaxSize: {x: 4000, y: 4021}
589589
m_ActualView: {fileID: 15}
590590
m_Panes:
591591
- {fileID: 15}

Library/EditorUserBuildSettings.asset

0 Bytes
Binary file not shown.
512 Bytes
Binary file not shown.
-5 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
0000.59462d98.0000
2-
0000.59462dac.0000
1+
0000.5946212f.0000
2+
0000.5946213f.0000

Library/assetDatabase3

-224 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-136 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
Base path: /Applications/Unity/Unity.app/Contents
22
Cmd: initializeCompiler
3-
Cmd: compileSnippet
4-
api=15 type=0 insize=1958 outsize=1599 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
5-
Cmd: compileSnippet
6-
api=15 type=1 insize=1958 outsize=0 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1

Sunk.sln

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2017
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sunk", "Sunk.csproj", "{5CF43C1C-4863-2FA1-841D-7723DCDCF297}"
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sunk", "Assembly-CSharp.csproj", "{82E0A9FE-5FD6-5C2F-3501-D775ACDFA3E1}"
55
EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
88
Debug|Any CPU = Debug|Any CPU
99
Release|Any CPU = Release|Any CPU
1010
EndGlobalSection
1111
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12-
{5CF43C1C-4863-2FA1-841D-7723DCDCF297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13-
{5CF43C1C-4863-2FA1-841D-7723DCDCF297}.Debug|Any CPU.Build.0 = Debug|Any CPU
14-
{5CF43C1C-4863-2FA1-841D-7723DCDCF297}.Release|Any CPU.ActiveCfg = Release|Any CPU
15-
{5CF43C1C-4863-2FA1-841D-7723DCDCF297}.Release|Any CPU.Build.0 = Release|Any CPU
12+
{82E0A9FE-5FD6-5C2F-3501-D775ACDFA3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13+
{82E0A9FE-5FD6-5C2F-3501-D775ACDFA3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
14+
{82E0A9FE-5FD6-5C2F-3501-D775ACDFA3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
15+
{82E0A9FE-5FD6-5C2F-3501-D775ACDFA3E1}.Release|Any CPU.Build.0 = Release|Any CPU
1616
EndGlobalSection
1717
GlobalSection(SolutionProperties) = preSolution
1818
HideSolutionNode = FALSE
1919
EndGlobalSection
20+
GlobalSection(MonoDevelopProperties) = preSolution
21+
StartupItem = Assembly-CSharp.csproj
22+
EndGlobalSection
2023
EndGlobal

0 commit comments

Comments
 (0)