Merge branch 'develop'

ZeromusXYZ · May 24, 2020 · 9ac7c3d · 9ac7c3d
2 parents fd80e2a + 7dbd969
commit 9ac7c3d
Show file tree

Hide file tree

Showing 35 changed files with 13,194 additions and 416 deletions.
diff --git a/AAEmu.Launcher/AAEmu.Launcher.csproj b/AAEmu.Launcher/AAEmu.Launcher.csproj
@@ -104,6 +104,13 @@
   <ItemGroup>
     <Compile Include="AAPak.cs" />
     <Compile Include="Helpers.cs" />
+    <Compile Include="InfoPopupForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="InfoPopupForm.Designer.cs">
+      <DependentUpon>InfoPopupForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LauncherClass\Trion60Launcher.cs" />
     <Compile Include="LauncherClass\Trion35Launcher.cs" />
     <Compile Include="LauncherClass\Trion12Launcher.cs" />
     <Compile Include="LauncherClass\MailRu10Launcher.cs" />
@@ -128,9 +135,18 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="LauncherClass\BaseLauncher.cs" />
     <Compile Include="SubStream.cs" />
+    <Compile Include="URIGenForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="URIGenForm.Designer.cs">
+      <DependentUpon>URIGenForm.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="DebugHelperForm.resx">
       <DependentUpon>DebugHelperForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="InfoPopupForm.resx">
+      <DependentUpon>InfoPopupForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -140,6 +156,9 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="URIGenForm.resx">
+      <DependentUpon>URIGenForm.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="aaemu.info.aelcf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -202,6 +221,12 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="aaemu.ico" />
+    <None Include="Res\btn_aaemu_active.png" />
+    <None Include="Res\btn_aaemu.png" />
+    <None Include="Res\btn_minimize_active.png" />
+    <None Include="Res\btn_minimize.png" />
+    <None Include="Res\btn_exit_active.png" />
+    <None Include="Res\btn_exit.png" />
     <None Include="Res\btn_red.png" />
     <None Include="Res\flag_cn.png" />
     <None Include="Res\flag_de.png" />

diff --git a/AAEmu.Launcher/Helpers.cs b/AAEmu.Launcher/Helpers.cs
@@ -149,44 +149,44 @@ public static string GetMD5FromStream(Stream fs)
     public struct AAEmuNewsFeedLinksItem
     {
         [JsonProperty("self")]
-        public string self { get; set; }
+        public string Self { get; set; }
     }
 
     public struct AAEmuNewsFeedDataItemAttributes
     {
 
         [JsonProperty("picture")]
-        public string itemPicture { get; set; }
+        public string ItemPicture { get; set; }
         [JsonProperty("title")]
-        public string itemTitle { get; set; }
+        public string ItemTitle { get; set; }
         [JsonProperty("body")]
-        public string itemBody { get; set; }
+        public string ItemBody { get; set; }
         [JsonProperty("new")]
-        public string itemIsNew { get; set; }
+        public string ItemIsNew { get; set; }
         [JsonProperty("links")]
-        public AAEmuNewsFeedLinksItem itemLinks { get; set; }
+        public AAEmuNewsFeedLinksItem ItemLinks { get; set; }
     }
 
     public struct AAEmuNewsFeedDataItem
     {
         [JsonProperty("type")]
-        public string itemType { get; set; }
+        public string ItemType { get; set; }
 
         [JsonProperty("id")]
-        public int itemID { get; set; }
+        public int ItemID { get; set; }
 
         [JsonProperty("attributes")]
-        public AAEmuNewsFeedDataItemAttributes itemAttributes { get; set; }
+        public AAEmuNewsFeedDataItemAttributes ItemAttributes { get; set; }
 
     }
 
     public partial class AAEmuNewsFeed
     {
         [JsonProperty("data")]
-        public List<AAEmuNewsFeedDataItem> data { get; set; }
+        public List<AAEmuNewsFeedDataItem> Data { get; set; }
 
         [JsonProperty("links")]
-        public AAEmuNewsFeedLinksItem links { get; set; }
+        public AAEmuNewsFeedLinksItem Links { get; set; }
     }
 
     public class PakFileInfo
@@ -287,9 +287,9 @@ public int GetDownloadProgressPercent()
             return (int)p;
         }
 
-        public static string DateTimeToPAtchDateTimeStr(DateTime aTime)
+        public static string DateTimeToPatchDateTimeStr(DateTime aTime)
         {
-            string res = "";
+            string res ;
             try
             {
                 res = aTime.ToString("yyyyMMdd-HHmmss");
@@ -303,31 +303,21 @@ public static string DateTimeToPAtchDateTimeStr(DateTime aTime)
 
         public static long PatchDateTimeStrToFILETIME(string encodedString)
         {
-            long res = 0;
-
-            int yyyy = 0;
-            int mm = 0;
-            int dd = 0;
-            int hh = 0;
-            int nn = 0;
-            int ss = 0;
-
             try
             {
-                if (!int.TryParse(encodedString.Substring(0, 4), out yyyy)) yyyy = 0;
-                if (!int.TryParse(encodedString.Substring(4, 2), out mm)) mm = 0;
-                if (!int.TryParse(encodedString.Substring(6, 2), out dd)) dd = 0;
-                if (!int.TryParse(encodedString.Substring(9, 2), out hh)) hh = 0;
-                if (!int.TryParse(encodedString.Substring(11, 2), out nn)) nn = 0;
-                if (!int.TryParse(encodedString.Substring(13, 2), out ss)) ss = 0;
-
-                res = (new DateTime(yyyy, mm, dd, hh, nn, ss)).ToFileTime();
+                if (!int.TryParse(encodedString.Substring(0, 4), out var yyyy)) yyyy = 0;
+                if (!int.TryParse(encodedString.Substring(4, 2), out var mm)) mm = 0;
+                if (!int.TryParse(encodedString.Substring(6, 2), out var dd)) dd = 0;
+                if (!int.TryParse(encodedString.Substring(9, 2), out var hh)) hh = 0;
+                if (!int.TryParse(encodedString.Substring(11, 2), out var nn)) nn = 0;
+                if (!int.TryParse(encodedString.Substring(13, 2), out var ss)) ss = 0;
+
+                return (new DateTime(yyyy, mm, dd, hh, nn, ss)).ToFileTime();
             }
             catch
             {
-                res = 0;
+                return 0;
             }
-            return res;
         }
 
     }

diff --git a/AAEmu.Launcher/InfoPopupForm.Designer.cs b/AAEmu.Launcher/InfoPopupForm.Designer.cs
diff --git a/AAEmu.Launcher/InfoPopupForm.cs b/AAEmu.Launcher/InfoPopupForm.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace AAEmu.Launcher
+{
+    public partial class InfoPopupForm : Form
+    {
+        public InfoPopupForm()
+        {
+            InitializeComponent();
+        }
+    }
+}