bug的修改

2024-12-29 23:34:20 +08:00 · 2024-12-29 23:34:20 +08:00 · bf08d035f0
commit bf08d035f0
parent c8944bbd66
12 changed files with 101 additions and 32 deletions
--- a/meng_yao/Assets/Resources/Prefabs/Prompt.prefab
+++ b/meng_yao/Assets/Resources/Prefabs/Prompt.prefab
@ -153,7 +153,7 @@ MonoBehaviour:
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
    m_LineSpacing: 1
  m_Text: "\u64CD\u4F5C\u4E0D\u5F53\uFF01\uFF01\uFF01"
--- a/meng_yao/Assets/Resources/Prefabs/PromptWhite.prefab
+++ b/meng_yao/Assets/Resources/Prefabs/PromptWhite.prefab
@ -153,7 +153,7 @@ MonoBehaviour:
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
    m_LineSpacing: 1
  m_Text: "\u64CD\u4F5C\u4E0D\u5F53\uFF01\uFF01\uFF01"
--- a/meng_yao/Assets/Scenes/loading.unity
+++ b/meng_yao/Assets/Scenes/loading.unity
@ -1113,7 +1113,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0302e7dfe12577a4198abcaca8c0284b, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  globalFrameRate: 60
+  globalFrameRate: 100
 --- !u!1 &1348751385
 GameObject:
  m_ObjectHideFlags: 0
--- a/meng_yao/Assets/Scenes/scene_Main.unity
+++ b/meng_yao/Assets/Scenes/scene_Main.unity
@ -198566,6 +198566,34 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4694551373019731261, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4694551373019731261, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4694551373019731261, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -604
+      objectReference: {fileID: 0}
+    - target: {fileID: 4986190821057726994, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4986190821057726994, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4986190821057726994, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 61.479187
+      objectReference: {fileID: 0}
+    - target: {fileID: 4986190821057726994, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -775.7396
+      objectReference: {fileID: 0}
    - target: {fileID: 5545311447929385542, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -198582,6 +198610,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: start
+      value: 
+      objectReference: {fileID: 8687261538848957037}
    - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
      propertyPath: ActiveUsers
      value: 
@ -198629,6 +198661,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &8687261538848957037 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 811419366112732501, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+  m_PrefabInstance: {fileID: 8687261538848957033}
+  m_PrefabAsset: {fileID: 0}
 --- !u!222 &8852169993808461439
 CanvasRenderer:
  m_ObjectHideFlags: 0
--- a/meng_yao/Assets/script/scene_Main/DownPanel.cs
+++ b/meng_yao/Assets/script/scene_Main/DownPanel.cs
@ -16,11 +16,18 @@ public class DownPanel : Base
    void Start()
    {
        btns[0].onClick.AddListener(async() => {
-
+            btns[0].enabled = false;
+            Invoke("RecoverBtn",2f);
            await ButtonClickAnimationAsync(btns[0].gameObject);
            GameObject.Instantiate(PanelList[0], canvse.transform).GetComponent<Battle_Selection>()._staminaBar=this._staminaBar;
+
        });
    }

-   
+    void RecoverBtn()
+    {
+        btns[0].enabled = true;
+    }
+
+
 }
--- a/meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs
+++ b/meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs
@ -1,4 +1,4 @@
-using Palmmedia.ReportGenerator.Core.Reporting.Builders;
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
--- a/meng_yao/Assets/script/scene_Main/Tree_team.cs
+++ b/meng_yao/Assets/script/scene_Main/Tree_team.cs
@ -10,7 +10,7 @@ public class Tree_team : MonoBehaviour
    public Text PushNum;//¼äÍÆ
    public Image DirectPushFill;
    public Image PushFill;
-
+    public GameObject start;

    public Text Inviteusername;
    public Text Inviteuserid;
@ -32,11 +32,13 @@ public class Tree_team : MonoBehaviour
        {
            Inviteusername.text = info.Data.inviter.Nickname;
            Inviteuserid.text = info.Data.inviter.Uid;
+            start.gameObject.SetActive(true);
        }
        else
        {
            Inviteusername.text = "";
            Inviteuserid.text ="";
+            start.gameObject.SetActive(false);
        }
        TeamName.text = info.Data.Info.Nickname;
        TeamId.text = info.Data.Info.Uid;
--- a/meng_yao/Assets/script/scene_Main/ui/ModePanel.cs
+++ b/meng_yao/Assets/script/scene_Main/ui/ModePanel.cs
@ -2,7 +2,6 @@ using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.UI;
 using DG.Tweening;
-using static TreeEditor.TreeEditorHelper;



--- a/meng_yao/Assets/script/scene_loading/Logo_in.cs
+++ b/meng_yao/Assets/script/scene_loading/Logo_in.cs
@ -27,6 +27,7 @@ public class Logo_in : mount
    float timer = 0f;

    bool isSecond = true;
+    bool RealName =false;
    public   override void Awake()
    {
        
@ -45,16 +46,27 @@ public class Logo_in : mount

        string token = PlayerPrefs.GetString("UserToken", string.Empty); // 如果没有找到 token，返回空字符串

-
+     
        if (!string.IsNullOrEmpty(token))
        {
            MyGlobal.global.loginResponse.Data.access_token = token;
            bool info = await player.PalyerInfotest();
+
+            Debug.Log("½øÈëµÇÂ¼");
            if (info)
            {
-                Promptmgr.Instance.PromptBubble("登录成功");
-                sceneslider.gameObject.SetActive(true);
-                StartCoroutine(jiaLoading());
+                PlayerIndfo infoss = await loading_Jiekou.PalyerInfos();
+                if (infoss.Data.certify_status != -1)
+                {
+                    Promptmgr.Instance.PromptBubble("µÇÂ¼³É¹¦");
+                    sceneslider.gameObject.SetActive(true);
+                    StartCoroutine(jiaLoading());
+                }
+                else
+                {
+                     Real_name_screen();
+                }
+               
            }
            else
            {
@ -66,7 +78,8 @@ public class Logo_in : mount
        }
        else
        {
-            PlayerPrefs.SetInt("SceneStatus", -1);
+
+         PlayerPrefs.SetInt("SceneStatus", -1);
        sceneslider.gameObject.SetActive(false);
        Privacy_Policy_screen();
        }
@ -147,14 +160,15 @@ public class Logo_in : mount
            {
                if (type == 0) //发送验证码按钮
                {
-                    bool response = await loading_Jiekou.SendCodes(boxTypes[0].content,1);
-                    if (response)
+                    SendCodeResponse response = await loading_Jiekou.SendCodes(boxTypes[0].content,1);
+                    if (response.code ==200)
                    {
-                        Promptmgr.Instance.PromptBubble("发送成功");
+
+                        Promptmgr.Instance.PromptBubble(response.message);
                    }
                    else
                    {
-                        Promptmgr.Instance.PromptBubble("发送失败");
+                        Promptmgr.Instance.PromptBubble(response.message);
                    }
                }
            });
@ -168,9 +182,14 @@ public class Logo_in : mount
                }
                else if (type == 1) //确认注册并登录并进行实名认证
                {
-                        RegisterResponse response = await loading_Jiekou.Registers(boxTypes[0].content, boxTypes[1].content, boxTypes[2].content, boxTypes[3].content);
-                        Promptmgr.Instance.PromptBubble(response.message);
+                     RegisterResponse response = await loading_Jiekou.Registers(boxTypes[0].content, boxTypes[1].content, boxTypes[2].content, boxTypes[3].content);
+                     Debug.Log(response.message);
+                    if (response.code == 200)
+                    { 
+                      Promptmgr.Instance.PromptBubble(response.message);
                        Real_name_screen();
+                    }
+                    Promptmgr.Instance.PromptBubble(response.message);
                }
            });
    }
@ -250,18 +269,18 @@ public class Logo_in : mount
        {
            if (type == 0 &&  isSecond)
            {
-                bool response =await  loading_Jiekou.SendCodes(boxTypes[0].content);
-                if (response)
+                SendCodeResponse response =await  loading_Jiekou.SendCodes(boxTypes[0].content);
+                if (response.code == 200)
                {
                    isSecond = false;
                    Text time = gameObjects[1].transform.Find("ConfirmBtn/Confirmtext").GetComponent<Text>();
                    StartCoroutine(StartCountdown(time, 60f));
-                    Promptmgr.Instance.PromptBubble("发送成功");
+                    Promptmgr.Instance.PromptBubble(response.message);
                }
                else
                {
               
-                    Promptmgr.Instance.PromptBubble("发送失败");
+                    Promptmgr.Instance.PromptBubble(response.message);
                }
            }else
            {
--- a/meng_yao/Assets/script/scene_loading/loading_jiekou.cs
+++ b/meng_yao/Assets/script/scene_loading/loading_jiekou.cs
@ -43,7 +43,7 @@ public class loading_jiekou : MonoBehaviour
          return response;
    }

-    public async Task<bool> SendCodes(string account,int scene=0)//发送验证码
+    public async Task<SendCodeResponse> SendCodes(string account,int scene=0)//发送验证码
    {
        sendCode = new sendCode();
        SendCodeBody sendCodeBody = new SendCodeBody();
--- a/meng_yao/Assets/script/serveTestScript/CaptchaModule/sendCode.cs
+++ b/meng_yao/Assets/script/serveTestScript/CaptchaModule/sendCode.cs
@ -15,7 +15,7 @@ public class sendCode : MonoBehaviour
            { "client-info", "{\"platform\":\"ios\",\"phone_product\":\"apple\",\"phone_model\":\"iPhone_8\",\"system_version\":\"12.0\",\"screen_size\":\"750*1334\",\"device_no\":\"e3e277810fff9d955ebdd7037eff51a8\",\"version\":\"1.0.0\"}" }
        };
    }
-    public async Task<bool> SendCode(SendCodeBody body)
+    public async Task<SendCodeResponse> SendCode(SendCodeBody body)
    {
        //SendCodeBody body = new SendCodeBody();
        //body.account = "13502712157";
@ -26,8 +26,7 @@ public class sendCode : MonoBehaviour
        Debug.Log("·¢ËÍÑéÖ¤Âë" + response);
        SendCodeResponse sendCode = JsonConvert.DeserializeObject<SendCodeResponse>(response);
        myResponse CheckCodeResponse = JsonConvert.DeserializeObject<myResponse>(response);
-        bool isSucceed;
-        if (CheckCodeResponse.code == 200) { isSucceed = true; } else { isSucceed = false; }
-        return isSucceed;
+     
+        return sendCode;
    }
 }
--- a/meng_yao/Assets/script/serveTestScript/UserModule/register.cs
+++ b/meng_yao/Assets/script/serveTestScript/UserModule/register.cs
@ -28,8 +28,14 @@ public class register : MonoBehaviour
        string response = await myWeb.SendRequest(myWeb.URL + "/api/user/register", "POST", JsonConvert.SerializeObject(body), CreateHeadersTologin());
        Debug.Log("×¢²á" + response);
        RegisterResponse register = JsonConvert.DeserializeObject<RegisterResponse>(response);
-        MyGlobal.global.loginResponse.Data.access_token = register.data.token.access_token;
-        Debug.Log("=====zhuce======" + register.data.token.expires_in);
+        if (register.code == 200)
+        {
+            if (register.data.token.access_token != null)
+            { 
+              MyGlobal.global.loginResponse.Data.access_token = register.data.token.access_token;
+            }
+        }
+       // Debug.Log("=====zhuce======" + register.data.token.expires_in);
        return register;
    }
 }