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

meng_yao/Assets/Resources/Prefabs/Petcard.prefab

@@ -30,8 +30,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 1247601651492953792}
-  m_RootOrder: 8
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -106,8 +106,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 1247601651492953792}
-  m_RootOrder: 3
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -182,8 +182,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 1247601651492953792}
-  m_RootOrder: 6
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -259,8 +259,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3625754744270150334}
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 3625754743845814640}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -317,7 +317,7 @@ GameObject:
   - component: {fileID: 3625754743777606136}
   - component: {fileID: 3625754743777606137}
   m_Layer: 5
-  m_Name: Text (Legacy) (1)
+  m_Name: petname
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -335,8 +335,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 3625754743845814640}
-  m_RootOrder: 2
+  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}
@@ -414,7 +414,11 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3625754743569757296}
+  - {fileID: 3625754743777606138}
+  - {fileID: 1247601651492953792}
+  - {fileID: 8028426795095517688}
   m_Father: {fileID: 3625754743905974222}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -491,8 +495,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 1247601651492953792}
-  m_RootOrder: 4
+  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}
@@ -546,8 +550,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3625754743905974222}
+  - component: {fileID: 5993129780507250795}
   m_Layer: 5
-  m_Name: Card
+  m_Name: Petcard
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -566,14 +571,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3625754743845814640}
-  - {fileID: 3625754743569757296}
+  - {fileID: 6450136304373507703}
-  - {fileID: 3625754743777606138}
-  - {fileID: 3625754743101420344}
-  - {fileID: 3625754743896418124}
-  - {fileID: 3625754744720388343}
-  - {fileID: 3625754743305326732}
-  - {fileID: 3625754744018090713}
-  - {fileID: 3625754743032774235}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -582,6 +580,20 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 234, y: 300}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5993129780507250795
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3625754743905974223}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 798c4aa68dc4df64481417f7480ed740, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  petName: {fileID: 3625754743777606137}
+  petFightingBtn: {fileID: 8183562262175861975}
 --- !u!1 &3625754744018090714
 GameObject:
   m_ObjectHideFlags: 0
@@ -612,8 +624,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 1247601651492953792}
-  m_RootOrder: 7
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -764,8 +776,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3625754743905974222}
+  m_Father: {fileID: 1247601651492953792}
-  m_RootOrder: 5
+  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}
@@ -810,3 +822,394 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5456586616314319095
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1247601651492953792}
+  m_Layer: 5
+  m_Name: Startobj
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1247601651492953792
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5456586616314319095}
+  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: 3625754743101420344}
+  - {fileID: 3625754743896418124}
+  - {fileID: 3625754744720388343}
+  - {fileID: 3625754743305326732}
+  - {fileID: 3625754744018090713}
+  - {fileID: 3625754743032774235}
+  m_Father: {fileID: 3625754743845814640}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5459465969301237729
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7230766508870790309}
+  - component: {fileID: 848203989946481718}
+  - component: {fileID: 5733276043027222716}
+  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 &7230766508870790309
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5459465969301237729}
+  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: 6450136304373507703}
+  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!222 &848203989946481718
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5459465969301237729}
+  m_CullTransparentMesh: 1
+--- !u!114 &5733276043027222716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5459465969301237729}
+  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.38679248, g: 0.34847814, b: 0.34847814, 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: 28
+    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: "\u51FA\u6218"
+--- !u!1 &8729994381410932161
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8028426795095517688}
+  - component: {fileID: 8853847334384120890}
+  - component: {fileID: 1714874798090712099}
+  - component: {fileID: 4173642057463196963}
+  m_Layer: 5
+  m_Name: musk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8028426795095517688
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8729994381410932161}
+  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: 3625754743845814640}
+  m_RootOrder: 3
+  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: -2.1768, y: 0}
+  m_SizeDelta: {x: 238.3535, y: 300}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8853847334384120890
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8729994381410932161}
+  m_CullTransparentMesh: 1
+--- !u!114 &1714874798090712099
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8729994381410932161}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  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!114 &4173642057463196963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8729994381410932161}
+  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: 1714874798090712099}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8961164595193340455}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
+--- !u!1 &8961164595193340455
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6450136304373507703}
+  - component: {fileID: 8707385101030052602}
+  - component: {fileID: 6902752383748714024}
+  - component: {fileID: 3679022253423357094}
+  - component: {fileID: 8183562262175861975}
+  m_Layer: 5
+  m_Name: FightingBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6450136304373507703
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8961164595193340455}
+  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: 7230766508870790309}
+  m_Father: {fileID: 3625754743905974222}
+  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.000024319}
+  m_SizeDelta: {x: 212, y: 84}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8707385101030052602
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8961164595193340455}
+  m_CullTransparentMesh: 1
+--- !u!114 &6902752383748714024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8961164595193340455}
+  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: 09ac7c8122a751a488a56c414008c599, 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 &3679022253423357094
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8961164595193340455}
+  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: 6902752383748714024}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8183562262175861975
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8961164595193340455}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67568ae5000f36e47b318b324d277ccb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 0

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

@@ -26,12 +26,19 @@ public class WaterPanel : MonoBehaviour
     public Text LevelShow;
     public Image TreeExpFill;
 
+    public Text petLevel;
+    public Text petLevelshow;
+    public Image petExpFill;
+
     // Start is called before the first frame update
    async  void Start()
     {
         instance = this;
         TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
         Updated_interface(info);
+        Updated_water(info);
+        petBettleInfoResponse petinfo = await Scene_main_jiekou.instance.getPetBettleInfos();
+        Updated_petinfo(petinfo);
     }
 
     public void Updated_interface(TreeInfo info)
@@ -49,14 +56,26 @@ public class WaterPanel : MonoBehaviour
         stats5Name.text = info.Data.Charts[4].Name;
 
         Debug.Log(info.Data.upgrade_exp);
-        waterCountText.text = info.Data.Water.ToString();
         TreeLevel.text = "Éú̬Ê÷µÈ¼¶Lv." + info.Data.Level;
         LevelShow.text = info.Data.Exp + "/" + info.Data.upgrade_exp;
         TreeExpFill.fillAmount = info.Data.Exp / info.Data.upgrade_exp;
     }
 
+    public void Updated_water(TreeInfo info)
+    {
+        waterCountText.text = info.Data.Water.ToString();
+    }
 
 
+    public void Updated_petinfo(petBettleInfoResponse info)
+    {
+
+        petLevel.text = "³èÎïµÈ¼¶Lv." + info.data.Info.level;
+        petLevelshow.text = info.data.Info.exp + "/" + info.data.Info.upgrade_exp;
+        petExpFill.fillAmount = info.data.Info.exp / info.data.Info.upgrade_exp;
+
+    }
+
     // Update is called once per frame
     void Update()
     {

meng_yao/Assets/script/TanChuang/Lottery.cs

@@ -6,13 +6,42 @@ public class Lottery : MonoBehaviour
 {
     public GameObject LotteryPanel;
     public Button LotteryBtn;
-    void Start()
+
+    public GameObject petItem;
+    public Transform Connect;
+
+ 
+   async void Start()
     {
         LotteryBtn.onClick.AddListener(LotteryClick);
+        Update_itemClick();
     }
 
-    void LotteryClick()
+    async void Update_itemClick()
     {
+        PetHome info = await Scene_main_jiekou.instance.getPetHomes();
+        for (int i = 0; i < info.data.items.Count; i++)
+        {
+            GameObject obj = GameObject.Instantiate(petItem, Connect);
+            obj.GetComponent<PetCard>().petName.text = info.data.items[i].name;
+            obj.GetComponent<PetCard>().petFightingBtn.id = info.data.items[i].id;
+        }
+    }
+
+   async void LotteryClick()
+    {
+        PetAdoptResponse response = await Scene_main_jiekou.instance.PetAdopts();
+        if (response.code == 200)
+        {
+            Update_itemClick();
+            TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
+            WaterPanel.instance.Updated_water(info);
+            Debug.Log(response);
+        }
+        else
+        {
+            Promptmgr.Instance.PromptBubble("Ë®µÎÓà¶î²»×ã");
+        }
      
     }
 

meng_yao/Assets/script/scene_Main/FeedBtn.cs

@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class FeedBtn : MonoBehaviour
+{
+    Button feedBtn;
+    // Start is called before the first frame update
+    void Start()
+    {
+        feedBtn = GetComponent<Button>();
+        feedBtn.onClick.AddListener(FeedClick);
+    }
+
+ async   void FeedClick()
+    {
+        FeedPetResponse response = await Scene_main_jiekou.instance.feedpets();
+        if (response.code == 200)
+        {
+            Promptmgr.Instance.PromptBubble(response.message);
+            petBettleInfoResponse info = await Scene_main_jiekou.instance.getPetBettleInfos();
+            TreeInfo treeinfo = await Scene_main_jiekou.instance.TreeInfoS();
+            WaterPanel.instance.Updated_water(treeinfo);
+            WaterPanel.instance.Updated_petinfo(info);
+
+        }
+        else
+        {
+            Promptmgr.Instance.PromptBubble(response.message);
+        }
+
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/FeedBtn.cs.meta

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

meng_yao/Assets/script/scene_Main/PetCard.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class PetCard : MonoBehaviour
+{
+    public Text petName;
+    public PetFightingBtn petFightingBtn;
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/PetCard.cs.meta

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

meng_yao/Assets/script/scene_Main/PetFightingBtn.cs

@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class PetFightingBtn : MonoBehaviour
+{
+    Button figntBtn;
+    public int id;
+    void Start()
+    {
+        figntBtn = GetComponent<Button>();
+        figntBtn.onClick.AddListener(fightClick);
+    }
+
+    async void fightClick()
+    {
+        bool issuccefful = await Scene_main_jiekou.instance.PetBettless(id);
+        if (issuccefful)
+        {
+            petBettleInfoResponse petinfo = await Scene_main_jiekou.instance.getPetBettleInfos();
+            WaterPanel.instance.Updated_petinfo(petinfo);
+            this.gameObject.SetActive(false);
+        }
+        else
+        {
+            Promptmgr.Instance.PromptBubble("³öսʧ°Ü");
+            this.gameObject.SetActive(false);
+        }
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/PetFightingBtn.cs.meta

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

meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs

@@ -15,6 +15,11 @@ public class Scene_main_jiekou :MonoBehaviour
     wateringTree watering = new wateringTree();
     updatePlayerInfo updatePlayer=new updatePlayerInfo();
     cancellation cancellation = new cancellation();
+    petHome petHome = new petHome();
+    petBettleInfo petbettle = new petBettleInfo();
+    FeedPet feedPet = new FeedPet();
+    petAdopt petAdopt = new petAdopt();
+    petBettles petBettles = new petBettles();
 
     public static Scene_main_jiekou instance;
 
@@ -84,7 +89,7 @@ public class Scene_main_jiekou :MonoBehaviour
     public async Task<bool> Cancellations()
     {
         return await cancellation.Cancellation();
-    }
+    }//ŐËşĹĎúťŮ
 
 
 
@@ -113,4 +118,30 @@ public class Scene_main_jiekou :MonoBehaviour
     {
         return await _incomeList.IncomeList(page_num, page_size, type);
     }
-}
+
+
+    public async Task<PetHome> getPetHomes()//łčÎďÖŽźŇ
+    {
+        return await petHome.getPetHome();
+    }
+
+    public async Task<petBettleInfoResponse> getPetBettleInfos()
+    {
+        return await petbettle.getPetBettleInfo();
+    }
+
+    public async Task<FeedPetResponse> feedpets()
+    {
+        return await feedPet.feedpet();
+    }
+
+    public async Task<PetAdoptResponse> PetAdopts()
+    {
+        return await petAdopt.PetAdopt();
+    }
+
+    public async Task<bool> PetBettless(int id)//łčÎďid
+    {
+       return  await petBettles.PetBettles(id);
+    }
+    }

meng_yao/Assets/script/scene_Main/WateringBtn.cs

@@ -5,7 +5,7 @@ using UnityEngine.UI;
 
 public class WateringBtn : MonoBehaviour
 {
-    public Button wateringBtn;
+     Button wateringBtn;
     void Start()
     {
         wateringBtn = GetComponent<Button>();
@@ -20,6 +20,7 @@ public class WateringBtn : MonoBehaviour
             Debug.Log("浇水成功");
             TreeInfo info = await Scene_main_jiekou.instance.TreeInfoS();
            WaterPanel.instance. Updated_interface(info);
+           WaterPanel.instance.Updated_water(info);
         }
         else
         {

meng_yao/Assets/script/serveTestScript/treeModule/treeModuleNew/FeedPet.cs

@@ -27,7 +27,7 @@ public class FeedPet : MonoBehaviour
         Debug.Log("ιÑø³èÎï" + response);
         //bbbb
         FeedPetResponse feedPetResponse = JsonConvert.DeserializeObject<FeedPetResponse>(response);
-        Debug.Log("=========" + feedPetResponse.data.info.name);
+       // Debug.Log("=========" + feedPetResponse.data.info.name);
        
         return feedPetResponse;
     }

meng_yao/Assets/script/serveTestScript/treeModule/treeModuleNew/petAdopt.cs

@@ -26,7 +26,7 @@ public class petAdopt : MonoBehaviour
         Debug.Log("³èÎïÁìÑø" + response);
         //bbbb
         PetAdoptResponse petAdoptResponse = JsonConvert.DeserializeObject<PetAdoptResponse>(response);
-        Debug.Log("=========" + petAdoptResponse.data.name);
+      //  Debug.Log("=========" + petAdoptResponse.data.name);
         return petAdoptResponse;
     }
 }

meng_yao/Assets/script/serveTestScript/treeModule/treeModuleNew/petBettleInfo.cs

@@ -26,7 +26,7 @@ public class petBettleInfo : MonoBehaviour
         Debug.Log("宠物出战信息" + response);
         //bbbb
         petBettleInfoResponse Info = JsonConvert.DeserializeObject<petBettleInfoResponse>(response);
-        Debug.Log("=========" + Info.data.Info.name);
+       // Debug.Log("=========" + Info.data.Info.name);
         return Info;
     }
 }

meng_yao/Assets/script/serveTestScript/treeModule/treeModuleNew/petHome.cs

@@ -26,7 +26,7 @@ public class petHome : MonoBehaviour
         Debug.Log("녘膠裂소" + response);
         //bbbb
         PetHome petHome = JsonConvert.DeserializeObject<PetHome>(response);
-        Debug.Log("=========" + petHome.data.items[0].name);
+        //Debug.Log("=========" + petHome.data.items[0].name);
         return petHome;
     }
 }
@@ -40,8 +40,8 @@ public class PetHome
 
 public class PetHomeData
 {
-    public int water { get; set; } // 当前水余额
+    public float water { get; set; } // 当前水余额
-    public int adoption_price { get; set; } // 领养宠物价格
+    public float adoption_price { get; set; } // 领养宠物价格
     public List<PetHomeItem> items { get; set; } // 녘膠죗깊
 }