一些bug的修改

2024-12-25 12:02:14 +08:00 · 2024-12-25 12:02:14 +08:00 · 8048a0c9ec
commit 8048a0c9ec
parent 957565017a
12 changed files with 336 additions and 317 deletions
--- a/meng_yao/Assets/Resources/preform/gui/Asset_Details.prefab
+++ b/meng_yao/Assets/Resources/preform/gui/Asset_Details.prefab
@ -106,18 +106,18 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1821575069}
-  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
  m_Children:
  - {fileID: 14673290}
-  m_Father: {fileID: 6931136036260294093}
-  m_RootOrder: 1
+  m_Father: {fileID: 6931136036740879336}
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 80, y: 524.2}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 80.5, y: -76.78015}
  m_SizeDelta: {x: 160, y: 71}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1821575073
@ -234,7 +234,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 6931136036740879336}
-  - {fileID: 1821575070}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1159,6 +1158,7 @@ RectTransform:
  - {fileID: 6931136037459299246}
  - {fileID: 6931136036741494350}
  - {fileID: 6931136036337461018}
+  - {fileID: 1821575070}
  m_Father: {fileID: 6931136036260294093}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/meng_yao/Assets/Resources/preform/gui/pop_up_ui.prefab
+++ b/meng_yao/Assets/Resources/preform/gui/pop_up_ui.prefab
@ -438,9 +438,9 @@ RectTransform:
  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: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 540, y: 960}
+  m_SizeDelta: {x: 1080, y: 1920}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9071259163357382586
 CanvasRenderer:
@ -470,7 +470,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f1a323c8677a07748b645b8b7e9fdb3e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c31814b8c719a96418204b01b12f8c0f, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
--- a/meng_yao/Assets/Scenes/scene_Main.unity
+++ b/meng_yao/Assets/Scenes/scene_Main.unity
@ -10858,10 +10858,26 @@ PrefabInstance:
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
      value: UnityEngine.GameObject, UnityEngine
      objectReference: {fileID: 0}
+    - target: {fileID: 7268680617274445711, guid: f7fe6a6c7271b604cb5bbeed9500bd84, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7268680617274445711, guid: f7fe6a6c7271b604cb5bbeed9500bd84, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7268680617274445711, guid: f7fe6a6c7271b604cb5bbeed9500bd84, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.3
+      objectReference: {fileID: 0}
    - target: {fileID: 7268680617274445711, guid: f7fe6a6c7271b604cb5bbeed9500bd84, type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 67.7
      objectReference: {fileID: 0}
+    - target: {fileID: 7268680617274445711, guid: f7fe6a6c7271b604cb5bbeed9500bd84, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 7268680617402293267, guid: f7fe6a6c7271b604cb5bbeed9500bd84, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -16767,7 +16783,7 @@ RectTransform:
  m_Children:
  - {fileID: 2037317443}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 15
+  m_RootOrder: 12
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -28302,7 +28318,7 @@ RectTransform:
  - {fileID: 1812984222}
  - {fileID: 406679777}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 12
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -29957,7 +29973,7 @@ PrefabInstance:
    - target: {fileID: 1402318480, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: Musk
      value: 
-      objectReference: {fileID: 626334608}
+      objectReference: {fileID: 0}
    - target: {fileID: 1402318480, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: canvas
      value: 
@ -30101,7 +30117,7 @@ PrefabInstance:
    - target: {fileID: 2186939255280341675, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
      value: 
-      objectReference: {fileID: 626334608}
+      objectReference: {fileID: 0}
    - target: {fileID: 3011360592396996928, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_Pivot.x
      value: 0.5
@ -52599,6 +52615,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8631885452844930979, guid: 638b7f7423db411419568d073208d929, type: 3}
+      propertyPath: m_Text
+      value: "\u6218\u4EE4"
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 1906224345288813973, guid: 638b7f7423db411419568d073208d929, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: 638b7f7423db411419568d073208d929, type: 3}
@ -52607,127 +52627,6 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3}
  m_PrefabInstance: {fileID: 625499685}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &626334608
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 626334609}
-  - component: {fileID: 626334611}
-  - component: {fileID: 626334610}
-  - component: {fileID: 626334612}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!224 &626334609
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626334608}
-  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: 914645750}
-  m_RootOrder: 10
-  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: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &626334610
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626334608}
-  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: 0, g: 0, b: 0, a: 0.39215687}
-  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: 0}
-  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 &626334611
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626334608}
-  m_CullTransparentMesh: 1
--- !u!114 &626334612
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626334608}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 626334610}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1001 &626587211
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -70659,6 +70558,82 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 859837606}
  m_CullTransparentMesh: 1
+--- !u!1 &860571872
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 860571873}
+  - component: {fileID: 860571875}
+  - component: {fileID: 860571874}
+  m_Layer: 5
+  m_Name: musk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &860571873
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 860571872}
+  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: 1967589974}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &860571874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 860571872}
+  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: f1a323c8677a07748b645b8b7e9fdb3e, 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 &860571875
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 860571872}
+  m_CullTransparentMesh: 1
 --- !u!1 &861011837
 GameObject:
  m_ObjectHideFlags: 0
@ -73026,7 +73001,7 @@ RectTransform:
  - {fileID: 238160530}
  - {fileID: 1061079662}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 23
+  m_RootOrder: 22
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -73862,7 +73837,7 @@ RectTransform:
  m_Children:
  - {fileID: 1276678947}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 18
+  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -74412,12 +74387,11 @@ RectTransform:
  - {fileID: 405000655}
  - {fileID: 346722531}
  - {fileID: 2110342203}
-  - {fileID: 626334609}
-  - {fileID: 6291352156879861185}
  - {fileID: 350671369}
+  - {fileID: 6291352156879861185}
+  - {fileID: 204186791}
  - {fileID: 1964742056}
  - {fileID: 495221465}
-  - {fileID: 204186791}
  - {fileID: 1804566616}
  - {fileID: 1209102483}
  - {fileID: 906771042}
@ -74427,6 +74401,7 @@ RectTransform:
  - {fileID: 1503882532}
  - {fileID: 892568005}
  - {fileID: 1553952862}
+  - {fileID: 1967589974}
  - {fileID: 1044820713}
  m_Father: {fileID: 0}
  m_RootOrder: 16
@ -75891,8 +75866,8 @@ MonoBehaviour:
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
    m_LineSpacing: 1
  m_Text: "\u73A9\u6CD5\u4ECB\u7ECD"
 --- !u!222 &939924282
@ -79022,7 +78997,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 977672295}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.89819336, y: 2.9244385, z: -0.5260622}
+  m_LocalPosition: {x: -0.89819336, y: 2.9244385, z: -0.526062}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -81546,8 +81521,7 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1676565208}
+  m_Children: []
  m_Father: {fileID: 2110342203}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -82423,7 +82397,7 @@ MonoBehaviour:
    - {fileID: 21300000, guid: 35211616da1506c42b4b57771b54112d, type: 3}
    - {fileID: 21300000, guid: 755ed9341c1b5b3499f2aed41293942c, type: 3}
  image: {fileID: 1013650381}
-  Aintime: 100
+  Aintime: 80
  myspritesIndex: 0
 --- !u!1 &1015669998
 GameObject:
@ -84326,127 +84300,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1036135643}
  m_CullTransparentMesh: 1
--- !u!1 &1037349575
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1037349576}
-  - component: {fileID: 1037349579}
-  - component: {fileID: 1037349578}
-  - component: {fileID: 1037349577}
-  m_Layer: 5
-  m_Name: Button (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1037349576
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1037349575}
-  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: 238160530}
-  m_RootOrder: 2
-  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: 145, y: 0}
-  m_SizeDelta: {x: 56, y: 56}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1037349577
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1037349575}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 1037349578}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
--- !u!114 &1037349578
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1037349575}
-  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: b85a2a7556fd8294dbf2833ccd1c1dd7, 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 &1037349579
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1037349575}
-  m_CullTransparentMesh: 1
 --- !u!1 &1039082439
 GameObject:
  m_ObjectHideFlags: 0
@ -84593,7 +84446,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1039175769
 RectTransform:
  m_ObjectHideFlags: 0
@ -87044,7 +86897,7 @@ RectTransform:
  m_Children:
  - {fileID: 1544898928}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 19
+  m_RootOrder: 18
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -96254,7 +96107,7 @@ RectTransform:
  - {fileID: 422676075}
  - {fileID: 1210850315}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 21
+  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -98049,7 +97902,7 @@ RectTransform:
  m_Children:
  - {fileID: 1520958762}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 17
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -100419,6 +100272,8 @@ MonoBehaviour:
  WxText: {fileID: 210732312}
  QqBtn: {fileID: 1398303510}
  QqText: {fileID: 382941869}
+  IdBtn: {fileID: 1927259842}
+  IdText: {fileID: 2096186409}
 --- !u!1 &1231406991
 GameObject:
  m_ObjectHideFlags: 0
@ -113016,6 +112871,82 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1411013101}
  m_CullTransparentMesh: 1
+--- !u!1 &1412060312
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1412060313}
+  - component: {fileID: 1412060315}
+  - component: {fileID: 1412060314}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1412060313
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1412060312}
+  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: 1967589974}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 826, y: 754}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1412060314
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1412060312}
+  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: ec3495d64f387674e8fba64e06c5ea1b, type: 3}
+  m_Type: 1
+  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 &1412060315
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1412060312}
+  m_CullTransparentMesh: 1
 --- !u!1 &1413169018
 GameObject:
  m_ObjectHideFlags: 0
@ -117974,7 +117905,7 @@ RectTransform:
  m_Children:
  - {fileID: 134943862}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 20
+  m_RootOrder: 19
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -119597,7 +119528,7 @@ RectTransform:
  m_Children:
  - {fileID: 224117122}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 22
+  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -124236,6 +124167,22 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 914645750}
    m_Modifications:
+    - target: {fileID: 1821575070, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1821575070, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1821575070, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -383
+      objectReference: {fileID: 0}
+    - target: {fileID: 1821575070, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -88.329
+      objectReference: {fileID: 0}
    - target: {fileID: 6931136036260294082, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
      propertyPath: m_Name
      value: Asset_Details
@ -124254,7 +124201,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6931136036260294093, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
      propertyPath: m_RootOrder
-      value: 24
+      value: 23
      objectReference: {fileID: 0}
    - target: {fileID: 6931136036260294093, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
      propertyPath: m_AnchorMax.x
@ -124332,6 +124279,10 @@ PrefabInstance:
      propertyPath: m_SizeDelta.y
      value: -723.68835
      objectReference: {fileID: 0}
+    - target: {fileID: 6931136037450377240, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.010894775
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
 --- !u!224 &1553952862 stripped
@ -134143,8 +134094,8 @@ RectTransform:
  m_Children:
  - {fileID: 373241423}
  - {fileID: 1791333526}
-  m_Father: {fileID: 1005457135}
-  m_RootOrder: 0
+  m_Father: {fileID: 2110342203}
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -143483,7 +143434,7 @@ RectTransform:
  m_Children:
  - {fileID: 1955666516}
  m_Father: {fileID: 914645750}
-  m_RootOrder: 16
+  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -147366,7 +147317,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 1
    m_VerticalOverflow: 1
    m_LineSpacing: 1
-  m_Text: "\u51FA\u751F\u5730:\u5317\u4EAC\u5E02\u6D77\u6DC0\u533A"
+  m_Text: "\u51FA\u751F\u5730:\u9668\u661F"
 --- !u!222 &1852295289
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -157881,6 +157832,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: Txbtn
      objectReference: {fileID: 0}
+    - target: {fileID: 6653293569519999538, guid: 39dbb0315453e5f4aa07018f211b959e, type: 3}
+      propertyPath: m_Text
+      value: "\u7ED1\u5B9A"
+      objectReference: {fileID: 0}
    - target: {fileID: 6931136036260294082, guid: 39dbb0315453e5f4aa07018f211b959e, type: 3}
      propertyPath: m_Name
      value: lingjiangtixian
@ -158239,6 +158194,44 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1966962804}
  m_CullTransparentMesh: 1
+--- !u!1 &1967589973
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1967589974}
+  m_Layer: 5
+  m_Name: GgPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1967589974
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1967589973}
+  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: 860571873}
+  - {fileID: 1412060313}
+  m_Father: {fileID: 914645750}
+  m_RootOrder: 24
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &1969302687
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -168252,7 +168245,7 @@ GameObject:
  - component: {fileID: 2096186410}
  - component: {fileID: 2096186409}
  m_Layer: 5
-  m_Name: Text (Legacy) (1)
+  m_Name: ID
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -169237,6 +169230,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 1005457135}
+  - {fileID: 1676565208}
  m_Father: {fileID: 914645750}
  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -172576,8 +172570,8 @@ MonoBehaviour:
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
    m_LineSpacing: 1
  m_Text: "\u5C9B\u4E3B\u8BC1\u4E66"
 --- !u!222 &2139313839
@ -173691,7 +173685,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!222 &744146547634647197
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -173829,7 +173823,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!222 &744146548439543364
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -173988,7 +173982,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &744146549049508150
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -174545,7 +174539,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1206199082452696328
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -174773,7 +174767,7 @@ 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: -37, y: -124.8}
+  m_AnchoredPosition: {x: -37, y: -145}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1477323885073752907
@ -175412,10 +175406,10 @@ RectTransform:
  m_Father: {fileID: 1682967232464333744}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.26527086}
-  m_AnchorMax: {x: 1, y: 0.34500003}
-  m_AnchoredPosition: {x: 0, y: 34}
-  m_SizeDelta: {x: -1, y: 1.3436279}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -360}
+  m_SizeDelta: {x: 1079, y: 154.34363}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1477323885276133863
 GameObject:
@ -178539,7 +178533,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 390}
+  m_AnchoredPosition: {x: 0, y: 383}
  m_SizeDelta: {x: 994.9739, y: 331.3}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1477323886965175091
@ -182201,7 +182195,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!222 &4883130753928690585
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -182765,7 +182759,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &6291352156879861184 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 3440755765570656169, guid: 3f5429359ca1b1d4baad4416e9187115, type: 3}
@ -183441,7 +183435,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0.5}
  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -175, y: -124.8}
+  m_AnchoredPosition: {x: -175, y: -145.00002}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7550977465179483479
@ -183748,7 +183742,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &7795678984867577993
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -183975,7 +183969,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &8124715926810017793
 GameObject:
  m_ObjectHideFlags: 0
--- a/meng_yao/Assets/script/A_Fight/SkillUp/laohuSkillUp.cs
+++ b/meng_yao/Assets/script/A_Fight/SkillUp/laohuSkillUp.cs
@ -2,7 +2,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using Unity.VisualScripting;
-using UnityEditor.U2D.Path.GUIFramework;
 using UnityEngine;
 using static Google.Protobuf.Reflection.ExtensionRangeOptions.Types;

--- a/meng_yao/Assets/script/Panel/eco_tree/WaterPanel.cs
+++ b/meng_yao/Assets/script/Panel/eco_tree/WaterPanel.cs
@ -95,10 +95,10 @@ public class WaterPanel : MonoBehaviour

    public void Updated_Tree(int i)
    {
-        foreach (GameObject obj in Treelist)
-        { 
-           obj.SetActive(false);
-        }
+        //foreach (GameObject obj in Treelist)
+        //{ 
+        //   obj.SetActive(false);
+        //}

           switch (i)
        {
--- a/meng_yao/Assets/script/TanChuang/Customer_serviceTanchuang.cs
+++ b/meng_yao/Assets/script/TanChuang/Customer_serviceTanchuang.cs
@ -19,7 +19,7 @@ public class Customer_serviceTanchuang : mount
    private void LogoutClick()
    {
        List<BoxType> boxTypes = new List<BoxType>();
-        boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 13, content = "È·ÈÏ×¢Ïú" });
+        boxTypes.Add(new BoxType { Name = "", prompt = "È·ÈÏ", Type = 13, content = "È·ÈÏ×¢Ïú" });
        boxTypes.Add(new BoxType { Name = "submit", textName = " 取消确定 ", prompt = "取消", Type = 2 });
        GameObject gameObject = add_pop_up();
        List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "注销账号");//测试输入框回调处理
@ -55,7 +55,7 @@ public class Customer_serviceTanchuang : mount

        List<BoxType> boxTypes = new List<BoxType>();
        boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 13, content = "客服联系方式：qq：5649846541654" });
-        boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 11 });
+        boxTypes.Add(new BoxType { Name = "", prompt = "È·ÈÏ", Type = 11 });
        GameObject gameObject = add_pop_up();
        gameObject.transform.position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
        gameObject.transform.SetParent(canvas);
--- a/meng_yao/Assets/script/TanChuang/GgTanchuang.cs
+++ b/meng_yao/Assets/script/TanChuang/GgTanchuang.cs
@ -15,9 +15,8 @@ public class GgTanchuang : mount
    public Sprite GgglDownsp;
    public Sprite GgglUpsp;

-    public Transform canvas;
+     Transform canvas;
    // Start is called before the first frame update
-    public GameObject Musk;
    private void Awake()
    {
        
@ -28,6 +27,7 @@ public class GgTanchuang : mount
    {

        Ggbtn.onClick.AddListener(Display_pop_up_window);
+        canvas = GameObject.Find("pop").transform;
        //GgPanel = this.GetComponent<RectTransform>();

    }
@ -37,14 +37,15 @@ public class GgTanchuang : mount
        GgPanel.DOScale(Deflate, 0.3f).SetEase(Ease.OutBack);
        hdtxbg.sprite = GgglDownsp;
        StartCoroutine(Magnify(GgPanel));
-        Musk.gameObject.SetActive(true);
+      

        List<BoxType> boxTypes = new List<BoxType>();
        boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 9,widthnum =700,WidthHeight =650 ,content = "内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容" }) ;
        boxTypes.Add(new BoxType { Name = "", prompt = "确认", Type = 11 });
        GameObject gameObject = add_pop_up();  
-        gameObject.transform.position = new Vector3(Screen.width/2,Screen.height/2,0);
        gameObject.transform.SetParent(canvas);
+        gameObject.transform.position = new Vector3(Screen.width/2,Screen.height/2,0);
+      
        gameObject.GetComponent<input_box_pop_up_window>().minHeight = 800;//设置最低高度
        gameObject.GetComponent<input_box_pop_up_window>().setScrollMode(0);//设置滚动模式为滚动
        //gameObject.GetComponent<input_box_pop_up_window>().setScrollMode(0);//设置滚动模式为自动填充
@ -54,7 +55,7 @@ public class GgTanchuang : mount
            if (type == 1)
            {
                gameObject.GetComponent<input_box_pop_up_window>().destroy();
-                Musk.gameObject.SetActive(false);
+             
            }
        });
      }
--- a/meng_yao/Assets/script/TanChuang/Lingjiang_Tanchuang.cs
+++ b/meng_yao/Assets/script/TanChuang/Lingjiang_Tanchuang.cs
@ -18,8 +18,8 @@ public class Lingjiang_Tanchuang : mount


        List<BoxType> boxTypes = new List<BoxType>();
-        boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 13, content = "灌곬땍連마괜" });
-        boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 11 });
+        boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 13, content = "此功能未开通" });
+        boxTypes.Add(new BoxType { Name = "", prompt = "确认", Type = 11 });
        GameObject gameObject = add_pop_up();
        gameObject.transform.position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
        gameObject.transform.SetParent(canvas);
--- a/meng_yao/Assets/script/scene_Main/ManurePanel.cs
+++ b/meng_yao/Assets/script/scene_Main/ManurePanel.cs
@ -11,9 +11,9 @@ public class ManurePanel : MonoBehaviour
        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)
+            if (info.Data.Rewards[i].Show ==1)
            {
-                DropArrays[i].gameObject.SetActive(false);
+                DropArrays[i].gameObject.SetActive(true);
            }
        }

--- a/meng_yao/Assets/script/scene_Main/ui/GhItem.cs
+++ b/meng_yao/Assets/script/scene_Main/ui/GhItem.cs
@ -9,21 +9,32 @@ public class GhItem : MonoBehaviour
    public Text WxText;
    public Button QqBtn;
    public Text QqText;
+    public Button IdBtn;
+    public Text IdText;
    Clipboard clipboard = new Clipboard();
    void Start()
    {
        WxBtn.onClick.AddListener(WxClick);
        QqBtn.onClick.AddListener(QqClick);
+        IdBtn.onClick.AddListener(Idclick);
+    }
+
+    void Idclick()
+    {
+        Clipboard.CopyToClipboard(IdText.text);
+        Promptmgr.Instance.PromptBubble("复制成功");
    }

    void WxClick()
    {
        Clipboard.CopyToClipboard(WxText.text);
+        Promptmgr.Instance.PromptBubble("复制成功");
    }

    void QqClick()
    {
        Clipboard.CopyToClipboard(QqText.text);
+        Promptmgr.Instance.PromptBubble("复制成功");
    }

    // Update is called once per frame
--- a/meng_yao/Assets/script/scene_loading/Logo_in.cs
+++ b/meng_yao/Assets/script/scene_loading/Logo_in.cs
@ -42,11 +42,12 @@ public class Logo_in : mount

        string token = PlayerPrefs.GetString("UserToken", string.Empty); // 如果没有找到 token，返回空字符串

+
        if (!string.IsNullOrEmpty(token))
        {
            MyGlobal.global.loginResponse.Data.access_token = token;
-            PlayerIndfo info = await player.PalyerInfo();
-            if (info.code == 200)
+            bool info = await player.PalyerInfotest();
+            if (info)
            {
                Promptmgr.Instance.PromptBubble("登录成功");
                sceneslider.gameObject.SetActive(true);
--- a/meng_yao/Assets/script/serveTestScript/UserModule/playerInfo.cs
+++ b/meng_yao/Assets/script/serveTestScript/UserModule/playerInfo.cs
@ -31,6 +31,19 @@ public class playerInfo : MonoBehaviour
        //Debug.Log("======" + playerIndfo.Data.account);
        return playerIndfo;
    }
+
+    public async Task<bool> PalyerInfotest()
+    {
+        Debug.Log("进入用户详情");
+        string response = await myWeb.SendRequest(myWeb.URL + "/api/user/detail", "GET", "{}", CreateHeaders());
+        Debug.Log("用户详情" + response);
+        if (response == null)
+        {
+            return false;
+        }
+        return true;
+    }
+
 }
 //==============================================================================================================
 public class PlayerIndfo : myResponse