bug的修改

meng_yao/Assets/Resources/preform/gui/item_button_1.prefab

@@ -367,7 +367,7 @@ MonoBehaviour:
   iconobj: {fileID: 0}
   iconobj2: {fileID: 0}
   goldNumerobj: {fileID: 0}
-  nametextobj1: {fileID: 0}
+  nametextobj1: {fileID: 8244130570877256807}
   numbertextobj1: {fileID: 0}
   nametextobj2: {fileID: 0}
   numbertextobj2: {fileID: 0}

meng_yao/Assets/Scenes/scene_Main.unity

@@ -5246,7 +5246,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000061035156, y: -175.41699}
+  m_AnchoredPosition: {x: -0.00012207031, y: -175.41699}
   m_SizeDelta: {x: 0.00024414, y: -797.3971}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &59377654
@@ -198548,7 +198548,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3440755767378187977, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3739719649355226224, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMax.y
@@ -198626,6 +198626,10 @@ PrefabInstance:
       propertyPath: Inviteusername
       value: 
       objectReference: {fileID: 8687261538848957035}
+    - target: {fileID: 7522088576652445957, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
 --- !u!114 &8687261538848957034 stripped

meng_yao/Assets/script/Panel/eco_tree/WaterPanel.cs

@@ -99,27 +99,41 @@ public class WaterPanel : MonoBehaviour
            switch (i)
         {
             case 0:
+                Hide_tree();
                 Treelist[0].SetActive(true);
                 break;
             case 1:
+                Hide_tree();
                 Treelist[1].SetActive(true);
                 break;
             case 2:
+                Hide_tree();
                 Treelist[2].SetActive(true);
                 break;
             case 3:
+                Hide_tree();
                 Treelist[3].SetActive(true);
                 break;
             case 4:
+                Hide_tree();
                 Treelist[4].SetActive(true);
                 break;
             default:
+                Hide_tree();
                 Treelist[4].SetActive(true);
                 break;
         }
 
     }
 
+    public void Hide_tree()
+    {
+        Treelist[0].SetActive(false);
+        Treelist[1].SetActive(false);
+        Treelist[2].SetActive(false);
+        Treelist[3].SetActive(false);
+        Treelist[4].SetActive(false);
+    }
 
     public void Updated_water(TreeInfo info)
     {

meng_yao/Assets/script/Scene_jinshadao/BaoshiRoomcontroller.cs

@@ -169,6 +169,7 @@ public class BaoshiRoomcontroller : MonoBehaviour
         //number++;
         //UpdateShipNumberTextPro(number + "/10");
         fishMan = GameObject.Instantiate(fishManPrefab, this.transform);
+        fishManlist.Add(fishMan);
         fishMan.transform.position = startPos.position;
         fishManShipContorl = fishMan.GetComponent<minerControl>();
         fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos);

meng_yao/Assets/script/TanChuang/Lingjiang_Tanchuang.cs

@@ -46,7 +46,7 @@ public class Lingjiang_Tanchuang : mount
         title.text = response.data.config.title;
         balance.text = response.data.config.balance;
         explained.text = response.data.config.explained;
-        if (response.data.accounts.Count != 0)
+        if (response.data.accounts[0].status != 0)
         {
             Debug.Log(response.data.accounts);
             Txbtn.gameObject.SetActive(true);

meng_yao/Assets/script/scene_Main/AssetsPanel.cs

@@ -81,13 +81,12 @@ public class AssetsPanel : MonoBehaviour
     async void UpdateTaxt()
     {
         isUpdating = true;
-
+        CapitalbalanceIndefo CapitalbalanceData = await Scene_main_jiekou.instance.CapitalbalanceInfos();
-        PlayerInfoData _PlayerInfoData = await Scene_main_jiekou.instance.PlayerInfos();
+        Stone.text = CapitalbalanceData.data.gem.ToString();
-        Stone.text = _PlayerInfoData.gem.ToString();
+        Coin.text = CapitalbalanceData.data.gold.ToString();
-        Coin.text = _PlayerInfoData.gold.ToString();
+        Ore.text = CapitalbalanceData.data.water.ToString();
-        Ore.text = _PlayerInfoData.water.ToString();
+        Forging.text = CapitalbalanceData.data.forge.ToString();
-        Forging.text = _PlayerInfoData.forge.ToString();
+        CapitalbalanceData = null;
-        _PlayerInfoData = null;
         // 异步操作完成，标记为未执行
         isUpdating = false;
     }

meng_yao/Assets/script/scene_Main/Tree_team.cs

@@ -64,9 +64,9 @@ public class Tree_team : MonoBehaviour
             obj.transform.position= Vector3.zero;
             obj.GetComponent<Tree_team_item>().itemName.text = response.Data.List[i].Nickname;
             obj.GetComponent<Tree_team_item>().itemID.text ="id:"+ response.Data.List[i].Uid;
-            obj.GetComponent<Tree_team_item>().itemTeamCount.text ="团队人数"+ response.Data.List[i].team_count;
+            obj.GetComponent<Tree_team_item>().itemTeamCount.text ="团队人数:"+ response.Data.List[i].team_count;
-            obj.GetComponent<Tree_team_item>().Activecount.text = "活跃人数" + response.Data.List[i].team_active_count;
+            obj.GetComponent<Tree_team_item>().Activecount.text = "活跃人数:" + response.Data.List[i].team_active_count;
-            obj.GetComponent<Tree_team_item>().RegisterTime.text = response.Data.List[i].CreateTime;
+            obj.GetComponent<Tree_team_item>().RegisterTime.text = "注册时间:"+ response.Data.List[i].create_time;
         }
     }
 

meng_yao/Assets/script/scene_baoshidao/baoshidao_contorl.cs

@@ -124,9 +124,8 @@ public class baoshidao_contorl : MonoBehaviour
 
         if (fishMan != null)
         {
-            Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
+           // Promptmgr.Instance.PromptBubble("已经有船了", Color.black, Color.red);
-            Debug.Log("更新船");
+           // Debug.Log("更新船");
-
             return;
         }
 

meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs

@@ -139,6 +139,7 @@ public class roomcontroller : MonoBehaviour
         }
         musk.gameObject.SetActive(false);
         fishMan = GameObject.Instantiate(fishManPrefab, this.transform);
+        fishManlist.Add(fishMan);
         fishMan.transform.position = startPos.position;
         fishManShipContorl = fishMan.GetComponent<minerControl>();
         fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos);

meng_yao/Assets/script/scene_loading/Logo_in.cs

@@ -27,6 +27,8 @@ public class Logo_in : mount
     float timer = 0f;
 
     bool isSecond = true;
+    bool regiestisSecond = true;
+
     bool RealName =false;
     public   override void Awake()
     {
@@ -150,7 +152,7 @@ public class Logo_in : mount
         boxTypes.Add(new BoxType { Name = "account_number", textName = " 密码", prompt = "请输入密码", Type = 0, is_required = false });
         boxTypes.Add(new BoxType { Name = "account_number", textName = " 邀请码", prompt = "请输入邀请码", Type = 0, is_required = false });
         boxTypes.Add(new BoxType { Name = "verification_code", textName = " 验证码", prompt = "请输入验证码", Type = 1, nametext2 = "发送", is_required = true });
-        boxTypes.Add(new BoxType { Name = "submit", textName = " È¡ÏûÈ·¶¨ ", prompt = "È¡Ïû",Type = 5 });
+        boxTypes.Add(new BoxType { Name = "submit", textName = " 혤句횅땍 ", prompt = "혤句",nametext1 = "鬧꿍", Type = 5 });
         GameObject gameObject = add_pop_up(true);//生成弹窗母体
         List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "注册");//测试输入框回调处理
 
@@ -163,7 +165,9 @@ public class Logo_in : mount
                     SendCodeResponse response = await loading_Jiekou.SendCodes(boxTypes[0].content,1);
                     if (response.code ==200)
                     {
-
+                        regiestisSecond = false;
+                        Text time = gameObjects[3].transform.Find("ConfirmBtn/Confirmtext").GetComponent<Text>();
+                        StartCoroutine(StartCountdown(time, 60f));
                         Promptmgr.Instance.PromptBubble(response.message);
                     }
                     else
@@ -206,7 +210,7 @@ public class Logo_in : mount
             Debug.Log(boxTypes[0].content);
         }
         boxTypes.Add(new BoxType { Name = "verification_code", textName = " 密码", prompt = "密码", prompt2 = "请输入密码",Type = 0,is_required = true });
-        boxTypes.Add(new BoxType { Name = "submit", textName = " È¡ÏûÈ·¶¨ ",prompt = "È¡Ïû",Type = 5 });
+        boxTypes.Add(new BoxType { Name = "submit", textName = " 혤句횅땍 ",prompt = "혤句",nametext1="되쩌",Type = 5 });
         GameObject gameObject = add_pop_up(true); //生成弹窗母体
         List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "登录"); //测试输入框回调处理
         string a = boxTypes[0].content;
@@ -260,7 +264,7 @@ public class Logo_in : mount
         boxTypes.Add(new BoxType { Name = "account_number", textName = " 手机号", prompt = "请输入手机号",Type = 0, is_required = true });
         boxTypes.Add(new BoxType { Name = "verification_code", textName = " 验证码", prompt = "请输入验证码", Type = 1,nametext2 = "发送",is_required = true });
         boxTypes.Add(new BoxType { Name = "sumbit", prompt = "密码登录", Type = 11,is_required = true });
-        boxTypes.Add(new BoxType { Name = "submit", textName = " È¡ÏûÈ·¶¨ ",prompt = "×¢²á", Type = 5 });
+        boxTypes.Add(new BoxType { Name = "submit", textName = " 혤句횅땍 ",prompt = "鬧꿍",nametext1="되쩌", Type = 5 });
         GameObject gameObject = add_pop_up(true);//生成弹窗母体
         List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "登录");//测试输入框回调处理
 
@@ -279,7 +283,6 @@ public class Logo_in : mount
                 }
                 else
                 {
-               
                     Promptmgr.Instance.PromptBubble(response.message);
                 }
             }else
@@ -301,7 +304,6 @@ public class Logo_in : mount
         {
             if (type == 0)//注册
             {
-
                 Register_screen();
                 gameObject.GetComponent<input_box_pop_up_window>().destroy();
             }
@@ -353,6 +355,7 @@ public class Logo_in : mount
             Debug.Log("进入倒计时");
         }
         isSecond = true;
+        regiestisSecond = true;
         textComponent.text = "发送"; // 倒计时结束后更新文本
     }
 

meng_yao/Assets/script/serveTestScript/treeModule/treeFansList.cs

@@ -59,7 +59,7 @@ public class TreeFansListInfo
     public string avatar_url { get; set; }
     public string invite_code { get; set; }
     public int certify_status { get; set; }
-    public string CreateTime { get; set; }
+    public string create_time { get; set; }
     public string last_login_time { get; set; }
     public int team_count { get; set; }
     public int directly_count { get; set; }