edit version and text

This commit is contained in:
15459 2023-10-29 11:44:37 +08:00
parent 242a387a79
commit fc2b4d8ad6
12 changed files with 92 additions and 80 deletions

View File

@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>0.18.60</Version>
<AssemblyVersion>0.18.60</AssemblyVersion>
<FileVersion>0.18.60</FileVersion>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<Copyright>Copyright © Perfare 2020-2022; Copyright © hozuki 2020</Copyright>
<DebugType>embedded</DebugType>
</PropertyGroup>

View File

@ -2,9 +2,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>1.18.60</Version>
<AssemblyVersion>1.18.60</AssemblyVersion>
<FileVersion>1.18.60</FileVersion>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<Copyright>Copyright © Razmoth 2022; Copyright © Perfare 2018-2022</Copyright>
<DebugType>embedded</DebugType>
<ApplicationIcon>as.ico</ApplicationIcon>

View File

@ -71,16 +71,16 @@ namespace AssetStudio
}
}
}
Logger.Info($"{game.Name}Map build successfully, {collisions} collisions found !!");
Logger.Info($"{game.Name} 地图构建成功,发现 {collisions} 冲突!!");
}
catch (Exception e)
{
Logger.Warning($"{game.Name}Map was not build, {e.Message}");
Logger.Warning($"{game.Name}地图没有建立, {e.Message}");
}
}
public static void LoadMap(Game game)
{
Logger.Info($"Loading {game.Name}Map");
Logger.Info($"加载 {game.Name} 地图中");
try
{
CABMap.Clear();

View File

@ -4,9 +4,9 @@
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<ApplicationIcon>Resources\as.ico</ApplicationIcon>
<Version>0.18.60</Version>
<AssemblyVersion>0.18.60</AssemblyVersion>
<FileVersion>0.18.60</FileVersion>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<Copyright>Copyright © Razmoth 2022</Copyright>
<BaseOutputPath>..\AssetStudioGUI\bin</BaseOutputPath>
</PropertyGroup>

View File

@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>0.18.60</Version>
<AssemblyVersion>0.18.60</AssemblyVersion>
<FileVersion>0.18.60</FileVersion>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<Copyright>Copyright © Perfare 2018-2022; Copyright © hozuki 2020</Copyright>
<DebugType>embedded</DebugType>
</PropertyGroup>

View File

@ -5,9 +5,9 @@
<TargetFramework>net6.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<ApplicationIcon>Resources\as.ico</ApplicationIcon>
<Version>1.18.60</Version>
<AssemblyVersion>1.18.60</AssemblyVersion>
<FileVersion>1.18.60</FileVersion>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<Copyright>Copyright © Razmoth 2022; Copyright © Perfare 2018-2022; Copyright © MoYi </Copyright>
<DebugType>embedded</DebugType>
</PropertyGroup>

View File

@ -71,11 +71,11 @@
toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem();
toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
toolStripMenuItem9 = new System.Windows.Forms.ToolStripMenuItem();
toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
toolStripMenuItem10 = new System.Windows.Forms.ToolStripMenuItem();
toolStripMenuItem11 = new System.Windows.Forms.ToolStripMenuItem();
toolStripMenuItem12 = new System.Windows.Forms.ToolStripMenuItem();
toolStripMenuItem13 = new System.Windows.Forms.ToolStripMenuItem();
toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
filterTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
allToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
debugMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -406,21 +406,21 @@
// toolStripMenuItem4
//
toolStripMenuItem4.Name = "toolStripMenuItem4";
toolStripMenuItem4.Size = new System.Drawing.Size(180, 22);
toolStripMenuItem4.Size = new System.Drawing.Size(148, 22);
toolStripMenuItem4.Text = "所有资源";
toolStripMenuItem4.Click += toolStripMenuItem4_Click;
//
// toolStripMenuItem5
//
toolStripMenuItem5.Name = "toolStripMenuItem5";
toolStripMenuItem5.Size = new System.Drawing.Size(180, 22);
toolStripMenuItem5.Size = new System.Drawing.Size(148, 22);
toolStripMenuItem5.Text = "被选择的资源";
toolStripMenuItem5.Click += toolStripMenuItem5_Click;
//
// toolStripMenuItem6
//
toolStripMenuItem6.Name = "toolStripMenuItem6";
toolStripMenuItem6.Size = new System.Drawing.Size(180, 22);
toolStripMenuItem6.Size = new System.Drawing.Size(148, 22);
toolStripMenuItem6.Text = "被筛选的资源";
toolStripMenuItem6.Click += toolStripMenuItem6_Click;
//
@ -435,29 +435,24 @@
// toolStripMenuItem7
//
toolStripMenuItem7.Name = "toolStripMenuItem7";
toolStripMenuItem7.Size = new System.Drawing.Size(180, 22);
toolStripMenuItem7.Size = new System.Drawing.Size(148, 22);
toolStripMenuItem7.Text = "所有资源";
toolStripMenuItem7.Click += toolStripMenuItem7_Click;
//
// toolStripMenuItem8
//
toolStripMenuItem8.Name = "toolStripMenuItem8";
toolStripMenuItem8.Size = new System.Drawing.Size(180, 22);
toolStripMenuItem8.Size = new System.Drawing.Size(148, 22);
toolStripMenuItem8.Text = "被选择的资源";
toolStripMenuItem8.Click += toolStripMenuItem8_Click;
//
// toolStripMenuItem9
//
toolStripMenuItem9.Name = "toolStripMenuItem9";
toolStripMenuItem9.Size = new System.Drawing.Size(180, 22);
toolStripMenuItem9.Size = new System.Drawing.Size(148, 22);
toolStripMenuItem9.Text = "被筛选的资源";
toolStripMenuItem9.Click += toolStripMenuItem9_Click;
//
// toolStripSeparator2
//
toolStripSeparator2.Name = "toolStripSeparator2";
toolStripSeparator2.Size = new System.Drawing.Size(183, 6);
//
// toolStripMenuItem10
//
toolStripMenuItem10.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { toolStripMenuItem11, toolStripMenuItem12, toolStripMenuItem13 });
@ -486,6 +481,11 @@
toolStripMenuItem13.Text = "被筛选的资源";
toolStripMenuItem13.Click += toolStripMenuItem13_Click;
//
// toolStripSeparator2
//
toolStripSeparator2.Name = "toolStripSeparator2";
toolStripSeparator2.Size = new System.Drawing.Size(183, 6);
//
// filterTypeToolStripMenuItem
//
filterTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { allToolStripMenuItem });
@ -516,14 +516,14 @@
toolStripMenuItem15.CheckOnClick = true;
toolStripMenuItem15.CheckState = System.Windows.Forms.CheckState.Checked;
toolStripMenuItem15.Name = "toolStripMenuItem15";
toolStripMenuItem15.Size = new System.Drawing.Size(172, 22);
toolStripMenuItem15.Size = new System.Drawing.Size(180, 22);
toolStripMenuItem15.Text = "显示错误信息";
toolStripMenuItem15.Click += toolStripMenuItem15_Click;
//
// exportClassStructuresMenuItem
//
exportClassStructuresMenuItem.Name = "exportClassStructuresMenuItem";
exportClassStructuresMenuItem.Size = new System.Drawing.Size(172, 22);
exportClassStructuresMenuItem.Size = new System.Drawing.Size(180, 22);
exportClassStructuresMenuItem.Text = "导出类结构";
exportClassStructuresMenuItem.Click += exportClassStructuresMenuItem_Click;
//
@ -533,16 +533,17 @@
console.CheckOnClick = true;
console.CheckState = System.Windows.Forms.CheckState.Checked;
console.Name = "console";
console.Size = new System.Drawing.Size(172, 22);
console.Size = new System.Drawing.Size(180, 22);
console.Text = "启用控制台";
console.ToolTipText = "Check this option to log all events on a debug console.";
console.CheckedChanged += console_CheckedChanged;
console.Click += console_Click;
//
// enableFileLogging
//
enableFileLogging.CheckOnClick = true;
enableFileLogging.Name = "enableFileLogging";
enableFileLogging.Size = new System.Drawing.Size(172, 22);
enableFileLogging.Size = new System.Drawing.Size(180, 22);
enableFileLogging.Text = "启用文件日志记录";
enableFileLogging.CheckedChanged += enableFileLogging_CheckedChanged;
//
@ -1108,6 +1109,7 @@
Name = "AssetStudioGUIForm";
StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
Text = "AssetStudioGUI";
Load += AssetStudioGUIForm_Load_1;
DragDrop += AssetStudioGUIForm_DragDrop;
DragEnter += AssetStudioGUIForm_DragEnter;
KeyDown += AssetStudioForm_KeyDown;

View File

@ -242,7 +242,7 @@ namespace AssetStudioGUI
{
if (assetsManager.assetsFileList.Count == 0)
{
StatusStripUpdate("No Unity file can be loaded.");
StatusStripUpdate("无法加载Unity文件。");
return;
}
@ -251,11 +251,11 @@ namespace AssetStudioGUI
if (!string.IsNullOrEmpty(productName))
{
Text = $"Studio v{Application.ProductVersion} - {productName} - {Path.GetFileName(assetsManager.assetsFileList[0].originalPath)} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}";
Text = $"Studio v{Application.ProductVersion} - 游戏代号:{productName} - 文件:{Path.GetFileName(assetsManager.assetsFileList[0].originalPath)} - Unity版本:{assetsManager.assetsFileList[0].unityVersion} - MoYi中文限定版";
}
else
{
Text = $"Studio v{Application.ProductVersion} - {Studio.Game.Name} - {Path.GetFileName(assetsManager.assetsFileList[0].originalPath)} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}";
Text = $"Studio v{Application.ProductVersion} - 游戏代号:{Studio.Game.Name} - 文件:{Path.GetFileName(assetsManager.assetsFileList[0].originalPath)} - Unity版本:{assetsManager.assetsFileList[0].unityVersion} - MoYi中文限定版";
}
assetListView.VirtualListSize = visibleAssets.Count;
@ -2319,5 +2319,15 @@ namespace AssetStudioGUI
{
}
private void AssetStudioGUIForm_Load_1(object sender, EventArgs e)
{
}
private void console_Click(object sender, EventArgs e)
{
}
}
}

View File

@ -120,9 +120,6 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>312, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>432, 17</value>
</metadata>
<data name="fontPreviewBox.Text" xml:space="preserve">
<value>abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWYZ
1234567890.:,;'\"(!?)+-*/=
@ -141,6 +138,9 @@ The quick brown fox jumps over the lazy dog. 1234567890
The quick brown fox jumps over the lazy dog. 1234567890</value>
</data>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>432, 17</value>
</metadata>
<metadata name="timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>553, 17</value>
</metadata>

View File

@ -95,7 +95,7 @@ namespace AssetStudioGUI
private static int ExtractBundleFile(FileReader reader, string savePath)
{
StatusStripUpdate($"Decompressing {reader.FileName} ...");
StatusStripUpdate($"解压缩 {{reader.FileName}} ...");
var bundleFile = new BundleFile(reader);
reader.Dispose();
if (bundleFile.FileList.Length > 0)
@ -108,7 +108,7 @@ namespace AssetStudioGUI
private static int ExtractWebDataFile(FileReader reader, string savePath)
{
StatusStripUpdate($"Decompressing {reader.FileName} ...");
StatusStripUpdate($"解压缩 {{reader.FileName}} ...");
var webFile = new WebFile(reader);
reader.Dispose();
if (webFile.fileList.Length > 0)
@ -121,7 +121,7 @@ namespace AssetStudioGUI
private static int ExtractGameFile(FileReader reader, string savePath)
{
StatusStripUpdate($"Decompressing {reader.FileName}...");
StatusStripUpdate($"解压缩 {{reader.FileName}} ...");
var gameFile = new GameFile(reader);
reader.Dispose();
var fileList = gameFile.Bundles.SelectMany(x => x.Value).ToList();
@ -284,7 +284,7 @@ namespace AssetStudioGUI
}
else
{
Logger.Warning($"Unable to find GameObject with PathID {pair.Item1.m_PathID}, removing...");
Logger.Warning($"无法找到有效 {pair.Item1.m_PathID} 的游戏路径ID对象正在移除...");
assets.Remove(pair.Item2);
}
}
@ -301,7 +301,7 @@ namespace AssetStudioGUI
}
}
Logger.Info($"[{i + 1}/{files.Count}] Processed {Path.GetFileName(file)}");
Logger.Info($"[{i + 1}/{files.Count}] 已处理 {Path.GetFileName(file)}");
Progress.Report(i + 1, files.Count);
}
@ -310,7 +310,7 @@ namespace AssetStudioGUI
public static (string, List<TreeNode>) BuildAssetData()
{
StatusStripUpdate("Building asset list...");
StatusStripUpdate("编译素材列表...");
string productName = null;
var objectCount = assetsManager.assetsFileList.Sum(x => x.Objects.Count);
@ -460,7 +460,7 @@ namespace AssetStudioGUI
}
}
StatusStripUpdate("Building container list...");
StatusStripUpdate("编译拆解清单列表");
i = 0;
Progress.Reset();
@ -481,7 +481,7 @@ namespace AssetStudioGUI
visibleAssets = exportableAssets;
StatusStripUpdate("Building tree structure...");
StatusStripUpdate("建筑树形结构…");
var treeNodeCollection = new List<TreeNode>();
var treeNodeDictionary = new Dictionary<GameObject, GameObjectTreeNode>();
@ -639,7 +639,7 @@ namespace AssetStudioGUI
break;
}
exportPath += Path.DirectorySeparatorChar;
StatusStripUpdate($"[{exportedCount}/{toExportCount}] Exporting {asset.TypeString}: {asset.Text}");
StatusStripUpdate($"[{exportedCount}/{toExportCount}] 导出 {asset.TypeString}: {asset.Text}");
try
{
switch (exportType)
@ -666,17 +666,17 @@ namespace AssetStudioGUI
}
catch (Exception ex)
{
MessageBox.Show($"Export {asset.Type}:{asset.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}");
MessageBox.Show($"导出 {asset.Type}:{asset.Text} 错误\r\n{ex.Message}\r\n{ex.StackTrace}");
}
Progress.Report(++i, toExportCount);
}
var statusText = exportedCount == 0 ? "Nothing exported." : $"Finished exporting {exportedCount} assets.";
var statusText = exportedCount == 0 ? "没有导出任何内容." : $"完成导出 {exportedCount} 个素材";
if (toExportCount > exportedCount)
{
statusText += $" {toExportCount - exportedCount} assets skipped (not extractable or files already exist)";
statusText += $" {toExportCount - exportedCount}项资产已跳过 (无法提取或文件已存在)";
}
StatusStripUpdate(statusText);
@ -720,11 +720,11 @@ namespace AssetStudioGUI
break;
}
var statusText = $"Finished exporting asset list with {toExportAssets.Count()} items.";
var statusText = $"完成了包含 {toExportAssets.Count()} 个素材的导出";
StatusStripUpdate(statusText);
Logger.Info($"AssetMap build successfully !!");
Logger.Info($"资产映射成功编译!!");
if (Properties.Settings.Default.openAfterExport && toExportAssets.Count() > 0)
{
@ -744,7 +744,7 @@ namespace AssetStudioGUI
switch (exportListType)
{
case ExportListType.XML:
var filename = Path.Combine(savePath, "assets.xml");
var filename = Path.Combine(savePath, "Assets.xml");
var doc = new XDocument(
new XElement("Assets",
new XAttribute("filename", filename),
@ -768,7 +768,7 @@ namespace AssetStudioGUI
break;
}
var statusText = $"Finished exporting asset list with {toExportAssets.Count()} items.";
var statusText = $"完成导出含有 {toExportAssets.Count()} 项的资产列表。";
StatusStripUpdate(statusText);
@ -818,25 +818,25 @@ namespace AssetStudioGUI
}
Directory.CreateDirectory(targetPath);
//导出FBX
StatusStripUpdate($"Exporting {filename}.fbx");
StatusStripUpdate($"导出 {filename}.fbx");
try
{
ExportGameObject(j.gameObject, targetPath);
}
catch (Exception ex)
{
MessageBox.Show($"Export GameObject:{j.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}");
MessageBox.Show($"导出游戏对象:{j.Text} 错误\r\n{ex.Message}\r\n{ex.StackTrace}");
}
Progress.Report(++k, count);
StatusStripUpdate($"Finished exporting {filename}.fbx");
StatusStripUpdate($"完成导出 {filename}.fbx");
}
}
if (Properties.Settings.Default.openAfterExport)
{
OpenFolderInExplorer(savePath);
}
StatusStripUpdate("Finished");
StatusStripUpdate("完成");
});
}
@ -854,7 +854,7 @@ namespace AssetStudioGUI
ThreadPool.QueueUserWorkItem(state =>
{
Progress.Reset();
StatusStripUpdate($"Exporting {animator.Text}");
StatusStripUpdate($"导出 {{animator.Text}}");
try
{
ExportAnimator(animator, exportPath, animationList);
@ -863,12 +863,12 @@ namespace AssetStudioGUI
OpenFolderInExplorer(exportPath);
}
Progress.Report(1, 1);
StatusStripUpdate($"Finished exporting {animator.Text}");
StatusStripUpdate($"完成导出 {animator.Text}");
}
catch (Exception ex)
{
MessageBox.Show($"Export Animator:{animator.Text} error\r\n{ex.Message}\r\n{ex.StackTrace}");
StatusStripUpdate("Error in export");
MessageBox.Show($"导出动画器:{animator.Text} 错误\r\n{ex.Message}\r\n{ex.StackTrace}");
StatusStripUpdate("导出中的错误");
}
});
}
@ -886,17 +886,17 @@ namespace AssetStudioGUI
Progress.Reset();
foreach (var gameObject in gameObjects)
{
StatusStripUpdate($"Exporting {gameObject.m_Name}");
StatusStripUpdate($"导出 {gameObject.m_Name}");
try
{
var subExportPath = Path.Combine(exportPath, gameObject.m_Name) + Path.DirectorySeparatorChar;
ExportGameObject(gameObject, subExportPath, animationList);
StatusStripUpdate($"Finished exporting {gameObject.m_Name}");
StatusStripUpdate($"完成导出 {gameObject.m_Name}");
}
catch (Exception ex)
{
MessageBox.Show($"Export GameObject:{gameObject.m_Name} error\r\n{ex.Message}\r\n{ex.StackTrace}");
StatusStripUpdate("Error in export");
MessageBox.Show($"导出游戏对象:{gameObject.m_Name} 错误\r\n{ex.Message}\r\n{ex.StackTrace}");
StatusStripUpdate("导出错误");
}
Progress.Report(++i, count);
@ -908,7 +908,7 @@ namespace AssetStudioGUI
}
else
{
StatusStripUpdate("No Object selected for export.");
StatusStripUpdate("没有选择对象进行导出。");
}
});
}
@ -919,17 +919,17 @@ namespace AssetStudioGUI
{
var name = Path.GetFileName(exportPath);
Progress.Reset();
StatusStripUpdate($"Exporting {name}");
StatusStripUpdate($"导出 {name}");
try
{
ExportGameObjectMerge(gameObjects, exportPath, animationList);
Progress.Report(1, 1);
StatusStripUpdate($"Finished exporting {name}");
StatusStripUpdate($"导出完成{name}");
}
catch (Exception ex)
{
MessageBox.Show($"Export Model:{name} error\r\n{ex.Message}\r\n{ex.StackTrace}");
StatusStripUpdate("Error in export");
MessageBox.Show($"导出模型:{{name}} 错误\n{{ex.Message}}\n{{ex.StackTrace}}");
StatusStripUpdate("导出时出错");
}
if (Properties.Settings.Default.openAfterExport)
{
@ -958,7 +958,7 @@ namespace AssetStudioGUI
if (!assemblyLoader.Loaded)
{
var openFolderDialog = new OpenFolderDialog();
openFolderDialog.Title = "Select Assembly Folder";
openFolderDialog.Title = "选择程序集文件夹";
if (openFolderDialog.ShowDialog() == DialogResult.OK)
{
assemblyLoader.Load(openFolderDialog.Folder);

View File

@ -2,9 +2,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>0.18.60</Version>
<AssemblyVersion>0.18.60</AssemblyVersion>
<FileVersion>0.18.60</FileVersion>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<Copyright>Copyright © Razmoth 2022; Copyright © Perfare 2018-2022</Copyright>
<DebugType>embedded</DebugType>
</PropertyGroup>

View File

@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>0.18.60</Version>
<AssemblyVersion>0.18.60</AssemblyVersion>
<FileVersion>0.18.60</FileVersion>
<Version>1.00.00</Version>
<AssemblyVersion>1.00.00</AssemblyVersion>
<FileVersion>1.00.00</FileVersion>
<Copyright>Copyright © Perfare 2020-2022; Copyright © hozuki 2020</Copyright>
<DebugType>embedded</DebugType>
</PropertyGroup>