diff --git a/AssetEditor.sln b/AssetEditor.sln index 9377d6e87..1703d23f6 100644 --- a/AssetEditor.sln +++ b/AssetEditor.sln @@ -142,6 +142,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.CampaignAnimationSe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CampaignAnimationSetEditor", "Editors\CampaignAnimationSetEditor\Test.CampaignAnimationSetEditor\Test.CampaignAnimationSetEditor.csproj", "{32582784-3E26-44C1-9375-ECE044B4CB4A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VfxEditor", "VfxEditor", "{3336CE67-41D1-75E0-AFD7-87A71F549C7C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.VfxEditor", "Editors\VfxEditor\Editors.VfxEditor\Editors.VfxEditor.csproj", "{082015CD-EAD9-4C33-B3A1-B241F05FA778}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.VfxEditor", "Editors\VfxEditor\Test.VfxEditor\Test.VfxEditor.csproj", "{7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -692,6 +698,30 @@ Global {32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|x64.Build.0 = Release|Any CPU {32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|x86.ActiveCfg = Release|Any CPU {32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|x86.Build.0 = Release|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Debug|Any CPU.Build.0 = Debug|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Debug|x64.ActiveCfg = Debug|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Debug|x64.Build.0 = Debug|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Debug|x86.ActiveCfg = Debug|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Debug|x86.Build.0 = Debug|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Release|Any CPU.ActiveCfg = Release|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Release|Any CPU.Build.0 = Release|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Release|x64.ActiveCfg = Release|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Release|x64.Build.0 = Release|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Release|x86.ActiveCfg = Release|Any CPU + {082015CD-EAD9-4C33-B3A1-B241F05FA778}.Release|x86.Build.0 = Release|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Debug|x64.ActiveCfg = Debug|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Debug|x64.Build.0 = Debug|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Debug|x86.Build.0 = Debug|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Release|Any CPU.Build.0 = Release|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Release|x64.ActiveCfg = Release|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Release|x64.Build.0 = Release|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Release|x86.ActiveCfg = Release|Any CPU + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -758,6 +788,9 @@ Global {AA14F125-E7D2-8CBC-FC94-A1A6F78D9FAF} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0} {417FAB39-3269-4D1C-981B-DD9965E1B26C} = {AA14F125-E7D2-8CBC-FC94-A1A6F78D9FAF} {32582784-3E26-44C1-9375-ECE044B4CB4A} = {AA14F125-E7D2-8CBC-FC94-A1A6F78D9FAF} + {3336CE67-41D1-75E0-AFD7-87A71F549C7C} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0} + {082015CD-EAD9-4C33-B3A1-B241F05FA778} = {3336CE67-41D1-75E0-AFD7-87A71F549C7C} + {7C67E9EC-4878-46E8-859E-5A80CFA8FFC7} = {3336CE67-41D1-75E0-AFD7-87A71F549C7C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AB5968F3-98ED-4AFF-98EA-0DBEDCACADF2} diff --git a/AssetEditor/AssetEditor.csproj b/AssetEditor/AssetEditor.csproj index 445412ff1..c7e4ff2b2 100644 --- a/AssetEditor/AssetEditor.csproj +++ b/AssetEditor/AssetEditor.csproj @@ -30,6 +30,7 @@ + diff --git a/AssetEditor/Language_Cn.json b/AssetEditor/Language_Cn.json index 3a0f7a163..61dab7c30 100644 --- a/AssetEditor/Language_Cn.json +++ b/AssetEditor/Language_Cn.json @@ -409,6 +409,9 @@ "TextureEditor.Labels.NumMipMaps": "MipMap 数量", "MetadataEditor.Buttons.Refresh": "刷新", + "SuperView.ShowVfx": "显示特效", + "SuperView.VfxFilter": "特效过滤:", + "SuperView.VfxFilter.Tooltip": "单位在 battle_entities 中的 vfx_filter_id。特效标签的 id 若不是 0 也不是此值,就不会在该单位上播放:单位和它的传奇军团常共用一个元数据文件,分别用 id 1 和 id 2。", "MetadataEditor.Buttons.New": "新建", "MetadataEditor.Buttons.Delete": "删除", "MetadataEditor.Buttons.Up": "上移", diff --git a/AssetEditor/Language_En.json b/AssetEditor/Language_En.json index b73133b44..44d8e3020 100644 --- a/AssetEditor/Language_En.json +++ b/AssetEditor/Language_En.json @@ -409,6 +409,9 @@ "TextureEditor.Labels.NumMipMaps": "Num MipMaps", "MetadataEditor.Buttons.Refresh": "Refresh", + "SuperView.ShowVfx": "Show VFX", + "SuperView.VfxFilter": "VFX filter:", + "SuperView.VfxFilter.Tooltip": "The unit's vfx_filter_id in battle_entities. An effect tag whose id is neither 0 nor this does not play on it: a unit and its Regiment of Renown often share one meta, with id 1 and id 2.", "MetadataEditor.Buttons.New": "New", "MetadataEditor.Buttons.Delete": "Delete", "MetadataEditor.Buttons.Up": "Up", diff --git a/AssetEditor/Language_Fr.json b/AssetEditor/Language_Fr.json index 4d6e8e09a..3aba64c15 100644 --- a/AssetEditor/Language_Fr.json +++ b/AssetEditor/Language_Fr.json @@ -385,6 +385,9 @@ "TextureEditor.Labels.Height": "Height", "TextureEditor.Labels.NumMipMaps": "Num MipMaps", "MetadataEditor.Buttons.Refresh": "Refresh", + "SuperView.ShowVfx": "Afficher les VFX", + "SuperView.VfxFilter": "Filtre VFX :", + "SuperView.VfxFilter.Tooltip": "Le vfx_filter_id de l'unité dans battle_entities. Une balise d'effet dont l'id n'est ni 0 ni celui-ci n'est pas jouée sur elle : une unité et son régiment de renom partagent souvent un même méta, avec les id 1 et 2.", "MetadataEditor.Buttons.New": "New", "MetadataEditor.Buttons.Delete": "Delete", "MetadataEditor.Buttons.Up": "Up", diff --git a/AssetEditor/Services/DependencyInjectionConfig.cs b/AssetEditor/Services/DependencyInjectionConfig.cs index 3483c2eef..157b0327f 100644 --- a/AssetEditor/Services/DependencyInjectionConfig.cs +++ b/AssetEditor/Services/DependencyInjectionConfig.cs @@ -37,6 +37,7 @@ public DependencyInjectionConfig(bool loadResources = true) new Editors.Ipc.DependencyInjectionContainer(), new Editors.BmdEditor.DependencyInjectionContainer(), new Editors.CscEditor.DependencyInjectionContainer(), + new Editors.VfxEditor.DependencyInjectionContainer(), new Editors.CampaignAnimationSetEditor.DependencyInjectionContainer(), // Host application diff --git a/AssetEditor/Themes/Controls.xaml b/AssetEditor/Themes/Controls.xaml index ba3a43a87..ae557d347 100644 --- a/AssetEditor/Themes/Controls.xaml +++ b/AssetEditor/Themes/Controls.xaml @@ -3879,6 +3879,8 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +