yuqucheng/killapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复wifi设置页返回逻辑与多语言标点问题

Browse Source 
1. 修正多语言文案中的逗号格式问题
2. 新增wifi页面来源参数，根据来源正确处理返回栈
This commit is contained in:
“虞渠成” 2026-07-06 16:31:28 +08:00
parent 9d0287733e
commit 400fdf60a5
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Res/language/language.json
View File

@ -1511,8 +1511,8 @@
}, },
{ {
"key": "100303", "key": "100303",
"zh": "获取到{0}条消杀数据,正在上传，请稍后", "zh": "获取到{0}条消杀数据，正在上传，请稍后",
"en": "Uploading {0} elimination records, please wait..." "en": "Uploading {0} elimination records,please wait..."
} }

3
Assets/Scripts/UI/Pages/DeviceInfoPage/SetWifiPage.cs
View File

@ -19,6 +19,7 @@ namespace Kill.UI.Pages
int comefrom=0; int comefrom=0;
public void Init(Action<string> wifiInfoCallback,int comefrom=0) public void Init(Action<string> wifiInfoCallback,int comefrom=0)
{ {
this.comefrom=comefrom;
callback = wifiInfoCallback; callback = wifiInfoCallback;
UIManager.Instance.RegisterBackAction(Back); UIManager.Instance.RegisterBackAction(Back);
backButton.onClick.RemoveAllListeners(); backButton.onClick.RemoveAllListeners();
@ -38,6 +39,8 @@ namespace Kill.UI.Pages
{ {
if(comefrom==0) if(comefrom==0)
UIManager.Instance.RegisterBackAction(GetComponentInParent<DeviceInfoPage>().Back); UIManager.Instance.RegisterBackAction(GetComponentInParent<DeviceInfoPage>().Back);
else
UIManager.Instance.ClearBackAction();
Destroy(gameObject); Destroy(gameObject);
} }

2
Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
View File

@ -1791,7 +1791,7 @@ namespace Kill.UI.Pages
} }
SetWifiPage wifiPage=Instantiate(setWifiPage, transform); SetWifiPage wifiPage=Instantiate(setWifiPage, transform);
wifiPage.gameObject.SetActive(true); wifiPage.gameObject.SetActive(true);
wifiPage.Init(null); wifiPage.Init(null,1);
} }
} }