From 6f416ecbce4c82289076696ee55fbbc282af6265 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Wed, 15 Feb 2023 00:50:19 +0800 Subject: [PATCH] bug fix --- Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 1 + .../UmaDatabase/UmaDatabaseController.cs | 57 +++-- Assets/Scripts/UmaViewerMain.cs | 1 + Assets/Scripts/UmaViewerUI.cs | 201 ++++++++++-------- 4 files changed, 145 insertions(+), 115 deletions(-) diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 8a96cf3..665930f 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -124,6 +124,7 @@ public class CostumeEntry { public string Id; public int CharaId; + public string DressName; public int BodyType; public int BodyTypeSub; public Sprite Icon; diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs index c59c5b8..f5848db 100644 --- a/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseController.cs @@ -44,6 +44,7 @@ public class UmaDatabaseController public IEnumerable MetaEntries; public IEnumerable CharaData; + public IEnumerable MobCharaData; public IEnumerable FaceTypeData; public IEnumerable LiveData; public IEnumerable DressData; @@ -73,7 +74,8 @@ public class UmaDatabaseController MetaEntries = ReadMeta(metaDb); masterDb.Open(); - CharaData = ReadMaster(masterDb); + CharaData = ReadCharaMaster(masterDb); + MobCharaData = ReadMobCharaMaster(masterDb); FaceTypeData = ReadFaceTypeData(masterDb); LiveData = ReadAllLiveData(masterDb); DressData = ReadAllDressData(masterDb); @@ -119,10 +121,20 @@ public class UmaDatabaseController return entries; } - static IEnumerable ReadMaster(SqliteConnection conn) + static IEnumerable ReadCharaMaster(SqliteConnection conn) + { + return ReadMaster(conn, "SELECT * FROM chara_data C,(SELECT D.'index' charaid,D.'text' charaname FROM text_data D WHERE id like 6) T WHERE C.id like T.charaid"); + } + + static IEnumerable ReadMobCharaMaster(SqliteConnection conn) + { + return ReadMaster(conn, "SELECT * FROM chara_data C,(SELECT D.'index' charaid,D.'text' charaname FROM text_data D WHERE id like 6) T WHERE C.id like T.charaid"); + } + + static IEnumerable ReadMaster(SqliteConnection conn,string sql) { SqliteCommand sqlite_cmd = conn.CreateCommand(); - sqlite_cmd.CommandText = "SELECT * FROM chara_data C,(SELECT D.'index' charaid,D.'text' charaname FROM text_data D WHERE id like 6) T WHERE C.id like T.charaid"; + sqlite_cmd.CommandText = sql; SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader(); var result = new DataTable(); result.Load(sqlite_datareader); @@ -158,43 +170,24 @@ public class UmaDatabaseController static IEnumerable ReadAllLiveData(SqliteConnection conn) { - SqliteCommand sqlite_cmd = conn.CreateCommand(); - sqlite_cmd.CommandText = - $"SELECT * FROM live_data L,(SELECT D.'index' songid,D.'text' songname FROM text_data D WHERE id like 16) T WHERE L.music_id like T.songid"; - SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader(); - var result = new DataTable(); - result.Load(sqlite_datareader); - var temp = result.Rows.GetEnumerator(); - while (temp.MoveNext()) - { - yield return (DataRow)temp.Current; - } + return ReadMaster(conn, $"SELECT * FROM live_data L,(SELECT D.'index' songid,D.'text' songname FROM text_data D WHERE id like 16) T WHERE L.music_id like T.songid"); } static IEnumerable ReadAllDressData(SqliteConnection conn) { - SqliteCommand sqlite_cmd = conn.CreateCommand(); - sqlite_cmd.CommandText = - $"SELECT * FROM dress_data"; - SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader(); - var result = new DataTable(); - result.Load(sqlite_datareader); - var temp = result.Rows.GetEnumerator(); - while (temp.MoveNext()) - { - yield return (DataRow)temp.Current; - } + return ReadMaster(conn, $"SELECT * FROM dress_data C,(SELECT D.'index' dressid,D.'text' dressname FROM text_data D WHERE id like 14) T WHERE C.id like T.dressid"); } public static DataRow ReadCharaData(int id) { - SqliteCommand sqlite_cmd = instance.masterDb.CreateCommand(); - sqlite_cmd.CommandText = $"SELECT * FROM chara_data WHERE id LIKE {id}"; - SqliteDataReader sqlite_datareader = sqlite_cmd.ExecuteReader(); - var result = new DataTable(); - result.Load(sqlite_datareader); - DataRow row = result.Rows[0]; - return row; + foreach (var chara in instance.CharaData) + { + if (Convert.ToInt32(chara["id"]) == id) + { + return chara; + } + } + return null; } public void CloseAllConnection() diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index b54b5c1..45b02cd 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -94,6 +94,7 @@ public class UmaViewerMain : MonoBehaviour if (costume != null) { costume.CharaId = Convert.ToInt32(data["chara_id"]); + costume.DressName = data["dressname"].ToString(); costume.BodyType = Convert.ToInt32(data["body_type"]); costume.BodyTypeSub = Convert.ToInt32(data["body_type_sub"]); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index b9efea3..571aadc 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -15,7 +15,7 @@ public class UmaViewerUI : MonoBehaviour public static UmaViewerUI Instance; private UmaViewerMain Main => UmaViewerMain.Instance; private UmaViewerBuilder Builder => UmaViewerBuilder.Instance; - + public CanvasScaler canvasScaler; [Header("normal models")] @@ -194,9 +194,9 @@ public class UmaViewerUI : MonoBehaviour LoadedAssetCount++; string filePath = entry.FilePath; - var container = Instantiate(UmaContainerAssetsPrefab, LoadedAssetsPanel).GetComponent(); + var container = Instantiate(UmaContainerAssetsPrefab, LoadedAssetsPanel).GetComponent(); container.Name = Path.GetFileName(entry.Name); - container.Button.onClick.AddListener(() => {Process.Start("explorer.exe", "/select," + filePath);}); + container.Button.onClick.AddListener(() => { Process.Start("explorer.exe", "/select," + filePath); }); LoadedAssetsPanel.sizeDelta = new Vector2(0, LoadedAssetCount * 35); } @@ -214,14 +214,16 @@ public class UmaViewerUI : MonoBehaviour { var container1 = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); container1.Name = container1.name = "Generic"; - container1.Button.onClick.AddListener(() => { + container1.Button.onClick.AddListener(() => + { HighlightChildImage(AnimationSetList.content, container1); ListAnimations(-1, false); }); var container2 = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); container2.Name = container2.name = "Tail"; - container2.Button.onClick.AddListener(() => { + container2.Button.onClick.AddListener(() => + { HighlightChildImage(AnimationSetList.content, container2); ListAnimations(-2, false); }); @@ -232,7 +234,8 @@ public class UmaViewerUI : MonoBehaviour var container3 = Instantiate(UmaContainerPrefab, CharactersList.content).GetComponent(); container3.Name = container3.name = chara.Id + " " + chara.Name; - container3.Button.onClick.AddListener(() => { + container3.Button.onClick.AddListener(() => + { HighlightChildImage(CharactersList.content, container3); ListCostumes(charaInstance, false); }); @@ -245,7 +248,8 @@ public class UmaViewerUI : MonoBehaviour var container4 = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); container4.Name = container4.name = chara.Id + " " + chara.Name; - container4.Button.onClick.AddListener(() => { + container4.Button.onClick.AddListener(() => + { HighlightChildImage(AnimationSetList.content, container4); ListAnimations(charaInstance.Id, false); }); @@ -262,7 +266,8 @@ public class UmaViewerUI : MonoBehaviour { var container1 = Instantiate(UmaContainerPrefab, MiniAnimationSetList.content).GetComponent(); container1.Name = container1.name = "General"; - container1.Button.onClick.AddListener(() => { + container1.Button.onClick.AddListener(() => + { HighlightChildImage(MiniAnimationSetList.content, container1); ListAnimations(-1, true); }); @@ -272,7 +277,8 @@ public class UmaViewerUI : MonoBehaviour var charaInstance = chara; var container2 = Instantiate(UmaContainerPrefab, MiniCharactersList.content).GetComponent(); container2.Name = container2.name = chara.Id + " " + chara.Name; - container2.Button.onClick.AddListener(() => { + container2.Button.onClick.AddListener(() => + { HighlightChildImage(MiniCharactersList.content, container2); ListCostumes(charaInstance, true); }); @@ -285,7 +291,8 @@ public class UmaViewerUI : MonoBehaviour var container3 = Instantiate(UmaContainerPrefab, MiniAnimationSetList.content).GetComponent(); container3.Name = container3.name = chara.Id + " " + chara.Name; - container3.Button.onClick.AddListener(() => { + container3.Button.onClick.AddListener(() => + { HighlightChildImage(MiniAnimationSetList.content, container3); ListAnimations(charaInstance.Id, true); }); @@ -302,9 +309,9 @@ public class UmaViewerUI : MonoBehaviour { foreach (FacialMorph morph in targetMorph) { - if(morph is FacialOtherMorph extraMorph) + if (morph is FacialOtherMorph extraMorph) { - foreach(var prop in extraMorph.BindProperties) + foreach (var prop in extraMorph.BindProperties) { var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent(); container.Name = $"{morph.locator.name}({prop.Type})"; @@ -323,7 +330,7 @@ public class UmaViewerUI : MonoBehaviour break; case BindProperty.BindType.EyeSelect: container.Slider.wholeNumbers = true; - container.Slider.maxValue = prop.BindPrefab.Count/2 - 1; + container.Slider.maxValue = prop.BindPrefab.Count / 2 - 1; container.Slider.minValue = 0; break; case BindProperty.BindType.Enable: @@ -342,9 +349,10 @@ public class UmaViewerUI : MonoBehaviour container.Slider.minValue = 0; break; } - container.Slider.onValueChanged.AddListener((a) => { + container.Slider.onValueChanged.AddListener((a) => + { target.ChangeMorphWeight(prop, a); - if(prop.Type == BindProperty.BindType.Enable&& morph.name.Contains("Manga")) + if (prop.Type == BindProperty.BindType.Enable && morph.name.Contains("Manga")) { target.ChangeMorphWeight(target.EyeMorphs[42], container.Slider.value > 0 ? 1 : 0); target.ChangeMorphWeight(target.EyeMorphs[43], container.Slider.value > 0 ? 1 : 0); @@ -408,12 +416,12 @@ public class UmaViewerUI : MonoBehaviour { mat.mainTextureOffset = new Vector2(0.25f * (val % 4), -0.25f * (val / 4)); } - else if(type == 1) + else if (type == 1) { var vector = mat.GetVector("_UVOffset"); mat.SetVector("_UVOffset", new Vector4(0.25f * (val % 4), -0.25f * (val / 4), vector.z, vector.w)); } - else if(type == 2) + else if (type == 2) { var vector = mat.GetVector("_UVOffset"); mat.SetVector("_UVOffset", new Vector4(vector.x, vector.y, 0.25f * (val % 4), -0.25f * (val / 4))); @@ -430,8 +438,8 @@ public class UmaViewerUI : MonoBehaviour public void UpdateFacialPanels() { - if(currentFaceDrivenKeyTarget) - LoadFacialPanels(currentFaceDrivenKeyTarget); + if (currentFaceDrivenKeyTarget) + LoadFacialPanels(currentFaceDrivenKeyTarget); } public void LoadEmotionPanels(FaceEmotionKeyTarget target) @@ -443,7 +451,7 @@ public class UmaViewerUI : MonoBehaviour if (target == null) return; - foreach(var emotion in target.FaceEmotionKey) + foreach (var emotion in target.FaceEmotionKey) { if (emotion.label == "Base") { @@ -464,10 +472,11 @@ public class UmaViewerUI : MonoBehaviour { var liveInstance = live; var container = Instantiate(UmaContainerLivePrefab, LiveList.content).GetComponent(); - container.Name = " "+ live.MusicId + " " + live.SongName; + container.Name = " " + live.MusicId + " " + live.SongName; container.Image.sprite = live.Icon; container.Image.enabled = container.Image.sprite; - container.Button.onClick.AddListener(() => { + container.Button.onClick.AddListener(() => + { HighlightChildImage(LiveList.content, container); ShowLiveSelectPannel(live); }); @@ -476,7 +485,8 @@ public class UmaViewerUI : MonoBehaviour CharaContainer.Name = " " + live.MusicId + " " + live.SongName; CharaContainer.Image.sprite = live.Icon; CharaContainer.Image.enabled = CharaContainer.Image.sprite; - CharaContainer.Button.onClick.AddListener(() => { + CharaContainer.Button.onClick.AddListener(() => + { HighlightChildImage(LiveSoundList.content, container); ListLiveSounds(live.MusicId); }); @@ -500,11 +510,11 @@ public class UmaViewerUI : MonoBehaviour } NormalSoundCtrl.Initialize(pageentrys, NormalSoundList); } - + public void LoadPropPanel() { var pageentrys = new List(); - foreach (var prop in Main.AbList.Where(a=>a.Name.Contains("pfb_chr_prop") && !a.Name.Contains("clothes"))) + foreach (var prop in Main.AbList.Where(a => a.Name.Contains("pfb_chr_prop") && !a.Name.Contains("clothes"))) { var pageentry = new PageManager.Entry(); pageentry.Name = Path.GetFileName(prop.Name); @@ -515,7 +525,7 @@ public class UmaViewerUI : MonoBehaviour }; pageentrys.Add(pageentry); } - PropPageCtrl.Initialize(pageentrys,PropList); + PropPageCtrl.Initialize(pageentrys, PropList); } public void LoadMapPanel() @@ -540,7 +550,7 @@ public class UmaViewerUI : MonoBehaviour { if (currentLive == null) return; var selectlist = LiveSelectList.content.GetComponentsInChildren(); - if(selectlist != null) + if (selectlist != null) { Builder.LoadLive(currentLive, new List(selectlist)); LiveSelectPannel.SetActive(false); @@ -554,7 +564,7 @@ public class UmaViewerUI : MonoBehaviour { Destroy(LiveSelectList.content.GetChild(i).gameObject); } - + currentLive = entry; LiveSelectImage.sprite = entry.Icon; LiveSelectInfoText.text = $"{entry.SongName}\nMembers Count: {entry.MemberCount}"; @@ -562,7 +572,8 @@ public class UmaViewerUI : MonoBehaviour { var chara = Instantiate(LiveSelectPrefab, LiveSelectList.content).GetComponent(); chara.IndexText.text = (i + 1).ToString(); - chara.GetComponent