AIが先手のときの挙動調査中

BitBoard · Feb 17, 2024 · 0e6473d · 0e6473d
1 parent 6c2fee4
commit 0e6473d
Show file tree

Hide file tree

Showing 5 changed files with 256 additions and 223 deletions.
diff --git a/Assets/Scripts/GameSceneScreen/GameSceneController.cs b/Assets/Scripts/GameSceneScreen/GameSceneController.cs
@@ -103,7 +103,7 @@ private void SetCells()
         }
     }
 
-	private async UniTask InitBoard(string boardJsonPath = "", BoardType boardType = BoardType.NoHandicap, bool isBlackTurn = true)
+	private async UniTask InitBoard(string boardJsonPath = "", BoardType boardType = BoardType.NoHandicap, bool isAIFirst = false)
     {
         ClearPieces();
         capturePieceAreaData = new CapturePieceAreaData();
@@ -112,7 +112,8 @@ private async UniTask InitBoard(string boardJsonPath = "", BoardType boardType =
         gameState = new GameState(boardType);
         gameState.ShowBoard();
         battleAI = new RandomAI();
-        this.isBlackTurn = isBlackTurn;
+        this.isBlackTurn = true;
+		this.isAIFirst = isAIFirst;
 
         if (String.IsNullOrEmpty(boardJsonPath))
 		{
@@ -127,7 +128,16 @@ private async UniTask InitBoard(string boardJsonPath = "", BoardType boardType =
             var piece = Instantiate(piecePrefab, cells[data.y, data.x].transform);
             piece.GetComponent<Image>().sprite = Resources.Load<Sprite>("ShogiUI/Piece/" + data.pieceType);
             piece.GetComponent<Piece>().pieceType = PieceData.StrToPieceType(data.pieceType);
-			piece.GetComponent<Piece>().piecePotition = new PieceData.PiecePotition(data.x, data.y);
+			if(isAIFirst)
+			{
+				// AIが先手の場合、blackpieceとwhitepieceの配置を逆にする
+                piece.GetComponent<Piece>().piecePotition = new PieceData.PiecePotition(8 - data.x, 8 - data.y);
+			}
+			else
+			{
+                piece.GetComponent<Piece>().piecePotition = new PieceData.PiecePotition(data.x, data.y);
+            }
+
 			piece.GetComponent<Piece>().OnClickAction += UniTask.UnityAction(async () =>
 			{
 				if (!IsPlayerTurn())
@@ -139,7 +149,7 @@ private async UniTask InitBoard(string boardJsonPath = "", BoardType boardType =
 
 	    }
 
-		if (!isBlackTurn)
+		if (isAIFirst)
 		{
 			await GetAIAction();
 		}
@@ -191,8 +201,8 @@ private async UniTask SelectPiece(Piece piece)
 			return;
 		}
 
-		var from = selectedPiece.SqPos;
-		var to = piece.SqPos;
+		var from = selectedPiece.SqPos(isAIFirst);
+		var to = piece.SqPos(isAIFirst);
 
 		// 合法手かどうかを判定する
 		var move = Util.MakeMove(from, to);
@@ -287,15 +297,15 @@ private async UniTask MovePiece(Cell cell, bool isBlack)
 		if (selectedPiece.IsCaptured())
 		{
 			var pt = Converter.PieceTypeToDropPiece(selectedPiece.pieceType);
-			var to = cell.SqPos;
+			var to = cell.SqPos(isAIFirst);
 			move = Util.MakeMoveDrop(pt, to);
 			decidedMove = move;
 		}
 		else
 		{
 			// 盤上の駒を移動する場合
-			var from = selectedPiece.SqPos;
-			var to = cell.SqPos;
+			var from = selectedPiece.SqPos(isAIFirst);
+			var to = cell.SqPos(isAIFirst);
 			move = Util.MakeMove(from, to);
 			movePromote = Util.MakeMovePromote(from, to);
 			decidedMove = move;
@@ -451,6 +461,7 @@ private Piece GetCapturedPiece(PieceType pieceType, bool isBlack)
 
 	private bool IsPlayerTurn()
 	{
+		// 「先手のターンかつAIが後手」「後手のターンかつAIが先手」の場合、プレイヤーは手番を持っている
 		return isBlackTurn != isAIFirst;
 	}
 
@@ -468,9 +479,20 @@ private async UniTask GetAIAction()
 		var to = move.To();
 		var toX = Converter.SquareToX(to);
 		var toY = Converter.SquareToY(to);
+
 		Debug.Log("fromX:" + fromX + " fromY:" + fromY + " toX:" + toX + " toY:" + toY);
 		isPieceSelected = true;
 
+		/*
+		if(isAIFirst)
+		{
+			fromX = 8 - fromX;
+			fromY = 8 - fromY;
+			toX = 8 - toX;
+			toY = 8 - toY;
+		}
+		*/
+
 		// 駒を打つ場合
 		if (move.IsDrop())
 		{

diff --git a/Assets/Scripts/GameSceneScreen/Popup/ConfigPopupController.cs b/Assets/Scripts/GameSceneScreen/Popup/ConfigPopupController.cs
@@ -15,7 +15,7 @@ public class ConfigPopupController : MonoBehaviour
     [SerializeField] private Button closeButton;
     [SerializeField] private Button firstPlayerButton;
     [SerializeField] private Button secondPlayerButton;
-    private bool isBlackTurn = true;
+    private bool isAIFirst = false;
 
     public UnityAction<string, BoardType, bool> action;
 
@@ -96,7 +96,7 @@ private void StartGame()
                 boardType = BoardType.NoHandicap;
                 break;
         }
-        action.Invoke(boardJsonPath, boardType, isBlackTurn);
+        action.Invoke(boardJsonPath, boardType, isAIFirst);
         ClosePanel();
     }
 
@@ -108,7 +108,7 @@ private void ClosePanel()
 
     private void ChooseFirstPlayer()
     {
-        isBlackTurn = true;
+        isAIFirst = false;
         firstPlayerButton.image.color = new Color32(101, 173, 211, 255);
         secondPlayerButton.image.color = new Color32(255, 255, 255, 255);
         firstPlayer.text = "▲先手";
@@ -117,7 +117,7 @@ private void ChooseFirstPlayer()
 
     private void ChooseSecondPlayer()
     {
-        isBlackTurn = false;
+        isAIFirst = true;
         firstPlayerButton.image.color = new Color32(255, 255, 255, 255);
         secondPlayerButton.image.color = new Color32(101, 173, 211, 255);
         firstPlayer.text = "△後手";
@@ -141,7 +141,7 @@ private void DropdownValueChanged(TMP_Dropdown change)
             secondPlayerButton.gameObject.SetActive(false);
             firstPlayer.text = "△後手";
             secondPlayer.text = "▲先手";
-            isBlackTurn = true;
+            isAIFirst = true;
         }
     }
 }
diff --git a/Assets/Scripts/Shogi/Cell.cs b/Assets/Scripts/Shogi/Cell.cs
@@ -14,7 +14,10 @@ public class Cell : MonoBehaviour, IPointerClickHandler
 	public int y;
 	public UnityAction OnClickAction;
 
-	public Square SqPos => Converter.PosToSquare(x, y);
+	public Square SqPos(bool isAIFirst)
+	{
+        return Converter.PosToSquare(x, y, isAIFirst);
+    }
 
 
 	public void OnPointerClick(PointerEventData eventData)

diff --git a/Assets/Scripts/Shogi/Piece.cs b/Assets/Scripts/Shogi/Piece.cs
@@ -12,9 +12,12 @@ public class Piece : MonoBehaviour, IPointerClickHandler
     public UnityAction OnClickAction;
     public bool isPromoted = false;
 
-    public Square SqPos => Converter.PosToSquare(piecePotition.x, piecePotition.y);
     public GameObject Outline => outline;
-
+
+    public Square SqPos(bool isAIFirst)
+    {
+        return Converter.PosToSquare(piecePotition.x, piecePotition.y, isAIFirst);
+    }
 
     public void OnPointerClick(PointerEventData eventData)
     {