diff --git a/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab b/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab index e6cc2717..1b71be2c 100644 --- a/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab +++ b/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab @@ -723,82 +723,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1921139585393781969 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6943407587892129304} - - component: {fileID: 568647403688753412} - - component: {fileID: 4375134611120901919} - m_Layer: 5 - m_Name: Image (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6943407587892129304 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1921139585393781969} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3440755765570656168} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &568647403688753412 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1921139585393781969} - m_CullTransparentMesh: 1 ---- !u!114 &4375134611120901919 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1921139585393781969} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.16862746} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1281bf36fe226f44e96bf78085db5f37, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2043866561720012843 GameObject: m_ObjectHideFlags: 0 @@ -1152,7 +1076,6 @@ RectTransform: - {fileID: 4694551373019731261} - {fileID: 4986190821057726994} - {fileID: 3440755767175130427} - - {fileID: 6943407587892129304} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1215,7 +1138,9 @@ MonoBehaviour: PushNum: {fileID: 1793803559} DirectPushFill: {fileID: 3440755767441218820} PushFill: {fileID: 1605100379} - TeammateCount: {fileID: 0} + Inviteusername: {fileID: 0} + Inviteuserid: {fileID: 0} + ActiveUsers: {fileID: 0} TeamName: {fileID: 3440755766994517451} TeamId: {fileID: 3440755766186172140} TeamCount: {fileID: 3440755766308721002} @@ -2493,7 +2418,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_Color: {r: 1, g: 1, b: 1, a: 0.5} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3003,7 +2928,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &543951980213979160 RectTransform: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab b/meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab index bf8e1a5e..824da832 100644 --- a/meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab +++ b/meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab @@ -340,6 +340,8 @@ MonoBehaviour: itemName: {fileID: 4533143387084264790} itemID: {fileID: 1099218842895152054} itemTeamCount: {fileID: 8608755332041465017} + Activecount: {fileID: 3095757104724791354} + RegisterTime: {fileID: 2554716571525085631} --- !u!1 &4556036416265401581 GameObject: m_ObjectHideFlags: 0 @@ -669,7 +671,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1263834504861912404 RectTransform: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/script/TanChuang/GgTanchuang.cs b/meng_yao/Assets/script/TanChuang/GgTanchuang.cs index 5b838e96..13f823ae 100644 --- a/meng_yao/Assets/script/TanChuang/GgTanchuang.cs +++ b/meng_yao/Assets/script/TanChuang/GgTanchuang.cs @@ -48,7 +48,6 @@ public class GgTanchuang : mount n = noticeIndfo.Data.notice.content; } - List boxTypes = new List(); boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 9,widthnum =700,WidthHeight =650 ,content = n }) ; boxTypes.Add(new BoxType { Name = "", prompt = "确认", Type = 11 }); diff --git a/meng_yao/Assets/script/scene_Main/Tree_team.cs b/meng_yao/Assets/script/scene_Main/Tree_team.cs index 3f8232e3..762b2e11 100644 --- a/meng_yao/Assets/script/scene_Main/Tree_team.cs +++ b/meng_yao/Assets/script/scene_Main/Tree_team.cs @@ -12,25 +12,39 @@ public class Tree_team : MonoBehaviour public Image PushFill; - public Text TeammateCount; + public Text Inviteusername; + public Text Inviteuserid; + + public Text ActiveUsers; public Text TeamName; public Text TeamId; public Text TeamCount; public GameObject item; public Transform parent; + [HideInInspector] public List itemlist=new List(); async void OnEnable() { TreeTeam info = await Scene_main_jiekou.instance.TreeTeamDatas(); - TeammateCount.text = info.Data.Info.team_count + "/10"; + ActiveUsers.text ="活跃人数:"+ info.Data.Info.team_active_count.ToString(); + if (info.Data.inviter_show == 1) + { + Inviteusername.text = info.Data.inviter.Nickname; + Inviteuserid.text = info.Data.inviter.Uid; + } + else + { + Inviteusername.text = ""; + Inviteuserid.text =""; + } TeamName.text = info.Data.Info.Nickname; TeamId.text = info.Data.Info.Uid; TeamCount.text = "团队人数:" + info.Data.Info.team_count; - DirectPushNum.text = info.Data.Info.directly_count + "/" + info.Data.Items[0].req_val; - DirectPushFill.fillAmount = info.Data.Items[0].Percentage; - PushNum.text = info.Data.Items[1].now_val + "/" + info.Data.Items[0].req_val; - PushFill.fillAmount = info.Data.Items[1].Percentage; + DirectPushNum.text = info.Data.Info.directly_active_count + "/" + info.Data.Info.directly_count; + DirectPushFill.fillAmount = (float)info.Data.Info.directly_active_count / info.Data.Info.directly_count; + PushNum.text = info.Data.Info.team_active_count + "/" + info.Data.Info.team_count; + PushFill.fillAmount = (float)info.Data.Info.team_active_count/info.Data.Info.team_count; Init(); } @@ -49,7 +63,8 @@ public class Tree_team : MonoBehaviour obj.GetComponent().itemName.text = response.Data.List[i].Nickname; obj.GetComponent().itemID.text ="id:"+ response.Data.List[i].Uid; obj.GetComponent().itemTeamCount.text ="团队人数"+ response.Data.List[i].team_count; - + obj.GetComponent().Activecount.text = "活跃人数" + response.Data.List[i].team_active_count; + obj.GetComponent().RegisterTime.text = response.Data.List[i].CreateTime; } } diff --git a/meng_yao/Assets/script/scene_Main/Tree_team_item.cs b/meng_yao/Assets/script/scene_Main/Tree_team_item.cs index bff05419..3da87cb9 100644 --- a/meng_yao/Assets/script/scene_Main/Tree_team_item.cs +++ b/meng_yao/Assets/script/scene_Main/Tree_team_item.cs @@ -9,7 +9,8 @@ public class Tree_team_item : MonoBehaviour public Text itemName; public Text itemID; public Text itemTeamCount; - + public Text Activecount; + public Text RegisterTime; void Start() { diff --git a/meng_yao/Assets/script/serveTestScript/treeModule/treeFansList.cs b/meng_yao/Assets/script/serveTestScript/treeModule/treeFansList.cs index 787eeac5..e0cce4ea 100644 --- a/meng_yao/Assets/script/serveTestScript/treeModule/treeFansList.cs +++ b/meng_yao/Assets/script/serveTestScript/treeModule/treeFansList.cs @@ -39,6 +39,8 @@ public class TreeFansListData { public TreeFansListPageInfo Pages { get; set; } public List List { get; set; } + + } public class TreeFansListPageInfo diff --git a/meng_yao/Assets/script/serveTestScript/treeModule/treeTeamData.cs b/meng_yao/Assets/script/serveTestScript/treeModule/treeTeamData.cs index c6cde512..79f99a31 100644 --- a/meng_yao/Assets/script/serveTestScript/treeModule/treeTeamData.cs +++ b/meng_yao/Assets/script/serveTestScript/treeModule/treeTeamData.cs @@ -51,6 +51,10 @@ public class TreeTeamData { public TreeTeamInfo Info { get; set; } public List Items { get; set; } + + public int inviter_show { get; set; } + + public inviterInfo inviter { get; set; } } public class TreeTeamInfo @@ -79,4 +83,24 @@ public class TreeTeamItem public int now_val { get; set; } public int req_val { get; set; } public float Percentage { get; set; }//百分比进度 1 = 100% +} + +public class inviterInfo +{ + public string Uid { get; set; } + public string Account { get; set; } + public string Nickname { get; set; } + public string avatar_url { get; set; } + public string invite_code { get; set; } + public int certify_status { get; set; }//实名状态 0:未实名 1:已实名 + 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; } + public int team_active_count { get; set; } + public int directly_active_count { get; set; } + public int Level { get; set; } + public string level_name { get; set; } + public string level_icon { get; set; } + } \ No newline at end of file