Compare commits

..

2 Commits

13 changed files with 6808 additions and 6780 deletions

View File

@@ -22,4 +22,4 @@ MonoBehaviour:
cost: 1 cost: 1
weight: 1 weight: 1
modelPath: Assets/Models/Skeleton_Minion.fbx modelPath: Assets/Models/Skeleton_Minion.fbx
animationControllerPath: Assets/Animations/PlayerAnimationController.controller animationControllerPath: Assets/Animations/MonsterAnimationController.controller

View File

@@ -22,4 +22,4 @@ MonoBehaviour:
cost: 2 cost: 2
weight: 0.5 weight: 0.5
modelPath: Assets/Models/Skeleton_Minion.fbx modelPath: Assets/Models/Skeleton_Minion.fbx
animationControllerPath: Assets/Animations/PlayerAnimationController.controller animationControllerPath: Assets/Animations/MonsterAnimationController.controller

View File

@@ -22,4 +22,4 @@ MonoBehaviour:
cost: 5 cost: 5
weight: 0.2 weight: 0.2
modelPath: Assets/Models/Skeleton_Minion.fbx modelPath: Assets/Models/Skeleton_Minion.fbx
animationControllerPath: Assets/Animations/PlayerAnimationController.controller animationControllerPath: Assets/Animations/MonsterAnimationController.controller

View File

@@ -22,4 +22,4 @@ MonoBehaviour:
cost: 3 cost: 3
weight: 0.333 weight: 0.333
modelPath: Assets/Models/Skeleton_Minion.fbx modelPath: Assets/Models/Skeleton_Minion.fbx
animationControllerPath: Assets/Animations/PlayerAnimationController.controller animationControllerPath: Assets/Animations/MonsterAnimationController.controller

View File

@@ -22,4 +22,4 @@ MonoBehaviour:
cost: 10 cost: 10
weight: 0.1 weight: 0.1
modelPath: Assets/Models/Skeleton_Minion.fbx modelPath: Assets/Models/Skeleton_Minion.fbx
animationControllerPath: Assets/Animations/PlayerAnimationController.controller animationControllerPath: Assets/Animations/MonsterAnimationController.controller

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -89,6 +89,13 @@ namespace Northbound
Debug.LogWarning("[FogOfWar] Fog Material이 설정되지 않았습니다!"); Debug.LogWarning("[FogOfWar] Fog Material이 설정되지 않았습니다!");
} }
#if UNITY_EDITOR
if (fogSystem.disableInEditor)
{
_meshRenderer.enabled = false;
}
#endif
// 렌더링 레이어 설정 // 렌더링 레이어 설정
gameObject.layer = LayerMask.NameToLayer("UI"); // 또는 별도 레이어 생성 gameObject.layer = LayerMask.NameToLayer("UI"); // 또는 별도 레이어 생성
@@ -123,6 +130,18 @@ namespace Northbound
var fogSystem = FogOfWarSystem.Instance; var fogSystem = FogOfWarSystem.Instance;
if (fogSystem == null) return; if (fogSystem == null) return;
#if UNITY_EDITOR
if (fogSystem.disableInEditor)
{
if (_meshRenderer != null)
_meshRenderer.enabled = false;
return;
}
#endif
if (_meshRenderer != null)
_meshRenderer.enabled = true;
var fogData = fogSystem.GetPlayerFogData(_localClientId); var fogData = fogSystem.GetPlayerFogData(_localClientId);
for (int y = 0; y < fogSystem.gridHeight; y++) for (int y = 0; y < fogSystem.gridHeight; y++)

View File

@@ -217,6 +217,10 @@ namespace Northbound
[Tooltip("Minimum obstacle height to block vision")] [Tooltip("Minimum obstacle height to block vision")]
public float minBlockingHeight = 2.0f; public float minBlockingHeight = 2.0f;
[Header("Editor Settings")]
[Tooltip("Disable fog of war in Unity Editor for easier development")]
public bool disableInEditor = true;
// 서버: 각 플레이어별 가시성 맵 // 서버: 각 플레이어별 가시성 맵
private Dictionary<ulong, FogOfWarData> _serverFogData = new Dictionary<ulong, FogOfWarData>(); private Dictionary<ulong, FogOfWarData> _serverFogData = new Dictionary<ulong, FogOfWarData>();
@@ -462,6 +466,11 @@ namespace Northbound
/// </summary> /// </summary>
public FogOfWarState GetVisibilityState(ulong clientId, Vector3 worldPosition) public FogOfWarState GetVisibilityState(ulong clientId, Vector3 worldPosition)
{ {
#if UNITY_EDITOR
if (disableInEditor)
return FogOfWarState.Visible;
#endif
FogOfWarData fogData = GetPlayerFogData(clientId); FogOfWarData fogData = GetPlayerFogData(clientId);
if (fogData == null) if (fogData == null)
return FogOfWarState.Unexplored; return FogOfWarState.Unexplored;

View File

@@ -1,6 +1,6 @@
id,memo,move_speed,max_hp,atk_range,atk_damage,atk_interval_sec,cost,weight,model_path,animation_controller_path id,memo,move_speed,max_hp,atk_range,atk_damage,atk_interval_sec,cost,weight,model_path,animation_controller_path
101,Grunt(기본),2.6,30,1,3,1.2,1,1.0,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/PlayerAnimationController.controller 101,Grunt(기본),2.6,30,1,3,1.2,1,1.0,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/MonsterAnimationController.controller
102,Fast(빠름/약함),3.4,18,1,2,1.0,2,0.5,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/PlayerAnimationController.controller 102,Fast(빠름/약함),3.4,18,1,2,1.0,2,0.5,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/MonsterAnimationController.controller
103,Tank(느림/단단),2.0,70,1,4,1.5,5,0.2,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/PlayerAnimationController.controller 103,Tank(느림/단단),2.0,70,1,4,1.5,5,0.2,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/MonsterAnimationController.controller
104,Ranged(원거리/약함),2.4,22,5,2,1.4,3,0.333,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/PlayerAnimationController.controller 104,Ranged(원거리/약함),2.4,22,5,2,1.4,3,0.333,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/MonsterAnimationController.controller
105,Elite(소수 정예),2.8,120,1,7,1.3,10,0.1,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/PlayerAnimationController.controller 105,Elite(소수 정예),2.8,120,1,7,1.3,10,0.1,Assets/Models/Skeleton_Minion.fbx,Assets/Animations/MonsterAnimationController.controller
1 id memo move_speed max_hp atk_range atk_damage atk_interval_sec cost weight model_path animation_controller_path
2 101 Grunt(기본) 2.6 30 1 3 1.2 1 1.0 Assets/Models/Skeleton_Minion.fbx Assets/Animations/PlayerAnimationController.controller Assets/Animations/MonsterAnimationController.controller
3 102 Fast(빠름/약함) 3.4 18 1 2 1.0 2 0.5 Assets/Models/Skeleton_Minion.fbx Assets/Animations/PlayerAnimationController.controller Assets/Animations/MonsterAnimationController.controller
4 103 Tank(느림/단단) 2.0 70 1 4 1.5 5 0.2 Assets/Models/Skeleton_Minion.fbx Assets/Animations/PlayerAnimationController.controller Assets/Animations/MonsterAnimationController.controller
5 104 Ranged(원거리/약함) 2.4 22 5 2 1.4 3 0.333 Assets/Models/Skeleton_Minion.fbx Assets/Animations/PlayerAnimationController.controller Assets/Animations/MonsterAnimationController.controller
6 105 Elite(소수 정예) 2.8 120 1 7 1.3 10 0.1 Assets/Models/Skeleton_Minion.fbx Assets/Animations/PlayerAnimationController.controller Assets/Animations/MonsterAnimationController.controller