From 400fdf60a51e5698add32120f052e77e1f4bd242 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: Mon, 6 Jul 2026 16:31:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dwifi=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E8=BF=94=E5=9B=9E=E9=80=BB=E8=BE=91=E4=B8=8E=E5=A4=9A?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=A0=87=E7=82=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修正多语言文案中的逗号格式问题
2. 新增wifi页面来源参数，根据来源正确处理返回栈
---
 Assets/Res/language/language.json                     | 4 ++--
 Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs | 3 +++
 Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json
index c140024..b31d0c5 100644
--- a/Assets/Res/language/language.json
+++ b/Assets/Res/language/language.json
@@ -1511,8 +1511,8 @@
   },
   {
     "key": "100303",
-    "zh": "获取到{0}条消杀数据,正在上传，请稍后",
-    "en": "Uploading {0} elimination records, please wait..."
+    "zh": "获取到{0}条消杀数据，正在上传，请稍后",
+    "en": "Uploading {0} elimination records,please wait..."
   }
 
 
diff --git a/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs b/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs
index d052d81..e9604d6 100644
--- a/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs
+++ b/Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs
@@ -19,6 +19,7 @@ namespace Kill.UI.Pages
         int comefrom=0;
         public void Init(Action<string> wifiInfoCallback,int comefrom=0)
         {
+            this.comefrom=comefrom;
             callback = wifiInfoCallback;
             UIManager.Instance.RegisterBackAction(Back);
             backButton.onClick.RemoveAllListeners();
@@ -38,6 +39,8 @@ namespace Kill.UI.Pages
         {
             if(comefrom==0)
                 UIManager.Instance.RegisterBackAction(GetComponentInParent<DeviceInfoPage>().Back);
+            else
+                UIManager.Instance.ClearBackAction();
             Destroy(gameObject);
         }
 
diff --git a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
index 6122b85..1720576 100644
--- a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
+++ b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
@@ -1791,7 +1791,7 @@ namespace Kill.UI.Pages
             }
             SetWifiPage wifiPage=Instantiate(setWifiPage, transform);
             wifiPage.gameObject.SetActive(true);
-            wifiPage.Init(null);
+            wifiPage.Init(null,1);
         }
 
     }