jie65535/GrasscutterCommandGenerator
1
0
Fork 0
mirror of https://github.com/jie65535/GrasscutterCommandGenerator.git synced 2025-12-10 08:51:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update all resources to 6.1

Browse Source 
Update version to v1.18.0
This commit is contained in:
杰
2025-11-03 18:03:11 +08:00
parent 3f678992d6
commit 2dccec3070
65 changed files with 29556 additions and 24587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/GrasscutterTools/Game/Data/Excels/MaterialData.cs
View File

@@ -33,8 +33,7 @@ namespace GrasscutterTools.Game.Data.Excels
[JsonProperty("itemType"), JsonConverter(typeof(StringEnumConverter))]
public ItemType ItemType { get; set; }
[JsonProperty("materialType"), JsonConverter(typeof(StringEnumConverter))]
public MaterialType MaterialType { get; set; }
public string MaterialType { get; set; }
[JsonProperty("itemUse")]
public List<ItemUseData> ItemUse { get; set; }

4
Source/GrasscutterTools/Game/Data/Excels/SceneData.cs
View File

@@ -17,8 +17,6 @@
*
**/
using GrasscutterTools.Game.Props;
using Newtonsoft.Json;
namespace GrasscutterTools.Game.Data.Excels
@@ -27,7 +25,7 @@ namespace GrasscutterTools.Game.Data.Excels
internal class SceneData : GameResource
{
[JsonProperty("type")]
public SceneType SceneType { get; set; }
public string SceneType { get; set; }
[JsonProperty("scriptData")]
public string ScriptData { get; set; }

8
Source/GrasscutterTools/Game/Data/GameResources.cs
View File

@@ -208,7 +208,7 @@ namespace GrasscutterTools.Game.Data
File.WriteAllLines(
Path.Combine(dir, "Avatar.txt"),
MaterialData.Values
.Where(it => it.MaterialType == MaterialType.MATERIAL_AVATAR)
.Where(it => it.MaterialType == "MATERIAL_AVATAR")
.Select(it => $"{it.Id}:{TextMapData.GetText(it.NameTextMapHash.ToString())}"),
Encoding.UTF8);
@@ -318,12 +318,12 @@ namespace GrasscutterTools.Game.Data
{
foreach (var m in itemTypes
.GroupBy(it => it.MaterialType)
.Where(it => it.Key != MaterialType.MATERIAL_NONE)
.Where(it => it.Key != "MATERIAL_NONE")
.OrderBy(it => it.Average(m => m.Id)))
{
sb.Append("// ").AppendLine(m.Key.ToTranslatedString(language.Key));
sb.Append("// ").AppendLine(MaterialType.ToTranslatedString(m.Key, language.Key));
if (m.Key == MaterialType.MATERIAL_BGM)
if (m.Key == "MATERIAL_BGM")
{
foreach (var materialData in m)
{