Skip to content

Commit 6d34a12

Browse files
Merge pull request #6850 from planetarium/fix/planet-select-diabled-error
fix planet-select-diabled-error
2 parents ebde1d4 + 2fb124b commit 6d34a12

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

nekoyume/Assets/_Scripts/UI/Scroller/SelectPlanetScroll.cs

+29-28
Original file line numberDiff line numberDiff line change
@@ -114,42 +114,43 @@ bool IsThor(PlanetInfo e) => e.ID.Equals(PlanetId.Thor) ||
114114
private void OnClickCell((
115115
SelectPlanetCell cell,
116116
SelectPlanetCell.ViewModel viewModel) tuple)
117+
{
118+
OnClickSelectedPlanetSubject.OnNext(this);
119+
}
120+
121+
private void OnClickDisableCell((
122+
SelectPlanetCell cell,
123+
SelectPlanetCell.ViewModel viewModel) tuple)
117124
{
118125
var (_, viewModel) = tuple;
119-
if (viewModel.IsSelected)
126+
if (viewModel == null || viewModel.HasError)
120127
{
121-
OnClickSelectedPlanetSubject.OnNext(this);
122-
return;
128+
Widget.Find<OneButtonSystem>().Show(L10nManager.Localize("ERROR_UNABLE_CONNECT_PLANET"),
129+
L10nManager.Localize("UI_YES"),
130+
null);
123131
}
124-
125-
var selectedPlanetId = viewModel.PlanetId;
126-
var newItemsSource = ItemsSource.Select(e =>
132+
else
127133
{
128-
if (e.IsSelected)
129-
{
130-
e.IsSelected = false;
131-
return e;
132-
}
133-
134-
if (e.PlanetId.Equals(selectedPlanetId))
134+
var selectedPlanetId = viewModel.PlanetId;
135+
var newItemsSource = ItemsSource.Select(e =>
135136
{
136-
e.IsSelected = true;
137-
return e;
138-
}
137+
if (e.IsSelected)
138+
{
139+
e.IsSelected = false;
140+
return e;
141+
}
139142

140-
return e;
141-
}).ToArray();
142-
UpdateContents(newItemsSource);
143-
OnChangeSelectedPlanetSubject.OnNext((this, tuple.viewModel.PlanetId));
144-
}
143+
if (e.PlanetId.Equals(selectedPlanetId))
144+
{
145+
e.IsSelected = true;
146+
return e;
147+
}
145148

146-
private void OnClickDisableCell((
147-
SelectPlanetCell cell,
148-
SelectPlanetCell.ViewModel viewModel) tuple)
149-
{
150-
Widget.Find<OneButtonSystem>().Show(L10nManager.Localize("ERROR_UNABLE_CONNECT_PLANET"),
151-
L10nManager.Localize("UI_YES"),
152-
null);
149+
return e;
150+
}).ToArray();
151+
UpdateContents(newItemsSource);
152+
OnChangeSelectedPlanetSubject.OnNext((this, tuple.viewModel.PlanetId));
153+
}
153154
}
154155
}
155156
}

0 commit comments

Comments
 (0)