From b563233d2f12d97bb51ef3093a2e7982beb8e01a Mon Sep 17 00:00:00 2001
From: liuliang <597380732@qq.com>
Date: Fri, 20 Dec 2024 21:03:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B0=B4=E6=BB=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meng_yao/Assets/Scenes/scene_Main.unity       | 518 ++++++++++--------
 .../Assets/script/scene_Main/ManurePanel.cs   |  27 +
 .../script/scene_Main/ManurePanel.cs.meta     |  11 +
 .../Assets/script/scene_Main/Tree_team.cs     |   1 +
 .../Assets/script/scene_Main/WaterDrop.cs     |  45 +-
 5 files changed, 361 insertions(+), 241 deletions(-)
 create mode 100644 meng_yao/Assets/script/scene_Main/ManurePanel.cs
 create mode 100644 meng_yao/Assets/script/scene_Main/ManurePanel.cs.meta

diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity
index 8494121d6..b5ba214cb 100644
--- a/meng_yao/Assets/Scenes/scene_Main.unity
+++ b/meng_yao/Assets/Scenes/scene_Main.unity
@@ -26695,83 +26695,83 @@ PrefabInstance:
       objectReference: {fileID: 1743557964}
     - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2112356529, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -530
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 284
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005861961296864, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -134
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 428
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862092927511, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -43
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 284
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862566341466, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -43
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 140
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862583204628, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -43
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862614175136, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_IsActive
@@ -26779,35 +26779,35 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 428
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005862934533551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -43
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 140
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1745005863352503744, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -43
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2186939255280341675, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -26903,419 +26903,419 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 313.16
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592472604161, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592563063319, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -370
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 106.99179
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592582767272, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592610347646, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 16
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592645564356, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592737030264, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 49.333332
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592788503291, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 82.666664
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592791725621, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 16
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592795155832, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 16
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360592853690225, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 790.55896
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593140457125, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593186653855, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -530
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593285734026, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 82.666664
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593425406784, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 16
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593491066409, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 557.86066
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593513166655, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -57
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 576.32
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593518217985, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 16
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593588897738, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 16
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593609606336, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593660999834, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 57
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593689822042, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -57
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 49.333332
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 448.77536
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593804744475, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593911696199, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360593930733148, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 390.9071
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594066920930, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -57
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594115621021, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: boundaryRect
@@ -27323,131 +27323,131 @@ PrefabInstance:
       objectReference: {fileID: 599549935}
     - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594142010806, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 223.95355
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594209581039, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -57
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 49.333332
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594274763711, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 49.75
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594277765519, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -370
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 49.333332
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594375218644, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 82.666664
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594499795596, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 82.666664
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3011360594507023531, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -85
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4905329732822886045, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: PersonID
@@ -31916,7 +31916,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &426100837
 Transform:
   m_ObjectHideFlags: 0
@@ -41254,9 +41254,9 @@ RectTransform:
   m_Father: {fileID: 1477323886473665161}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 74, y: -496.75}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &555829219
@@ -83767,83 +83767,83 @@ PrefabInstance:
       objectReference: {fileID: 1607805909}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -109
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 266.89
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -109
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 483.78
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -109
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 700.67
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -109
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 917.56
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -109
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502976399296, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_IsActive
@@ -108385,19 +108385,19 @@ PrefabInstance:
       objectReference: {fileID: 426100836}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 50
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502042200660, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -109
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502376877128, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_IsActive
@@ -108405,51 +108405,51 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 266.89
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502443881119, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -109
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 483.78
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502666870844, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -109
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 700.67
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502728653940, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -109
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502826152887, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_IsActive
@@ -108461,19 +108461,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 917.56
       objectReference: {fileID: 0}
     - target: {fileID: 2278414502908617433, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -109
       objectReference: {fileID: 0}
     - target: {fileID: 2278414503729634016, guid: 51fb8da1c1df4d14585a5f5bb1a088b7, type: 3}
       propertyPath: m_IsActive
@@ -115464,7 +115464,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1607805910
 Transform:
   m_ObjectHideFlags: 0
@@ -121163,9 +121163,9 @@ RectTransform:
   m_Father: {fileID: 1477323885727800918}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 74, y: -355.4}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1684710737
@@ -156268,6 +156268,7 @@ MonoBehaviour:
   DropBtn: {fileID: 0}
   targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 6
 --- !u!114 &924268791607708460
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -156283,6 +156284,7 @@ MonoBehaviour:
   DropBtn: {fileID: 0}
   targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 4
 --- !u!114 &924268792840249349
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -156298,6 +156300,7 @@ MonoBehaviour:
   DropBtn: {fileID: 0}
   targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 2
 --- !u!114 &1066468052626369803
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -157349,6 +157352,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1477323885218741137}
+  - component: {fileID: 1477323885218741138}
   m_Layer: 5
   m_Name: ManurePanel
   m_TagString: Untagged
@@ -157384,6 +157388,27 @@ RectTransform:
   m_AnchoredPosition: {x: -0.5, y: 2.0100098}
   m_SizeDelta: {x: -1, y: 4.019989}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1477323885218741138
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1477323885218741136}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f03d12340aff50a429546bc27002ff44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DropArrays:
+  - {fileID: 1206199082452696326}
+  - {fileID: 744146547634647184}
+  - {fileID: 7687579132756152348}
+  - {fileID: 744146548872551353}
+  - {fileID: 8115502124296646205}
+  - {fileID: 744146548398372042}
+  - {fileID: 4883130753928690580}
+  - {fileID: 6274686225547590652}
 --- !u!1 &1477323885272221126
 GameObject:
   m_ObjectHideFlags: 0
@@ -157581,9 +157606,9 @@ RectTransform:
   m_Father: {fileID: 1477323886473665161}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 74, y: -208.25}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1477323885311605773
@@ -158466,9 +158491,9 @@ RectTransform:
   m_Father: {fileID: 1477323885727800918}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 74, y: -209.7}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1477323885819143781
@@ -159641,9 +159666,9 @@ RectTransform:
   m_Father: {fileID: 1477323885727800918}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 74, y: -64}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1477323886531312264
@@ -159679,9 +159704,9 @@ RectTransform:
   m_Father: {fileID: 1477323886473665161}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 74, y: -352.5}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1477323886569317696
@@ -160639,8 +160664,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DropBtn: {fileID: 0}
-  targetPosition: {fileID: 0}
+  targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 1
 --- !u!224 &1635682451688820537
 RectTransform:
   m_ObjectHideFlags: 0
@@ -160658,9 +160684,9 @@ RectTransform:
   m_Father: {fileID: 1477323886473665161}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 74, y: -64}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &1682967232464333744
@@ -164297,8 +164323,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DropBtn: {fileID: 0}
-  targetPosition: {fileID: 0}
+  targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 7
 --- !u!1 &5030294901345889888
 GameObject:
   m_ObjectHideFlags: 0
@@ -164535,8 +164562,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DropBtn: {fileID: 0}
-  targetPosition: {fileID: 0}
+  targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 8
 --- !u!1 &5886320606151238136
 GameObject:
   m_ObjectHideFlags: 0
@@ -165797,8 +165825,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DropBtn: {fileID: 0}
-  targetPosition: {fileID: 0}
+  targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 3
 --- !u!222 &7864017317208561165
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -166118,8 +166147,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DropBtn: {fileID: 0}
-  targetPosition: {fileID: 0}
+  targetPosition: {fileID: 1477323885343120432}
   flyDuration: 1
+  id: 5
 --- !u!114 &8533826443837745445
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -166351,6 +166381,22 @@ PrefabInstance:
       propertyPath: m_Text
       value: "\u76F4\u63A8\u4EBA\u6570"
       objectReference: {fileID: 0}
+    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1294
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 647
+      objectReference: {fileID: 0}
     - target: {fileID: 3440755766773818894, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -200
@@ -166379,6 +166425,14 @@ PrefabInstance:
       propertyPath: m_ChildAlignment
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3440755767111519418, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_VerticalFit
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767111519418, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_HorizontalFit
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 3440755767441218820, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_Type
       value: 3
diff --git a/meng_yao/Assets/script/scene_Main/ManurePanel.cs b/meng_yao/Assets/script/scene_Main/ManurePanel.cs
new file mode 100644
index 000000000..6f87ff444
--- /dev/null
+++ b/meng_yao/Assets/script/scene_Main/ManurePanel.cs
@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ManurePanel : MonoBehaviour
+{
+    public GameObject[] DropArrays;
+
+ async   void Start()
+    {
+        TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
+        for (int i = 0; i < info.Data.Rewards.Count; i++)
+        {
+            if (info.Data.Rewards[i].Show ==0)
+            {
+                DropArrays[i].gameObject.SetActive(false);
+            }
+        }
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
diff --git a/meng_yao/Assets/script/scene_Main/ManurePanel.cs.meta b/meng_yao/Assets/script/scene_Main/ManurePanel.cs.meta
new file mode 100644
index 000000000..d32a301f4
--- /dev/null
+++ b/meng_yao/Assets/script/scene_Main/ManurePanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f03d12340aff50a429546bc27002ff44
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/meng_yao/Assets/script/scene_Main/Tree_team.cs b/meng_yao/Assets/script/scene_Main/Tree_team.cs
index f33f35d12..f29439331 100644
--- a/meng_yao/Assets/script/scene_Main/Tree_team.cs
+++ b/meng_yao/Assets/script/scene_Main/Tree_team.cs
@@ -41,6 +41,7 @@ public class Tree_team : MonoBehaviour
        for (int i=0;i< response.Data.Pages.total_count; i++)
         {
             GameObject obj = GameObject.Instantiate(item,parent);
+            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;
diff --git a/meng_yao/Assets/script/scene_Main/WaterDrop.cs b/meng_yao/Assets/script/scene_Main/WaterDrop.cs
index 671de2b8e..5a6eed907 100644
--- a/meng_yao/Assets/script/scene_Main/WaterDrop.cs
+++ b/meng_yao/Assets/script/scene_Main/WaterDrop.cs
@@ -10,31 +10,58 @@ public class WaterDrop : MonoBehaviour
     public Transform targetPosition; // 目标位置
     public float flyDuration = 1f;   // 飞行持续时间
     public int id;
-
+    string trans_id;
 
     void Start()
     {
-        DropBtn =GetComponent<Button>();
+        DropBtn = GetComponent<Button>();
+
         DropBtn.onClick.AddListener(DropClick);
     }
 
     async void DropClick()
     {
-        bool succefful = await Scene_main_jiekou.instance.TreeGetWaters(id, "string");
+        trans_id = GenerateRandomString(6);
+        bool succefful = await Scene_main_jiekou.instance.TreeGetWaters(id, trans_id);
 
         if (succefful)
         {
+            TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
+
             transform.DOMove(targetPosition.position, flyDuration)
-                .OnComplete(() =>
-                    Destroy(this.gameObject)
-                );
+                .OnComplete(async () => {
+
+                    WaterPanel.instance.Updated_water(info);
+                    Destroy(this.gameObject);
+                });
+
+
         }
-       
-     
+        else
+        {
+
+        }
+
+
     }
+
+    public string GenerateRandomString(int length)
+    {
+        System.Random random = new System.Random(); // 创建一个新的随机数生成器
+        const string chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; // 可用字符
+        char[] stringChars = new char[length]; // 用来存储生成的字符
+
+        for (int i = 0; i < length; i++)
+        {
+            stringChars[i] = chars[random.Next(chars.Length)]; // 随机选择一个字符
+        }
+
+        return new string(stringChars); // 将字符数组转换为字符串
+    }
+
     // Update is called once per frame
     void Update()
     {
-        
+
     }
 }

From 593a412bcab331a347b860e3514609ebdb02950c Mon Sep 17 00:00:00 2001
From: liuliang <597380732@qq.com>
Date: Fri, 20 Dec 2024 21:13:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=A2=E9=98=9Fbug=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/Prefabs/Eco_tree_team.prefab    | 508 +++++++++++-
 meng_yao/Assets/Scenes/scene_Main.unity       | 745 +-----------------
 2 files changed, 514 insertions(+), 739 deletions(-)

diff --git a/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab b/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab
index 68000fd80..7c69fe427 100644
--- a/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab
+++ b/meng_yao/Assets/Resources/Prefabs/Eco_tree_team.prefab
@@ -1,5 +1,413 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &151667937
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 151667938}
+  - component: {fileID: 151667940}
+  - component: {fileID: 151667939}
+  m_Layer: 5
+  m_Name: PushNumer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &151667938
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 151667937}
+  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: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 181, y: -104}
+  m_SizeDelta: {x: 221.08832, y: 67.53931}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &151667940
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 151667937}
+  m_CullTransparentMesh: 1
+--- !u!114 &151667939
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 151667937}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u95F4\u63A8\u4EBA\u6570"
+--- !u!1 &1239001328
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1239001329}
+  - component: {fileID: 1239001331}
+  - component: {fileID: 1239001330}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1239001329
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1239001328}
+  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: 3440755767378187976}
+  m_RootOrder: 1
+  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: 33.8608, y: -0.0805}
+  m_SizeDelta: {x: 110.2787, y: 34.2443}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1239001331
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1239001328}
+  m_CullTransparentMesh: 1
+--- !u!114 &1239001330
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1239001328}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 999
+--- !u!1 &1605100377
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1605100378}
+  - component: {fileID: 1605100380}
+  - component: {fileID: 1605100379}
+  m_Layer: 5
+  m_Name: PushFill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1605100378
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605100377}
+  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: 1959425528}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -8.1117, y: 0}
+  m_SizeDelta: {x: 179.921, y: -4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1605100380
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605100377}
+  m_CullTransparentMesh: 1
+--- !u!114 &1605100379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605100377}
+  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: a3dd8cd033839dd45b97947b59d59c47, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1793803557
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1793803558}
+  - component: {fileID: 1793803560}
+  - component: {fileID: 1793803559}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1793803558
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1793803557}
+  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: 1959425528}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 16}
+  m_SizeDelta: {x: -534, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1793803560
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1793803557}
+  m_CullTransparentMesh: 1
+--- !u!114 &1793803559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1793803557}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9811321, g: 0.9811321, b: 0.9811321, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 20/100
+--- !u!1 &1959425527
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1959425528}
+  - component: {fileID: 1959425531}
+  - component: {fileID: 1959425530}
+  - component: {fileID: 1959425529}
+  m_Layer: 5
+  m_Name: PushTiao
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1959425528
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959425527}
+  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:
+  - {fileID: 1605100378}
+  - {fileID: 1793803558}
+  m_Father: {fileID: 3440755766777603805}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 119.56641, y: -109}
+  m_SizeDelta: {x: -378.8672, y: 32}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1959425531
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959425527}
+  m_CullTransparentMesh: 1
+--- !u!114 &1959425530
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959425527}
+  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: 705fcc4638dd2e54fb3eb11f58ffcffa, 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!114 &1959425529
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959425527}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &1342525991856669873
 GameObject:
   m_ObjectHideFlags: 0
@@ -87,6 +495,7 @@ GameObject:
   - component: {fileID: 3440755765421972194}
   - component: {fileID: 3440755765421972192}
   - component: {fileID: 3440755765421972193}
+  - component: {fileID: 8687261538848957038}
   m_Layer: 5
   m_Name: jinbitiao
   m_TagString: Untagged
@@ -113,7 +522,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 119.56641, y: 0}
+  m_AnchoredPosition: {x: 119.56641, y: -31}
   m_SizeDelta: {x: -378.8672, y: 32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3440755765421972192
@@ -154,6 +563,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8687261538848957038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3440755765421972195}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &3440755765570656169
 GameObject:
   m_ObjectHideFlags: 0
@@ -165,6 +587,7 @@ GameObject:
   - component: {fileID: 3440755765570656168}
   - component: {fileID: 3440755765570656174}
   - component: {fileID: 3440755765570656175}
+  - component: {fileID: 6291352156879861188}
   m_Layer: 5
   m_Name: Eco_tree_team
   m_TagString: Untagged
@@ -179,7 +602,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3440755765570656169}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -234,6 +657,28 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6291352156879861188
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3440755765570656169}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a2d1ccd10c3613b408e333e0b49333ce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DirectPushNum: {fileID: 3440755766716849008}
+  PushNum: {fileID: 1793803559}
+  DirectPushFill: {fileID: 3440755767441218820}
+  PushFill: {fileID: 1605100379}
+  TeammateCount: {fileID: 3440755766087238670}
+  TeamName: {fileID: 3440755766994517451}
+  TeamId: {fileID: 3440755766186172140}
+  TeamCount: {fileID: 3440755766308721002}
+  item: {fileID: 4453883187140258689, guid: 9c0a1afc49941d041a7b0a58e553c4ae, type: 3}
+  parent: {fileID: 3440755767111519412}
 --- !u!1 &3440755765987815313
 GameObject:
   m_ObjectHideFlags: 0
@@ -269,7 +714,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 181, y: 0}
+  m_AnchoredPosition: {x: 181, y: -31}
   m_SizeDelta: {x: 221.08832, y: 67.53931}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3440755765987815318
@@ -313,7 +758,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u56E2\u961F\u4F7F\u7528\u91D1\u5E01"
+  m_Text: "\u76F4\u63A8\u4EBA\u6570"
 --- !u!1 &3440755766087238664
 GameObject:
   m_ObjectHideFlags: 0
@@ -775,10 +1220,10 @@ RectTransform:
   m_Father: {fileID: 3440755766479410396}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -17, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 647}
+  m_SizeDelta: {x: 0, y: 1294}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3440755766577965690
 CanvasRenderer:
@@ -976,6 +1421,8 @@ RectTransform:
   - {fileID: 3440755765987815312}
   - {fileID: 3440755767162293360}
   - {fileID: 3440755765421972194}
+  - {fileID: 151667938}
+  - {fileID: 1959425528}
   m_Father: {fileID: 3440755765570656168}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1213,7 +1660,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 531.5, y: 0}
+  m_AnchoredPosition: {x: 540, y: -0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &3440755767111519418
@@ -1229,7 +1676,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 1
-  m_VerticalFit: 1
+  m_VerticalFit: 2
 --- !u!114 &3440755767111519417
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1247,7 +1694,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 1
+  m_ChildAlignment: 0
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -1400,6 +1847,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4676938936693110530}
+  - {fileID: 1239001329}
   m_Father: {fileID: 3440755766777603805}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1458,7 +1906,7 @@ GameObject:
   - component: {fileID: 3440755767441218827}
   - component: {fileID: 3440755767441218820}
   m_Layer: 5
-  m_Name: Image
+  m_Name: DirectPushFill
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1481,8 +1929,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -200.85056, y: 0}
-  m_SizeDelta: {x: -410.3012, y: -4}
+  m_AnchoredPosition: {x: -8.1117, y: 0}
+  m_SizeDelta: {x: 179.921, y: -4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3440755767441218827
 CanvasRenderer:
@@ -1513,10 +1961,10 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 21300000, guid: a3dd8cd033839dd45b97947b59d59c47, type: 3}
-  m_Type: 1
+  m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
-  m_FillMethod: 4
+  m_FillMethod: 0
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
@@ -1557,8 +2005,8 @@ RectTransform:
   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: 66, y: 78}
+  m_AnchoredPosition: {x: -60.69827, y: -2.2027}
+  m_SizeDelta: {x: 43.7137, y: 52.9963}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5685503560019856232
 CanvasRenderer:
@@ -1615,23 +2063,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 1
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 3440755765570656169}
     - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
       value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: CloseClick
+      value: SetActive
       objectReference: {fileID: 0}
     - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
-      value: ZdTanchuang, Assembly-CSharp
+      value: UnityEngine.GameObject, UnityEngine
       objectReference: {fileID: 0}
     - target: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
@@ -1703,7 +2151,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 165
+      value: 202
       objectReference: {fileID: 0}
     - target: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -1721,9 +2169,21 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8631885452844930976, guid: 638b7f7423db411419568d073208d929, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 22
+      objectReference: {fileID: 0}
     - target: {fileID: 8631885452844930979, guid: 638b7f7423db411419568d073208d929, type: 3}
       propertyPath: m_Text
-      value: "\u95EF\u5173"
+      value: "\u751F\u6001\u6811\u56E2\u961F"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8631885452844930979, guid: 638b7f7423db411419568d073208d929, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8631885452844930979, guid: 638b7f7423db411419568d073208d929, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 25
       objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 1906224345288813973, guid: 638b7f7423db411419568d073208d929, type: 3}
diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity
index b5ba214cb..d88308e58 100644
--- a/meng_yao/Assets/Scenes/scene_Main.unity
+++ b/meng_yao/Assets/Scenes/scene_Main.unity
@@ -12402,86 +12402,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 151124523}
   m_CullTransparentMesh: 1
---- !u!1 &151667937
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 151667938}
-  - component: {fileID: 151667940}
-  - component: {fileID: 151667939}
-  m_Layer: 5
-  m_Name: PushNumer
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &151667938
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 151667937}
-  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: 8687261538848957034}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 181, y: -104}
-  m_SizeDelta: {x: 221.08832, y: 67.53931}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &151667939
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 151667937}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 30
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u95F4\u63A8\u4EBA\u6570"
---- !u!222 &151667940
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 151667937}
-  m_CullTransparentMesh: 1
 --- !u!1 &155670159
 GameObject:
   m_ObjectHideFlags: 0
@@ -48991,17 +48911,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 649045041}
   m_CullTransparentMesh: 1
---- !u!114 &649244084 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3440755766087238670, 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 &649622052
 GameObject:
   m_ObjectHideFlags: 0
@@ -53212,17 +53121,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 720615030}
   m_CullTransparentMesh: 1
---- !u!114 &721092697 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3440755766308721002, 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 &721781964
 GameObject:
   m_ObjectHideFlags: 0
@@ -88375,86 +88273,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -24.21}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1239001328
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1239001329}
-  - component: {fileID: 1239001331}
-  - component: {fileID: 1239001330}
-  m_Layer: 5
-  m_Name: Text (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1239001329
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1239001328}
-  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: 6291352157748032673}
-  m_RootOrder: 1
-  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: 33.8608, y: -0.0805}
-  m_SizeDelta: {x: 110.2787, y: 34.2443}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1239001330
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1239001328}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 30
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 999
---- !u!222 &1239001331
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1239001328}
-  m_CullTransparentMesh: 1
 --- !u!1 &1244641367
 GameObject:
   m_ObjectHideFlags: 0
@@ -108006,17 +107824,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1536836582}
   m_CullTransparentMesh: 1
---- !u!114 &1537214398 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3440755766994517451, 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 &1540186942
 GameObject:
   m_ObjectHideFlags: 0
@@ -115114,82 +114921,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1604348266}
   m_CullTransparentMesh: 1
---- !u!1 &1605100377
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1605100378}
-  - component: {fileID: 1605100380}
-  - component: {fileID: 1605100379}
-  m_Layer: 5
-  m_Name: PushFill
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1605100378
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1605100377}
-  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: 1959425528}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -8.1117, y: 0}
-  m_SizeDelta: {x: 179.921, y: -4}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1605100379
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1605100377}
-  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: a3dd8cd033839dd45b97947b59d59c47, type: 3}
-  m_Type: 3
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 0
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1605100380
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1605100377}
-  m_CullTransparentMesh: 1
 --- !u!1 &1605158733
 GameObject:
   m_ObjectHideFlags: 0
@@ -127639,86 +127370,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1791361411}
   m_CullTransparentMesh: 1
---- !u!1 &1793803557
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1793803558}
-  - component: {fileID: 1793803560}
-  - component: {fileID: 1793803559}
-  m_Layer: 5
-  m_Name: Text (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1793803558
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1793803557}
-  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: 1959425528}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 16}
-  m_SizeDelta: {x: -534, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1793803559
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1793803557}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.9811321, g: 0.9811321, b: 0.9811321, 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 20/100
---- !u!222 &1793803560
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1793803557}
-  m_CullTransparentMesh: 1
 --- !u!1 &1795383505
 GameObject:
   m_ObjectHideFlags: 0
@@ -141222,98 +140873,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1959063475}
   m_CullTransparentMesh: 1
---- !u!1 &1959425527
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1959425528}
-  - component: {fileID: 1959425531}
-  - component: {fileID: 1959425530}
-  - component: {fileID: 1959425529}
-  m_Layer: 5
-  m_Name: PushTiao
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1959425528
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1959425527}
-  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:
-  - {fileID: 1605100378}
-  - {fileID: 1793803558}
-  m_Father: {fileID: 8687261538848957034}
-  m_RootOrder: 10
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 119.56641, y: -109}
-  m_SizeDelta: {x: -378.8672, y: 32}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1959425529
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1959425527}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
---- !u!114 &1959425530
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1959425527}
-  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: 705fcc4638dd2e54fb3eb11f58ffcffa, 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!222 &1959425531
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1959425527}
-  m_CullTransparentMesh: 1
 --- !u!1 &1959507340
 GameObject:
   m_ObjectHideFlags: 0
@@ -155158,17 +154717,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4804007837237946664, guid: 15168d57c92ea41448ae50cc637cbe00, type: 3}
   m_PrefabInstance: {fileID: 2143862703}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &2144872185 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3440755766186172140, 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 &2144941302
 GameObject:
   m_ObjectHideFlags: 0
@@ -164807,38 +164355,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 3440755765570656168, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
   m_PrefabInstance: {fileID: 8687261538848957033}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &6291352156879861188
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6291352156879861184}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a2d1ccd10c3613b408e333e0b49333ce, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DirectPushNum: {fileID: 8687261538848957037}
-  PushNum: {fileID: 1793803559}
-  DirectPushFill: {fileID: 8687261538848957035}
-  PushFill: {fileID: 1605100379}
-  TeammateCount: {fileID: 649244084}
-  TeamName: {fileID: 1537214398}
-  TeamId: {fileID: 2144872185}
-  TeamCount: {fileID: 721092697}
-  item: {fileID: 4453883187140258689, guid: 9c0a1afc49941d041a7b0a58e553c4ae, type: 3}
-  parent: {fileID: 6291352157481234141}
---- !u!224 &6291352157481234141 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-  m_PrefabInstance: {fileID: 8687261538848957033}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &6291352157748032673 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3440755767378187976, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-  m_PrefabInstance: {fileID: 8687261538848957033}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &6320014723365615636
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -166245,34 +165761,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 914645750}
     m_Modifications:
-    - target: {fileID: 384102548078815398, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 755272235090024930, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 1513438634924543719, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 2765749834924751322, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 3205663316541499916, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755765421972193, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 705fcc4638dd2e54fb3eb11f58ffcffa, type: 3}
-    - target: {fileID: 3440755765421972194, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -31
-      objectReference: {fileID: 0}
     - target: {fileID: 3440755765570656168, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -166365,241 +165853,68 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3440755765682643304, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 705fcc4638dd2e54fb3eb11f58ffcffa, type: 3}
-    - target: {fileID: 3440755765965947336, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755765987815312, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -31
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755765987815319, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_Text
-      value: "\u76F4\u63A8\u4EBA\u6570"
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 1294
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755766577965685, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 647
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755766773818894, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -200
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 531.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519417, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 3440755766577965689, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_ChildAlignment
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519418, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_VerticalFit
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767111519418, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_HorizontalFit
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767441218820, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_Type
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767441218820, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_FillAmount
+    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 3440755767441218820, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_FillMethod
+    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 179.921
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767441218821, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -8.1117
-      objectReference: {fileID: 0}
-    - target: {fileID: 3440755767441218822, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_Name
-      value: DirectPushFill
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676938936693110530, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 43.7137
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676938936693110530, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 52.9963
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676938936693110530, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -60.69827
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676938936693110530, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -2.2027
-      objectReference: {fileID: 0}
-    - target: {fileID: 5658678665577839841, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980759839357700, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3440755767111519412, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3739719649355226224, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980759839357700, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 3739719649355226224, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980759839357700, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 3739719649355226224, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980759839357700, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 3739719649355226224, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980760517679599, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 5545311447929385542, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980760517679599, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 5545311447929385542, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980760517679599, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 5545311447929385542, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 535
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6336980760517679599, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
+    - target: {fileID: 5545311447929385542, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -100.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053682314492981, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_Text
-      value: "\u751F\u6001\u6811\u56E2\u961F"
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053682314492981, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_FontData.m_MinSize
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053682314492981, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_FontData.m_FontSize
-      value: 25
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053682314492982, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 22
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053683027315534, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053683027315534, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 6291352156879861184}
-    - target: {fileID: 6344053683027315534, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: SetActive
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053683027315534, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
-      value: UnityEngine.GameObject, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 6344053683027315535, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 202
-      objectReference: {fileID: 0}
-    - target: {fileID: 6716681476672627215, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 7116531440675740212, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-      propertyPath: m_RootOrder
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
---- !u!224 &8687261538848957034 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3440755766777603805, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-  m_PrefabInstance: {fileID: 8687261538848957033}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &8687261538848957035 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3440755767441218820, 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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &8687261538848957036 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3440755765421972195, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
-  m_PrefabInstance: {fileID: 8687261538848957033}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &8687261538848957037 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3440755766716849008, 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!114 &8687261538848957038
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8687261538848957036}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
 --- !u!222 &8852169993808461439
 CanvasRenderer:
   m_ObjectHideFlags: 0

From 41645a34d98c9381c860608fb22dde24aa5d1298 Mon Sep 17 00:00:00 2001
From: liuliang <597380732@qq.com>
Date: Fri, 20 Dec 2024 21:33:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B0=B4=E6=BB=B4?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/script/scene_Main/WaterDrop.cs     | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/meng_yao/Assets/script/scene_Main/WaterDrop.cs b/meng_yao/Assets/script/scene_Main/WaterDrop.cs
index 5a6eed907..dc74338f6 100644
--- a/meng_yao/Assets/script/scene_Main/WaterDrop.cs
+++ b/meng_yao/Assets/script/scene_Main/WaterDrop.cs
@@ -21,18 +21,33 @@ public class WaterDrop : MonoBehaviour
 
     async void DropClick()
     {
+
+
         trans_id = GenerateRandomString(6);
         bool succefful = await Scene_main_jiekou.instance.TreeGetWaters(id, trans_id);
 
         if (succefful)
         {
+
+
             TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
-
-            transform.DOMove(targetPosition.position, flyDuration)
-                .OnComplete(async () => {
-
-                    WaterPanel.instance.Updated_water(info);
-                    Destroy(this.gameObject);
+            // 先进行缩放动画
+            transform.DOScale(new Vector3(0.5f, 0.5f, 0.5f), 0.5f)  // 缩小到0.5倍大小
+                .OnComplete(() =>
+                {
+                    // 然后执行移动动画
+                    transform.DOScale(Vector3.one, 0.5f);
+                    transform.DOMove(targetPosition.position, flyDuration)
+                        .OnComplete(async () =>
+                        {
+                            // 移动完成后更新水面信息并销毁物体
+                            transform.DOScale(new Vector3(0.5f, 0.5f, 0.5f), 0.5f).OnComplete(() =>
+                            {
+                                transform.DOScale(Vector3.one, 0.5f);
+                                WaterPanel.instance.Updated_water(info);
+                                Destroy(this.gameObject);
+                            });
+                        });
                 });
 
 

From 6fa9e38562e04a3b65d9c56832682f0373026404 Mon Sep 17 00:00:00 2001
From: GL <2365963573@qq.com>
Date: Fri, 20 Dec 2024 21:42:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=86=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meng_yao/Assets/Prefabs/Bullet/Bing.prefab    | 104 ++++++++++++++++++
 .../Assets/Prefabs/Bullet/Bing.prefab.meta    |   7 ++
 meng_yao/Assets/Prefabs/Bullet/bingqiu.prefab |   5 +
 meng_yao/Assets/Scenes/New/Scene_map_1.unity  |   2 +-
 meng_yao/Assets/common                        |   2 +-
 meng_yao/Assets/script/A_Fight/Bing.cs        |  55 +++++++++
 meng_yao/Assets/script/A_Fight/Bing.cs.meta   |  11 ++
 meng_yao/Assets/script/A_Fight/enemy.cs       |  96 +++++++++++-----
 8 files changed, 255 insertions(+), 27 deletions(-)
 create mode 100644 meng_yao/Assets/Prefabs/Bullet/Bing.prefab
 create mode 100644 meng_yao/Assets/Prefabs/Bullet/Bing.prefab.meta
 create mode 100644 meng_yao/Assets/script/A_Fight/Bing.cs
 create mode 100644 meng_yao/Assets/script/A_Fight/Bing.cs.meta

diff --git a/meng_yao/Assets/Prefabs/Bullet/Bing.prefab b/meng_yao/Assets/Prefabs/Bullet/Bing.prefab
new file mode 100644
index 000000000..71129b305
--- /dev/null
+++ b/meng_yao/Assets/Prefabs/Bullet/Bing.prefab
@@ -0,0 +1,104 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1091443316701177648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 660602218193290689}
+  - component: {fileID: 762876158176410263}
+  - component: {fileID: 4303165778035962172}
+  m_Layer: 0
+  m_Name: Bing
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &660602218193290689
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.391, y: -0.135, z: 0}
+  m_LocalScale: {x: 0.15529104, y: 0.15529104, z: 0.15529104}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &762876158176410263
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 2b550a2055708b54a8609c17a089281c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &4303165778035962172
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a7361a599e01f924eb9bd42480cf7ade, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Crole: {fileID: 0}
+  bullet: {fileID: 0}
+  attackTime: 0
+  attackAllTime: 3
+  lifeTime: 3
diff --git a/meng_yao/Assets/Prefabs/Bullet/Bing.prefab.meta b/meng_yao/Assets/Prefabs/Bullet/Bing.prefab.meta
new file mode 100644
index 000000000..7ad84d887
--- /dev/null
+++ b/meng_yao/Assets/Prefabs/Bullet/Bing.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b9df638c9cb3bfe43acb042655fd517e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/meng_yao/Assets/Prefabs/Bullet/bingqiu.prefab b/meng_yao/Assets/Prefabs/Bullet/bingqiu.prefab
index 0040d6e4b..4e74fe96f 100644
--- a/meng_yao/Assets/Prefabs/Bullet/bingqiu.prefab
+++ b/meng_yao/Assets/Prefabs/Bullet/bingqiu.prefab
@@ -4819,8 +4819,13 @@ MonoBehaviour:
   role: {fileID: 0}
   attackObj: {fileID: 0}
   myBulletType: 0
+  bulletAttributes: 3
   bulletMoveType: 0
   BulletDeadTimer: 10
+  animator: {fileID: 0}
+  IsMove: 1
+  Collider2D: {fileID: 0}
+  effectPre: {fileID: 1091443316701177648, guid: b9df638c9cb3bfe43acb042655fd517e, type: 3}
 --- !u!210 &6519243243911487068
 SortingGroup:
   m_ObjectHideFlags: 0
diff --git a/meng_yao/Assets/Scenes/New/Scene_map_1.unity b/meng_yao/Assets/Scenes/New/Scene_map_1.unity
index 5a507845f..d67d79b10 100644
--- a/meng_yao/Assets/Scenes/New/Scene_map_1.unity
+++ b/meng_yao/Assets/Scenes/New/Scene_map_1.unity
@@ -5839,7 +5839,7 @@ MonoBehaviour:
   Prefab: {fileID: 4703411402065954783, guid: aac4ad2c72526a54691494dd54e115a6, type: 3}
   SpawnLocation: {fileID: 734893407}
   GenerationInterval: 15
-  GenerationIntervalOfOne: 1
+  GenerationIntervalOfOne: 3
   GenerateQuantityMax: 20
   GenerateQuantity: 5
   deadNumber: 0
diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common
index 1e50006cf..8fec6273a 160000
--- a/meng_yao/Assets/common
+++ b/meng_yao/Assets/common
@@ -1 +1 @@
-Subproject commit 1e50006cf9e2a255ad0ae6c91abbef15075f7dd6
+Subproject commit 8fec6273a4346583fb36152f04a9a9ac7c7f00dc
diff --git a/meng_yao/Assets/script/A_Fight/Bing.cs b/meng_yao/Assets/script/A_Fight/Bing.cs
new file mode 100644
index 000000000..29f43c85a
--- /dev/null
+++ b/meng_yao/Assets/script/A_Fight/Bing.cs
@@ -0,0 +1,55 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Bing : MonoBehaviour
+{
+    public enemy Crole;                // 角色对象，用来扣血
+    public Bullet bullet;              // 子弹脚本
+    private float lastDamageTime = 0;  // 上一次扣血的时间
+    private float lastDamageAllTime = 0;  // 上一次灼烧效果的总时间
+    [Header("灼烧扣血间隔")]
+    public float attackTime;          // 扣血的间隔时间
+    [Header("冰总时间")]
+    public float attackAllTime = 3;   // 扣血的持续时间
+    [Header("冰消失时间")]
+    public float lifeTime = 3f;      // 火焰的持续时间，默认 5 秒
+
+    private float spawnTime;          // 记录火焰生成的时间
+
+    void Start()
+    {
+        Debug.Log("-------------------------");
+        spawnTime = Time.time;  // 记录火焰对象的生成时间
+        Crole = transform.parent.GetComponent<enemy>();
+    }
+
+    void Update()
+    {
+        // 判断是否超过火焰存在的最大时间
+        if (Time.time - spawnTime > lifeTime)
+        {
+            Destroy(gameObject);  // 超过时间后销毁物体
+            return;  // 直接返回，不再执行后面的灼烧逻辑
+        }
+
+        // 这里可以加上灼烧的具体逻辑，比如伤害的扣除等
+        if (Crole != null && bullet != null)
+        {
+            // 进行灼烧扣血操作
+            if (Time.time - lastDamageAllTime > attackAllTime || lastDamageAllTime == 0)
+            {
+                if (Time.time - lastDamageTime > attackTime || attackTime == 0)
+                {
+                    // 执行伤害逻辑
+                    Crole.bloodLoss(new object[] { Crole, bullet.role.Attack + bullet.bulletData.attack, bullet.attackObj.damageTyp, bullet.role });
+                    Debug.Log("灼烧扣血");
+
+                    lastDamageTime = Time.time;
+                }
+
+                lastDamageAllTime = Time.time;
+            }
+        }
+    }
+}
diff --git a/meng_yao/Assets/script/A_Fight/Bing.cs.meta b/meng_yao/Assets/script/A_Fight/Bing.cs.meta
new file mode 100644
index 000000000..b222c72d4
--- /dev/null
+++ b/meng_yao/Assets/script/A_Fight/Bing.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2f1e781458640124495bde523ec003da
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/meng_yao/Assets/script/A_Fight/enemy.cs b/meng_yao/Assets/script/A_Fight/enemy.cs
index fed41e113..6ef14add1 100644
--- a/meng_yao/Assets/script/A_Fight/enemy.cs
+++ b/meng_yao/Assets/script/A_Fight/enemy.cs
@@ -8,76 +8,122 @@ public class enemy : Role
     [Header("移动速度")] public float moveSpeed;
 
     [HideInInspector]
-    public float harmNumber=0;//伤害
+    public float harmNumber = 0;  // 伤害
 
 
     public float HarmNumber
     {
-        get=> harmNumber;
+        get => harmNumber;
         set
         {
-            harmNumber=value;
-            Debug.Log(enemyId+"总伤害"+ harmNumber );
+            harmNumber = value;
+            Debug.Log(enemyId + "总伤害" + harmNumber);
         }
     }
 
+    private float originalMoveSpeed;  // 记录初始的移动速度
+    private float slowDownTime = 0f;  // 记录减速开始时间
+    private bool isSlowed = false;   // 标记是否处于减速状态
+
     public override void Start()
     {
         base.Start();
 
-        //
-        //moveSpeed += Random.Range(-0.5f,0.5f);
+        originalMoveSpeed = moveSpeed;  // 保存初始移动速度
+
         if (camp == Camp.Enemy)
         {
-            if (AnimationTree!=null)
+            if (AnimationTree != null)
             {
-                AnimationTree[0].CharacterAnimationFrameInterval = (int)(36/moveSpeed) ;
-
-                
+                AnimationTree[0].CharacterAnimationFrameInterval = (int)(36 / moveSpeed);
             }
-           
+
             //开始移动
             Init(InitEnenyData.instance.GetRandomWaypoints());
         }
-
-     
     }
 
     public void Init(waypoints _waypoints)
     {
         base.Navigation.waypoints = _waypoints;
-       
-            //开始移动
-         Navigation.MoveToNextWaypoint(this.gameObject,moveSpeed);
-       
+
+        //开始移动
+        Navigation.MoveToNextWaypoint(this.gameObject, moveSpeed);
     }
 
     public override void die()
     {
         base.die();
         if (Application.isPlaying)
-        {            
+        {
             // 将当前敌人对象放入死亡池            
-            if (SpawnPool.intance != null )
+            if (SpawnPool.intance != null)
             {
-               
-                SkillBox.instance.AddExperience(6,this.gameObject.transform);
+                SkillBox.instance.AddExperience(6, this.gameObject.transform);
             }
 
             UIContorl.instance.Killnumber += 1;
         }
     }
 
-   
-    
-
     private void OnTriggerEnter2D(Collider2D collision)
     {
-      //  Debug.Log("进入范围检测");
+        // 进入范围检测
         if (this.camp == Camp.Enemy && collision.tag == "House")
         {
             UIContorl.instance.Hp -= 1;
             Destroy(this.gameObject);
         }
     }
+
+    // 减速并在指定时间后恢复原速度
+    public void SlowDown(float slowFactor, float duration)
+    {
+        if (!isSlowed)
+        {
+            Debug.Log("减速------------------------");
+            // 临时设置减速后的速度
+            moveSpeed *= slowFactor;
+
+            // 如果有动画控制，更新动画速度
+            if (AnimationTree != null)
+            {
+
+                AnimationTree[0].CharacterAnimationFrameInterval = (int)(36 / moveSpeed);
+                
+            }
+            Navigation.ChangeSpeed(slowFactor, duration);
+            // 标记减速状态
+            isSlowed = true;
+
+            // 记录减速开始时间
+            slowDownTime = Time.time;
+
+        }
+    }
+
+    void Update()
+    {
+        if (isSlowed)
+        {
+            // 检查减速时间是否到了
+            if (Time.time - slowDownTime >= 3f)  // 3秒后恢复原速度
+            {
+                // 恢复初始速度
+                moveSpeed = originalMoveSpeed;
+
+                // 恢复动画速度
+                if (AnimationTree != null)
+                {
+                    foreach (var anim in AnimationTree)
+                    {
+                        anim.CharacterAnimationFrameInterval = (int)(36 / moveSpeed);
+                    }
+                }
+
+                // 取消减速状态
+                isSlowed = false;
+            }
+        }
+    }
 }