Merge remote-tracking branch 'origin/main'

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

View File

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

View File

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