Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -92,7 +92,7 @@ namespace GFGGame
             string[] infos = Regex.Split(content, " ");
             if (infos.Length < 2)
             {
-                PromptController.Instance.ShowFloatTextPrompt("�밴��ָ����ʽ������Ʒ��Ϣ", MessageType.ERR);
+                PromptController.Instance.ShowFloatTextPrompt("请按照指定格式输入物品信息", MessageType.ERR);
                 return;
             }
 
@@ -103,18 +103,18 @@ namespace GFGGame
                 string messageSuc;
                 if (itemNum > 0)
                 {
-                    messageSuc = "获取 " + itemId + "*" + itemNum;
+                    messageSuc = "已获得物品" + itemId + "*" + itemNum;
                     GMController.SendGMCommand("getItem " + content, messageSuc).Coroutine();
                 }
                 else if (itemNum < 0)
                 {
-                    messageSuc = "获取 " + itemId + "*" + itemNum;
+                    messageSuc = "已扣除物品" + itemId + "*" + itemNum;
                     GMController.SendGMCommand("getItem " + content, messageSuc).Coroutine();
                 }
             }
             else
             {
-                PromptController.Instance.ShowFloatTextPrompt("�밴��ָ����ʽ������Ʒ��Ϣ", MessageType.ERR);
+                PromptController.Instance.ShowFloatTextPrompt("请按照指定格式输入物品信息", MessageType.ERR);
             }
         }
 
@@ -123,11 +123,11 @@ namespace GFGGame
             int tmp;
             if (!int.TryParse(_ui.m_ComBtn.m_txtRoleLv.text, out tmp))
             {
-                PromptController.Instance.ShowFloatTextPrompt("����������");
+                PromptController.Instance.ShowFloatTextPrompt("请输入数字");
                 return;
             }
             string lv = _ui.m_ComBtn.m_txtRoleLv.text;
-            string messageSuc = "�ȼ�������" + lv;
+            string messageSuc = "等级提升至" + lv;
 
             GMController.SendGMCommand("lv " + lv, messageSuc).Coroutine();
         }
@@ -139,11 +139,11 @@ namespace GFGGame
             if (!int.TryParse(_ui.m_ComBtn.m_txtChapter.text, out tmp) ||
                 !int.TryParse(_ui.m_ComBtn.m_txtChapterLv.text, out tmp1))
             {
-                PromptController.Instance.ShowFloatTextPrompt("����������");
+                PromptController.Instance.ShowFloatTextPrompt("请输入数字");
                 return;
             }
             string content = _ui.m_ComBtn.m_txtChapter.text + " " + _ui.m_ComBtn.m_txtChapterLv.text;
-            string messageSuc = string.Format("��ǰ�ؿ���{0}�µ�{1}��", _ui.m_ComBtn.m_txtChapter.text,
+            string messageSuc = string.Format("当前关卡第{0}章第{1}关", _ui.m_ComBtn.m_txtChapter.text,
                 _ui.m_ComBtn.m_txtChapterLv.text);
             GMController.SendGMCommand("chapter " + content, messageSuc).Coroutine();
         }
@@ -155,7 +155,7 @@ namespace GFGGame
             if (result)
             {
                 GameGlobal.skipCheckOpen = !GameGlobal.skipCheckOpen;
-                PromptController.Instance.ShowFloatTextPrompt("�ѿ����������ܿ������");
+                PromptController.Instance.ShowFloatTextPrompt("已开启跳过功能开启检测");
             }
         }
 
@@ -163,7 +163,7 @@ namespace GFGGame
         {
             string gm = string.Format("SetArenaRank|{0}|{1}", _ui.m_ComBtn.m_txtArenaGrade.text,
                 _ui.m_ComBtn.m_txtArenaRank.text);
-            bool result = await GMController.SendGMCommand(gm, "�޸ijɹ�");
+            bool result = await GMController.SendGMCommand(gm, "修改成功");
             if (result)
             {
                 ArenaDataManager.Instance.Grade = int.Parse(_ui.m_ComBtn.m_txtArenaGrade.text);
@@ -174,17 +174,17 @@ namespace GFGGame
 
         private void OnClickBtnStart()
         {
-            GMController.SendGMCommand("League|StartQuestion", "��ʼ����").Coroutine();
+            GMController.SendGMCommand("League|StartQuestion", "开始答题").Coroutine();
         }
 
         private void OnClickBtnEnd()
         {
-            GMController.SendGMCommand("League|EndQuestion", "��������").Coroutine();
+            GMController.SendGMCommand("League|EndQuestion", "结束答题").Coroutine();
         }
 
         private void OnClickBtnActiveEnd()
         {
-            GMController.SendGMCommand("League|CloseQuestion", "�����").Coroutine();
+            GMController.SendGMCommand("League|CloseQuestion", "活动结束").Coroutine();
         }
 
         private async void OnClickBtnLeagueSkill()
@@ -212,12 +212,12 @@ namespace GFGGame
                 long hasCount = ItemDataManager.GetItemNum(skillCfg.consumeArr[0][0]);
                 if (hasCount < needCount)
                 {
-                    PromptController.Instance.ShowFloatTextPrompt("���IJ���");
+                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
                     break;
                 }
                 await SkillSProxy.ReqActiveSkill(SkillType.LeagueSkill, skillId);
             }
-            PromptController.Instance.ShowFloatTextPrompt("ѧϰ����");
+            PromptController.Instance.ShowFloatTextPrompt("学习结束");
         }
 
         private async void OnClickBtnAll()
@@ -284,7 +284,7 @@ namespace GFGGame
             string[] infos = Regex.Split(content, " ");
             if (infos.Length < 2)
             {
-                PromptController.Instance.ShowFloatTextPrompt("�밴��ָ����ʽ������Ʒ��Ϣ", MessageType.ERR);
+                PromptController.Instance.ShowFloatTextPrompt("请按照指定格式输入物品信息", MessageType.ERR);
                 return;
             }
             switch (infos[0])
@@ -292,29 +292,29 @@ namespace GFGGame
                 case "cjstime":
                     if (infos[1].Length != 10)
                     {
-                        PromptController.Instance.ShowFloatTextPrompt("����������Ϊ��λ����ȷ��ʱ���");
+                        PromptController.Instance.ShowFloatTextPrompt("请输入以秒为单位的正确的时间戳");
                         return;
                     }
                     LuckyBoxDataManager.Instance.startTime = int.Parse(infos[1]);
-                    PromptController.Instance.ShowFloatTextPrompt("���óɹ�");
+                    PromptController.Instance.ShowFloatTextPrompt("设置成功");
 
                     break;
                 case "cjetime":
                     if (infos[1].Length != 10)
                     {
-                        PromptController.Instance.ShowFloatTextPrompt("����������Ϊ��λ����ȷ��ʱ���");
+                        PromptController.Instance.ShowFloatTextPrompt("请输入以秒为单位的正确的时间戳");
                         return;
                     }
                     LuckyBoxDataManager.Instance.endTime = int.Parse(infos[1]);
-                    PromptController.Instance.ShowFloatTextPrompt("���óɹ�");
+                    PromptController.Instance.ShowFloatTextPrompt("设置成功");
                     break;
                 default:
-                    GMController.SendGMCommand(content, "���óɹ�").Coroutine();
+                    GMController.SendGMCommand(content, "设置成功").Coroutine();
                     break;
             }
         }
 
-        //���ü���ֵ
+        //设置计数值
         private void OnClickBtnSetCount(EventContext context)
         {
             var roleNumType = _ui.m_RoleNumType.text;
@@ -324,7 +324,7 @@ namespace GFGGame
             GMController.SendGMCommand($"setNum {roleNumType} {num}", "").Coroutine();
         }
 
-        //��Ӽ���ֵ
+        //添加计数值
         private void OnClickBtnAddCount(EventContext context)
         {
             var roleNumType = _ui.m_AddRoleNumType.text;