From 89b0d231b4b9abd6034e30ddbbbe6c5bbb23703f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Tue, 27 Sep 2022 22:56:34 +0800 Subject: [PATCH] bug fix --- Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 1 + Assets/Scripts/UmaViewerBuilder.cs | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 3b7acf7..83f674f 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -21,6 +21,7 @@ public class UmaHeadData { public int id; public string costumeId; + public int tailId; } public class UmaLyricsData diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 5956948..de88b0d 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -172,10 +172,12 @@ public class UmaViewerBuilder : MonoBehaviour // Record Head Data int head_id; string head_costumeId; + int tailId = (int)charaData["tailModelId"]; if (UI.isHeadFix && CurrentHead != null) { head_id = CurrentHead.id; head_costumeId = CurrentHead.costumeId; + tailId = CurrentHead.tailId; } else { @@ -185,13 +187,14 @@ public class UmaViewerBuilder : MonoBehaviour CurrentHead = new UmaHeadData(); CurrentHead.id = id; CurrentHead.costumeId = costumeId; + CurrentHead.tailId = tailId; } string head = UmaDatabaseController.HeadPath + $"chr{head_id}_{head_costumeId}/pfb_chr{head_id}_{head_costumeId}"; asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == head); bool isDefaultHead = false; //Some costumes don't have custom heads - if (costumeId != "00" && asset == null) + if (head_costumeId != "00" && asset == null) { asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == UmaDatabaseController.HeadPath + $"chr{head_id}_00/pfb_chr{head_id}_00"); isDefaultHead = true; @@ -227,7 +230,8 @@ public class UmaViewerBuilder : MonoBehaviour } - int tailId = (int)charaData["tailModelId"]; + + if (tailId != 0) { string tailName = $"tail{tailId.ToString().PadLeft(4, '0')}_00"; @@ -236,7 +240,7 @@ public class UmaViewerBuilder : MonoBehaviour asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == tailPfb); if (asset != null) { - foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_{id}") || a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_0000"))) + foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_{head_id}") || a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_0000"))) { RecursiveLoadAsset(asset1); }