Degulleo/Degullmok-client
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #75 from Degulleo/DO-75-승패-함수-문제-해결

Browse Source 
Do 75 승패 함수 문제 해결
This commit is contained in:
Sehyeon 2025-03-28 11:44:22 +09:00 committed by GitHub
commit 635d6c9f76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Assets/Script/AI/AIEvaluator.cs
View File

@ -11,9 +11,9 @@ public static class AIEvaluator
// AI 패턴 점수 // AI 패턴 점수
public const float FIVE_IN_A_ROW = 100000f; public const float FIVE_IN_A_ROW = 100000f;
public const float OPEN_FOUR = 15000f; public const float OPEN_FOUR = 15000f;
public const float HALF_OPEN_FOUR = 5000f; public const float HALF_OPEN_FOUR = 6000f;
public const float CLOSED_FOUR = 500f; public const float CLOSED_FOUR = 500f;
public const float OPEN_THREE = 3000f; public const float OPEN_THREE = 3500f;
public const float HALF_OPEN_THREE = 500f; public const float HALF_OPEN_THREE = 500f;
public const float CLOSED_THREE = 50f; public const float CLOSED_THREE = 50f;
public const float OPEN_TWO = 100f; public const float OPEN_TWO = 100f;
@ -23,13 +23,13 @@ public static class AIEvaluator
public const float CLOSED_ONE = 1f; public const float CLOSED_ONE = 1f;
// 복합 패턴 점수 // 복합 패턴 점수
public const float DOUBLE_THREE = 8000f; public const float DOUBLE_THREE = 9000f;
public const float DOUBLE_FOUR = 12000f; public const float DOUBLE_FOUR = 12000f;
public const float FOUR_THREE = 10000f; public const float FOUR_THREE = 11000f;
// 위치 가중치 기본값 // 위치 가중치 기본값
public const float CENTER_WEIGHT = 1.2f; public const float CENTER_WEIGHT = 1.3f;
public const float EDGE_WEIGHT = 0.8f; public const float EDGE_WEIGHT = 0.85f;
} }
private static readonly int[][] Directions = AIConstants.Directions; private static readonly int[][] Directions = AIConstants.Directions;
@ -51,7 +51,7 @@ public static class AIEvaluator
ai4Positions, player4Positions); ai4Positions, player4Positions);
// 2. 복합 패턴 평가 // 2. 복합 패턴 평가
score += EvaluateComplexPatterns(aiOpen3Positions, playerOpen3Positions, ai4Positions, player4Positions, aiPlayer); score += EvaluateComplexPatterns(aiOpen3Positions, playerOpen3Positions, ai4Positions, player4Positions);
return score; return score;
} }
@ -153,8 +153,7 @@ public static class AIEvaluator
List<(int row, int col, int[] dir)> aiOpen3Positions, List<(int row, int col, int[] dir)> aiOpen3Positions,
List<(int row, int col, int[] dir)> playerOpen3Positions, List<(int row, int col, int[] dir)> playerOpen3Positions,
List<(int row, int col, int[] dir)> ai4Positions, List<(int row, int col, int[] dir)> ai4Positions,
List<(int row, int col, int[] dir)> player4Positions, List<(int row, int col, int[] dir)> player4Positions)
Enums.PlayerType aiPlayer)
{ {
float score = 0; float score = 0;
@ -494,12 +493,12 @@ public static class AIEvaluator
if (count >= 4) if (count >= 4)
{ {
normalScore = PatternScore.FIVE_IN_A_ROW / 8.5f; normalScore = PatternScore.FIVE_IN_A_ROW / 7.5f;
} }
else if (count == 3) else if (count == 3)
{ {
// 일관된 분모 사용 (방어 가중치는 유지) // 일관된 분모 사용 (방어 가중치는 유지)
normalScore = (openEnds == 2) ? PatternScore.OPEN_THREE / 1.3f : normalScore = (openEnds == 2) ? PatternScore.OPEN_THREE / 1.25f :
(openEnds == 1) ? PatternScore.HALF_OPEN_THREE / 3.2f : (openEnds == 1) ? PatternScore.HALF_OPEN_THREE / 3.2f :
PatternScore.CLOSED_THREE / 4.2f; PatternScore.CLOSED_THREE / 4.2f;
} }
@ -562,7 +561,7 @@ public static class AIEvaluator
if (!AreParallelDirections(openThrees[i].dir, openThrees[j].dir)) if (!AreParallelDirections(openThrees[i].dir, openThrees[j].dir))
{ {
float threeThreeScore = PatternScore.DOUBLE_THREE / 4; // 복합 패턴 가중치 float threeThreeScore = PatternScore.DOUBLE_THREE / 4; // 복합 패턴 가중치
score += isAI ? threeThreeScore * 1.1f : threeThreeScore * 1.3f; score += isAI ? threeThreeScore * 1.2f : threeThreeScore * 1.3f;
break; break;
} }
} }
@ -579,7 +578,7 @@ public static class AIEvaluator
if (!AreParallelDirections(fours[i].dir, fours[j].dir)) if (!AreParallelDirections(fours[i].dir, fours[j].dir))
{ {
float fourFourScore = PatternScore.DOUBLE_FOUR / 4; float fourFourScore = PatternScore.DOUBLE_FOUR / 4;
score += isAI ? fourFourScore * 1.2f : fourFourScore * 1.5f; score += isAI ? fourFourScore * 1.3f : fourFourScore * 1.7f;
break; break;
} }
} }
@ -590,7 +589,7 @@ public static class AIEvaluator
if (fours.Count > 0 && openThrees.Count > 0) if (fours.Count > 0 && openThrees.Count > 0)
{ {
float fourThreeScore = PatternScore.FOUR_THREE / 4; float fourThreeScore = PatternScore.FOUR_THREE / 4;
score += isAI ? fourThreeScore * 1.1f : fourThreeScore * 1.4f; score += isAI ? fourThreeScore * 1.1f : fourThreeScore * 1.6f;
} }
return score; return score;

2
Assets/Script/AI/MiniMaxAIController.cs
View File

@ -360,7 +360,7 @@ public static class MiniMaxAIController
var (count, _) = CountStones(board, row, col, dir, player, isSavedCache); var (count, _) = CountStones(board, row, col, dir, player, isSavedCache);
// 자기 자신 포함하여 5개 이상일 시 true 반환 // 자기 자신 포함하여 5개 이상일 시 true 반환
if (count + 1 == WIN_COUNT) if (count + 1 >= WIN_COUNT)
return true; return true;
} }

2
Assets/Script/Game/GameUtility/GameWinCheck.cs
View File

@ -7,7 +7,7 @@
} }
// 특정 방향으로 같은 돌 개수와 열린 끝 개수를 계산하는 함수 // 특정 방향으로 같은 돌 개수와 열린 끝 개수를 계산하는 함수
private (int count, int openEnds) CountStones( public static (int count, int openEnds) CountStones(
Enums.PlayerType[,] board, int row, int col, int[] direction, Enums.PlayerType player) Enums.PlayerType[,] board, int row, int col, int[] direction, Enums.PlayerType player)
{ {
int size = board.GetLength(0); int size = board.GetLength(0);

11
Assets/Script/Renju/RenjuForbiddenMoveDetector.cs
View File

@ -73,16 +73,21 @@ public class RenjuForbiddenMoveDetector : ForbiddenDetectorBase
// 금수 위치에서 5목이 가능할 경우 해당 위치는 금수 표기 X // 금수 위치에서 5목이 가능할 경우 해당 위치는 금수 표기 X
private List<Vector2Int> CheckHasFiveStones(Enums.PlayerType[,] board, List<Vector2Int> forbiddenMoves) private List<Vector2Int> CheckHasFiveStones(Enums.PlayerType[,] board, List<Vector2Int> forbiddenMoves)
{ {
int[][] directions = AIConstants.Directions;
// 리스트를 수정하는 동안 오류를 방지하기 위해 뒤에서부터 반복 // 리스트를 수정하는 동안 오류를 방지하기 위해 뒤에서부터 반복
for (int i = forbiddenMoves.Count - 1; i >= 0; i--) for (int i = forbiddenMoves.Count - 1; i >= 0; i--)
{ {
int row = forbiddenMoves[i].x; int row = forbiddenMoves[i].x;
int col = forbiddenMoves[i].y; int col = forbiddenMoves[i].y;
// 해당 위치에서 승리(5목)이 가능하면 금수 표기 X foreach (var dir in directions)
if (OmokAI.Instance.CheckGameWin(Enums.PlayerType.PlayerA, board, row, col))
{ {
forbiddenMoves.RemoveAt(i); var (count, _) = GameLogic.CountStones(board, row, col, dir, Enums.PlayerType.PlayerA);
// 해당 위치에서 승리(5목)이 가능하면 금수 표기 X
if (count + 1 == 5)
forbiddenMoves.RemoveAt(i);
} }
} }