Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab

@@ -255,6 +255,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0960890c95df374a810b41f209b68b1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  itemName: {fileID: 4533143387084264790}
+  itemID: {fileID: 1099218842895152054}
+  itemTeamCount: {fileID: 8608755332041465017}
 --- !u!1 &4556036416265401581
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Scenes/scene_Main.unity

@@ -162395,15 +162395,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1070
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 1005
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 531.5
       objectReference: {fileID: 0}
     - target: {fileID: 4676938936693110530, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_SizeDelta.x

meng_yao/Assets/script/scene_Main/Tree_team.cs

@@ -19,14 +19,20 @@ public class Tree_team : MonoBehaviour
         TeamName.text = info.Data.Info.Nickname;
         TeamId.text = info.Data.Info.Uid;
         TeamCount.text = "团队人数:"+info.Data.Info.TeamCount;
-        Init(info);
+        Init();
     }
 
-    void Init(TreeTeam team)
-    { 
-       for(int i=0;i< team.Data.Info.TeamCount; i++)
+    async void Init()
+    {
+        TreeFansListResponse response = await Scene_main_jiekou.instance.TreeFansListS();
+        Debug.Log(response);
+
+       for (int i=0;i< response.Data.Pages.TotalCount; i++)
         {
             GameObject obj = GameObject.Instantiate(item,parent);
+            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].TeamCount;
 
         }
     }