dal4segno/Northbound
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dal4segno:a31ed42f65e43c0220c8d29948c546b047fb9d28
Branches Tags
dal4segno:main
..
compare: dal4segno:6d0365c0db4272bb3083a0143ec2916e54c56838
Branches Tags
dal4segno:main

3 Commits
a31ed42f65 ... 6d0365c0db

Author SHA1 Message Date
dal4segno
6d0365c0db MapGenerator의 Resource 배치 x좌표 수정 
0 ~ x -> -x/2 ~ x/2
 2026-02-13 16:17:48 +09:00
dal4segno
bd17a2e7eb Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound 2026-02-13 16:17:01 +09:00
dal4segno
6473db37eb 건설 관련 코드에서 플레이어 구분자를 하나로 통일함 
ClientID, NetworkObjectId 를 혼용해서 사용하고 있었음.
 2026-02-13 15:55:07 +09:00
2 changed files with 23 additions and 16 deletions
Expand all files Collapse all files

13
Assets/Scripts/BuildingManager.cs
View File

@@ -438,14 +438,17 @@ namespace Northbound
private TeamType GetPlayerTeam(ulong playerId)
{
// 플레이어의 NetworkObject 찾기
if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager != null)
if (NetworkManager.Singleton != null && NetworkManager.Singleton.ConnectedClients != null)
{
if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(playerId, out NetworkObject playerNetObj))
if (NetworkManager.Singleton.ConnectedClients.TryGetValue(playerId, out var client))
{
var teamMember = playerNetObj.GetComponent<ITeamMember>();
if (teamMember != null)
if (client.PlayerObject != null)
{
return teamMember.GetTeam();
var teamMember = client.PlayerObject.GetComponent<ITeamMember>();
if (teamMember != null)
{
return teamMember.GetTeam();
}
}
}
}

26
Assets/Scripts/MapGenerator.cs
View File

@@ -222,6 +222,7 @@ namespace Northbound
{
_generatedResources = resources;
success = true;
Debug.Log($"<color=green>[MapGenerator] Normal resource generation succeeded on attempt {attempt + 1}</color>");
break;
}
else
@@ -232,8 +233,9 @@ namespace Northbound
if (!success)
{
Debug.LogWarning("[MapGenerator] All resource generation attempts failed, using fallback layout");
Debug.LogWarning("<color=yellow>[MapGenerator] All resource generation attempts failed, using fallback layout</color>");
GenerateResourceFallbackLayout();
Debug.Log($"<color=yellow>[MapGenerator] Fallback layout X coordinates: {string.Join(", ", System.Array.ConvertAll(_generatedResources, r => r.position.x.ToString("F1")))}</color>");
}
SpawnResources();
@@ -298,6 +300,7 @@ namespace Northbound
if (IsValidResourcePosition(candidatePosition, existingResources, currentIndex))
{
position = candidatePosition;
Debug.Log($"[MapGenerator] Generated valid resource position: X={position.x:F2} (range: {-playableAreaWidth/2f:F2} to {playableAreaWidth/2f:F2})");
return true;
}
}
@@ -367,15 +370,15 @@ namespace Northbound
{
_generatedResources = new ResourceData[]
{
new ResourceData { position = new Vector2(30, 100), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(50, 200), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(20, 300), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(60, 400), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(35, 500), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(55, 600), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(25, 700), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(45, 150), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(65, 250), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction }
new ResourceData { position = new Vector2(-30, 100), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(30, 200), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(-20, 300), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(20, 400), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(0, 500), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(-35, 600), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(35, 700), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(-15, 150), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction },
new ResourceData { position = new Vector2(15, 250), baseProduction = additionalResourceBaseProduction, qualityModifier = 0f, finalProduction = additionalResourceBaseProduction }
};
float totalProduction = initialResourceProduction;
@@ -559,7 +562,8 @@ namespace Northbound
float x = Random.Range(-playableAreaWidth / 2f, playableAreaWidth / 2f);
float z = Random.Range(startZ, endZ);
return new Vector3(x, center.y, z);
Vector3 result = new Vector3(x, center.y, z);
return result;
}
private bool IsValidObstaclePosition(Vector3 position)