Skip to content
This repository was archived by the owner on May 19, 2021. It is now read-only.

Commit fdc85fb

Browse files
committed
check 4.x library file for version data, automatically fetch unity updates list if enter tab first time,
1 parent c743a0f commit fdc85fb

File tree

3 files changed

+40
-15
lines changed

3 files changed

+40
-15
lines changed

UnityLauncher/Form1.Designer.cs

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnityLauncher/Form1.cs

+29-5
Original file line numberDiff line numberDiff line change
@@ -166,21 +166,33 @@ string GetProjectVersion(string path)
166166
MessageBox.Show("Invalid projectversion data found in '" + versionPath + "'.\n\nFile Content:\n" + string.Join("\n", data).ToString());
167167
}
168168
}
169-
else // maybe 4.x
169+
else // maybe its 4.x
170170
{
171171
versionPath = Path.Combine(path, "ProjectSettings", "ProjectSettings.asset");
172172
if (File.Exists(versionPath) == true)
173173
{
174+
// first try if its ascii format
175+
var data = File.ReadAllLines(versionPath);
176+
if (data != null && data.Length > 0 && data[0].IndexOf("YAML") > -1)
177+
{
178+
// in text format, then we need to try library file instead
179+
var newVersionPath = Path.Combine(path, "Library", "AnnotationManager");
180+
if (File.Exists(versionPath) == true)
181+
{
182+
versionPath = newVersionPath;
183+
}
184+
}
185+
174186
// try to get version data out from binary asset
175-
var data = File.ReadAllBytes(versionPath);
176-
if (data != null && data.Length > 0)
187+
var binData = File.ReadAllBytes(versionPath);
188+
if (binData != null && binData.Length > 0)
177189
{
178190
int dataLen = 7;
179191
int startIndex = 20;
180192
var bytes = new byte[dataLen];
181193
for (int i = 0; i < dataLen; i++)
182194
{
183-
bytes[i] = data[startIndex + i];
195+
bytes[i] = binData[startIndex + i];
184196
}
185197
version = Encoding.UTF8.GetString(bytes);
186198
}
@@ -1005,6 +1017,19 @@ private void btnOpenUpdateWebsite_Click(object sender, EventArgs e)
10051017
}
10061018
}
10071019

1020+
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
1021+
{
1022+
// if enter Updates tab, then automatically fetch list of unity versions if list is empty (not fetched)
1023+
if (((TabControl)sender).SelectedIndex == 3) // FIXME: fixed index 3 for this tab..
1024+
{
1025+
if (gridUnityUpdates.Rows.Count == 0)
1026+
{
1027+
FetchListOfUnityUpdates();
1028+
}
1029+
}
1030+
}
1031+
1032+
10081033

10091034
#endregion UI events
10101035

@@ -1146,7 +1171,6 @@ void FetchListOfUnityUpdates()
11461171
private void UnityVersionsListDownloaded(object sender, DownloadStringCompletedEventArgs e)
11471172
{
11481173
// TODO check for error..
1149-
11501174
SetStatus("Downloading list of unity versions..Done");
11511175
isDownloadUnityList = false;
11521176
// parse to list

UnityLauncher/Form1.resx

+9-9
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,6 @@
120120
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>14, 20</value>
122122
</metadata>
123-
<metadata name="_Date.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124-
<value>True</value>
125-
</metadata>
126-
<metadata name="_UnityUpdateVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127-
<value>True</value>
128-
</metadata>
129-
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130-
<value>14, 20</value>
131-
</metadata>
132123
<metadata name="_project.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133124
<value>True</value>
134125
</metadata>
@@ -171,6 +162,15 @@
171162
<metadata name="_UnityUpdateVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
172163
<value>True</value>
173164
</metadata>
165+
<metadata name="_Date.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
166+
<value>True</value>
167+
</metadata>
168+
<metadata name="_UnityUpdateVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
169+
<value>True</value>
170+
</metadata>
171+
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
172+
<value>14, 20</value>
173+
</metadata>
174174
<metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
175175
<value>111, 20</value>
176176
</metadata>

0 commit comments

Comments
 (0)