diff --git a/src/ui/flutter/lib/game/battle.dart b/src/ui/flutter/lib/game/battle.dart index ebdff92d..ff3b5046 100644 --- a/src/ui/flutter/lib/game/battle.dart +++ b/src/ui/flutter/lib/game/battle.dart @@ -88,7 +88,7 @@ class Battle { } init() { - _position = Position.init(); + _position = Position(); _focusIndex = _blurIndex = Move.invalidValue; } @@ -96,6 +96,7 @@ class Battle { Battle.shared.position.init(); _focusIndex = _blurIndex = Move.invalidValue; cmdlist = [""]; + sideToMove = Color.black; } select(int pos) { diff --git a/src/ui/flutter/lib/mill/position.dart b/src/ui/flutter/lib/mill/position.dart index f4f210b1..8b13388a 100644 --- a/src/ui/flutter/lib/mill/position.dart +++ b/src/ui/flutter/lib/mill/position.dart @@ -201,7 +201,7 @@ class Position { return false; } - Position.init() { + init() { for (var i = 0; i < _grid.length; i++) { _grid[i] = Piece.noPiece; } @@ -218,16 +218,12 @@ class Position { setPosition(rule); // TODO // TODO - score[Color.black] = score[Color.white] = score[Color.draw] = nPlayed = 0; _recorder = MillRecorder(lastCapturedPosition: fen()); } - init() { - Position.init(); - } - Position() { + score[Color.black] = score[Color.white] = score[Color.draw] = nPlayed = 0; init(); } diff --git a/src/ui/flutter/lib/routes/battle_page.dart b/src/ui/flutter/lib/routes/battle_page.dart index 332f53f9..2320d1aa 100644 --- a/src/ui/flutter/lib/routes/battle_page.dart +++ b/src/ui/flutter/lib/routes/battle_page.dart @@ -309,7 +309,8 @@ class _BattlePageState extends State { confirm() { Navigator.of(context).pop(); Battle.shared.newGame(); - setState(() {}); + //setState(() {}); + changeStatus('新游戏'); if (Battle.shared.isAIsTurn()) { print("New Game: AI's turn."); @@ -317,7 +318,6 @@ class _BattlePageState extends State { } //setState(() {}); - changeStatus('新游戏'); } cancel() => Navigator.of(context).pop();