Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -38738,7 +38738,7 @@
     },
     {
       "ID": 10425,
-      "txt": "获得了2本完整的功法，可以用起来！"
+      "txt": "获得了1本完整的功法，可以用起来！"
     },
     {
       "ID": 10426,

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -507,8 +507,37 @@ namespace Fort23.Mono
                 if (_currShowTime > _showTime)
                 {
                     _currShowTime -= _showTime;
-                    _sb.Append(_currShowMessage[_currShowIndex]);
-                    _currShowIndex++;
+                    
+                    string v = _currShowMessage[_currShowIndex].ToString();
+                    if (v == "<")
+                    {
+                        int count = 0;
+                        int endIndex = 0;
+                        for (int i = _currShowIndex; i < _currShowMessage.Length - 1; i++)
+                        {
+                            count++;
+                            string ve = _currShowMessage[i].ToString();
+                            _sb.Append(ve);
+                            if (ve == ">")
+                            {
+                                string ve1 =  _currShowMessage[i - 1].ToString();
+                                if (ve1 == "r")
+                                {
+                                    endIndex = i;
+                                    break;
+                                }
+                            }
+                        }
+                        _currShowIndex += count;
+                    }
+                    else
+                    {
+                        _sb.Append(_currShowMessage[_currShowIndex]);
+                        _currShowIndex++;
+                    }
+                    
+                    
+                  
                     showText.text = _sb.ToString();
                 }
             }

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase9.cs

@@ -83,7 +83,7 @@ namespace Fort23.Mono.Phases
             await ctask;
             pgm.SetOnClickMask(false);
             CombatController.currActiveCombat.isUpdate = false;
-            GameObject gameObject = UIManager.Instance.GetComponent<CombatPanel>().magicWeapons[0].own;
+            GameObject gameObject = UIManager.Instance.GetComponent<CombatPanel>().magicWeapons[0].bg_hui.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;