diff --git a/Assets/Scripts/UIScripts/Student/Mono/AnserWindowCtrl.cs b/Assets/Scripts/UIScripts/Student/Mono/AnserWindowCtrl.cs index 1c181ab..256a08f 100644 --- a/Assets/Scripts/UIScripts/Student/Mono/AnserWindowCtrl.cs +++ b/Assets/Scripts/UIScripts/Student/Mono/AnserWindowCtrl.cs @@ -112,7 +112,7 @@ public class AnserWindowCtrl : MonoBehaviour //选择错误时 显示答题结果 public void ShowRightResult(string msg) { - promptText.SetPrompt(LocalizationManager.Format("选择错误,应{0}", msg), Color.red, 2.5f); + promptText.SetPrompt(LocalizationManager.Format("选择错误,应{0}", LocalizationManager.Get(msg)), Color.red, 2.5f); } diff --git a/Assets/Scripts/UIScripts/Student/Sub1LearnPanel.cs b/Assets/Scripts/UIScripts/Student/Sub1LearnPanel.cs index 45e6744..4b071fa 100644 --- a/Assets/Scripts/UIScripts/Student/Sub1LearnPanel.cs +++ b/Assets/Scripts/UIScripts/Student/Sub1LearnPanel.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; @@ -90,9 +90,9 @@ public class Sub1LearnPanel : BasePanel List options = new List(); foreach (var item in tufaMsg.options) { - options.Add(item.Key); + options.Add(LocalizationManager.Get(item.Key)); } - answerWindow.SetAskAndAnswer(tuFa.ToString(), options, AnswerEvent); + answerWindow.SetAskAndAnswer(LocalizationManager.Get(tuFa.ToString()), options, AnswerEvent); if (AdjustingManager.Instance.Adjusting)//导调状态下遇到突发事件发送消息到教员端 { @@ -107,28 +107,38 @@ public class Sub1LearnPanel : BasePanel // 完成答题时 检查选项是否最佳选项以及当前选项对应的罚时 并恢复车辆移动 导调模式下发送事件信息到教员端 void AnswerEvent(string selectOperations) { - bool isRightOption = selectOperations == tufaMsg.rightOption; - int takeTime = tufaMsg.options[selectOperations]; + // Find the original Chinese key from the displayed (localized) text + string selectedKey = selectOperations; + foreach (var item in tufaMsg.options) + { + if (LocalizationManager.Get(item.Key) == selectOperations) + { + selectedKey = item.Key; + break; + } + } + bool isRightOption = selectedKey == tufaMsg.rightOption; + int takeTime = tufaMsg.options[selectedKey]; time -= takeTime * 60;//takeTime为负数 if (isRightOption)//正确处理方式不记录罚时 { - StudentOperateRecorder.Instance.InjectOperateMsg($"行军过程中遇到{tuFa.ToString()},选择处理方式为{selectOperations}"); + StudentOperateRecorder.Instance.InjectOperateMsgLocalized("行军过程中遇到{0},选择处理方式为{1}", tuFa.ToString(), selectedKey); } else - StudentOperateRecorder.Instance.InjectOperateMsg($"行军过程中遇到{tuFa.ToString()},选择处理方式为{selectOperations},罚时{takeTime}分钟"); + StudentOperateRecorder.Instance.InjectOperateMsgLocalized("行军过程中遇到{0},选择处理方式为{1},罚时{2}分钟", tuFa.ToString(), selectedKey, Mathf.Abs(takeTime)); - if (AdjustingManager.Instance.Adjusting)//导调状态下遇到突发事件发送消息到教员端 + if (AdjustingManager.Instance.Adjusting)//导调状态下遇到突发事件发送事件信息到教员端 { NetTuFaHandleMsg msg = new NetTuFaHandleMsg(); if (isRightOption) { msg.msgType = TuFaMsgType.handleRight; - msg.msg = $"{ selectOperations}"; + msg.msg = $"{ selectedKey}"; } else { msg.msgType = TuFaMsgType.handleWrong; - msg.msg = $"{ selectOperations},罚时{takeTime}分钟"; + msg.msg = $"{ selectedKey},罚时{takeTime}分钟"; } TCPManager.Instance.SendNetMsg(msg, NetMsgName.TuFaEvent); } diff --git a/Assets/StreamingAssets/Localization.xml b/Assets/StreamingAssets/Localization.xml index 71cf2cf..8b87572 100644 --- a/Assets/StreamingAssets/Localization.xml +++ b/Assets/StreamingAssets/Localization.xml @@ -452,4 +452,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +