Browse Source

7/24更新

Jees 2 days ago
parent
commit
c2f8c2af90

+ 6 - 2
Assets/Resources/Data/languages.json

@@ -983,8 +983,12 @@
                 "zh-cn": "你不能领养自己的狗。"
                 "zh-cn": "你不能领养自己的狗。"
             },
             },
             "QRcode_cancelled": {
             "QRcode_cancelled": {
-                "en": "The transfer QR code has been cancelled by the sender.",
-                "zh-cn": "传输二维码已经被发送者取消。"
+                "en": "The QR code has been cancelled by the sender.",
+                "zh-cn": "二维码已经被发送者取消。"
+            },
+            "QRcode_invalid": {
+                "en": "The QR code is invalid.",
+                "zh-cn": "二维码无效。"
             }
             }
         }
         }
     },
     },

+ 7 - 7
Assets/Scripts/Develop Script/TestSetup.cs

@@ -62,14 +62,14 @@ public class TestSetup : MonoBehaviour
     {
     {
         if (SceneManager.GetActiveScene().name == "Login")
         if (SceneManager.GetActiveScene().name == "Login")
         {
         {
-            // PlayerPrefs.SetString("LoginToken", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiSlRZTlpQOU8iLCJleHAiOjE3NTY1NDUxNzd9.oQgjY_6ZHJVYaYxh2b_LMIkUaCJ9FX8UpxpHOt_yLg8");
-            // DateTime now = DateTime.Now;
-            // DateTime oneHourAgo = now.AddHours(-1);
-            // PlayerPrefs.SetString("LoginTokenTime", oneHourAgo.ToString());
-            // EnviromentSetting.languageCode = "en";
-            // EnviromentSetting.UUID = "abc";
+            PlayerPrefs.SetString("LoginToken", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiSlRZTlpQOU8iLCJleHAiOjE3NTY1NDUxNzd9.oQgjY_6ZHJVYaYxh2b_LMIkUaCJ9FX8UpxpHOt_yLg8");
+            DateTime now = DateTime.Now;
+            DateTime oneHourAgo = now.AddHours(-1);
+            PlayerPrefs.SetString("LoginTokenTime", oneHourAgo.ToString());
+            EnviromentSetting.languageCode = "en";
+            EnviromentSetting.UUID = "abc";
 
 
-            PlayerPrefs.DeleteAll();
+            // PlayerPrefs.DeleteAll();
         }
         }
 
 
         //Debug.Log("Login token" + PlayerPrefs.GetString("LoginToken"));
         //Debug.Log("Login token" + PlayerPrefs.GetString("LoginToken"));

+ 10 - 4
Assets/Scripts/Login/CreateOrAdopt.cs

@@ -221,29 +221,35 @@ public class CreateOrAdopt : MonoBehaviour
         {
         {
             ClickEvent e = new ClickEvent();
             ClickEvent e = new ClickEvent();
             // 二维码过期
             // 二维码过期
-            if (data["code"].ToString() == "620")
+            if (int.Parse(data["code"].ToString()) == 620)
             {
             {
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "QRcode_expired", EnviromentSetting.languageCode });
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "QRcode_expired", EnviromentSetting.languageCode });
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
             }
             }
             // 超过领养狗的数量上限
             // 超过领养狗的数量上限
-            if (data["code"].ToString() == "621")
+            if (int.Parse(data["code"].ToString()) == 621)
             {
             {
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "dog_limit", EnviromentSetting.languageCode });
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "dog_limit", EnviromentSetting.languageCode });
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
             }
             }
             // 不能接收来自自己的狗
             // 不能接收来自自己的狗
-            if (data["code"].ToString() == "622")
+            if (int.Parse(data["code"].ToString()) == 622)
             {
             {
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "cannot_receive_own_dog", EnviromentSetting.languageCode });
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "cannot_receive_own_dog", EnviromentSetting.languageCode });
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
             }
             }
             // 传输二维码已经被发送者取消
             // 传输二维码已经被发送者取消
-            if (data["code"].ToString() == "623")
+            if (int.Parse(data["code"].ToString()) == 623)
             {
             {
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "QRcode_cancelled", EnviromentSetting.languageCode });
                 string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "QRcode_cancelled", EnviromentSetting.languageCode });
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
                 MessageBoxController.ShowMessage(msg, () => CancelClick(e));
             }
             }
+            // 传输二维码不存在or二维码无效
+            if (int.Parse(data["code"].ToString()) == 624)
+            {
+                string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "QRcode_invalid", EnviromentSetting.languageCode });
+                MessageBoxController.ShowMessage(msg, () => CancelClick(e));
+            }
         }
         }
         else
         else
         {
         {