From b5c7241fcb0e1b562ed18a457b7bf83fcbbdba43 Mon Sep 17 00:00:00 2001 From: 1415ddfer <1783488228@qq.com> Date: Sun, 4 Aug 2024 17:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=86=E6=9E=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AboutDialog/About1.xaml.cs | 2 +- MainWindow.xaml.cs | 5 ++ Manager/DataStream.cs | 8 +-- Manager/EngineManager.cs | 8 +-- Manager/UpDateManager.cs | 13 +++-- controls/MemberControl.xaml | 11 ++-- dialog/EditMember.xaml | 4 +- dialog/EditTeamControl.xaml.cs | 12 ++-- dialog/RegDialog.xaml | 60 ++++++++++++++++++++ dialog/RegDialog.xaml.cs | 94 +++++++++++++++++++++++++++++++ dialog/UseAccDataTextAdd.xaml.cs | 23 +++----- res/captcha.jpg | Bin 0 -> 2111 bytes 12 files changed, 194 insertions(+), 46 deletions(-) create mode 100644 dialog/RegDialog.xaml create mode 100644 dialog/RegDialog.xaml.cs create mode 100644 res/captcha.jpg diff --git a/AboutDialog/About1.xaml.cs b/AboutDialog/About1.xaml.cs index 2c680b7..b53982f 100644 --- a/AboutDialog/About1.xaml.cs +++ b/AboutDialog/About1.xaml.cs @@ -28,7 +28,7 @@ namespace Zerolauncher.AboutDialog private void Hyperlink_Click_1(object sender, RoutedEventArgs e) { - MessageBox.Show("已拷贝到粘贴板", "提示"); + MessageBox.Show("已拷贝到粘贴板呢喵", "提示"); Clipboard.SetDataObject("ddfgame@foxmail.com", true); } diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index f6f64bd..f02f2de 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -36,6 +36,11 @@ namespace Zerolauncher member.text.Content = ServicesStaticInfo.ServicesShortName[account.providerId] + "-" + account.nickName; mLayout.Children.Add(member); } + if (i ==0) + { + EditMemberDialog.CreateDailog(null); + MessageBox.Show("下次右键账号和窗口空白处可以打菜单喵", "小提示"); + } } public void ReloadBtn() diff --git a/Manager/DataStream.cs b/Manager/DataStream.cs index 4388774..7cd9f35 100644 --- a/Manager/DataStream.cs +++ b/Manager/DataStream.cs @@ -15,13 +15,9 @@ namespace Zerolauncher.Manager if (File.Exists(path)) { dataStream = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(Decompress(File.ReadAllBytes(path)))); + return; } - else - { - dataStream = JsonConvert.DeserializeObject( - "{\"teamIndex\":0,\"Groups\":[{\"Name\":\"队伍1\", \"Accounts\": [{\"providerId\":0,\"userName\":\"test\",\"userPWD\":\"test\",\"nickName\":\"测试账号\",\"serverId\":\"1\"}]}], \"ecs\": \"\"}"); - } - + dataStream = JsonConvert.DeserializeObject("{\"teamIndex\":0,\"Groups\":[{\"Name\":\"队伍1\", \"Accounts\": []}], \"ecs\": \"\"}"); } public static void write() diff --git a/Manager/EngineManager.cs b/Manager/EngineManager.cs index 453caea..4d1c023 100644 --- a/Manager/EngineManager.cs +++ b/Manager/EngineManager.cs @@ -21,7 +21,7 @@ namespace Zerolauncher.Manager { if (UpDateData.is_check == false) { - MessageBox.Show("正在更新游戏数据，请等待1-3秒。\n 请检查网络", "错误", MessageBoxButton.OK, MessageBoxImage.Warning); + MessageBox.Show("正在更新游戏数据，请等待1-3秒喵。\n 请检查网络", "错误", MessageBoxButton.OK, MessageBoxImage.Warning); return true; } //if (UpDateManager.state) @@ -35,13 +35,13 @@ namespace Zerolauncher.Manager switch (CacheSha.errorCode) { case 1: - MessageBox.Show("发生网络错误==EMS。\n 请检查网络", "错误", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show("发生网络错误==EMS。\n 请检查网络喵", "错误", MessageBoxButton.OK, MessageBoxImage.Error); break; case 2: - MessageBox.Show("发生游戏服务错误==EMS。\n 请联系管理员", "错误", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show("发生游戏服务错误==EMS。\n 请联系管理员喵", "错误", MessageBoxButton.OK, MessageBoxImage.Error); break; default: - MessageBox.Show("发生未知错误==EMS。\n 请联系管理员", "错误", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show("发生未知错误==EMS。\n 请联系管理员喵", "错误", MessageBoxButton.OK, MessageBoxImage.Error); break; } return true; diff --git a/Manager/UpDateManager.cs b/Manager/UpDateManager.cs index d4a4439..99170e7 100644 --- a/Manager/UpDateManager.cs +++ b/Manager/UpDateManager.cs @@ -58,18 +58,18 @@ namespace Zerolauncher.Manager switch (CacheSha.errorCode) { case 1: - MessageBox.Show("检查更新出错。\n 请检查网络", "错误", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show("检查更新出错喵。\n 请检查网络", "错误", MessageBoxButton.OK, MessageBoxImage.Error); break; case 2: - MessageBox.Show("软件已停止服务或服务错误。\n 请联系管理员", "错误", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show("软件已停止服务或服务错误喵。\n 请联系管理员", "错误", MessageBoxButton.OK, MessageBoxImage.Error); break; default: - MessageBox.Show("检查更新出错。", "错误", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show("检查更新出错喵。", "错误", MessageBoxButton.OK, MessageBoxImage.Error); break; } return; } - MessageBoxResult result = MessageBox.Show($"大厅组件需要更新\n是否更新?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Warning); + MessageBoxResult result = MessageBox.Show($"大厅组件需要更新\n是否更新?喵", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Warning); if (result == MessageBoxResult.OK) { try @@ -79,8 +79,9 @@ namespace Zerolauncher.Manager } catch (Exception _ex) { - MessageBox.Show("执行自动更新失败！，\n请手动访问链接重新下载大厅文件或联系管理员。", "错误", MessageBoxButton.OK, MessageBoxImage.Error); - } + MessageBox.Show("执行自动更新失败！，\n请手动访问链接重新下载大厅文件或联系管理员喵。", "错误", MessageBoxButton.OK, MessageBoxImage.Error); + Process.Start(new ProcessStartInfo(UpDateData.lanzou + UpDateData.auto_packet_url) { UseShellExecute = true }); + } } } diff --git a/controls/MemberControl.xaml b/controls/MemberControl.xaml index af96a3f..5423469 100644 --- a/controls/MemberControl.xaml +++ b/controls/MemberControl.xaml @@ -5,10 +5,9 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" mc:Ignorable="d" d:DesignHeight="75" d:DesignWidth="65" Margin="5"> - - - - - + + + + diff --git a/dialog/EditMember.xaml b/dialog/EditMember.xaml index eab9162..1f3d77b 100644 --- a/dialog/EditMember.xaml +++ b/dialog/EditMember.xaml @@ -27,8 +27,8 @@ - + + + + + + + + + + + + + + diff --git a/dialog/RegDialog.xaml.cs b/dialog/RegDialog.xaml.cs new file mode 100644 index 0000000..b9c39ec --- /dev/null +++ b/dialog/RegDialog.xaml.cs @@ -0,0 +1,94 @@ +using Newtonsoft.Json.Linq; +using System.Net.Http; +using System.Windows; +using System.Windows.Media.Imaging; +using Zerolauncher.Manager; + +namespace Zerolauncher.dialog +{ + /// + /// RegDialog.xaml 的交互逻辑 + /// + public partial class RegDialog : Window + { + private HttpClient client; + private string user; + private string password; + public RegDialog(String acc, String pwd) + { + user = acc; + password = pwd; + InitializeComponent(); + client = new(); + FleshPic(null, null); + } + + private async void FleshPic(object _, RoutedEventArgs e) + { + var main_ip = UpDateData.game_url; + HttpResponseMessage? response = null; + try + { + response = await client.GetAsync($"http://{main_ip}/module/captcha.php"); + if (response != null) + { + foreach (var item in response.Headers) + Console.WriteLine($"{item.Key}"); + } + //var bin = response.Content.ReadAsStream(); + //verify = ocr.RunInference(new Bitmap(bin)); + //using (var fileStream = File.Create("tmp.png")) + //{ + // bin.Seek(0, SeekOrigin.Begin);//设置复制开始的地方 + // bin.CopyTo(fileStream); + //} + using (var stream = response.Content.ReadAsStream()) + { + BitmapImage bitmap = new BitmapImage(); + bitmap.BeginInit(); + bitmap.CacheOption = BitmapCacheOption.OnLoad; + bitmap.StreamSource = stream; + bitmap.EndInit(); + bitmap.Freeze(); // 为了线程安全 + + CapPic.Source = bitmap; // 设置Image控件的Source + } + } + catch (Exception ex) + { + Console.WriteLine($" 网络发生错误，类型：{ex.GetType().Name}，消息：{ex.Message}"); + } + } + + private async void okButton_Click(object _, RoutedEventArgs e) + { + var main_ip = UpDateData.game_url; + var values = new Dictionary + { + { "rUsername", user }, + { "rPassword", password }, + { "rPasswords", password }, + { "rEmail", bottomMarginTextBox.Text }, + { "rCode", rightMarginTextBox.Text } + }; + var content = new FormUrlEncodedContent(values); + try + { + var response = await client.PostAsync($"http://{main_ip}/form/register.php", content); + var src = await response.Content.ReadAsStringAsync(); + var jsonObj = JObject.Parse(src); + MessageBox.Show(jsonObj["content"].ToString(), jsonObj["title"].ToString()); + if(int.Parse(jsonObj["type"].ToString()) == 0) Close(); + } + catch (Exception ex) + { + MessageBox.Show($"类型：{ex.GetType().Name}，消息：{ex.Message}", "发生错误喵"); + } + } + + private void cancelButton_Click(object sender, RoutedEventArgs e) + { + Close(); + } + } +} diff --git a/dialog/UseAccDataTextAdd.xaml.cs b/dialog/UseAccDataTextAdd.xaml.cs index 518ec2e..c6aff62 100644 --- a/dialog/UseAccDataTextAdd.xaml.cs +++ b/dialog/UseAccDataTextAdd.xaml.cs @@ -34,39 +34,30 @@ namespace Zerolauncher.dialog var accTexts = lines[i].Split(input_split.Text); if (accTexts.Length != 5) { - MessageBox.Show($"文本在{i}行非法！\n{lines[i]}", "Error", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show($"文本在{i}行非法喵！\n{lines[i]}", "Error", MessageBoxButton.OK, MessageBoxImage.Error); return; } - var acc = new AccountNew { }; + var acc = new Account { }; if (!int.TryParse(accTexts[0], out acc.providerId)) { - MessageBox.Show($"输入的服务商代号错误！在{i}行\n错误：[{lines[i]}]无法转换成服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show($"输入的服务器代号错误喵！在{i}行\n错误：[{lines[i]}]无法转换成服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error); return; } if(0 < acc.providerId || acc.providerId > ServicesStaticInfo.ServicesName.Length) { - MessageBox.Show($"输入的服务商代号错误！在{i}行\n错误：[{acc.providerId}]不是有效的服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show($"输入的服务器代号错误喵！在{i}行\n错误：[{acc.providerId}]不是有效的服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error); return; } - if (!int.TryParse(accTexts[1], out acc.serverId)) - { - MessageBox.Show($"输入的服务器代号错误！在{i}行\n错误：[{lines[i]}]无法转换成服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error); - return; - } - if (0 < acc.providerId || acc.providerId > ServicesStaticInfo.ServerIds.Length) - { - MessageBox.Show($"输入的服务器代号错误！在{i}行\n错误：[{acc.providerId}]不是有效的服务器代号", "Error", MessageBoxButton.OK, MessageBoxImage.Error); - return; - } + acc.serverId = accTexts[1]; acc.userName = accTexts[2]; acc.userPWD = accTexts[3]; acc.nickName = accTexts[4]; if (!AccountManager.AddAccounts(acc)) { - MessageBox.Show($"文本在{i}行出错！\n警告：[{acc.nickName}]昵称冲突，将跳过添加此账号", "Warring", MessageBoxButton.OK, MessageBoxImage.Error); + MessageBox.Show($"文本在{i}行出错喵！\n警告：[{acc.nickName}]昵称冲突，将跳过添加此账号", "Warring", MessageBoxButton.OK, MessageBoxImage.Error); } } - MessageBox.Show("添加完成！", "提示"); + MessageBox.Show("添加完成喵！", "提示"); AccountManager.saveEdit(); AddMemebersDialog.Close(); } diff --git a/res/captcha.jpg b/res/captcha.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3692f680b38c6f5be614bb5779b4c433bfdbfbd8 GIT binary patch literal 2111 zcmc)Ic{JPU8VB%SB$1`2ghJtrZ74VocQv}tHy${q=1C14F~Fa8#{*|!X^ykJVrGtG z>T8fr;CutzZqpdSI76JC26Ar+30S$K_+uCh?gS2hT!o}clEtcNs1Y>?L=y4f5)cdqL&A|#NTd`|4kJhWuWPRr zK*0em;3XKO1c;zOU=(Pt1HkShp`b4X{JlUT;QjZ);0WZQ{e~I|Km-H^i$K6oCFk}q0|m6Q+1pRar&Z8IQLK6TSC3W3BNk&%@n99JQdR8MQ` z=<4ZHOiax#m|wK8{My#e-oeqy`Ih@P-+Fk`=>CiVW?)co$i4f~-#_@_VN7yLYTD!U zj3=1|g+CP)m;78>#;K~VsjYin-_X|H(b>g)+5Kv8==Jc(=$p5^DZ%v2?C*2$<`-5! zd|X@K_+xYH(}4>Ffd6Fe?|;Jn#f92;i9jG=2<*TG5((T77zKeUYKlr4Tf^LZrIfT- zaP;}4{K^*y{3#ou^i973Bu4r46k+v%_C@xe!J_^r**{?abnyT&Flhhtz$oA>@ToY4 zm?siLj@wL|ZluC!W9OvkRi!#Y<{F>-3|m39Q7XDP6q}lztkXWVaFecTn>N#XS8B7u zLdfgTCUrm0U`bb#Tb$1L6lR5vU|6fV7l#AhFNOZ-wXA;S1WKtn?)cp9d&uODZ{}o+ zf>)+l^bB8d6_bCmRN&RmbQv=pG9aD_D+H2QaYDUyHklj3E;hpH)Q+5@jY@K^I-6;+ za91?qUQw{=dh6>II&6w{%+ERLW8ntBMdIh5y_F~RIR=+7TF7tpnU~70xqb$ZeWp%t zsWqKz!3w)Fc`Y3MG~N60igAf9qs1YhoO(f_FtUR&9I(asDv;`};&?$7?=c?Vo&|n0 zo%C9PTcqArfyhO?bC8SYw9@Nt^fH$GXK`~h!|mj7YOU8_8BQ~+u#Rl6&W*%Vw1(^3 zZCVn~O_j7a)aq3FJt{)7>HR(_A>E%1)93tE9SsPc!$t53>==ot-iD!PT95`RDN9y z>|{=4Paq7)K!=)(wZOTzq7y=ii*0bsgWV2(*ObzynG-USS}9SkBEw&N z*)E-K*Vd-3s!j9$Hv99AK`(_^P^TyIWl9bv<==DotbqDxx#?&Ttc_ZFxwE<6Fx;sb z9Z`}{0u?T{rW>g=8Ie~@L+|LXp~EfV%@bS@re=} z&GF2LzUl?O?|}D!>o0!xDhTsKbZxn;UET7uMwJ4G#iz|y)K1F!T)f%}z9x4Y`{D|A z?Ww(w?f7@TwHhH&L9L6wZ5Ojy1>6cx1(&=1VNiNloBNFvx-x3J`zR+XoC3-cyS~Yq z+5;pOBGiYLyAntFlC`{>RW(l(ZO(seOo|U$<62p;sa=$Wn1JR8Z@Ft28lzeF&ayhy z;lnf7E7@UVx1nMf_9SIQ+9fWl>^OhSF!GgAW=jcE4p~Gr5hr%K{K(j{9~})zXso_9 zR9{){bytwBU%f*r6u$p%nVLpeyXTfAK50Cjg-!Jf{bZYi9=xLsR(2I%`+a~>55!*! zdGCMKDsM7_HJ>a#!L`a;y_#LqS1Lc)BlrcrKzY>6VbMHM%gax@sHSiek7A2C*qQQ? zCjI<{UA&98c^Ba9Y-+c(=5@O(>DEeh#!S{NWROBuk{No@a^;V;y6FvvDrobQW4 z4$XYnLYLpo_gk6uWItRV6F!Kl&K1L3cpbg!+MS}d%