From ed0b4da21161402462d31fab044ba842a0fe93fc Mon Sep 17 00:00:00 2001 From: sgr Date: Sun, 18 Feb 2024 15:21:19 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BE=8C=E6=89=8B=E7=95=AA=E3=81=A7=E6=88=90?= =?UTF-8?q?=E9=A7=92=E3=81=8C=E5=8F=8D=E8=BB=A2=E3=81=99=E3=82=8B=E6=8C=99?= =?UTF-8?q?=E5=8B=95=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Data/PieceData.cs | 26 +++++++++---------- .../GameSceneScreen/GameSceneController.cs | 12 ++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Assets/Scripts/Data/PieceData.cs b/Assets/Scripts/Data/PieceData.cs index 67847fc..ecf6c98 100644 --- a/Assets/Scripts/Data/PieceData.cs +++ b/Assets/Scripts/Data/PieceData.cs @@ -106,34 +106,34 @@ public static string PieceTypeToStr(PieceType pieceType) /// /// /// - public static string PieceTypeToPromoteStr(PieceType pieceType) + public static string PieceTypeToPromoteStr(PieceType pieceType, bool isAIFirst) { switch (pieceType) { case PieceType.WhitePawn: - return "white_prom_pawn"; + return isAIFirst? "black_prom_pawn" : "white_prom_pawn"; case PieceType.WhiteLance: - return "white_prom_lance"; + return isAIFirst ? "black_prom_lance" : "white_prom_lance"; case PieceType.WhiteKnight: - return "white_prom_knight"; + return isAIFirst ? "black_prom_knight" : "white_prom_knight"; case PieceType.WhiteSilver: - return "white_prom_silver"; + return isAIFirst ? "black_prom_silver" : "white_prom_silver"; case PieceType.WhiteBishop: - return "white_horse"; + return isAIFirst ? "black_horse" : "white_horse"; case PieceType.WhiteRook: - return "white_dragon"; + return isAIFirst ? "black_dragon" : "white_dragon"; case PieceType.BlackPawn: - return "black_prom_pawn"; + return isAIFirst ? "white_prom_pawn" : "black_prom_pawn"; case PieceType.BlackLance: - return "black_prom_lance"; + return isAIFirst ? "white_prom_lance" : "black_prom_lance"; case PieceType.BlackKnight: - return "black_prom_knight"; + return isAIFirst ? "white_prom_knight" : "black_prom_knight"; case PieceType.BlackSilver: - return "black_prom_silver"; + return isAIFirst ? "white_prom_silver" : "black_prom_silver"; case PieceType.BlackBishop: - return "black_horse"; + return isAIFirst ? "white_horse" : "black_horse"; case PieceType.BlackRook: - return "black_dragon"; + return isAIFirst ? "white_dragon" : "black_dragon"; default: throw new Exception("成れない駒です。"); } diff --git a/Assets/Scripts/GameSceneScreen/GameSceneController.cs b/Assets/Scripts/GameSceneScreen/GameSceneController.cs index 4a50055..920eddf 100644 --- a/Assets/Scripts/GameSceneScreen/GameSceneController.cs +++ b/Assets/Scripts/GameSceneScreen/GameSceneController.cs @@ -227,7 +227,7 @@ private async UniTask SelectPiece(Piece piece) { // この場合は強制的に成る decidedMove = movePromote; - PromotePiece(selectedPiece); + PromotePiece(selectedPiece, isAIFirst); } else { @@ -253,7 +253,7 @@ private async UniTask SelectPiece(Piece piece) if (shouldPromote) { decidedMove = movePromote; - PromotePiece(selectedPiece); + PromotePiece(selectedPiece, isAIFirst); } // 変数を初期化 @@ -334,7 +334,7 @@ private async UniTask MovePiece(Cell cell, bool isBlack) { // この場合は強制的に成る decidedMove = movePromote; - PromotePiece(selectedPiece); + PromotePiece(selectedPiece, isAIFirst); } else { @@ -358,7 +358,7 @@ private async UniTask MovePiece(Cell cell, bool isBlack) if (shouldPromote) { decidedMove = movePromote; - PromotePiece(selectedPiece); + PromotePiece(selectedPiece, isAIFirst); } // 変数を初期化 @@ -496,10 +496,10 @@ private void CapturePiece(Piece piece, bool isBlack) Destroy(piece.gameObject); } - private void PromotePiece(Piece piece) + private void PromotePiece(Piece piece, bool isAIFirst) { piece.isPromoted = true; - piece.GetComponent().sprite = Resources.Load("ShogiUI/Piece/" + PieceData.PieceTypeToPromoteStr(piece.pieceType)); + piece.GetComponent().sprite = Resources.Load("ShogiUI/Piece/" + PieceData.PieceTypeToPromoteStr(piece.pieceType, isAIFirst)); } ///