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

meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab

@@ -342,6 +342,7 @@ MonoBehaviour:
   itemTeamCount: {fileID: 8608755332041465017}
   Activecount: {fileID: 3095757104724791354}
   RegisterTime: {fileID: 2554716571525085631}
+  waterNumber: {fileID: 5673584769543089576}
 --- !u!1 &4556036416265401581
 GameObject:
   m_ObjectHideFlags: 0
@@ -671,7 +672,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1263834504861912404
 RectTransform:
   m_ObjectHideFlags: 0

meng_yao/Assets/Scenes/scene_Main.unity

@@ -85533,6 +85533,7 @@ MonoBehaviour:
   petExpFill: {fileID: 7550977464679505027}
   feedBtn: {fileID: 1477323885672320044}
   Pet: {fileID: 7550977465179483479}
+  PlaceOfBirthtext: {fileID: 1477323885143245122}
 --- !u!1 &994655074
 GameObject:
   m_ObjectHideFlags: 0
@@ -149831,6 +149832,7 @@ MonoBehaviour:
   ReviseBtn: {fileID: 999265802}
   NameText: {fileID: 852761426}
   IdText: {fileID: 1380548575}
+  island: {fileID: 1852295288}
   headTanchuang: {fileID: 136090572}
 --- !u!1 &1744156003
 GameObject:
@@ -198618,6 +198620,10 @@ PrefabInstance:
       propertyPath: ActiveUsers
       value: 
       objectReference: {fileID: 8687261538848957036}
+    - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: waternumner
+      value: 
+      objectReference: {fileID: 8687261538848957040}
     - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: Inviteuserid
       value: 
@@ -198626,6 +198632,14 @@ PrefabInstance:
       propertyPath: Inviteusername
       value: 
       objectReference: {fileID: 8687261538848957035}
+    - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: Invitewaterobj
+      value: 
+      objectReference: {fileID: 8687261538848957039}
+    - target: {fileID: 6291352156879861188, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: Invitewaternumner
+      value: 
+      objectReference: {fileID: 8687261538848957038}
     - target: {fileID: 7522088576652445957, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_IsActive
       value: 1
@@ -198670,6 +198684,33 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 811419366112732501, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
   m_PrefabInstance: {fileID: 8687261538848957033}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8687261538848957038 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 570513023715921022, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+  m_PrefabInstance: {fileID: 8687261538848957033}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &8687261538848957039 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7522088576652445957, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+  m_PrefabInstance: {fileID: 8687261538848957033}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8687261538848957040 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1239001330, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+  m_PrefabInstance: {fileID: 8687261538848957033}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!222 &8852169993808461439
 CanvasRenderer:
   m_ObjectHideFlags: 0

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

@@ -39,6 +39,7 @@ public class WaterPanel : MonoBehaviour
     public Button feedBtn;
     public GameObject Pet;
 
+    public Text PlaceOfBirthtext;
     private void OnEnable()
     {
         DateTime currentTime = DateTime.Now;
@@ -68,6 +69,8 @@ public class WaterPanel : MonoBehaviour
         Updated_water(info);
         petBettleInfoResponse petinfo = await Scene_main_jiekou.instance.getPetBettleInfos();
         Updated_petinfo(petinfo);
+        PlayerInfoData playerinfo = await Scene_main_jiekou.instance.PlayerInfos();
+        PlaceOfBirthtext.text = playerinfo.island_name;
     }
 
     public void Updated_interface(TreeInfo info)

meng_yao/Assets/script/scene_Main/ReviseName.cs

@@ -9,6 +9,7 @@ public class ReviseName : mount
     public Button ReviseBtn;
     public Text NameText;
     public Text IdText;
+    public Text island;
 
     public GameObject headTanchuang;
     // Start is called before the first frame update
@@ -61,6 +62,7 @@ public class ReviseName : mount
         PlayerInfoData info = await Scene_main_jiekou.instance.PlayerInfos();
         this.NameText.text = info.nickname.ToString();
         this.IdText.text = info.uid.ToString();
+        island.text = "出生地："+info.island_name;
         this.gameObject.SetActive(true);
     }
 }

meng_yao/Assets/script/scene_Main/Tree_team.cs

@@ -11,9 +11,12 @@ public class Tree_team : MonoBehaviour
     public Image DirectPushFill;
     public Image PushFill;
     public GameObject start;
+    public GameObject Invitewaterobj;
+    public Text waternumner;
 
     public Text Inviteusername;
     public Text Inviteuserid;
+    public Text Invitewaternumner;
 
     public Text ActiveUsers;
     public Text TeamName;
@@ -28,16 +31,20 @@ public class Tree_team : MonoBehaviour
     {
         TreeTeam info = await Scene_main_jiekou.instance.TreeTeamDatas();
         ActiveUsers.text ="活跃人数:"+ info.Data.Info.team_active_count.ToString();
+        waternumner.text = info.Data.Info.water.ToString();
         if (info.Data.inviter_show == 1)
         {
             Inviteusername.text = info.Data.inviter.Nickname;
             Inviteuserid.text = info.Data.inviter.Uid;
+            Invitewaternumner.text =info.Data.inviter.water.ToString();
+            Invitewaterobj.gameObject.SetActive(true);
             start.gameObject.SetActive(true);
         }
         else
         {
             Inviteusername.text = "";
             Inviteuserid.text ="";
+            Invitewaterobj.gameObject.SetActive(false);
             start.gameObject.SetActive(false);
         }
         TeamName.text = info.Data.Info.Nickname;
@@ -67,6 +74,7 @@ public class Tree_team : MonoBehaviour
             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>().RegisterTime.text = "注册时间:"+ response.Data.List[i].create_time;
+            obj.GetComponent<Tree_team_item>().waterNumber.text = response.Data.List[i].water.ToString();
         }
     }
 

meng_yao/Assets/script/scene_Main/Tree_team_item.cs

@@ -11,6 +11,8 @@ public class Tree_team_item : MonoBehaviour
     public Text itemTeamCount;
     public Text Activecount;
     public Text RegisterTime;
+    public Text waterNumber;
+
     void Start()
     {
         

meng_yao/Assets/script/serveTestScript/UserModule/playerInfo.cs

@@ -59,8 +59,9 @@ public class PlayerInfoData
     public int certify_status;
     public string certify_name;
     public string identity_card_no;
-    public string location;
+    public string island_name;
-    public int location_status;
+    //public string location;
+    //public int location_status;
     public long gem;
     public long gold;
     public long forge;

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

@@ -61,6 +61,8 @@ public class TreeFansListInfo
     public int certify_status { get; set; }
     public string create_time { get; set; }
     public string last_login_time { get; set; }
+
+    public float water { get; set; }
     public int team_count { get; set; }
     public int directly_count { get; set; }
     public int team_active_count { get; set; }

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

@@ -67,6 +67,8 @@ public class TreeTeamInfo
     public int certify_status { get; set; }//实名状态 0:未实名 1:已实名
     public string create_time { get; set; }
     public string last_login_time { get; set; }
+
+    public float water { get; set; }
     public int team_count { get; set; }
     public int directly_count { get; set; }
     public int team_active_count { get; set; }
@@ -95,6 +97,8 @@ public class inviterInfo
     public int certify_status { get; set; }//实名状态 0:未实名 1:已实名
     public string create_time { get; set; }
     public string last_login_time { get; set; }
+
+    public float water { get; set; }
     public int team_count { get; set; }
     public int directly_count { get; set; }
     public int team_active_count { get; set; }