Skip to content

Commit bc500a1

Browse files
Merge pull request #28 from Live2D/feature/add_hit_areas_null_check
Add HitAreas null check
2 parents c62c2ba + 99b00bd commit bc500a1

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

Assets/Live2D/Cubism/Framework/Json/CubismModel3Json.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,18 +353,21 @@ public CubismModel ToModel(MaterialPicker pickMaterial, TexturePicker pickTextur
353353

354354

355355
// Initialize drawables.
356-
for (var i = 0; i < HitAreas.Length; i++)
356+
if(HitAreas != null)
357357
{
358-
for (var j = 0; j < drawables.Length; j++)
358+
for (var i = 0; i < HitAreas.Length; i++)
359359
{
360-
if (drawables[j].Id == HitAreas[i].Id)
360+
for (var j = 0; j < drawables.Length; j++)
361361
{
362-
// Add components for hit judgement to HitArea target Drawables.
363-
var hitDrawable = drawables[j].gameObject.AddComponent<CubismHitDrawable>();
364-
hitDrawable.Name = HitAreas[i].Name;
362+
if (drawables[j].Id == HitAreas[i].Id)
363+
{
364+
// Add components for hit judgement to HitArea target Drawables.
365+
var hitDrawable = drawables[j].gameObject.AddComponent<CubismHitDrawable>();
366+
hitDrawable.Name = HitAreas[i].Name;
365367

366-
drawables[j].gameObject.AddComponent<CubismRaycastable>();
367-
break;
368+
drawables[j].gameObject.AddComponent<CubismRaycastable>();
369+
break;
370+
}
368371
}
369372
}
370373
}

0 commit comments

Comments
 (0)