diff --git a/Greedy Kings.xcodeproj/project.xcworkspace/xcuserdata/surenpoghosyan.xcuserdatad/UserInterfaceState.xcuserstate b/Greedy Kings.xcodeproj/project.xcworkspace/xcuserdata/surenpoghosyan.xcuserdatad/UserInterfaceState.xcuserstate
index 1f1680d..86cf3ad 100644
Binary files a/Greedy Kings.xcodeproj/project.xcworkspace/xcuserdata/surenpoghosyan.xcuserdatad/UserInterfaceState.xcuserstate and b/Greedy Kings.xcodeproj/project.xcworkspace/xcuserdata/surenpoghosyan.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Greedy Kings.xcodeproj/xcuserdata/surenpoghosyan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Greedy Kings.xcodeproj/xcuserdata/surenpoghosyan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 3d45cf5..7b36e46 100644
--- a/Greedy Kings.xcodeproj/xcuserdata/surenpoghosyan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Greedy Kings.xcodeproj/xcuserdata/surenpoghosyan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -593,6 +593,21 @@
endingLineNumber = "174"
offsetFromSymbolStart = "496">
+
+
@@ -751,6 +766,21 @@
endingLineNumber = "355"
offsetFromSymbolStart = "504">
+
+
@@ -829,6 +859,21 @@
endingLineNumber = "356"
offsetFromSymbolStart = "864">
+
+
@@ -1093,116 +1138,20 @@
endingLineNumber = "284"
offsetFromSymbolStart = "516">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ startingLineNumber = "281"
+ endingLineNumber = "281"
+ offsetFromSymbolStart = "516">
@@ -1297,6 +1246,21 @@
endingLineNumber = "388"
offsetFromSymbolStart = "1764">
+
+
diff --git a/Greedy Kings/Game/UI/Pick Character/Views/PickCharacterViewController.swift b/Greedy Kings/Game/UI/Pick Character/Views/PickCharacterViewController.swift
index a76bbcb..9e4b50f 100644
--- a/Greedy Kings/Game/UI/Pick Character/Views/PickCharacterViewController.swift
+++ b/Greedy Kings/Game/UI/Pick Character/Views/PickCharacterViewController.swift
@@ -55,13 +55,12 @@ final class PickCharacterViewController: UIViewController {
// set character data
private func setupCharacterData() {
if let characters = storageManager.get(key: "characters", storageType: .userdefaults) as? Data {
+
let decoder = JSONDecoder()
if let characters = try? decoder.decode([Character].self, from: characters) {
- print(characters)
characterData = characters
}
}
-
}
// setup custom back button for navigation
@@ -233,13 +232,9 @@ extension PickCharacterViewController: UICollectionViewDataSource {
cell.isUserInteractionEnabled = character.availableToPick
// check the availability of character for picking and change its ui state
- if character.availableToPick {
- cell.nameLabel.alpha = 1
- cell.characterImageView.alpha = 0.7
+ if character.availableToPick == true {
cell.isUserInteractionEnabled = true
} else {
- cell.nameLabel.alpha = 0.7
- cell.characterImageView.alpha = 0.7
cell.isUserInteractionEnabled = false
}
return cell
@@ -254,6 +249,7 @@ extension PickCharacterViewController: UICollectionViewDelegate {
let sectionOffset = indexPath.section * (characterData.count / 2)
let selectedCharacter = characterData[sectionOffset + indexPath.row]
+
if selectedCharacter.availableToPick {
if selectedPlayer == 1 {
if pickedCharacterForPlayer1 == nil {
@@ -274,7 +270,7 @@ extension PickCharacterViewController: UICollectionViewDelegate {
pickedCharacterForPlayer1 = selectedCharacter
- cell?.alpha = 0.5
+ cell?.alpha = 0.7
characterData[sectionOffset + indexPath.row].availableToPick = false
selectedPlayer = 2
@@ -297,13 +293,12 @@ extension PickCharacterViewController: UICollectionViewDelegate {
])
pickedCharacterForPlayer2 = selectedCharacter
- cell?.alpha = 0.5
+ cell?.alpha = 0.7
characterData[sectionOffset + indexPath.row].availableToPick = false
nextButton.alpha = 1.0
selectedPlayer = 1
}
}
- collectionView.reloadData()
}
}
}