From 33db0174862972f9b0e3ef2fc2ebec2970c20253 Mon Sep 17 00:00:00 2001
From: mercury233 <me@mercury233.me>
Date: Mon, 8 Apr 2019 01:50:46 +0800
Subject: [PATCH] revert & fix MultiStringMaster

---
 Assets/SibylSystem/Book/Book.cs               |  4 ++--
 .../MonoHelpers/multiStringMaster.cs          | 22 +++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Assets/SibylSystem/Book/Book.cs b/Assets/SibylSystem/Book/Book.cs
index 9916f8e2..b826e09f 100644
--- a/Assets/SibylSystem/Book/Book.cs
+++ b/Assets/SibylSystem/Book/Book.cs
@@ -124,7 +124,7 @@ public class Book : WindowServant2D
                     master.remove(item.get_data().Name);
                 }
             }
-            deckString += master.managedString;
+            deckString += master.managedString.TrimEnd('\n');
             lab.text = deckString;
         }
         if (labop != null)
@@ -146,7 +146,7 @@ public class Book : WindowServant2D
                     master.Add(item.get_data().Name);
                 }
             }
-            opString += master.managedString;
+            opString += master.managedString.TrimEnd('\n');
             if (master.strings.Count > 0)
             {
                 labop.text = InterString.Get("[ff5555]对手使用过：@n[?][-]", opString);
diff --git a/Assets/SibylSystem/MonoHelpers/multiStringMaster.cs b/Assets/SibylSystem/MonoHelpers/multiStringMaster.cs
index 8861a091..218667c1 100644
--- a/Assets/SibylSystem/MonoHelpers/multiStringMaster.cs
+++ b/Assets/SibylSystem/MonoHelpers/multiStringMaster.cs
@@ -11,13 +11,7 @@ public class MultiStringMaster
 
     public List<part> strings = new List<part>();
 
-    private string _managedString = "";
-
-    public string managedString
-    {
-        get { return _managedString.TrimEnd('\n'); }
-        set { _managedString = value; }
-    }
+    public string managedString = "";
 
     public void Add(string str)
     {
@@ -37,16 +31,16 @@ public class MultiStringMaster
             t.str = str;
             strings.Add(t);
         }
-        _managedString = "";
+        managedString = "";
         for (int i = 0; i < strings.Count; i++)
         {
             if (strings[i].count == 1)
             {
-                _managedString += strings[i].str + "\n";
+                managedString += strings[i].str + "\n";
             }
             else
             {
-                _managedString += strings[i].str + "*" + strings[i].count.ToString() + "\n";
+                managedString += strings[i].str + "*" + strings[i].count.ToString() + "\n";
             }
         }
     }
@@ -54,7 +48,7 @@ public class MultiStringMaster
     public void clear()
     {
         strings.Clear();
-        _managedString = "";
+        managedString = "";
     }
 
     public void remove(string str)
@@ -78,16 +72,16 @@ public class MultiStringMaster
                 t.count--;
             }
         }
-        _managedString = "";
+        managedString = "";
         for (int i = 0; i < strings.Count; i++)
         {
             if (strings[i].count == 1)
             {
-                _managedString += strings[i].str + "\n";
+                managedString += strings[i].str + "\n";
             }
             else
             {
-                _managedString += strings[i].str + "*" + strings[i].count.ToString() + "\n";
+                managedString += strings[i].str + "*" + strings[i].count.ToString() + "\n";
             }
         }
     }