Merge branch 'feature/peipei-fix' into 'develop'

问题修复

See merge request aibis-dream/aibis-dream!5

Assets/Resources/Prefabs/UI/Choice Button.prefab

@@ -231,8 +231,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 280, y: 0}
-  m_SizeDelta: {x: 455.96, y: 48}
+  m_AnchoredPosition: {x: 650, y: 0}
+  m_SizeDelta: {x: 1200, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6660134571396433606
 CanvasRenderer:

Assets/Resources/Yarn/OptionTest/OptionTest1.yarn

@@ -2,6 +2,16 @@
 ---
 <<character_init Art/Character/Express_1>>
 我: 这是选项测试文件 #line:069537f 
+我: 做一点测试
+    -> 选项一
+    -> 选项二
+    -> 超长选项测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试
+
+我: <b>粗体</b><i>斜体</i><u>下划线</u><s>删除线</s><color=\#FF0000>制定颜色</color>
+我: <size=+10>放大</size><size=-10>缩小</size><sup>上标</sup>正常<sub>下标</sub>
+我: <rainb>彩虹</rainb><fade>褪色</fade><pend>摇晃</pend><wave>波浪</wave><shake>震动</shake>
+我: <bounce>Bounce</bounce><rot>旋转</rot><wiggle>Wiggle</wiggle>
+
 我: 点击不同按钮可以执行不同命令 #line:00147c3 # auto_next
 <<load_scene OptionTestScene>>
 我: 加载测试场景 #line:0a67910 

Assets/Scripts/UI/DialogUiViewer.cs

@@ -89,7 +89,6 @@ namespace AibisDream
         public void ShowAutoLine(string dialogLine, string actor, Action nextStep)
         {
             dialogBox.SetActive(true);
-            dialogText.ShowText("");
             dialogText.gameObject.SetActive(true);
             choiceBox.SetActive(false);
             
@@ -112,6 +111,8 @@ namespace AibisDream
             dialogBox.SetActive(true);
             choiceBox.SetActive(true);
             dialogText.gameObject.SetActive(false);
+            dialogText.ShowText("");
+            actorName.text = "";
 
             // 销毁原来的按钮
             foreach (Transform child in choiceBox.transform)