Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
LiZhenhuan1019 committed Mar 21, 2021
2 parents 2babf5c + 810efa7 commit 29a3f65
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/resources/config.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
GAME_VERSION=e1.5.9
GAME_BRANCH=beta
MOD_VERSION=v2.1.0
MOD_VERSION=v2.1.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Module>
<Name value="EnhancedBattleTest"/>
<Id value="EnhancedBattleTest"/>
<Version value="v2.1.0"/>
<Version value="v2.1.1"/>
<SingleplayerModule value="true"/>
<MultiplayerModule value="false"/>
<DependedModules>
Expand Down
2 changes: 0 additions & 2 deletions source/EnhancedBattleTest/src/UI/MapSelectionGroupVM.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ public void OnGameTypeChange(BattleType gameType)
}
else
{
SelectedMap = _availableMaps[_availableMaps.Count - 1];
_searchText = new TextObject("{=7i1vmgQ9}Select a Map").ToString();
OnPropertyChanged(nameof(SearchText));
}
Expand All @@ -207,7 +206,6 @@ public void RandomizeMap()
// ISSUE: explicit non-virtual call
if (mapSearchResults != null && mapSearchResults.Count > 0)
{
SearchText = "";
MapSearchResults[MBRandom.RandomInt(MapSearchResults.Count)].ExecuteSelection();
}
}
Expand Down

0 comments on commit 29a3f65

Please sign in to comment.