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 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().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); } }