diff --git a/App.xaml.cs b/App.xaml.cs
index 167d1c8..36b640e 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -1,8 +1,4 @@
-using System.Configuration;
-using System.Data;
-using System.Windows;
-
-namespace Migrator
+namespace Migrator
{
///
/// Interaction logic for App.xaml
diff --git a/MainWindow.xaml b/MainWindow.xaml
index ebbf6a6..be11937 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -22,7 +22,14 @@
-
-
+
+
+
+
+
+
+
+
+
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 39a6dbe..a292a90 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,16 +1,4 @@
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Forms;
-using System.IO;
-using H5MotaUpdate.ViewModels;
+using System.Windows;
namespace H5MotaUpdate
{
diff --git a/ViewModels/MainViewModel.cs b/ViewModels/MainViewModel.cs
index 6a55a30..34711ac 100644
--- a/ViewModels/MainViewModel.cs
+++ b/ViewModels/MainViewModel.cs
@@ -1,19 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
using System.IO;
-using System.Linq;
using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using System.Windows.Input;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
namespace H5MotaUpdate.ViewModels
{
@@ -66,18 +55,29 @@ namespace H5MotaUpdate.ViewModels
}
}
+ public ObservableCollection ErrorMessages => ErrorLogger.ErrorMessages;
+
public ICommand SelectSourceCommand { get; set; }
public ICommand SelectDestCommand { get; set; }
public ICommand MigrateCommand { get; set; }
+ public ICommand HelpCommand { get; set; }
public MainViewModel()
{
+ ErrorLogger.LogError("111", "red");
+ ErrorLogger.LogError("222", "");
+ ErrorLogger.LogError("222", "");
+ ErrorLogger.LogError("222", "");
+ ErrorLogger.LogError("222", "");
+ ErrorLogger.LogError("222", "");
+ ErrorLogger.LogError("222", "");
SourceRootDirectory = "请选择包含要翻新的旧塔的文件夹";
DestRootDirectory = "请选择一个包含新的2.10.3样板的文件夹";
VersionString = "-";
SelectSourceCommand = new RelayCommand(SelectSourceRootFolder);
SelectDestCommand = new RelayCommand(SelectDestRootFolder);
MigrateCommand = new RelayCommand(StartMigrate);
+ HelpCommand = new RelayCommand(FileUtils.ShowHelp);
MigrateServerTable = false;
}
diff --git a/ViewModels/Migrator/DataJSMigrator.cs b/ViewModels/Migrator/DataJSMigrator.cs
index 9e72dd6..dd2da51 100644
--- a/ViewModels/Migrator/DataJSMigrator.cs
+++ b/ViewModels/Migrator/DataJSMigrator.cs
@@ -1,23 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Linq;
-using System.Numerics;
-using System.Runtime.CompilerServices;
using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Media.Effects;
-using System.Windows.Shapes;
-using System.Xml.Linq;
-using Microsoft.VisualBasic.Devices;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
namespace H5MotaUpdate.ViewModels
{
diff --git a/ViewModels/Migrator/EnemysJSMigrator.cs b/ViewModels/Migrator/EnemysJSMigrator.cs
index d4d5eae..27a9244 100644
--- a/ViewModels/Migrator/EnemysJSMigrator.cs
+++ b/ViewModels/Migrator/EnemysJSMigrator.cs
@@ -1,20 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Shapes;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
// 功能:复制project/enemy.js文件
diff --git a/ViewModels/Migrator/ErrorLogger.cs b/ViewModels/Migrator/ErrorLogger.cs
new file mode 100644
index 0000000..1f68cba
--- /dev/null
+++ b/ViewModels/Migrator/ErrorLogger.cs
@@ -0,0 +1,45 @@
+using System.Collections.ObjectModel;
+
+using Brush = System.Windows.Media.Brush;
+using Brushes = System.Windows.Media.Brushes;
+public class ColoredString
+{
+ public string Text { get; set; }
+ public Brush Color { get; set; }
+
+ public ColoredString(string text, Brush color)
+ {
+ Text = text;
+ Color = color;
+ }
+}
+
+namespace H5MotaUpdate.ViewModels
+{
+ internal static class ErrorLogger
+ {
+ private static ObservableCollection _errorMessages = new ObservableCollection();
+
+ public static ObservableCollection ErrorMessages { get { return _errorMessages; } }
+
+ public static void LogError(string error, string color)
+ {
+ switch (color)
+ {
+ case "red":
+ ErrorMessages.Add(new ColoredString(error, Brushes.Red));
+ break;
+ case "black":
+ default:
+ ErrorMessages.Add(new ColoredString(error, Brushes.Black));
+ break;
+ }
+
+ }
+
+ public static void Clear()
+ {
+ _errorMessages.Clear();
+ }
+ }
+}
diff --git a/ViewModels/Migrator/FloorsMigrator.cs b/ViewModels/Migrator/FloorsMigrator.cs
index 4f075c7..818cd41 100644
--- a/ViewModels/Migrator/FloorsMigrator.cs
+++ b/ViewModels/Migrator/FloorsMigrator.cs
@@ -1,23 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices.JavaScript;
using System.Text;
-using System.Text.Json.Nodes;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Shapes;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using static System.Runtime.InteropServices.JavaScript.JSType;
namespace H5MotaUpdate.ViewModels
{
diff --git a/ViewModels/Migrator/IconsJSMigrator.cs b/ViewModels/Migrator/IconsJSMigrator.cs
index dfdbe6f..3a1a0fc 100644
--- a/ViewModels/Migrator/IconsJSMigrator.cs
+++ b/ViewModels/Migrator/IconsJSMigrator.cs
@@ -1,20 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Shapes;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
namespace H5MotaUpdate.ViewModels
diff --git a/ViewModels/Migrator/ItemsJSMigrator.cs b/ViewModels/Migrator/ItemsJSMigrator.cs
index 475e82a..543bf0c 100644
--- a/ViewModels/Migrator/ItemsJSMigrator.cs
+++ b/ViewModels/Migrator/ItemsJSMigrator.cs
@@ -1,21 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
using System.Text;
-using System.Text.Json.Nodes;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Shapes;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
namespace H5MotaUpdate.ViewModels
{
internal class ItemsJSMigrator
@@ -92,7 +77,7 @@ namespace H5MotaUpdate.ViewModels
if (newItemDatas.ContainsKey(key))
{
JObject itemData = (JObject)newItemDatas[key];
- if (ele== "itemEffectTip")
+ if (ele == "itemEffectTip")
{
valueString = "${" + valueString + "}";
}
diff --git a/ViewModels/Migrator/MapsJSMigrator.cs b/ViewModels/Migrator/MapsJSMigrator.cs
index a9871ec..c601ed3 100644
--- a/ViewModels/Migrator/MapsJSMigrator.cs
+++ b/ViewModels/Migrator/MapsJSMigrator.cs
@@ -1,18 +1,6 @@
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
using System.Text;
-using System.Text.Json.Nodes;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Shapes;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
namespace H5MotaUpdate.ViewModels
{
diff --git a/ViewModels/Migrator/MediaSourceMigrator.cs b/ViewModels/Migrator/MediaSourceMigrator.cs
index 5844af9..9a527e2 100644
--- a/ViewModels/Migrator/MediaSourceMigrator.cs
+++ b/ViewModels/Migrator/MediaSourceMigrator.cs
@@ -1,20 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.Drawing;
namespace H5MotaUpdate.ViewModels
{
@@ -158,7 +143,7 @@ namespace H5MotaUpdate.ViewModels
foreach (string filePath in files)
{
string fileName = Path.GetFileName(filePath);
- if (fileName == "icons.png" && version
+ /// 打开readme文件
+ ///
+ public static void ShowHelp()
+ {
+
+ }
}
}
diff --git a/ViewModels/Utils/StringUtils.cs b/ViewModels/Utils/StringUtils.cs
index 384e86d..ad5f715 100644
--- a/ViewModels/Utils/StringUtils.cs
+++ b/ViewModels/Utils/StringUtils.cs
@@ -1,14 +1,6 @@
-using System;
+using Newtonsoft.Json.Linq;
using System.IO;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.Windows;
-using System.Windows.Forms;
namespace H5MotaUpdate.ViewModels
{
@@ -208,8 +200,9 @@ namespace H5MotaUpdate.ViewModels
/// 将塔的地图尺寸写入libs/core.js
///
public static void WriteMapWidth(string destFilePath, int width, int height)
- {
- try {
+ {
+ try
+ {
string tempFilePath = destFilePath + ".tmp";
string fileContent = File.ReadAllText(destFilePath);
@@ -219,8 +212,9 @@ namespace H5MotaUpdate.ViewModels
File.Delete(destFilePath);
File.Move(tempFilePath, destFilePath);
}
- catch {
-
+ catch
+ {
+
}
}
}
diff --git a/ViewModels/Utils/VersionUtils.cs b/ViewModels/Utils/VersionUtils.cs
index 43d88f2..6ef58bd 100644
--- a/ViewModels/Utils/VersionUtils.cs
+++ b/ViewModels/Utils/VersionUtils.cs
@@ -1,17 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Eventing.Reader;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
+using System.IO;
using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Input;
-using System.Xml.Linq;
namespace H5MotaUpdate.ViewModels
{