From 5e67d38bd2c793799842ca7e0f79cb8e1b524c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E8=99=9E=E6=B8=A0=E6=88=90=E2=80=9D?= <“yuqucheng2006@qq.com”> Date: Thu, 25 Jun 2026 10:43:57 +0800 Subject: [PATCH] debug --- Assets/Res/language/language.json | 56 ++++---- Assets/Res/ui/common/头像遮罩.png | Bin 0 -> 5243 bytes Assets/Res/ui/common/头像遮罩.png.meta | 127 ++++++++++++++++++ .../Group 111.png => common/默认头像.png} | Bin .../默认头像.png.meta} | 0 .../Res/ui/deviceinfopage/视频和音效.prefab | 4 +- .../Res/ui/deviceinfopage/设备用户管理.prefab | 8 +- Assets/Res/ui/homepage/homePage.prefab | 6 +- Assets/Res/ui/homepage/定时任务.prefab | 122 ++++++++--------- Assets/Res/ui/homepage/错误提示.prefab | 4 +- Assets/Res/ui/rankPage/rankPage.prefab | 49 ++++--- Assets/Res/ui/safetylearningpage/题目.prefab | 2 +- Assets/Res/ui/selfpage/selfpage.prefab | 8 +- Assets/Res/ui/selfpage/个人信息页.prefab | 8 +- Assets/Res/ui/selfpage/二维码页面.prefab | 8 +- Assets/Res/ui/videopage/一条视频.prefab | 2 +- Assets/Scenes/MainScene.unity | 1 + Assets/Scripts/Bluetooth/BluetoothManager.cs | 9 +- .../ConnectDevice/ConnectDevicePageCtrl.cs | 2 + Assets/Scripts/UI/Pages/Ranking/RankItem.cs | 10 +- .../Scripts/UI/Pages/SelfPage/SelfInfoPage.cs | 7 +- Assets/Scripts/UI/Pages/SelfPage/SelfPage.cs | 9 +- .../UI/Pages/SelfPage/SelfQrcodePage.cs | 9 +- 23 files changed, 287 insertions(+), 164 deletions(-) create mode 100644 Assets/Res/ui/common/头像遮罩.png create mode 100644 Assets/Res/ui/common/头像遮罩.png.meta rename Assets/Res/ui/{selfpage/Group 111.png => common/默认头像.png} (100%) rename Assets/Res/ui/{selfpage/Group 111.png.meta => common/默认头像.png.meta} (100%) diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json index 288cebe..2abfca9 100644 --- a/Assets/Res/language/language.json +++ b/Assets/Res/language/language.json @@ -37,7 +37,7 @@ { "key": "100008", "zh": "请输入邮箱地址", - "en": "Please enter email address" + "en": "Please enter your email address" }, { "key": "100009", @@ -52,7 +52,7 @@ { "key": "100011", "zh": "同意并继续", - "en": "Agree and continue" + "en": "Agree and Continue" }, { "key": "100012", @@ -62,17 +62,17 @@ { "key": "100013", "zh": "邮件已发送至:", - "en": "Email has been sent: " + "en": "Email sent to:" }, { "key": "100014", "zh": "{0}秒后重新发送验证码", - "en": "Resend in {0} seconds" + "en": "Resend verification code in {0} seconds" }, { "key": "100015", "zh": "重新发送验证码", - "en": "Send again" + "en": "Resend" }, { "key": "100016", @@ -122,7 +122,7 @@ { "key": "100025", "zh": "密码包含6位数字", - "en": "The password contains 6 digits" + "en": "Password must contain 6 digits" }, { "key": "100026", @@ -142,17 +142,17 @@ { "key": "100029", "zh": "复杂密码需同时包含6-16位数字、字母和字符", - "en": "Strong password must be 6-16 characters and include letters,\nnumbers, and symbols" + "en": "Strong password must be 6-16 characters including letters, \nnumbers, and symbols" }, { "key": "100030", "zh": "登录你的\n账号", - "en": "Login to your\nAccount" + "en": "Log in to your\nAccount" }, { "key": "100031", "zh": "没有账号?去注册", - "en": "Don't have an account ? Sign up" + "en": "Don't have an account? Sign up" }, { "key": "100032", @@ -172,22 +172,22 @@ { "key": "100035", "zh": "该邮箱未注册,请先注册账号", - "en": "This email is not registered. Please sign up" + "en": "This email is not registered. Please sign up first." }, { "key": "100036", "zh": "网络连接不稳定,请检查后重试", - "en": "Network is unstable. Please try again" + "en": "Network connection is unstable. Please try again." }, { "key": "100037", "zh": "再次返回退出应用", - "en": "Exit application again" + "en": "Press again to exit the app" }, { "key": "100038", "zh": "登录已过期,请重新登录", - "en": "Login expired. Please login again" + "en": "Login expired. Please sign in again." }, { "key": "100039", @@ -197,7 +197,7 @@ { "key": "100040", "zh": "账号或密码错误,请重试", - "en": "Incorrect username or password. Please try again" + "en": "Incorrect account or password. Please try again." }, { "key": "100041", @@ -212,7 +212,7 @@ { "key": "100043", "zh": "绑定设备", - "en": "Connect a Device" + "en": "Connect Device" }, { "key": "100044", @@ -237,12 +237,12 @@ { "key": "100048", "zh": "我已经完成了安全培训", - "en": "I've completed the safety training" + "en": "I have completed the safety training" }, { "key": "100049", "zh": "安全培训视频", - "en": "Safety training videos" + "en": "Safety Training Videos" }, { "key": "100050", @@ -252,7 +252,7 @@ { "key": "100051", "zh": "我已了解测试说明中的所有注意事项", - "en": "I have read and understood all the instructions and precautions in this guide" + "en": "I have read and understood all the precautions in the instructions" }, { "key": "100052", @@ -292,7 +292,7 @@ { "key": "100059", "zh": "恭喜你完成了所有安全测试问题!", - "en": "Congratulations! You have completed all the safety test questions" + "en": "Congratulations! You have completed all safety test questions!" }, { "key": "100060", @@ -307,27 +307,27 @@ { "key": "100062", "zh": "安全测试资源加载失败,请稍后重试", - "en": "Failed to load the safety test resources. Please try again later" + "en": "Failed to load safety test resources. Please try again later." }, { "key": "100063", "zh": "恭喜你已经学习完了所有视频教程,正确回答完以下15道选择题即可成为合格的使用者。\n答题规则:\n1.回答正确自动跳到下一道题\n2.回答错误会先进行答案解析,并播放相关视频,然后继续答题\n3.接下来的题目还会涉及到已经答过的题目\n4.回答错误的题目会打乱答案顺序继续回答,直至回答正确所有题目才算合格\n例如:第3题错误,原先应该依次出现4~15的题目,出现错误后,接下来1~15的题目都会打乱顺序依次出现,直至能一次性正确回答所有问题\n5.已经回答正确两遍的题目可以不再出现", - "en": "Congratulations! You have completed all the video tutorials. You will become a qualified user once you have answered the following 15 multiple-choice questions correctly.\n\nAnswering rules:\n• A correct answer will automatically advance to the next question.\n• If you answer incorrectly, the answer will be explained, and a related video will be played before you can continue answering thequestion.\n• The following questions will also include those that you have already answered.\n• Answering a question incorrectly will scramble the answer order, and you must continue answering until you answer all questions correctly to pass.\nFor example: If question 3 is answered incorrectly, questions 4 through 15, which were originally supposed to appear sequentially, will appear in a shuffled order after the error, until all questions can be answered correctly in one go.\n• Questions that have already been answered correctly twice will not appear again." + "en": "Congratulations! You have completed all video tutorials. Correctly answer the following 15 multiple-choice questions to become a qualified user.\n\nAnswering rules:\n1. A correct answer will automatically advance to the next question.\n2. An incorrect answer will first show the explanation and play the relevant video, then continue.\n3. Subsequent questions will also include previously answered ones.\n4. Incorrectly answered questions will have their answer order scrambled; you must answer correctly to pass.\nExample: If question 3 is wrong, questions 4-15 that would have appeared in order will now appear in shuffled order until all can be answered correctly in one pass.\n5. Questions answered correctly twice in a row will no longer appear." }, { "key": "100064", "zh": "全屏播放", - "en": "maximized view" + "en": "Full-Screen Playback" }, { "key": "100065", "zh": "扫描二维码", - "en": "Scan the QR Code" + "en": "Scan QR Code" }, { "key": "100066", "zh": "找到设备屏幕二维码,并将其放置在上方摄像头视野范围内。", - "en": "Locate the QR code on the device screen and place it within the camera frame above" + "en": "Locate the QR code on the device screen and place it within the camera frame above." }, { "key": "100067", @@ -342,7 +342,7 @@ { "key": "100069", "zh": "请确保设备的蓝牙已开启,且您就在附近。", - "en": "Please ensure that the device's Bluetooth is turned on and that you are nearby." + "en": "Please ensure the device's Bluetooth is turned on and you are nearby." }, { "key": "100070", @@ -911,17 +911,17 @@ }, { "key": "100183", - "zh": "你好", + "zh": "Hello", "en": "Hello" }, { "key": "100184", - "zh": "再见", + "zh": "Goodbye", "en": "Goodbye" }, { "key": "100185", - "zh": "测试", + "zh": "Test", "en": "Test" }, { diff --git a/Assets/Res/ui/common/头像遮罩.png b/Assets/Res/ui/common/头像遮罩.png new file mode 100644 index 0000000000000000000000000000000000000000..9a9d3b5ec0bdc0d4ba282d93815405b94cc5840c GIT binary patch literal 5243 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 XaevId /// 蓝牙断开后延迟跳回主页 /// @@ -135,7 +135,9 @@ namespace Kill.Bluetooth { IsConnected=false; // 延迟一下确保主页能读到最新的 IsConnected 状态 - StartCoroutine(DelayedGoHome()); + if(needBackHome) + StartCoroutine(DelayedGoHome()); + needBackHome=true; } private System.Collections.IEnumerator DelayedGoHome() @@ -883,8 +885,9 @@ namespace Kill.Bluetooth /// 断开当前连接(带协议通知) /// 先发送0x70断开命令给设备,再断开BLE连接 /// - public void Disconnect() + public void Disconnect(bool backHome=false) { + needBackHome=backHome; if (!IsConnected) { Log("当前没有连接的设备"); diff --git a/Assets/Scripts/UI/Pages/ConnectDevice/ConnectDevicePageCtrl.cs b/Assets/Scripts/UI/Pages/ConnectDevice/ConnectDevicePageCtrl.cs index 136f48b..04ca911 100644 --- a/Assets/Scripts/UI/Pages/ConnectDevice/ConnectDevicePageCtrl.cs +++ b/Assets/Scripts/UI/Pages/ConnectDevice/ConnectDevicePageCtrl.cs @@ -101,7 +101,9 @@ public class ConnectDevicePageCtrl : MonoBehaviour private void ShowErrorPage() { if(BluetoothManager.Instance.IsConnected) + { BluetoothManager.Instance.Disconnect(); + } topBar.SetActive(false); foreach(GameObject g in sonPages) g.gameObject.SetActive(false); diff --git a/Assets/Scripts/UI/Pages/Ranking/RankItem.cs b/Assets/Scripts/UI/Pages/Ranking/RankItem.cs index c8e5f1b..7deed58 100644 --- a/Assets/Scripts/UI/Pages/Ranking/RankItem.cs +++ b/Assets/Scripts/UI/Pages/Ranking/RankItem.cs @@ -13,17 +13,17 @@ namespace Kill.UI.Pages public Text countText; public Image avatar; public Text rankText; + public Sprite normalAvatar; public void SetData(RankData data) { - avatar.gameObject.SetActive(false); + avatar.sprite=normalAvatar; nameText.text = data.nickname; countText.text = data.kill_count.ToString(); - if(string.IsNullOrEmpty(data.avatar)) + if(!string.IsNullOrEmpty(data.avatar)) { - avatar.gameObject.SetActive(false); - } - else NetworkCtrl.Instance.LoadImageToUIImageAsync(data.avatar, avatar); + } + if(rankText!=null) { if(data.rank<=0) diff --git a/Assets/Scripts/UI/Pages/SelfPage/SelfInfoPage.cs b/Assets/Scripts/UI/Pages/SelfPage/SelfInfoPage.cs index 48f651f..bfed2e2 100644 --- a/Assets/Scripts/UI/Pages/SelfPage/SelfInfoPage.cs +++ b/Assets/Scripts/UI/Pages/SelfPage/SelfInfoPage.cs @@ -51,15 +51,10 @@ namespace Kill.UI.Pages // 设置头像 if (userInfo.avatar != null) { - await NetworkCtrl.Instance.LoadImageToUIRawImageAsync(userInfo.avatar, avatarImage); avatarImage.gameObject.SetActive(true); + await NetworkCtrl.Instance.LoadImageToUIRawImageAsync(userInfo.avatar, avatarImage); avatarImage.transform.parent.GetComponent().showMaskGraphic = false; } - else - { - avatarImage.gameObject.SetActive(false); - avatarImage.transform.parent.GetComponent().showMaskGraphic = true; - } } if (nicknameText != null) diff --git a/Assets/Scripts/UI/Pages/SelfPage/SelfPage.cs b/Assets/Scripts/UI/Pages/SelfPage/SelfPage.cs index aafa007..2f97dfb 100644 --- a/Assets/Scripts/UI/Pages/SelfPage/SelfPage.cs +++ b/Assets/Scripts/UI/Pages/SelfPage/SelfPage.cs @@ -68,15 +68,10 @@ namespace Kill.UI.Pages avatarImage.gameObject.SetActive(false); nicknameText.text = userInfo.username; emailText.text = userInfo.email; - if (string.IsNullOrEmpty(userInfo.avatar)) + if (!string.IsNullOrEmpty(userInfo.avatar)) { - avatarImage.gameObject.SetActive(false); - avatarImage.transform.parent.GetComponent().showMaskGraphic=true; - } - else - { - await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage); avatarImage.gameObject.SetActive(true); + await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage); avatarImage.transform.parent.GetComponent().showMaskGraphic=false; } } diff --git a/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs b/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs index 47db3ee..1a0e7d1 100644 --- a/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs +++ b/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs @@ -24,15 +24,10 @@ namespace Kill.UI.Pages emailText.text = userInfo.email; userIdText.text = $"User ID: {userInfo.id}"; qrCodeGenerator.Generate(userInfo.id); - if (string.IsNullOrEmpty(userInfo.avatar)) + if (!string.IsNullOrEmpty(userInfo.avatar)) { - avatarImage.gameObject.SetActive(false); - avatarImage.transform.parent.GetComponent().showMaskGraphic=true; - } - else - { - await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage); avatarImage.gameObject.SetActive(true); + await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage); avatarImage.transform.parent.GetComponent().showMaskGraphic=false; } }