From 786dca23fdb9fd5e2eb8782bef3ecc43a78433b9 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Mon, 30 May 2022 22:28:33 +0300 Subject: [PATCH] Release v0.4.10.13 A3DA --- KKdMainLib/A3DA.cs | 31 +++++++++++++++--------------- KKdMainLib/KKdMainLib.csproj | 4 ++-- KKdMainLib/STR.cs | 5 +++-- PD_Tool/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/KKdMainLib/A3DA.cs b/KKdMainLib/A3DA.cs index e37734b..260e32d 100644 --- a/KKdMainLib/A3DA.cs +++ b/KKdMainLib/A3DA.cs @@ -2652,11 +2652,11 @@ namespace KKdMainLib MsgPack instance = new MsgPack(Data.MObjectHRC[i0].Instances.Length, "Instance"); for (i1 = 0; i1 < Data.MObjectHRC[i0].Instances.Length; i1++) { - instance[i1] = MsgPack.New.Add(ref Data.MObjectHRC[i0].Instances[i1].MT) - .Add("Name", Data.MObjectHRC[i0].Instances[i1].Name); + MsgPack _instance = MsgPack.New.Add("Name", Data.MObjectHRC[i0].Instances[i1].Name); if (Data.MObjectHRC[i0].Instances[i1].Shadow) - instance[i1].Add("Shadow", true); - instance[i1].Add("UIDName", Data.MObjectHRC[i0].Instances[i1].UIDName); + _instance.Add("Shadow", true); + _instance.Add("UIDName", Data.MObjectHRC[i0].Instances[i1].UIDName); + instance[i1] = _instance.Add(ref Data.MObjectHRC[i0].Instances[i1].MT); } _mObjectHRC.Add(instance); @@ -2667,19 +2667,19 @@ namespace KKdMainLib MsgPack node = new MsgPack(Data.MObjectHRC[i0].Node.Length, "Node"); for (i1 = 0; i1 < Data.MObjectHRC[i0].Node.Length; i1++) { - node[i1] = MsgPack.New + MsgPack _node = MsgPack.New .Add("Name" , Data.MObjectHRC[i0].Node[i1].Name ) - .Add("Parent", Data.MObjectHRC[i0].Node[i1].Parent) - .Add(ref Data.MObjectHRC[i0].Node[i1].MT); + .Add("Parent", Data.MObjectHRC[i0].Node[i1].Parent); if (Data.MObjectHRC[i0].Node[i1].JointOrient.HasValue) { Vec3 jointOrient = Data.MObjectHRC[i0].Node[i1].JointOrient.Value; - node[i1] = node[i1].Add(new MsgPack("JointOrient") + _node.Add(new MsgPack("JointOrient") .Add("X", jointOrient.X) .Add("Y", jointOrient.Y) .Add("Z", jointOrient.Z)); } + node[i1] = _node.Add(ref Data.MObjectHRC[i0].Node[i1].MT); } _mObjectHRC.Add(node); } @@ -2737,10 +2737,11 @@ namespace KKdMainLib MsgPack texPat = new MsgPack(Data.Object[i0].TexPat.Length, "TexturePattern"); for (i1 = 0; i1 < Data.Object[i0].TexPat.Length; i1++) { - texPat[i1] = MsgPack.New.Add("Name", Data.Object[i0].TexPat[i1].Name); + MsgPack _texPat = MsgPack.New.Add("Name", Data.Object[i0].TexPat[i1].Name); if (Data.Object[i0].TexPat[i1].Pat != null) - texPat[i1] = texPat[i1].Add("Pat" , Data.Object[i0].TexPat[i1].Pat ) - .Add("PatOffset", Data.Object[i0].TexPat[i1].PatOffset); + _texPat.Add("Pat" , Data.Object[i0].TexPat[i1].Pat ) + .Add("PatOffset", Data.Object[i0].TexPat[i1].PatOffset); + texPat[i1] = _texPat; } _object.Add(texPat); } @@ -2786,19 +2787,19 @@ namespace KKdMainLib MsgPack node = new MsgPack(Data.ObjectHRC[i0].Node.Length, "Node"); for (i1 = 0; i1 < Data.ObjectHRC[i0].Node.Length; i1++) { - node[i1] = MsgPack.New + MsgPack _node = MsgPack.New .Add("Name" , Data.ObjectHRC[i0].Node[i1].Name ) - .Add("Parent", Data.ObjectHRC[i0].Node[i1].Parent) - .Add(ref Data.ObjectHRC[i0].Node[i1].MT); + .Add("Parent", Data.ObjectHRC[i0].Node[i1].Parent); if (Data.ObjectHRC[i0].Node[i1].JointOrient.HasValue) { Vec3 jointOrient = Data.ObjectHRC[i0].Node[i1].JointOrient.Value; - node[i1] = node[i1].Add(new MsgPack("JointOrient") + _node.Add(new MsgPack("JointOrient") .Add("X", jointOrient.X) .Add("Y", jointOrient.Y) .Add("Z", jointOrient.Z)); } + node[i1] = _node.Add(ref Data.ObjectHRC[i0].Node[i1].MT); } _objectHRC.Add(node); } diff --git a/KKdMainLib/KKdMainLib.csproj b/KKdMainLib/KKdMainLib.csproj index aac5868..af084ca 100644 --- a/KKdMainLib/KKdMainLib.csproj +++ b/KKdMainLib/KKdMainLib.csproj @@ -6,12 +6,12 @@ korenkonder (C) 2018-2022 A simple library for working with Project Diva AC/DT/F/AFT/F2/X/XHD/FT/VRFL/M39 files - 0.4.10.12 + 0.4.10.13 KKdMainLib KKdMainLib net461 KKdMainLib - 0.4.10.12 + 0.4.10.13 AnyCPU diff --git a/KKdMainLib/STR.cs b/KKdMainLib/STR.cs index abc4bdd..a7f666b 100644 --- a/KKdMainLib/STR.cs +++ b/KKdMainLib/STR.cs @@ -178,10 +178,11 @@ namespace KKdMainLib MsgPack strings = new MsgPack(Strings.Length, "Strings"); for (int i = 0; i < Strings.Length; i++) { - strings[i] = MsgPack.New.Add("ID", Strings[i].ID); + MsgPack @string = MsgPack.New.Add("ID", Strings[i].ID); if (Strings[i].Str.V != null) if (Strings[i].Str.V != "") - strings[i] = strings[i].Add("Str", Strings[i].Str.V); + @string.Add("Str", Strings[i].Str.V); + strings[i] = @string; } str.Add(strings); diff --git a/PD_Tool/Properties/AssemblyInfo.cs b/PD_Tool/Properties/AssemblyInfo.cs index f5f3f76..f935bc4 100644 --- a/PD_Tool/Properties/AssemblyInfo.cs +++ b/PD_Tool/Properties/AssemblyInfo.cs @@ -11,5 +11,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E")] -[assembly: AssemblyVersion("0.4.10.12")] -[assembly: AssemblyFileVersion("0.4.10.12")] +[assembly: AssemblyVersion("0.4.10.13")] +[assembly: AssemblyFileVersion("0.4.10.13")]