Merge branch 'release/1.4' of Hesham/OWtrack into master (1.4.0a2)
- #22 incapsulate data.json save dir - Refactoring - #16 hidden Form Bug - #21 Negative win/loss values
This commit is contained in:
commit
0958d3d467
@ -1,6 +1,6 @@
|
|||||||
namespace OWTrack
|
namespace OWTrack
|
||||||
{
|
{
|
||||||
partial class Form1
|
partial class MainForm
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Required designer variable.
|
/// Required designer variable.
|
||||||
@ -29,7 +29,7 @@
|
|||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
this.components = new System.ComponentModel.Container();
|
this.components = new System.ComponentModel.Container();
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
||||||
this.label1 = new System.Windows.Forms.Label();
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
this.status = new System.Windows.Forms.Label();
|
this.status = new System.Windows.Forms.Label();
|
||||||
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
||||||
@ -126,7 +126,7 @@
|
|||||||
this.WinBut.TabIndex = 6;
|
this.WinBut.TabIndex = 6;
|
||||||
this.WinBut.Text = "win";
|
this.WinBut.Text = "win";
|
||||||
this.WinBut.UseVisualStyleBackColor = true;
|
this.WinBut.UseVisualStyleBackColor = true;
|
||||||
this.WinBut.Click += new System.EventHandler(this.button1_Click);
|
this.WinBut.Click += new System.EventHandler(this.WinBtn_Click);
|
||||||
//
|
//
|
||||||
// button2
|
// button2
|
||||||
//
|
//
|
||||||
@ -136,7 +136,7 @@
|
|||||||
this.button2.TabIndex = 6;
|
this.button2.TabIndex = 6;
|
||||||
this.button2.Text = "loss";
|
this.button2.Text = "loss";
|
||||||
this.button2.UseVisualStyleBackColor = true;
|
this.button2.UseVisualStyleBackColor = true;
|
||||||
this.button2.Click += new System.EventHandler(this.button2_Click);
|
this.button2.Click += new System.EventHandler(this.LossBtn_Click);
|
||||||
//
|
//
|
||||||
// label2
|
// label2
|
||||||
//
|
//
|
@ -7,22 +7,22 @@ using System.IO;
|
|||||||
|
|
||||||
namespace OWTrack
|
namespace OWTrack
|
||||||
{
|
{
|
||||||
public partial class Form1 : Form
|
public partial class MainForm : Form
|
||||||
{
|
{
|
||||||
Tracker tr = new Tracker();
|
Tracker tr = new Tracker();
|
||||||
private const string IS_RUNNING = "Running";
|
private const string IS_RUNNING = "Running";
|
||||||
private const string NOT_RUNNING = " Not running";
|
private const string NOT_RUNNING = " Not running";
|
||||||
|
private string savesPath = Directory.GetCurrentDirectory() + "/saves/data.json";
|
||||||
private bool SRonce = false;
|
private bool SRonce = false;
|
||||||
|
|
||||||
public Form1()
|
public MainForm()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
loadSave();
|
loadSave();
|
||||||
checkStatus();
|
checkStatus();
|
||||||
update();
|
update();
|
||||||
label4.Text = Program.Version.ToString();
|
label4.Text = Program.Version.ToString();
|
||||||
Text = "OWTrack " + Program.Version.ToString();
|
Text = "OWTrack " + Program.Version.ToString();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkStatus()
|
private void checkStatus()
|
||||||
@ -46,85 +46,67 @@ namespace OWTrack
|
|||||||
|
|
||||||
private void loadSave()
|
private void loadSave()
|
||||||
{
|
{
|
||||||
if (saveExist())
|
Directory.CreateDirectory("saves");
|
||||||
|
if (saveManeger.saveExist())
|
||||||
{
|
{
|
||||||
tr.wins = savedTracker().wins;
|
try
|
||||||
tr.losses = savedTracker().losses;
|
{
|
||||||
tr.newSR = savedTracker().newSR;
|
using (StreamReader st = new StreamReader(savesPath))
|
||||||
tr.startSR = savedTracker().startSR;
|
|
||||||
tr.gamePath = savedTracker().gamePath;
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool saveExist()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (File.Exists(Directory.GetCurrentDirectory() + "/data.json"))
|
|
||||||
{
|
|
||||||
using (StreamReader st = new StreamReader(Directory.GetCurrentDirectory() + "/data.json"))
|
|
||||||
{
|
{
|
||||||
string line = st.ReadLine();
|
string line = st.ReadLine();
|
||||||
if (line.Contains("Overwatch.exe"))
|
if (line.Contains("Overwatch.exe"))
|
||||||
{
|
{
|
||||||
st.Close();
|
tr = saveManeger.GetSavedTracker();
|
||||||
return true;
|
st.Close();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!tr.LoacteOW())
|
if (!tr.LoacteOW())
|
||||||
{
|
{
|
||||||
st.Close();
|
tr.gamePath = getGamePath();
|
||||||
getGamePath();
|
|
||||||
}
|
}
|
||||||
return true;
|
st.Close();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (!tr.LoacteOW())
|
|
||||||
{
|
|
||||||
getGamePath();
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
MessageBox.Show(e.Message);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void getGamePath()
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
MessageBox.Show(e.Message);
|
||||||
|
}
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
else if (!tr.LoacteOW())
|
||||||
|
{
|
||||||
|
tr.gamePath = getGamePath();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private string getGamePath()
|
||||||
{
|
{
|
||||||
openFileDialog1.Title = "Select Overwatch.exe";
|
openFileDialog1.Title = "Select Overwatch.exe";
|
||||||
openFileDialog1.DefaultExt = "exe";
|
openFileDialog1.DefaultExt = "exe";
|
||||||
openFileDialog1.Filter = "exe Files (*.exe)|*.exe|All files (*.*)|*.*";
|
openFileDialog1.Filter = "exe Files (*.exe)|*.exe|All files (*.*)|*.*";
|
||||||
openFileDialog1.CheckFileExists = true;
|
|
||||||
openFileDialog1.CheckPathExists = true;
|
|
||||||
|
|
||||||
DialogResult result = openFileDialog1.ShowDialog();
|
DialogResult result = openFileDialog1.ShowDialog();
|
||||||
|
|
||||||
if (result == DialogResult.OK)
|
if (result == DialogResult.OK)
|
||||||
{
|
{
|
||||||
tr.gamePath = openFileDialog1.FileName;
|
//tr.gamePath = openFileDialog1.FileName;
|
||||||
|
MessageBox.Show("Saved Overwatch.exe location.\nPress Clear to rest\n" + openFileDialog1.FileName );
|
||||||
|
return openFileDialog1.FileName;
|
||||||
}
|
}
|
||||||
else if (result == DialogResult.Cancel)
|
else
|
||||||
{
|
{
|
||||||
Close();
|
update();
|
||||||
}
|
return null;
|
||||||
FindForm();
|
}
|
||||||
update();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Tracker savedTracker()
|
private Tracker savedTracker()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Directory.GetCurrentDirectory() + "/data.json"));
|
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(savesPath));
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@ -132,35 +114,6 @@ namespace OWTrack
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void timer1_Tick(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
checkStatus();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button1_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
tr.addWin();
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button2_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
tr.addLoss();
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void reduceWinBut_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
tr.reduceWin();
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void reduceLossBut_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
tr.rediceLoss();
|
|
||||||
update();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void update()
|
private void update()
|
||||||
{
|
{
|
||||||
@ -173,9 +126,42 @@ namespace OWTrack
|
|||||||
}
|
}
|
||||||
else srLabel.Text = tr.startSR.ToString() + " - " + tr.srDiff();
|
else srLabel.Text = tr.startSR.ToString() + " - " + tr.srDiff();
|
||||||
srTextBox.Text = null;
|
srTextBox.Text = null;
|
||||||
File.WriteAllText(Directory.GetCurrentDirectory() + "/data.json", JsonConvert.SerializeObject(tr));
|
File.WriteAllText(Directory.GetCurrentDirectory() + "/saves/data.json", JsonConvert.SerializeObject(tr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region Events
|
||||||
|
private void timer1_Tick(object sender, EventArgs e) => checkStatus();
|
||||||
|
|
||||||
|
private void WinBtn_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
tr.addWin();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LossBtn_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
tr.addLoss();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void reduceWinBut_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (tr.wins > 0)
|
||||||
|
{
|
||||||
|
tr.reduceWin();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void reduceLossBut_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (tr.losses > 0)
|
||||||
|
{
|
||||||
|
tr.rediceLoss();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void clearBut_Click(object sender, EventArgs e)
|
private void clearBut_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
tr.reset();
|
tr.reset();
|
||||||
@ -209,6 +195,7 @@ namespace OWTrack
|
|||||||
else tr.newSR = sr;
|
else tr.newSR = sr;
|
||||||
}
|
}
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -13,7 +13,7 @@
|
|||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||||
<PublishUrl>publish\</PublishUrl>
|
<PublishUrl>publish\</PublishUrl>
|
||||||
<Install>true</Install>
|
<Install>false</Install>
|
||||||
<InstallFrom>Disk</InstallFrom>
|
<InstallFrom>Disk</InstallFrom>
|
||||||
<UpdateEnabled>false</UpdateEnabled>
|
<UpdateEnabled>false</UpdateEnabled>
|
||||||
<UpdateMode>Foreground</UpdateMode>
|
<UpdateMode>Foreground</UpdateMode>
|
||||||
@ -87,7 +87,7 @@
|
|||||||
<TargetZone>LocalIntranet</TargetZone>
|
<TargetZone>LocalIntranet</TargetZone>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationIcon>Jeanette-Foshee-Simpsons-11-Rollover-Homer-donut-1.ico</ApplicationIcon>
|
<ApplicationIcon>assets\Jeanette-Foshee-Simpsons-11-Rollover-Homer-donut-1.ico</ApplicationIcon>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||||
@ -106,17 +106,24 @@
|
|||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Form1.cs">
|
<Compile Include="MainForm.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Form1.Designer.cs">
|
<Compile Include="MainForm.Designer.cs">
|
||||||
<DependentUpon>Form1.cs</DependentUpon>
|
<DependentUpon>MainForm.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="saveManeger.cs" />
|
||||||
|
<Compile Include="Splash.cs">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="Splash.Designer.cs">
|
||||||
|
<DependentUpon>Splash.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Tracker.cs" />
|
<Compile Include="Tracker.cs" />
|
||||||
<Compile Include="Program.cs" />
|
<Compile Include="Program.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<EmbeddedResource Include="Form1.resx">
|
<EmbeddedResource Include="MainForm.resx">
|
||||||
<DependentUpon>Form1.cs</DependentUpon>
|
<DependentUpon>MainForm.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Properties\Resources.resx">
|
<EmbeddedResource Include="Properties\Resources.resx">
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
@ -127,6 +134,9 @@
|
|||||||
<AutoGen>True</AutoGen>
|
<AutoGen>True</AutoGen>
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
<DependentUpon>Resources.resx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<EmbeddedResource Include="Splash.resx">
|
||||||
|
<DependentUpon>Splash.cs</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<None Include="app.manifest" />
|
<None Include="app.manifest" />
|
||||||
<None Include="OWTrack_TemporaryKey.pfx" />
|
<None Include="OWTrack_TemporaryKey.pfx" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
@ -156,7 +166,7 @@
|
|||||||
</BootstrapperPackage>
|
</BootstrapperPackage>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="Jeanette-Foshee-Simpsons-11-Rollover-Homer-donut-1.ico" />
|
<Content Include="assets\Jeanette-Foshee-Simpsons-11-Rollover-Homer-donut-1.ico" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
@ -1,8 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Deployment.Application;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using System.Deployment.Application;
|
using System.Deployment.Application;
|
||||||
|
|
||||||
@ -19,10 +15,10 @@ namespace OWTrack
|
|||||||
{
|
{
|
||||||
Application.EnableVisualStyles();
|
Application.EnableVisualStyles();
|
||||||
Application.SetCompatibleTextRenderingDefault(false);
|
Application.SetCompatibleTextRenderingDefault(false);
|
||||||
Application.Run(new Form1());
|
Application.Run(new MainForm());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string Version = "1.3.0";
|
public static string Version { get; } = "1.4.0a2";
|
||||||
//public static string Version = Application.ProductVersion;
|
//public static string Version = Application.ProductVersion;
|
||||||
//public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
//public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
|
|||||||
// set of attributes. Change these attribute values to modify the information
|
// set of attributes. Change these attribute values to modify the information
|
||||||
// associated with an assembly.
|
// associated with an assembly.
|
||||||
[assembly: AssemblyTitle("OWTrack")]
|
[assembly: AssemblyTitle("OWTrack")]
|
||||||
[assembly: AssemblyDescription("")]
|
[assembly: AssemblyDescription("Shitty SR Tracker")]
|
||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("Hesham Systems LLC")]
|
[assembly: AssemblyCompany("Hesham Systems LLC")]
|
||||||
[assembly: AssemblyProduct("OWTrack")]
|
[assembly: AssemblyProduct("OWTrack")]
|
||||||
@ -35,8 +35,8 @@ using System.Runtime.InteropServices;
|
|||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
//[assembly: AssemblyVersion("1.0.0.0")]
|
//[assembly: AssemblyVersion("1.0.0.0")]
|
||||||
//[assembly: AssemblyFileVersion("1.0.0.0")]
|
//[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||||
[assembly: AssemblyVersion("2.0.*")]
|
[assembly: AssemblyVersion("1.3.0.3")]
|
||||||
[assembly: AssemblyFileVersion("1.2.0.0")]
|
[assembly: AssemblyFileVersion("1.3.0.3")]
|
||||||
[assembly: NeutralResourcesLanguage("")]
|
[assembly: NeutralResourcesLanguage("")]
|
||||||
|
|
||||||
|
|
||||||
|
98
OWTrack/Splash.Designer.cs
generated
Normal file
98
OWTrack/Splash.Designer.cs
generated
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
namespace OWTrack
|
||||||
|
{
|
||||||
|
partial class Splash
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
|
||||||
|
this.progressBar1 = new System.Windows.Forms.ProgressBar();
|
||||||
|
this.splashLabel = new System.Windows.Forms.Label();
|
||||||
|
this.versionLabel = new System.Windows.Forms.Label();
|
||||||
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
|
this.SuspendLayout();
|
||||||
|
//
|
||||||
|
// progressBar1
|
||||||
|
//
|
||||||
|
this.progressBar1.Location = new System.Drawing.Point(95, 57);
|
||||||
|
this.progressBar1.Name = "progressBar1";
|
||||||
|
this.progressBar1.Size = new System.Drawing.Size(196, 12);
|
||||||
|
this.progressBar1.TabIndex = 0;
|
||||||
|
//
|
||||||
|
// splashLabel
|
||||||
|
//
|
||||||
|
this.splashLabel.AutoSize = true;
|
||||||
|
this.splashLabel.Location = new System.Drawing.Point(171, 31);
|
||||||
|
this.splashLabel.Name = "splashLabel";
|
||||||
|
this.splashLabel.Size = new System.Drawing.Size(0, 13);
|
||||||
|
this.splashLabel.TabIndex = 1;
|
||||||
|
this.splashLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||||
|
//
|
||||||
|
// versionLabel
|
||||||
|
//
|
||||||
|
this.versionLabel.AutoSize = true;
|
||||||
|
this.versionLabel.Location = new System.Drawing.Point(13, 91);
|
||||||
|
this.versionLabel.Name = "versionLabel";
|
||||||
|
this.versionLabel.Size = new System.Drawing.Size(0, 13);
|
||||||
|
this.versionLabel.TabIndex = 2;
|
||||||
|
//
|
||||||
|
// label1
|
||||||
|
//
|
||||||
|
this.label1.AutoSize = true;
|
||||||
|
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.label1.ForeColor = System.Drawing.Color.Gray;
|
||||||
|
this.label1.Location = new System.Drawing.Point(13, 13);
|
||||||
|
this.label1.Name = "label1";
|
||||||
|
this.label1.Size = new System.Drawing.Size(89, 24);
|
||||||
|
this.label1.TabIndex = 3;
|
||||||
|
this.label1.Text = "OWtrack";
|
||||||
|
//
|
||||||
|
// Splash
|
||||||
|
//
|
||||||
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
this.ClientSize = new System.Drawing.Size(402, 116);
|
||||||
|
this.Controls.Add(this.label1);
|
||||||
|
this.Controls.Add(this.versionLabel);
|
||||||
|
this.Controls.Add(this.splashLabel);
|
||||||
|
this.Controls.Add(this.progressBar1);
|
||||||
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||||
|
this.Name = "Splash";
|
||||||
|
this.Text = "Splash";
|
||||||
|
this.ResumeLayout(false);
|
||||||
|
this.PerformLayout();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private System.Windows.Forms.PageSetupDialog pageSetupDialog1;
|
||||||
|
private System.Windows.Forms.ProgressBar progressBar1;
|
||||||
|
private System.Windows.Forms.Label splashLabel;
|
||||||
|
private System.Windows.Forms.Label versionLabel;
|
||||||
|
private System.Windows.Forms.Label label1;
|
||||||
|
}
|
||||||
|
}
|
20
OWTrack/Splash.cs
Normal file
20
OWTrack/Splash.cs
Normal file
@ -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 OWTrack
|
||||||
|
{
|
||||||
|
public partial class Splash : Form
|
||||||
|
{
|
||||||
|
public Splash()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
123
OWTrack/Splash.resx
Normal file
123
OWTrack/Splash.resx
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>17, 17</value>
|
||||||
|
</metadata>
|
||||||
|
</root>
|
@ -13,7 +13,7 @@ namespace OWTrack
|
|||||||
public string gamePath;
|
public string gamePath;
|
||||||
|
|
||||||
public void Track() { }
|
public void Track() { }
|
||||||
public void reset() { wins = 0; losses = 0; startSR = 0; newSR = 0; }
|
public void reset() { wins = 0; losses = 0; startSR = 0; newSR = 0; gamePath = null; }
|
||||||
public void addWin() { wins++; }
|
public void addWin() { wins++; }
|
||||||
public void addLoss() { losses++; }
|
public void addLoss() { losses++; }
|
||||||
public void reduceWin() { wins--; }
|
public void reduceWin() { wins--; }
|
||||||
@ -31,17 +31,13 @@ namespace OWTrack
|
|||||||
.FirstOrDefault(p => p.MainModule.FileName.StartsWith(gamePath)) != default(Process);
|
.FirstOrDefault(p => p.MainModule.FileName.StartsWith(gamePath)) != default(Process);
|
||||||
return isRunning;
|
return isRunning;
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
Exception ex = new Exception("Error in tracking Overwatch.exe");
|
Exception ex = new Exception("Error in tracking Overwatch.exe");
|
||||||
throw ex;
|
throw ex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Not Working!
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
public bool LoacteOW()
|
public bool LoacteOW()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</requestedPrivileges>
|
</requestedPrivileges>
|
||||||
<applicationRequestMinimum>
|
<applicationRequestMinimum>
|
||||||
<defaultAssemblyRequest permissionSetReference="Custom" />
|
<defaultAssemblyRequest permissionSetReference="Custom" />
|
||||||
<PermissionSet ID="Custom" SameSite="site" Unrestricted="true" />
|
<PermissionSet ID="Custom" SameSite="site" />
|
||||||
</applicationRequestMinimum>
|
</applicationRequestMinimum>
|
||||||
</security>
|
</security>
|
||||||
</trustInfo>
|
</trustInfo>
|
||||||
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.7 KiB |
72
OWTrack/saveManeger.cs
Normal file
72
OWTrack/saveManeger.cs
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace OWTrack
|
||||||
|
{
|
||||||
|
class saveManeger
|
||||||
|
{
|
||||||
|
private static string savesPath = Directory.GetCurrentDirectory() + "/saves/data.json";
|
||||||
|
|
||||||
|
public static Tracker GetSavedTracker()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(savesPath));
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO: use para
|
||||||
|
public static Tracker GetSavedTracker(string customPath)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Directory.GetCurrentDirectory() + "/data.json"));
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool SaveJSON(Tracker tracker)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File.WriteAllText(Directory.GetCurrentDirectory() + "/data.json", JsonConvert.SerializeObject(tracker));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool saveExist()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (File.Exists(savesPath))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user