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

meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab

@@ -31,7 +31,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 11
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -350,7 +350,7 @@ RectTransform:
   - {fileID: 1605100378}
   - {fileID: 1793803558}
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 12
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -408,7 +408,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
---- !u!1 &811419366112732501
+--- !u!1 &732161016814281045
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -416,51 +416,51 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4164755854649893641}
-  - component: {fileID: 5913878687116785999}
-  - component: {fileID: 7977836302241737709}
+  - component: {fileID: 6126919218937586277}
+  - component: {fileID: 2298855426112857716}
+  - component: {fileID: 7746347150304936047}
   m_Layer: 5
-  m_Name: start
+  m_Name: invitestart2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &4164755854649893641
+--- !u!224 &6126919218937586277
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 811419366112732501}
+  m_GameObject: {fileID: 732161016814281045}
   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: 4694551373019731261}
-  m_RootOrder: 7
+  m_RootOrder: 8
   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: -10.3, y: 4.6}
+  m_AnchoredPosition: {x: 8.900024, y: 8}
   m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5913878687116785999
+--- !u!222 &2298855426112857716
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 811419366112732501}
+  m_GameObject: {fileID: 732161016814281045}
   m_CullTransparentMesh: 1
---- !u!114 &7977836302241737709
+--- !u!114 &7746347150304936047
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 811419366112732501}
+  m_GameObject: {fileID: 732161016814281045}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -606,7 +606,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 7
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -768,7 +768,9 @@ RectTransform:
   - {fileID: 3178000799280237318}
   - {fileID: 392821210567316286}
   - {fileID: 543951980213979160}
-  - {fileID: 4164755854649893641}
+  - {fileID: 4961338149058221425}
+  - {fileID: 6126919218937586277}
+  - {fileID: 5425350693352377547}
   m_Father: {fileID: 3440755765570656168}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -891,6 +893,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2071961479749553837
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4961338149058221425}
+  - component: {fileID: 3877346798969490668}
+  - component: {fileID: 5398230435026814923}
+  m_Layer: 5
+  m_Name: invitestart1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4961338149058221425
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2071961479749553837}
+  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: 4694551373019731261}
+  m_RootOrder: 7
+  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: -13, y: 8}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3877346798969490668
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2071961479749553837}
+  m_CullTransparentMesh: 1
+--- !u!114 &5398230435026814923
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2071961479749553837}
+  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: 1}
+  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: 2914682688bf6ac419e37b0a38dafb68, 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 &2516311745646271477
 GameObject:
   m_ObjectHideFlags: 0
@@ -1073,7 +1151,7 @@ RectTransform:
   - {fileID: 3440755767441218821}
   - {fileID: 3440755766716849009}
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 10
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -1243,6 +1321,8 @@ MonoBehaviour:
   TeamCount: {fileID: 3440755766308721002}
   item: {fileID: 4453883187140258689, guid: 9c0a1afc49941d041a7b0a58e553c4ae, type: 3}
   parent: {fileID: 3440755767111519412}
+  searchInput: {fileID: 0}
+  SearchBtn: {fileID: 0}
   itemlist: []
 --- !u!1 &3440755765987815313
 GameObject:
@@ -1275,7 +1355,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 8
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -1435,7 +1515,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -1825,6 +1905,8 @@ RectTransform:
   - {fileID: 3440755766994517444}
   - {fileID: 3440755766186172141}
   - {fileID: 5814038380250757398}
+  - {fileID: 5210575702403465213}
+  - {fileID: 3302765097313059229}
   - {fileID: 3440755767378187976}
   - {fileID: 3440755766308721003}
   - {fileID: 8007219411683506756}
@@ -2144,7 +2226,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 9
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2259,7 +2341,7 @@ RectTransform:
   - {fileID: 4676938936693110530}
   - {fileID: 1239001329}
   m_Father: {fileID: 3440755766777603805}
-  m_RootOrder: 5
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -2783,6 +2865,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5649668343302070044
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3302765097313059229}
+  - component: {fileID: 200643325515504048}
+  - component: {fileID: 2056871831065541549}
+  m_Layer: 5
+  m_Name: start (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3302765097313059229
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5649668343302070044}
+  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: 3440755766777603805}
+  m_RootOrder: 6
+  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: 30.8, y: 116}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &200643325515504048
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5649668343302070044}
+  m_CullTransparentMesh: 1
+--- !u!114 &2056871831065541549
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5649668343302070044}
+  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: 1}
+  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: 2914682688bf6ac419e37b0a38dafb68, 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 &5803808300611534956
 GameObject:
   m_ObjectHideFlags: 0
@@ -3099,6 +3257,158 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9080\u8BF7\u6211\u7684\u4EBA"
+--- !u!1 &6049160320687940483
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5210575702403465213}
+  - component: {fileID: 6757179997792932200}
+  - component: {fileID: 2188734791692763987}
+  m_Layer: 5
+  m_Name: start (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5210575702403465213
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6049160320687940483}
+  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: 3440755766777603805}
+  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: 4.9000244, y: 116}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6757179997792932200
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6049160320687940483}
+  m_CullTransparentMesh: 1
+--- !u!114 &2188734791692763987
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6049160320687940483}
+  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: 1}
+  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: 2914682688bf6ac419e37b0a38dafb68, 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 &6840424875556356993
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5425350693352377547}
+  - component: {fileID: 6152214926364707719}
+  - component: {fileID: 3259169443625296495}
+  m_Layer: 5
+  m_Name: invitestart3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5425350693352377547
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6840424875556356993}
+  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: 4694551373019731261}
+  m_RootOrder: 9
+  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: 34.799927, y: 8}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6152214926364707719
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6840424875556356993}
+  m_CullTransparentMesh: 1
+--- !u!114 &3259169443625296495
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6840424875556356993}
+  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: 1}
+  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: 2914682688bf6ac419e37b0a38dafb68, 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 &7522088576652445957
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Resources/Prefabs/clanNumer_ecotreeteam.prefab

@@ -31,7 +31,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2646303518908567183}
-  m_RootOrder: 5
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -111,7 +111,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2646303518908567183}
-  m_RootOrder: 7
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -276,6 +276,8 @@ RectTransform:
   - {fileID: 5258344228938421904}
   - {fileID: 2912110103177016098}
   - {fileID: 6136470844937187002}
+  - {fileID: 8475485090092594426}
+  - {fileID: 632679168379217601}
   - {fileID: 3350264009428956527}
   - {fileID: 1263834504861912404}
   - {fileID: 2358858416306749021}
@@ -345,6 +347,86 @@ MonoBehaviour:
   RegisterTime: {fileID: 2554716571525085631}
   waterNumber: {fileID: 5673584769543089576}
   headsprite: {fileID: 3775845607762266819}
+  itemstart:
+  - {fileID: 4556036416265401581}
+  - {fileID: 6441282358768533722}
+  - {fileID: 4457598843487757728}
+--- !u!1 &4457598843487757728
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 632679168379217601}
+  - component: {fileID: 6456337694341419227}
+  - component: {fileID: 3463038652462037472}
+  m_Layer: 5
+  m_Name: start (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &632679168379217601
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4457598843487757728}
+  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: 2646303518908567183}
+  m_RootOrder: 6
+  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: 25.199987, y: 46.27}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6456337694341419227
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4457598843487757728}
+  m_CullTransparentMesh: 1
+--- !u!114 &3463038652462037472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4457598843487757728}
+  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: 1}
+  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: 2914682688bf6ac419e37b0a38dafb68, 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 &4556036416265401581
 GameObject:
   m_ObjectHideFlags: 0
@@ -362,7 +444,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6136470844937187002
 RectTransform:
   m_ObjectHideFlags: 0
@@ -452,7 +534,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2646303518908567183}
-  m_RootOrder: 8
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -577,6 +659,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6441282358768533722
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8475485090092594426}
+  - component: {fileID: 3984252410238323478}
+  - component: {fileID: 2730641050467040947}
+  m_Layer: 5
+  m_Name: start (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8475485090092594426
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6441282358768533722}
+  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: 2646303518908567183}
+  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: 6, y: 46.27}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3984252410238323478
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6441282358768533722}
+  m_CullTransparentMesh: 1
+--- !u!114 &2730641050467040947
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6441282358768533722}
+  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: 1}
+  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: 2914682688bf6ac419e37b0a38dafb68, 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 &7324155123832526693
 GameObject:
   m_ObjectHideFlags: 0
@@ -690,7 +848,7 @@ RectTransform:
   - {fileID: 8795671919513725973}
   - {fileID: 4575551597944037606}
   m_Father: {fileID: 2646303518908567183}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}

meng_yao/Assets/script/JumpScene/jinTols.cs

@@ -3,11 +3,17 @@ using System.Collections.Generic;
 using UnityEngine;
 using DG.Tweening;
 using UnityEngine.SceneManagement;
+using System.Threading.Tasks;
 public class jinTols : MonoBehaviour
 {
     public GameObject gotoscene;
     public GameObject nowScene;
-    
+
+    private async void OnEnable()
+    {
+        await Task.Delay(500);
+    }
+
     public void OnMouseDown()
     {
         //SceneManager.LoadScene(JumpScene.cultivation_Jinsha_mine_slices);

meng_yao/Assets/script/scene_Main/Asset_Details.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,6 +13,7 @@ public class Asset_Details : MonoBehaviour
     public Text GiveMoneyText;
     public Text HaveMoneyText;
 
+    public Text time;
 
     public GameObject itemBoxPrefab;
     public GameObject itemBoxPrefabParent;
@@ -68,7 +70,7 @@ public class Asset_Details : MonoBehaviour
         }
 
         // 获取收入列表
-        IcomeList infoIcomeList = await Scene_main_jiekou.instance.GetIncomeList(1, 10, type);
+        IcomeList infoIcomeList = await Scene_main_jiekou.instance.GetIncomeList(1, 99, type);
 
         // Step 1: 排序 statistics 按日期
         List<statistics> sortedStatistics = infoIcomeList.Data.statistics
@@ -142,6 +144,12 @@ public class Asset_Details : MonoBehaviour
         GetMoneyText.text = "￥"+get; 
         GiveMoneyText.text = "￥" + give;
         HaveMoneyText.text = "￥" + have;
+        DateTime currentTime = DateTime.Now;
+
+        // 格式化为 "yyyy.MM" 格式
+        string formattedTime = currentTime.ToString("yyyy.MM");
+        time.text = formattedTime;
+
     }
 
 

meng_yao/Assets/script/scene_Main/ManurePanel.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class ManurePanel : MonoBehaviour
 {
@@ -13,7 +14,9 @@ public class ManurePanel : MonoBehaviour
         {
             if (info.Data.Rewards[i].Show ==1)
             {
+                DropArrays[i].transform.Find("Text").GetComponent<Text>().text = info.Data.Rewards[i].reward+"g";
                 DropArrays[i].gameObject.SetActive(true);
+
             }
         }
 

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 GameObject Invitewaterobj;
     public Text waternumner;
     public Image head;
@@ -19,6 +19,10 @@ public class Tree_team : MonoBehaviour
     public Text Inviteuserid;
     public Text Invitewaternumner;
     public Image Invitehead;
+    public GameObject InviteHeadmusk;
+    public GameObject InviteHeadbk;
+
+
 
     public Text ActiveUsers;
     public Text TeamName;
@@ -30,6 +34,8 @@ public class Tree_team : MonoBehaviour
     public InputField searchInput;
     public Button SearchBtn;
 
+    public List<GameObject> userstart;
+    public List<GameObject> Invitestart;
 
     [HideInInspector]
     public List<GameObject> itemlist=new List<GameObject>();
@@ -45,22 +51,52 @@ public class Tree_team : MonoBehaviour
             Invitehead.sprite = await Scene_main_jiekou.instance.ImageLoaderSprite(info.Data.inviter.avatar_url);
             Invitewaternumner.text =info.Data.inviter.water.ToString();
             Invitewaterobj.gameObject.SetActive(true);
-            start.gameObject.SetActive(true);
+            if (info.Data.inviter.Level == 0)
+            {
+                Invitestart[0].gameObject.SetActive(true);
+            }
+            if (info.Data.inviter.Level == 1)
+            {
+                Invitestart[0].gameObject.SetActive(true);
+                Invitestart[1].gameObject.SetActive(true);
+            }
+            if (info.Data.inviter.Level >= 2)
+            {
+                Invitestart[0].gameObject.SetActive(true);
+                Invitestart[1].gameObject.SetActive(true);
+                Invitestart[2].gameObject.SetActive(true);
+            }
         }
         else
         {
             Inviteusername.text = "";
             Inviteuserid.text ="";
             Invitewaterobj.gameObject.SetActive(false);
-            start.gameObject.SetActive(false);
+            InviteHeadmusk.gameObject.SetActive(false);
+            InviteHeadbk.gameObject.SetActive(false);
         }
         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_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;
+        if (info.Data.Info.Level == 0)
+        {
+            userstart[0].gameObject.SetActive(true);
+        }
+        if (info.Data.Info.Level == 1)
+        {
+            userstart[0].gameObject.SetActive(true);
+            userstart[1].gameObject.SetActive(true);
+        }
+        if (info.Data.Info.Level >= 2)
+        {
+            userstart[0].gameObject.SetActive(true);
+            userstart[1].gameObject.SetActive(true);
+            userstart[2].gameObject.SetActive(true);
+        }
+        DirectPushNum.text = info.Data.Items[0].now_val + "/" + info.Data.Items[0].req_val;
+        DirectPushFill.fillAmount = info.Data.Items[0].Percentage;
+        PushNum.text = info.Data.Items[1].now_val + "/" + info.Data.Items[1].req_val;
+        PushFill.fillAmount = info.Data.Items[1].Percentage;
         head.sprite= await Scene_main_jiekou.instance.ImageLoaderSprite(info.Data.Info.avatar_url);
         Init();
     }
@@ -89,6 +125,22 @@ public class Tree_team : MonoBehaviour
                 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();
                 obj.GetComponent<Tree_team_item>().headsprite.sprite = await Scene_main_jiekou.instance.ImageLoaderSprite(response.Data.List[i].avatar_url);
+
+                if (response.Data.List[i].Level == 0)
+                {
+                    obj.GetComponent<Tree_team_item>().itemstart[0].gameObject.SetActive(true);
+                }
+                if (response.Data.List[i].Level == 1)
+                {
+                    obj.GetComponent<Tree_team_item>().itemstart[0].gameObject.SetActive(true);
+                    obj.GetComponent<Tree_team_item>().itemstart[1].gameObject.SetActive(true);
+                }
+                if (response.Data.List[i].Level == 2)
+                {
+                    obj.GetComponent<Tree_team_item>().itemstart[0].gameObject.SetActive(true);
+                    obj.GetComponent<Tree_team_item>().itemstart[1].gameObject.SetActive(true);
+                    obj.GetComponent<Tree_team_item>().itemstart[2].gameObject.SetActive(true);
+                }
             }
         }
         else
@@ -115,9 +167,27 @@ public class Tree_team : MonoBehaviour
             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();
             obj.GetComponent<Tree_team_item>().headsprite.sprite = await Scene_main_jiekou.instance.ImageLoaderSprite(response.Data.List[i].avatar_url);
+
+            if (response.Data.List[i].Level == 0)
+            {
+                obj.GetComponent<Tree_team_item>().itemstart[0].gameObject.SetActive(true);
+            }
+            if (response.Data.List[i].Level == 1)
+            {
+                obj.GetComponent<Tree_team_item>().itemstart[0].gameObject.SetActive(true);
+                obj.GetComponent<Tree_team_item>().itemstart[1].gameObject.SetActive(true);
+            }
+            if (response.Data.List[i].Level == 2)
+            {
+                obj.GetComponent<Tree_team_item>().itemstart[0].gameObject.SetActive(true);
+                obj.GetComponent<Tree_team_item>().itemstart[1].gameObject.SetActive(true);
+                obj.GetComponent<Tree_team_item>().itemstart[2].gameObject.SetActive(true);
+            }
         }
     }
 
+  
+
     void CleatClick()
     {
         foreach (GameObject ob in itemlist)

meng_yao/Assets/script/scene_Main/Tree_team_item.cs

@@ -13,6 +13,7 @@ public class Tree_team_item : MonoBehaviour
     public Text RegisterTime;
     public Text waterNumber;
     public Image headsprite;
+    public List<GameObject> itemstart;
     void Start()
     {
         

meng_yao/Assets/script/scene_Main/ui/prizeitem.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class prizeitem : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/ui/prizeitem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5ea6810e3aa12e947ad9fe3f99cd0fba
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_Main/ui/treeachievePanel.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class treeachievePanel : MonoBehaviour
+{
+    public GameObject sxcardobj;
+    public Transform sxcardConnact;
+
+    public List<GameObject>prizeobj = new List<GameObject>();
+
+    void Start()
+    {
+        
+    }
+
+  
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/ui/treeachievePanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e3ec4f0605c7ca9489d931578ce868d4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -50,7 +50,7 @@ public class TreeInfoData
 public class TreeInfoReward
 {
     public int Index { get; set; }
-    public string RewardValue { get; set; }
+    public string reward { get; set; }
     public int Show { get; set; }
 }