Merge branch 'master' of http://www.scserverddns.top:13000/sc/sunlight_cdkey

MainWindow.xaml.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -108,11 +109,18 @@ namespace SUNLIGHT_CDKEY
             string a;
             string b, my, mm, md;
 
-            if (sn_id.Text == "") return;
+            if (sn_id.Text.Length <6)//id字节长度大于6有效
+            {
+                sn_id.BorderBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255,0, 0));
+                return;
+            }else sn_id.BorderBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 255, 255));
 
             a= sn_id.Text.Substring(0, 6);
-            b=(2255-y).ToString()+(255-m).ToString()+(255-d).ToString();
->>>>>>>>> Temporary merge branch 2
+       
+            my = Convert.ToString(Convert.ToInt32(2255 - y), 16).ToUpper();
+            mm = Convert.ToString(Convert.ToInt32(255 - m), 16).ToUpper();
+            md = Convert.ToString(Convert.ToInt32(255-d), 16).ToUpper();
+            b=my+mm+md;
 
             cdk.Text = a + b + CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(b), true);
         }