diff --git a/Gutterball 3/.vs/Gutterball 3/v15/.suo b/Gutterball 3/.vs/Gutterball 3/v15/.suo index fccf629f..94a931d4 100644 Binary files a/Gutterball 3/.vs/Gutterball 3/v15/.suo and b/Gutterball 3/.vs/Gutterball 3/v15/.suo differ diff --git a/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-shm b/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-shm index d54cf262..588a9303 100644 Binary files a/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-shm and b/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-shm differ diff --git a/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-wal b/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-wal index 16627e88..98fef953 100644 Binary files a/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-wal and b/Gutterball 3/.vs/Gutterball 3/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Gutterball 3/Assets/Scripts/Game.cs b/Gutterball 3/Assets/Scripts/Game.cs index 90354e55..b235e3ff 100644 --- a/Gutterball 3/Assets/Scripts/Game.cs +++ b/Gutterball 3/Assets/Scripts/Game.cs @@ -759,7 +759,7 @@ public class Game : MonoBehaviour else if (playerTurn == 2) { gameManager.chooseBallIndex = gameManager.turnBalls3; - playerNameText.text = gameManager.bowler[gameManager.turnBalls3].playerName; + playerNameText.text = gameManager.bowler[gameManager.turnNameIndex3].playerName; } else if (playerTurn == 3) { diff --git a/Gutterball 3/Library/CurrentLayout.dwlt b/Gutterball 3/Library/CurrentLayout.dwlt index e9bbdb9d..73c37843 100644 --- a/Gutterball 3/Library/CurrentLayout.dwlt +++ b/Gutterball 3/Library/CurrentLayout.dwlt @@ -109,7 +109,7 @@ MonoBehaviour: m_MinSize: {x: 683, y: 492} m_MaxSize: {x: 14004, y: 14042} vertical: 0 - controlID: 132 + controlID: 61 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -128,7 +128,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1089 + width: 1086 height: 635 m_MinSize: {x: 406, y: 492} m_MaxSize: {x: 10002, y: 14042} @@ -152,8 +152,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1089 - height: 364 + width: 1086 + height: 357 m_MinSize: {x: 406, y: 221} m_MaxSize: {x: 8006, y: 4021} vertical: 0 @@ -175,7 +175,7 @@ MonoBehaviour: x: 0 y: 0 width: 202 - height: 364 + height: 357 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} @@ -199,8 +199,8 @@ MonoBehaviour: serializedVersion: 2 x: 202 y: 0 - width: 887 - height: 364 + width: 884 + height: 357 m_MinSize: {x: 204, y: 221} m_MaxSize: {x: 4004, y: 4021} m_ActualView: {fileID: 14} @@ -225,9 +225,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 364 - width: 1089 - height: 271 + y: 357 + width: 1086 + height: 278 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 16} @@ -250,9 +250,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1089 + x: 1086 y: 0 - width: 277 + width: 280 height: 635 m_MinSize: {x: 277, y: 71} m_MaxSize: {x: 4002, y: 4021} @@ -363,13 +363,13 @@ MonoBehaviour: x: 0 y: 92 width: 200 - height: 343 + height: 336 m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 623d0000 m_LastClickedID: 0 - m_ExpandedIDs: 1ceaffffdaeaffff16ecffff1eecffff86f5ffff4af6ffff86f7ffff8ef7ffff98fbffff00000000 + m_ExpandedIDs: 24c9ffffc0d7ffffcad8ffff7edaffff84daffff24e3ffff32e4ffffeae5fffff4e5ffff2af6ffff9efbffff00000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -416,8 +416,8 @@ MonoBehaviour: serializedVersion: 2 x: 204 y: 92 - width: 883 - height: 343 + width: 880 + height: 336 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 1 lastFramingTime: 2971.1316064 @@ -519,9 +519,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 456 - width: 1087 - height: 250 + y: 449 + width: 1084 + height: 257 m_PersistentViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -546,9 +546,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 215} - m_SelectedIDs: 5e2f0000 - m_LastClickedID: 12126 - m_ExpandedIDs: 00000000e427000000ca9a3bffffff7f + m_SelectedIDs: 5a2f0000 + m_LastClickedID: 12122 + m_ExpandedIDs: 00000000e027000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -576,7 +576,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000e4270000 + m_ExpandedIDs: 00000000e0270000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -603,7 +603,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000054380000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -680,9 +680,9 @@ MonoBehaviour: m_DepthBufferBits: 0 m_Pos: serializedVersion: 2 - x: 1091 + x: 1088 y: 92 - width: 275 + width: 278 height: 614 m_PersistentViewDataDictionary: {fileID: 0} m_ScrollPosition: {x: 0, y: 0} diff --git a/Gutterball 3/Library/InspectorExpandedItems.asset b/Gutterball 3/Library/InspectorExpandedItems.asset index 09a2fb49..beae5bcd 100644 Binary files a/Gutterball 3/Library/InspectorExpandedItems.asset and b/Gutterball 3/Library/InspectorExpandedItems.asset differ diff --git a/Gutterball 3/Library/LastBuild.buildreport b/Gutterball 3/Library/LastBuild.buildreport index 4751dcdb..ab4332a7 100644 Binary files a/Gutterball 3/Library/LastBuild.buildreport and b/Gutterball 3/Library/LastBuild.buildreport differ diff --git a/Gutterball 3/Library/PlayerDataCache/Data/globalgamemanagers b/Gutterball 3/Library/PlayerDataCache/Data/globalgamemanagers index 7ca361d3..311d4b6f 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/Data/globalgamemanagers and b/Gutterball 3/Library/PlayerDataCache/Data/globalgamemanagers differ diff --git a/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index e058b90e..b1871ed5 100644 Binary files a/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/Gutterball 3/Library/ShaderCache/c/cea28c291c9730d4c22c486a57dcb1fc.bin b/Gutterball 3/Library/ShaderCache/c/cea28c291c9730d4c22c486a57dcb1fc.bin new file mode 100644 index 00000000..674b2b27 Binary files /dev/null and b/Gutterball 3/Library/ShaderCache/c/cea28c291c9730d4c22c486a57dcb1fc.bin differ diff --git a/Gutterball 3/Library/ShaderCache/d/dfcc8de7b52723ae08392e78eee4ac28.bin b/Gutterball 3/Library/ShaderCache/d/dfcc8de7b52723ae08392e78eee4ac28.bin new file mode 100644 index 00000000..5dc2d66f Binary files /dev/null and b/Gutterball 3/Library/ShaderCache/d/dfcc8de7b52723ae08392e78eee4ac28.bin differ diff --git a/Gutterball 3/Library/assetDatabase3 b/Gutterball 3/Library/assetDatabase3 index 2e9d6d3d..e710028e 100644 Binary files a/Gutterball 3/Library/assetDatabase3 and b/Gutterball 3/Library/assetDatabase3 differ diff --git a/Gutterball 3/Library/metadata/00/00000000000000006100000000000000 b/Gutterball 3/Library/metadata/00/00000000000000006100000000000000 index 10d7e53c..17b48359 100644 Binary files a/Gutterball 3/Library/metadata/00/00000000000000006100000000000000 and b/Gutterball 3/Library/metadata/00/00000000000000006100000000000000 differ diff --git a/Gutterball 3/Library/metadata/00/009c5fb85789b8b498df5581cd067c66.info b/Gutterball 3/Library/metadata/00/009c5fb85789b8b498df5581cd067c66.info index e469aa1c..bb62ac19 100644 Binary files a/Gutterball 3/Library/metadata/00/009c5fb85789b8b498df5581cd067c66.info and b/Gutterball 3/Library/metadata/00/009c5fb85789b8b498df5581cd067c66.info differ diff --git a/Gutterball 3/Library/metadata/00/00b43f0e9c8a12d409f9c349e8ff1532.info b/Gutterball 3/Library/metadata/00/00b43f0e9c8a12d409f9c349e8ff1532.info index 54c1d22d..98f5d38f 100644 Binary files a/Gutterball 3/Library/metadata/00/00b43f0e9c8a12d409f9c349e8ff1532.info and b/Gutterball 3/Library/metadata/00/00b43f0e9c8a12d409f9c349e8ff1532.info differ diff --git a/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 b/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 index 749a9402..5bf814ff 100644 Binary files a/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 and b/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 differ diff --git a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log index 86f05f71..a61ba7db 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,2 +1,6 @@ Base path: C:/Program Files/Unity/Hub/Editor/2017.3.1f1/Editor/Data Cmd: initializeCompiler +Cmd: compileSnippet + api=4 type=0 insize=1486 outsize=690 kw= pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 +Cmd: compileSnippet + api=4 type=1 insize=1486 outsize=354 kw= pd=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 SHADER_API_DESKTOP UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING ok=1 diff --git a/Mac.zip b/Mac.zip index 21c3c014..a6708faf 100644 Binary files a/Mac.zip and b/Mac.zip differ diff --git a/PC.zip b/PC.zip index ff9db8b3..49374eab 100644 Binary files a/PC.zip and b/PC.zip differ