iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
M1_IDMhan 2023-08-17 11:02:26 +09:00
commit eb99ca0575
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BlueWater/Assets/02.Scripts/Ai/AiController.cs
View File

@ -62,10 +62,12 @@ namespace BlueWaterProject
#region Unity built-in function #region Unity built-in function
#if UNITY_EDITOR
private void OnDrawGizmosSelected() private void OnDrawGizmosSelected()
{ {
DrawGizmosInFieldOfView(); DrawGizmosInFieldOfView();
} }
#endif
protected virtual void Awake() protected virtual void Awake()
{ {
@ -197,8 +199,7 @@ namespace BlueWaterProject
[field: SerializeField] public TargetInfo TargetInfo { get; set; } = new(); [field: SerializeField] public TargetInfo TargetInfo { get; set; } = new();
private const int TARGET_MAX_SIZE = 30; private const int TARGET_MAX_SIZE = 30;
#if UNITY_EDITOR
public void DrawGizmosInFieldOfView() public void DrawGizmosInFieldOfView()
{ {
if (!IsDrawGizmosInFieldOfView) return; if (!IsDrawGizmosInFieldOfView) return;
@ -212,7 +213,6 @@ namespace BlueWaterProject
Debug.DrawLine(myPos, TargetInfo.transform.position, Color.red); Debug.DrawLine(myPos, TargetInfo.transform.position, Color.red);
} }
#endif
public IEnumerator FindTarget() public IEnumerator FindTarget()
{ {

2
BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs
View File

@ -129,7 +129,7 @@ namespace BlueWaterProject
var soldierObject = Instantiate(soliderPrefabList[(int)unit.unitType - 1], spawnPosition, Quaternion.identity, unitController.transform).GetComponent<AiController>(); var soldierObject = Instantiate(soliderPrefabList[(int)unit.unitType - 1], spawnPosition, Quaternion.identity, unitController.transform).GetComponent<AiController>();
objectNameBuilder.Clear(); objectNameBuilder.Clear();
objectNameBuilder.Append(soliderPrefabList[(int)unit.unitType].name); objectNameBuilder.Append(soliderPrefabList[(int)unit.unitType - 1].name);
objectNameBuilder.Append("_"); objectNameBuilder.Append("_");
objectNameBuilder.AppendFormat("{0:00}", i + 1); objectNameBuilder.AppendFormat("{0:00}", i + 1);