diff --git a/2DGAMELIB/_2DGAMELIB/Ser.cs b/2DGAMELIB/_2DGAMELIB/Serializer.cs similarity index 98% rename from 2DGAMELIB/_2DGAMELIB/Ser.cs rename to 2DGAMELIB/_2DGAMELIB/Serializer.cs index c152f03..51904fd 100644 --- a/2DGAMELIB/_2DGAMELIB/Ser.cs +++ b/2DGAMELIB/_2DGAMELIB/Serializer.cs @@ -10,7 +10,7 @@ using Newtonsoft.Json.Serialization; namespace _2DGAMELIB { - public static class Ser + public static class Serializer { private static SerializableAttribute s = new SerializableAttribute(); @@ -86,7 +86,7 @@ namespace _2DGAMELIB return (T)NewFormatter().Deserialize(serializationStream); } - static Ser() { } + static Serializer() { } public static T JsonDeepCopy(this T Object) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs index 39378e0..e23ff64 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs @@ -748,12 +748,12 @@ namespace SlaveMatrix string text = Sta.CurrentDirectory + "temp.json"; string contents = Sta.Translate(Path, 1); File.WriteAllText(text, contents); - Sta.GameData = Ser.UnJson(text); + Sta.GameData = Serializer.UnJson(text); System.IO.File.Delete(text); } else { - Sta.GameData = Ser.UnJson(Path); + Sta.GameData = Serializer.UnJson(Path); } Sta.DontScar = false; Character d = Viola; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index 85e8a5e..36ed36c 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -1089,80 +1089,80 @@ namespace SlaveMatrix 胴体 = obj; //胴体.SaveExMod("C:\\Users\\adel4\\Documents\\胴体"); - //Ser.ToJson(胴体, "C:\\Users\\adel4\\Documents\\胴体.json"); - //胴体 = Ser.UnJson("C:\\Users\\adel4\\Documents\\胴体.json"); + //Serializer.ToJson(胴体, "C:\\Users\\adel4\\Documents\\胴体.json"); + //胴体 = Serializer.UnJson("C:\\Users\\adel4\\Documents\\胴体.json"); obj = Resources.肩左.ObjLoad(); obj.MigrateKeys(); 肩左 = obj; //肩左.SaveExMod("C:\\Users\\dave\\Documents\\肩左"); - //Ser.ToJson(肩左, "C:\\Users\\dave\\Documents\\肩左.json"); - //肩左 = Ser.UnJson("C:\\Users\\dave\\Documents\\肩左.json"); + //Serializer.ToJson(肩左, "C:\\Users\\dave\\Documents\\肩左.json"); + //肩左 = Serializer.UnJson("C:\\Users\\dave\\Documents\\肩左.json"); obj = Resources.腕左.ObjLoad(); obj.MigrateKeys(); 腕左 = obj; //腕左.SaveExMod("C:\\Users\\dave\\Documents\\腕左"); - //Ser.ToJson(腕左, "C:\\Users\\dave\\Documents\\腕左.json"); - //腕左 = Ser.UnJson("C:\\Users\\dave\\Documents\\腕左.json"); + //Serializer.ToJson(腕左, "C:\\Users\\dave\\Documents\\腕左.json"); + //腕左 = Serializer.UnJson("C:\\Users\\dave\\Documents\\腕左.json"); obj = Resources.脚左.ObjLoad(); obj.MigrateKeys(); 脚左 = obj; //脚左.SaveExMod("C:\\Users\\dave\\Documents\\脚左"); - //Ser.ToJson(脚左, "C:\\Users\\dave\\Documents\\脚左.json"); - //脚左 = Ser.UnJson("C:\\Users\\dave\\Documents\\脚左.json"); + //Serializer.ToJson(脚左, "C:\\Users\\dave\\Documents\\脚左.json"); + //脚左 = Serializer.UnJson("C:\\Users\\dave\\Documents\\脚左.json"); 尻尾 = Resources.尻尾.ObjLoad(); //尻尾.SaveExMod("C:\\Users\\dave\\Documents\\尻尾"); - //Ser.ToJson(尻尾, "C:\\Users\\dave\\Documents\\尻尾.json"); - //尻尾 = Ser.UnJson("C:\\Users\\dave\\Documents\\尻尾.json"); + //Serializer.ToJson(尻尾, "C:\\Users\\dave\\Documents\\尻尾.json"); + //尻尾 = Serializer.UnJson("C:\\Users\\dave\\Documents\\尻尾.json"); 半身 = Resources.半身.ObjLoad(); //半身.SaveExMod("C:\\Users\\dave\\Documents\\半身"); - //Ser.ToJson(半身, "C:\\Users\\dave\\Documents\\半身.json"); - //半身 = Ser.UnJson("C:\\Users\\dave\\Documents\\半身.json"); + //Serializer.ToJson(半身, "C:\\Users\\dave\\Documents\\半身.json"); + //半身 = Serializer.UnJson("C:\\Users\\dave\\Documents\\半身.json"); 肢左 = Resources.肢左.ObjLoad(); //肢左.SaveExMod("C:\\Users\\dave\\Documents\\肢左"); - //Ser.ToJson(肢左, "C:\\Users\\dave\\Documents\\肢左.json"); - //肢左 = Ser.UnJson("C:\\Users\\dave\\Documents\\肢左.json"); + //Serializer.ToJson(肢左, "C:\\Users\\dave\\Documents\\肢左.json"); + //肢左 = Serializer.UnJson("C:\\Users\\dave\\Documents\\肢左.json"); 肢中 = Resources.肢中.ObjLoad(); //肢中.SaveExMod("C:\\Users\\dave\\Documents\\肢中"); - //Ser.ToJson(肢中, "C:\\Users\\dave\\Documents\\肢中.json"); - //肢中 = Ser.UnJson("C:\\Users\\dave\\Documents\\肢中.json"); + //Serializer.ToJson(肢中, "C:\\Users\\dave\\Documents\\肢中.json"); + //肢中 = Serializer.UnJson("C:\\Users\\dave\\Documents\\肢中.json"); 性器 = Resources.性器.ObjLoad(); //性器.SaveExMod("C:\\Users\\dave\\Documents\\性器"); - //Ser.ToJson(性器, "C:\\Users\\dave\\Documents\\性器.json"); - //性器 = Ser.UnJson("C:\\Users\\dave\\Documents\\性器.json"); + //Serializer.ToJson(性器, "C:\\Users\\dave\\Documents\\性器.json"); + //性器 = Serializer.UnJson("C:\\Users\\dave\\Documents\\性器.json"); 性器付 = Resources.性器付.ObjLoad(); //性器付.SaveExMod("C:\\Users\\dave\\Documents\\性器付"); - //Ser.ToJson(性器付, "C:\\Users\\dave\\Documents\\性器付.json"); - //性器付 = Ser.UnJson("C:\\Users\\dave\\Documents\\性器付.json"); + //Serializer.ToJson(性器付, "C:\\Users\\dave\\Documents\\性器付.json"); + //性器付 = Serializer.UnJson("C:\\Users\\dave\\Documents\\性器付.json"); スタンプ = Resources.スタンプ.ObjLoad(); //スタンプ.SaveExMod("C:\\Users\\dave\\Documents\\スタンプ"); - //Ser.ToJson(スタンプ, "C:\\Users\\dave\\Documents\\スタンプ.json"); - //スタンプ = Ser.UnJson("C:\\Users\\dave\\Documents\\スタンプ.json"); + //Serializer.ToJson(スタンプ, "C:\\Users\\dave\\Documents\\スタンプ.json"); + //スタンプ = Serializer.UnJson("C:\\Users\\dave\\Documents\\スタンプ.json"); カーソル = Resources.カーソル.ObjLoad(); //カーソル.SaveExMod("C:\\Users\\dave\\Documents\\カーソル"); - //Ser.ToJson(カーソル, "C:\\Users\\dave\\Documents\\カーソル.json"); - //カーソル = Ser.UnJson("C:\\Users\\dave\\Documents\\カーソル.json"); + //Serializer.ToJson(カーソル, "C:\\Users\\dave\\Documents\\カーソル.json"); + //カーソル = Serializer.UnJson("C:\\Users\\dave\\Documents\\カーソル.json"); その他 = Resources.その他.ObjLoad(); //その他.SaveExMod("C:\\Users\\dave\\Documents\\その他"); - //Ser.ToJson(その他, "C:\\Users\\dave\\Documents\\その他.json"); - //その他 = Ser.UnJson("C:\\Users\\dave\\Documents\\その他.json"); + //Serializer.ToJson(その他, "C:\\Users\\dave\\Documents\\その他.json"); + //その他 = Serializer.UnJson("C:\\Users\\dave\\Documents\\その他.json"); タイル = Resources.タイル.ObjLoad(); //タイル.SaveExMod("C:\\Users\\dave\\Documents\\タイル"); - //Ser.ToJson(タイル, "C:\\Users\\dave\\Documents\\タイル.json"); - //タイル = Ser.UnJson("C:\\Users\\dave\\Documents\\タイル.json"); + //Serializer.ToJson(タイル, "C:\\Users\\dave\\Documents\\タイル.json"); + //タイル = Serializer.UnJson("C:\\Users\\dave\\Documents\\タイル.json"); MaxAre = 0.0584246154149664; Elet = typeof(Ele); @@ -1468,7 +1468,7 @@ namespace SlaveMatrix public static string Translate(string Path, int Mode) { TranslateJsonFile = System.IO.Path.Combine(CurrentDirectory, "text", "Translate.json"); - TranslateDict = Ser.UnJson>(TranslateJsonFile); + TranslateDict = Serializer.UnJson>(TranslateJsonFile); string input = File.ReadAllText(Path); switch (Mode) {