diff --git a/CLEditor.sln b/CLEditor.sln index 32253818fce8482e9ec011d4f80241cfc39da361..4e428c75682420dfd8ef426c6949b98e17f0d5c0 100644 --- a/CLEditor.sln +++ b/CLEditor.sln @@ -27,15 +27,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "ThirdP EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Windows", "ThirdParty\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.IMEHelper.DesktopGL", "ThirdParty\IMEHelper\MonoGame.IMEHelper.DesktopGL\MonoGame.IMEHelper.DesktopGL.csproj", "{93E2B4DA-6417-4290-B8DA-874BC6D43C36}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "MonoGame.IMEHelper.Common", "ThirdParty\IMEHelper\MonoGame.IMEHelper.Common\MonoGame.IMEHelper.Common.shproj", "{A0CDBD0E-3A41-42B7-9425-A838BC2C7383}" -EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ThirdParty\IMEHelper\MonoGame.IMEHelper.Common\MonoGame.IMEHelper.Common.projitems*{93e2b4da-6417-4290-b8da-874bc6d43c36}*SharedItemsImports = 4 - ThirdParty\IMEHelper\MonoGame.IMEHelper.Common\MonoGame.IMEHelper.Common.projitems*{a0cdbd0e-3a41-42b7-9425-a838bc2c7383}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU Ad-Hoc|ARM = Ad-Hoc|ARM @@ -447,54 +439,6 @@ Global {7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x64.Build.0 = Release|x64 {7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.ActiveCfg = Release|Any CPU {7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|Any CPU.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|ARM.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|ARM.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|iPhone.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|x64.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|x64.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|x86.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.AppStore|x86.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|ARM.ActiveCfg = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|ARM.Build.0 = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|iPhone.Build.0 = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|x64.ActiveCfg = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|x64.Build.0 = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|x86.ActiveCfg = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Debug|x86.Build.0 = Debug|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|Any CPU.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|ARM.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|ARM.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|iPhone.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|iPhone.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|x64.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|x64.Build.0 = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|x86.ActiveCfg = Release|Any CPU - {93E2B4DA-6417-4290-B8DA-874BC6D43C36}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -508,8 +452,6 @@ Global {DB81988F-E0F2-45A0-A1FD-8C37F3D35244} = {5FD3C9FD-C9FD-40FB-A242-CAD6E6EDCA2F} {72E591D6-8F83-4D8C-8F67-9C325E623234} = {5FD3C9FD-C9FD-40FB-A242-CAD6E6EDCA2F} {7DE47032-A904-4C29-BD22-2D235E8D91BA} = {5FD3C9FD-C9FD-40FB-A242-CAD6E6EDCA2F} - {93E2B4DA-6417-4290-B8DA-874BC6D43C36} = {5FD3C9FD-C9FD-40FB-A242-CAD6E6EDCA2F} - {A0CDBD0E-3A41-42B7-9425-A838BC2C7383} = {5FD3C9FD-C9FD-40FB-A242-CAD6E6EDCA2F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {09D24DF9-151B-4065-8E04-AA89C79159C9} diff --git a/CLEditor/model/ResBuilder.cs b/CLEditor/model/ResBuilder.cs index 8bf71cb3032fef15ef9d31dd3fad88863ccdb50d..166e11dd21342076c32e27b4d889b938d3921824 100644 --- a/CLEditor/model/ResBuilder.cs +++ b/CLEditor/model/ResBuilder.cs @@ -110,7 +110,7 @@ namespace CLEngine.Editor } } - File.Delete(d + "\\\\Content.mgcb"); + File.Delete(Path.Combine(d + "Content.mgcb")); }; p.Start(); p.WaitForExit(); diff --git a/CLEditor/viewmodel/DataBaseViewModel.cs b/CLEditor/viewmodel/DataBaseViewModel.cs index b68cb9ca3d9f1fb756de674fc0aedd0a1f110f67..4f1c4b13612025fb19bf4b9b11a3e6aeaec76e87 100644 --- a/CLEditor/viewmodel/DataBaseViewModel.cs +++ b/CLEditor/viewmodel/DataBaseViewModel.cs @@ -76,6 +76,18 @@ namespace CLEngine.Editor.viewmodel } } + private string _dropIconPath; + + public string DropIconPath + { + get { return _dropIconPath; } + set + { + _dropIconPath = value; + RaisePropertyChanged(() => DropIconPath); + } + } + public DataBaseViewModel() { ItemObjects = GetItemObjects(); @@ -109,9 +121,13 @@ namespace CLEngine.Editor.viewmodel private void DropBrowserAction() { - Logger.Error("还未支持"); - //var fileSelectDialog = new OpenFileDialog(); - //var itemObject = (ItemObject)DataBaseWindow.ItemListInstance.SelectedItem; + var fileSelectDialog = new OpenFileDialog(); + var itemObject = (ItemObject)DataBaseWindow.ItemListInstance.SelectedItem; + if (itemObject != null) + { + itemObject.DropIconPath = ProcessDialog(fileSelectDialog, "Icon\\"); + DropIconPath = itemObject.DropIconPath; + } } private void BagBrowserAction() diff --git a/CLEditor/windows/DataBaseWindow.xaml b/CLEditor/windows/DataBaseWindow.xaml index d3bbf21de472062235a48fa3c24dbeb666545c78..a757d1ac93e034e9517496f32b620b251bbc1872 100644 --- a/CLEditor/windows/DataBaseWindow.xaml +++ b/CLEditor/windows/DataBaseWindow.xaml @@ -32,7 +32,7 @@ - + diff --git a/CLEditor/windows/DataBaseWindow.xaml.cs b/CLEditor/windows/DataBaseWindow.xaml.cs index e36d2ba036a5e003e0178d5e1abcc11d6a9ac21c..b92d9a7d37ffb17798f34922be5c5a96134da1ce 100644 --- a/CLEditor/windows/DataBaseWindow.xaml.cs +++ b/CLEditor/windows/DataBaseWindow.xaml.cs @@ -27,8 +27,11 @@ namespace CLEngine.Editor.windows /// private void ItemListOnSelectionChanged(object sender, SelectionChangedEventArgs e) { - if (DataContext is DataBaseViewModel dataBase) + if (DataContext is DataBaseViewModel dataBase) + { dataBase.IconPath = (ItemList.SelectedValue as ItemObject)?.IconPath; + dataBase.DropIconPath = (ItemList.SelectedValue as ItemObject)?.DropIconPath; + } } ///