修改种花逻辑

Assets/Resource/Prefab/PrefabUI/GroupC.prefab

@@ -72,7 +72,7 @@ GameObject:
   - component: {fileID: 222784409307816300}
   - component: {fileID: 114413401608218414}
   m_Layer: 5
-  m_Name: H_BtnLab
+  m_Name: H_BtnLab1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -140,7 +140,7 @@ GameObject:
   - component: {fileID: 114064049726762222}
   - component: {fileID: 114251295993762868}
   m_Layer: 5
-  m_Name: H_Btn
+  m_Name: H_Btn1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -194,6 +194,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1258023290191140
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224752065467151726}
+  - component: {fileID: 222175278493240498}
+  - component: {fileID: 114628443942127312}
+  m_Layer: 5
+  m_Name: H_AmtLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1276073434218628
 GameObject:
   m_ObjectHideFlags: 1
@@ -211,6 +228,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1279120123303556
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224632658604237256}
+  - component: {fileID: 114054225746362868}
+  m_Layer: 5
+  m_Name: HGroup
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1283821800310686
 GameObject:
   m_ObjectHideFlags: 1
@@ -329,7 +362,24 @@ GameObject:
   - component: {fileID: 222922769378168648}
   - component: {fileID: 114312847343381016}
   m_Layer: 5
-  m_Name: H_Lab
+  m_Name: H_Desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &1392157104044466
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224555706758148492}
+  - component: {fileID: 222090107236895420}
+  - component: {fileID: 114968658871397510}
+  m_Layer: 0
+  m_Name: H_BtnImagePlus
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -425,6 +475,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1530238603814338
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224396372018510664}
+  - component: {fileID: 222167465537819874}
+  - component: {fileID: 114507184666411254}
+  - component: {fileID: 114673630141514880}
+  m_Layer: 5
+  m_Name: H_Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1558083134865858
 GameObject:
   m_ObjectHideFlags: 1
@@ -459,6 +527,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1594891986195494
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224970525637999822}
+  m_Layer: 5
+  m_Name: H_ArrowPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1611675746432136
 GameObject:
   m_ObjectHideFlags: 1
@@ -470,7 +553,7 @@ GameObject:
   - component: {fileID: 222762021216001340}
   - component: {fileID: 114105196560958582}
   m_Layer: 0
-  m_Name: H_BtnImagePlus
+  m_Name: H_BtnImagePlus1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -561,6 +644,40 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1719915801622556
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224506338553918692}
+  - component: {fileID: 222514538495380258}
+  - component: {fileID: 114392734621162078}
+  m_Layer: 5
+  m_Name: H_BtnLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1750144988700724
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224779658539582892}
+  - component: {fileID: 222256907615596202}
+  - component: {fileID: 114208900614063950}
+  m_Layer: 5
+  m_Name: H_Lab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1768479316832410
 GameObject:
   m_ObjectHideFlags: 1
@@ -589,6 +706,7 @@ GameObject:
   - component: {fileID: 222181768093972770}
   - component: {fileID: 114228570390197156}
   - component: {fileID: 95509325786565990}
+  - component: {fileID: 114742043901921994}
   m_Layer: 5
   m_Name: H_Icon2
   m_TagString: Untagged
@@ -884,6 +1002,28 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6210\u5C31"
+--- !u!114 &114054225746362868
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1279120123303556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
 --- !u!114 &114064049726762222
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1156,6 +1296,39 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114208900614063950
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1750144988700724}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5803922, g: 0.09411766, b: 0.09411766, a: 1}
+  m_RaycastTarget: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7C89\u8272\u5C0F\u82B1"
 --- !u!114 &114219192796891946
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1381,16 +1554,16 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
     m_FontSize: 25
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 25
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 0
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u7C89\u8272\u5C0F\u82B1"
+  m_Text: "\u70B9\u51FB\u82B1\u6735\u79CD\u5230\u82B1\u56ED\u91CC"
 --- !u!114 &114320216275259612
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1527,6 +1700,72 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114392734621162078
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1719915801622556}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3eee1a7066daef94e8fa7cfbd0ffb1fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 33
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 33
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: 
+  Draw: 0
+  SetY: 0
+  Y: 0
+  LineHeight: 32.264736
+  RemovePos: 060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f00000020000000210000002200000023000000
+  ImageIndex: 00000000
+  RemoveIndex: 0100000002000000030000000400000005000000
+  NewTextIndex: 06000000070000000800000009000000
+  NewTextPos:
+  - {x: -17.60154, y: 12.409513, z: 0}
+  - {x: -1.882824, y: 12.409513, z: 0}
+  - {x: -1.882824, y: -13.2368145, z: 0}
+  - {x: -1.882824, y: -13.2368145, z: 0}
+  - {x: -17.60154, y: -13.2368145, z: 0}
+  - {x: -17.60154, y: 12.409513, z: 0}
+  - {x: -1.0555229, y: 13.2368145, z: 0}
+  - {x: 16.317799, y: 13.2368145, z: 0}
+  - {x: 16.317799, y: -13.2368145, z: 0}
+  - {x: 16.317799, y: -13.2368145, z: 0}
+  - {x: -1.0555229, y: -13.2368145, z: 0}
+  - {x: -1.0555229, y: 13.2368145, z: 0}
+  - {x: 17.1451, y: 13.2368145, z: 0}
+  - {x: 34.518414, y: 13.2368145, z: 0}
+  - {x: 34.518414, y: -14.064116, z: 0}
+  - {x: 34.518414, y: -14.064116, z: 0}
+  - {x: 17.1451, y: -14.064116, z: 0}
+  - {x: 17.1451, y: 13.2368145, z: 0}
+  - {x: 35.345715, y: 6.6184072, z: 0}
+  - {x: 50.237133, y: 6.6184072, z: 0}
+  - {x: 50.237133, y: -14.064116, z: 0}
+  - {x: 50.237133, y: -14.064116, z: 0}
+  - {x: 35.345715, y: -14.064116, z: 0}
+  - {x: 35.345715, y: 6.6184072, z: 0}
 --- !u!114 &114413401608218414
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1714,6 +1953,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114507184666411254
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1530238603814338}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114512259755983350
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1870,6 +2136,80 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114628443942127312
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1258023290191140}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 15
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 15
+    m_Alignment: 8
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: X1
+--- !u!114 &114673630141514880
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1530238603814338}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    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_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114507184666411254}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114683629818445646
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2067,6 +2407,47 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114742043901921994
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1841288910547846}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    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_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114228570390197156}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114818124490267298
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2269,6 +2650,34 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &114968658871397510
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1392157104044466}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3f7e6e302f395b744be6ac65d53a2240, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  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
+  Draw: 0
 --- !u!114 &114984531594920704
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4905,6 +5314,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1649262070213938}
+--- !u!222 &222090107236895420
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1392157104044466}
 --- !u!222 &222093148678631840
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4947,6 +5362,18 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1530102579648552}
+--- !u!222 &222167465537819874
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1530238603814338}
+--- !u!222 &222175278493240498
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1258023290191140}
 --- !u!222 &222181768093972770
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -4959,6 +5386,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1931768293620450}
+--- !u!222 &222256907615596202
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1750144988700724}
 --- !u!222 &222266676311966104
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5007,6 +5440,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1433030076169858}
+--- !u!222 &222514538495380258
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1719915801622556}
 --- !u!222 &222602192887733468
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5527,7 +5966,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -5552,6 +5991,25 @@ RectTransform:
   m_AnchoredPosition: {x: 179.5, y: 101}
   m_SizeDelta: {x: 358, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224396372018510664
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1530238603814338}
+  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_Children:
+  - {fileID: 224506338553918692}
+  m_Father: {fileID: 224632658604237256}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 88.915, y: -29}
+  m_SizeDelta: {x: 176.16, y: 58}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224430002346188078
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5570,6 +6028,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0.08529663, y: 0.000022888184}
   m_SizeDelta: {x: -628.62, y: 0}
   m_Pivot: {x: 0.00000006053597, y: 1}
+--- !u!224 &224506338553918692
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1719915801622556}
+  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_Children:
+  - {fileID: 224555706758148492}
+  m_Father: {fileID: 224396372018510664}
+  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: 41.8, y: 13.8}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224521926426990304
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5608,6 +6085,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224555706758148492
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1392157104044466}
+  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_Children: []
+  m_Father: {fileID: 224506338553918692}
+  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!224 &224580893849471086
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5620,8 +6115,9 @@ RectTransform:
   m_Children:
   - {fileID: 224101919039259918}
   - {fileID: 224293496060027752}
+  - {fileID: 224970525637999822}
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 1
+  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}
@@ -5638,10 +6134,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224779658539582892}
   - {fileID: 224843279890597442}
   - {fileID: 224580893849471086}
+  - {fileID: 224752065467151726}
   - {fileID: 224387557482805238}
-  - {fileID: 224768102107365078}
+  - {fileID: 224632658604237256}
   m_Father: {fileID: 224846047146302080}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5650,6 +6148,26 @@ RectTransform:
   m_AnchoredPosition: {x: 0.000015258789, y: 9}
   m_SizeDelta: {x: 493, y: 413}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224632658604237256
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1279120123303556}
+  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_Children:
+  - {fileID: 224396372018510664}
+  - {fileID: 224768102107365078}
+  m_Father: {fileID: 224590564811158144}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 10.001, y: -199}
+  m_SizeDelta: {x: 355.66, y: 58}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224690239718957846
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5748,6 +6266,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224752065467151726
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1258023290191140}
+  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_Children: []
+  m_Father: {fileID: 224590564811158144}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -205.04999, y: 86.74}
+  m_SizeDelta: {x: 73.600006, y: 20.6}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224758475223130984
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5790,18 +6326,36 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1184286533214554}
-  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_Children:
   - {fileID: 224025563559250782}
+  m_Father: {fileID: 224632658604237256}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 266.745, y: -29}
+  m_SizeDelta: {x: 176.16, y: 58}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224779658539582892
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1750144988700724}
+  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_Children: []
   m_Father: {fileID: 224590564811158144}
-  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}
-  m_AnchoredPosition: {x: 10.34, y: -196.46}
-  m_SizeDelta: {x: 176.16, y: 58}
+  m_AnchoredPosition: {x: 20, y: 77.2}
+  m_SizeDelta: {x: 285, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224798659987432184
 RectTransform:
@@ -5828,16 +6382,16 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1372042682506616}
-  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_Children: []
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 0
+  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: 20, y: 77.2}
+  m_AnchoredPosition: {x: 20, y: -144.52}
   m_SizeDelta: {x: 285, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224846047146302080
@@ -5918,6 +6472,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -10.5}
   m_SizeDelta: {x: 0, y: -21.1}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224970525637999822
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1594891986195494}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.5384617, y: 1.5384617, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224580893849471086}
+  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: -174.61551, y: 115.323074}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224987185824735694
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -51,7 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
-    <G_PlantTip desc=""><![CDATA[点击花朵种到花园里]]></G_PlantTip>
+    <H_PlantTip desc=""><![CDATA[点击花朵种到花园里]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解锁]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[完成小游戏或购买礼包可以解锁]]></H_BtnLab3>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -51,7 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
-    <G_PlantTip desc=""><![CDATA[]]></G_PlantTip>
+    <H_PlantTip desc=""><![CDATA[]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[收回]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[未解鎖]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[完成小遊戲或購買禮包可以解鎖]]></H_BtnLab3>

Assets/Resource/XML/lan/English.xml

@@ -51,7 +51,7 @@
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[Take all back]]></G_RetrieveLab>
-    <G_PlantTip desc=""><![CDATA[]]></G_PlantTip>
+    <H_PlantTip desc=""><![CDATA[]]></H_PlantTip>
     <H_BtnLab1 desc=""><![CDATA[Take back]]></H_BtnLab1>
     <H_BtnLab2 desc=""><![CDATA[Locked]]></H_BtnLab2>
     <H_BtnLab3 desc=""><![CDATA[Play minigame or buy pack to unlock]]></H_BtnLab3>

Assets/Script/Manage/ManaCenter.cs

@@ -569,7 +569,7 @@ public class ManaCenter : Regist
         RegistSkill(false);
         RegistIncome();
 
-        ManaSign.ShowOfflineReward();
+        ManaSign.ShowOfflinePanel();
     }
 
     public override void Instantiate()
@@ -1029,7 +1029,7 @@ public class ManaCenter : Regist
         RegistSkill(true);
         RegistIncome();
 
-        ManaSign.ShowOfflineReward();
+        ManaSign.ShowOfflinePanel();
 
         Analytics.SetUserId(ManaServer.ID);
 

Assets/Script/Manage/ManaData.cs

@@ -522,21 +522,25 @@ public class ManaData : Regist
         PlayerNode.SelectSingleNode("TutorialIndexE").Attributes[0].Value = ManaTutorial.TutorialIndexE.ToString();
     }
 
-    public static void SaveFlowerList()
+    public static void SaveFlowers()
     {
         XmlAttribute attribute = PlayerNode.SelectSingleNode("FlowerList").Attributes[0];
+        XmlAttribute attribute1 = PlayerNode.SelectSingleNode("FlowerAmtList").Attributes[0];
 
         attribute.Value = "";
+        attribute1.Value = "";
 
         foreach (var kv in ManaGarden.FlowerInfoDic)
         {
             if (kv.Value.Unlock)
             {
                 attribute.Value += kv.Value.ID_ + " ";
+                attribute1.Value += kv.Value.Amount + " ";
             }
         }
 
         attribute.Value = attribute.Value.Trim(' ');
+        attribute1.Value = attribute1.Value.Trim(' ');
     }
 
     public  static void SavePlayerConfig()
@@ -548,7 +552,7 @@ public class ManaData : Regist
             SaveDress();
             SavePlantList();
             SaveCommon();
-            SaveFlowerList();
+            SaveFlowers();
         }
     }
 

Assets/Script/Manage/ManaGarden.cs

@@ -165,6 +165,11 @@ public class ManaGarden : Regist
     public static float StarTimer;
     public static float AwardTimer;
 
+    public static Button RetrieveButton;
+    public static Text RetrieveButtonLab;
+    public static Button PurchaseButton;
+    public static Text PurchaseButtonLab;
+
     public static FlowerInfo SeleInfo;
     public static ManaGarden Instance;
 
@@ -326,6 +331,14 @@ public class ManaGarden : Regist
         #endregion
     }
 
+    public override void RegistReference()
+    {
+        RetrieveButton = ManaReso.Get<Button>("H_Btn");
+        RetrieveButtonLab = ManaReso.Get<Text>("H_BtnLab");
+        PurchaseButton = ManaReso.Get<Button>("H_Btn1");
+        PurchaseButtonLab = ManaReso.Get<Text>("H_BtnLab1");
+    }
+
 
     public static void UnlockSlot()
     {
@@ -384,174 +397,210 @@ public class ManaGarden : Regist
         PageList.Add(tra);
     }
 
-    public static void ShowRetrieveCard(FlowerInfo flowerInfo)
+    public static void ShowPlantCard(FlowerInfo flowerInfo, Slot seleSlot = null)
     {
-        SeleInfo = flowerInfo;
+        ShowFlowerCard(flowerInfo, null, seleSlot);
 
-        ManaReso.Get("H_FlowerCard").TweenForCG();
+        RetrieveButton.SetActive(false);
+        PurchaseButton.SetActive(true);
+    }
 
-        ManaReso.SetText("H_Lab", flowerInfo.Name);
+    public static void ShowRetrieveCard(FlowerInfo flowerInfo, Slot seleSlot = null)
+    {
+        ShowFlowerCard(flowerInfo, null, seleSlot);
 
+        RetrieveButton.SetActive(true);
+        PurchaseButton.SetActive(true);
+    }
 
-        Image image = ManaReso.Get<Image>("H_Icon2");
+    public static void ShowUnlockCard(FlowerInfo flowerInfo, Slot seleSlot = null)
+    {
+        ShowFlowerCard(flowerInfo, Lib.GrayMat, seleSlot);
 
-        image.material = null;
+        RetrieveButton.SetActive(false);
+        PurchaseButton.SetActive(true);
+    }
 
-        image.sprite = flowerInfo.Icon;
+    private static void ShowFlowerCard(FlowerInfo flowerInfo, Material material, Slot seleSlot)
+    {
+        SetRetrieveBtn(RetrieveButton, RetrieveButtonLab, seleSlot);
+        SetPurchaseBtn(flowerInfo, PurchaseButton, PurchaseButtonLab);
 
-        image.Resize(true, 0.8125f, 0.8125f);
+        SeleInfo = flowerInfo;
 
+        ManaReso.Get("H_FlowerCard").TweenForCG();
+        ManaReso.SetText("H_Lab", flowerInfo.Name);
 
-        ManaReso.SetText("H_BtnLab", Language.GetStr("UI", "H_BtnLab1"));
+        SetPlantStatus(flowerInfo);
 
-        ManaReso.Get<Image>("H_Btn").material = null;
+        Image image = ManaReso.Get<Image>("H_Icon2");
+        image.material = material;
+        image.sprite = flowerInfo.Icon;
+        image.Resize(true, 0.8125f, 0.8125f);
+    }
 
-        ManaReso.SetButtonEvent
+    private static void SetRetrieveBtn(Button button, Text buttonLab, Slot seleSlot = null)
+    {
+        RetrieveButton = button;
+        buttonLab.text = Language.GetStr("UI", "H_BtnLab1");
+        button.image.material = null;
+        button.onClick.RemoveAllListeners();
+        button.onClick.AddListener
         (
-            "H_Btn",
             () =>
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                ManaReso.Get("H_FlowerCard").TweenBacCG();
-
-                RetriveFlower();
+                RetriveFlower(seleSlot);
             }
         );
     }
 
-    public static void ShowUnlockCard(FlowerInfo flowerInfo)
+    private static void SetPurchaseBtn(FlowerInfo flowerInfo, Button button, Text buttonLab)
     {
-        SeleInfo = flowerInfo;
-
-        ManaReso.Get("H_FlowerCard").TweenForCG();
-
-        ManaReso.SetText("H_Lab", flowerInfo.Name);
-
-
-        if (FlowerCardMatTween != null)
-        {
-            FlowerCardMatTween.Pause();
-        }
-
-        Image image = ManaReso.Get<Image>("H_Icon2");
-
-        image.material = Lib.GrayMat;
-
-        image.sprite = flowerInfo.Icon;
-
-        image.Resize(true, 0.8125f, 0.8125f);
-
-
         if (flowerInfo.UnlockCur == Current.Free)
         {
-            ManaReso.SetText("H_BtnLab", Language.GetStr("UI", "H_BtnLab2"));
-
-            ManaReso.Get<Image>("H_Btn").material = Lib.GrayMat;
-
-            ManaReso.SetButtonEvent
-                (
-                    "H_Btn",
-                    () =>
-                    {
-                        Bubble.Show(null, Language.GetStr("UI", "H_BtnLab3"));
-                    }
-                );
+            buttonLab.text = Language.GetStr("UI", "H_BtnLab2");
+            button.image.material = Lib.GrayMat;
+            button.onClick.RemoveAllListeners();
+            button.onClick.AddListener
+            (
+                () =>
+                {
+                    Bubble.Show(null, Language.GetStr("UI", "H_BtnLab3"));
+                }
+            );
         }
         else
         {
-            ManaReso.SetText("H_BtnLab", Auxiliary.ImageParse(flowerInfo.UnlockCur) + flowerInfo.UnlockAmt);
-
-            ManaReso.Get<Image>("H_Btn").material = null;
-
-            ManaReso.SetButtonEvent
-                (
-                    "H_Btn",
-                    () =>
-                    {
-                        ManaCenter.Pay
+            buttonLab.text = Auxiliary.ImageParse(flowerInfo.UnlockCur) + flowerInfo.UnlockAmt;
+            button.image.material = null;
+            button.onClick.RemoveAllListeners();
+            button.onClick.AddListener
+            (
+                () =>
+                {
+                    ManaCenter.Pay
+                    (
+                        "",
+                        flowerInfo.UnlockAmt,
+                        flowerInfo.UnlockCur,
+                        () =>
+                        {
+                            flowerInfo.Add();
+                            SetPlantStatus(flowerInfo);
+                            ManaServer.Save();
+
+                            PlayFlowerCardMatTween();
+
+                            ManaAudio.PlayClip(Clip.CurrentClip);
+
+                            ManaReso.Get("H_Icon1").FindChild("UIFlashLight/UIParticle System").GetComponent<UIPartical>().Begin();
+                        },
+                        StaticsManager.ItemID.解锁花朵,
+                        StaticsManager.ConsumeModule.Shop,
+                        true,
+                        false,
+                        () =>
+                        {
+                            ManaReso.Get("H_FlowerCard").TweenBacCG();
+                            TweenCG tweenCg = ManaReso.Get("G_Flower").TweenBacCG();
+
+                            tweenCg.AddEventOnetime
                             (
-                                "",
-                                flowerInfo.UnlockAmt,
-                                flowerInfo.UnlockCur,
+                                EventType.BackwardFinish,
                                 () =>
                                 {
-                                    flowerInfo.Unlock = true;
-                                    ManaServer.Save();
-
-                                    Material material = new Material(ManaReso.Get<Image>("H_Icon2").material);
+                                    ManaReso.Get("F_Manage0").TweenForVec();
+                                }
+                            );
+                        }
+                    );
+                }
+            );
+        }
+    }
 
-                                    MaterialUnit materialUnit = new MaterialUnit
-                                        (
-                                        material,
-                                        ManaReso.Get("H_Icon2"),
-                                        new List<string>()
-                                        {
-                                            "_GrayLerp",
-                                        }
-                                        );
+    private static void SetPlantStatus(FlowerInfo flowerInfo)
+    {
+        if (flowerInfo.RemainAmount == 0)
+        {
+            ManaReso.Get<Button>("H_Icon2").interactable = false;
+            ManaReso.SetActive("H_AmtLab", false);
+            ManaReso.SetActive("H_Desc", false);
+        }
+        else
+        {
+            ManaReso.SetActive("H_Desc", true);
+            ManaReso.Get<Button>("H_Icon2").interactable = true;
+            ManaReso.SetActive("H_AmtLab", true);
+            ManaReso.SetText("H_AmtLab", "X" + flowerInfo.RemainAmount);
+        }
+    }
 
-                                    FlowerCardMatTween = materialUnit.CreateTweenMatFloat(1, 0, 1, true, true, Curve.EaseOutQuad, false);
+    private static void SetRetrieveStatus(FlowerInfo flowerInfo, Button button)
+    {
+        if (flowerInfo.PlantAmt == 0)
+            button.SetActive(false);
+        else
+            button.SetActive(true);
+    }
 
-                                    FlowerCardMatTween.OnForwardStart = () =>
-                                    {
-                                        materialUnit.Transform.GetComponent<Image>().material = materialUnit.Material;
-                                    };
+    private static void PlayFlowerCardMatTween()
+    {
+        if (ManaReso.Get<Image>("H_Icon2").material != Lib.GrayMat)
+        {
+            return;
+        }
 
-                                    FlowerCardMatTween.OnForwardFinish = () =>
-                                    {
-                                        ManaReso.Get<Image>("H_Icon2").material = null;
-                                    };
+        Material material = new Material(ManaReso.Get<Image>("H_Icon2").material);
 
-                                    materialUnit.TweenForMatFloat();
+        MaterialUnit materialUnit = new MaterialUnit
+        (
+            material,
+            ManaReso.Get("H_Icon2"),
+            new List<string>()
+            {
+                "_GrayLerp",
+            }
+        );
 
+        FlowerCardMatTween = materialUnit.CreateTweenMatFloat(1, 0, 1, true, true, Curve.EaseOutQuad, false);
 
-                                    ManaAudio.PlayClip(Clip.CurrentClip);
+        FlowerCardMatTween.OnForwardStart = () =>
+        {
+            materialUnit.Transform.GetComponent<Image>().material = materialUnit.Material;
+        };
 
-                                    ManaReso.Get("H_Icon1").FindChild("UIFlashLight/UIParticle System").GetComponent<UIPartical>().Begin();
+        FlowerCardMatTween.OnForwardFinish = () =>
+        {
+            ManaReso.Get<Image>("H_Icon2").material = null;
+        };
 
+        materialUnit.TweenForMatFloat();
+    }
 
-                                    ManaReso.SetText("H_BtnLab", Language.GetStr("UI", "H_BtnLab4"));
 
-                                    ManaReso.SetButtonEvent
-                                        (
-                                            "H_Btn",
-                                            () =>
-                                            {
-                                                PlantFlower(flowerInfo);
+    public static void RetriveFlower(Slot seleSlot = null)
+    {
+        if (seleSlot != null && seleSlot.Flower == null)
+            seleSlot = null;
 
-                                                ManaReso.Get("H_FlowerCard").TweenBacCG();
-                                            }
-                                        );
-                                },
-                                StaticsManager.ItemID.解锁花朵, 
-                                StaticsManager.ConsumeModule.Shop,
-                                true,
-                                false,
-                                () =>
-                                {
-                                    ManaReso.Get("H_FlowerCard").TweenBacCG();
-                                    TweenCG tweenCg = ManaReso.Get("G_Flower").TweenBacCG();
-
-                                    tweenCg.AddEventOnetime
-                                        (
-                                            EventType.BackwardFinish,
-                                            () =>
-                                            {
-                                                ManaReso.Get("F_Manage0").TweenForVec();
-                                            }
-                                        );
-                                }
-                            );
-                    }
-                );
+        if (seleSlot == null)
+        {
+            foreach (var slot in PlantList)
+            {
+                if (slot.Flower.FlowerInfo == SeleInfo)
+                {
+                    seleSlot = slot;
+                    break;
+                }
+            }
         }
-    }
-
 
-    public static void RetriveFlower()
-    {
-        SeleInfo.Slot.Retrieve();
+        seleSlot.Retrieve();
+        SetPlantStatus(seleSlot.FlowerInfo);
+        SetRetrieveStatus(seleSlot.FlowerInfo, RetrieveButton);
     }
 
     public static void RetriveFlowerAll()
@@ -593,7 +642,8 @@ public class ManaGarden : Regist
         else
         {
             slot.Plant(flowerInfo, true);
-
+            SetPlantStatus(flowerInfo);
+            SetRetrieveStatus(flowerInfo, RetrieveButton);
             ManaAudio.PlayClip(Clip.FlowerClip);
         }
     }

Assets/Script/Manage/ManaMiniGame.cs

@@ -174,7 +174,7 @@ public class Award
                 {
                     FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[FlowerID];
 
-                    flowerInfo.Unlock = true;
+                    flowerInfo.Add();
 
 
                     ManaReso.SetActive("Da_Flower", true);
@@ -1285,26 +1285,11 @@ public class ManaMiniGame : Regist
 
     public static void ResetNewFlowerStatus()
     {
-        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+        float flowerRate = (float) Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
 
         if (Random.Range(0, 1f) <= flowerRate)
         {
-            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
-            {
-                foreach (var kv in ManaGarden.FlowerInfoDic)
-                {
-                    if (kv.Value.Unlock == false)
-                    {
-                        ManaData.SavePlayerBool("NewFlowerFlag", true);
-
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                ManaData.SavePlayerBool("NewFlowerFlag", false);
-            }
+            ManaData.SavePlayerBool("NewFlowerFlag", true);
         }
         else
         {

Assets/Script/Manage/ManaPlayer.cs

@@ -101,7 +101,6 @@ public class ManaPlayer : Regist
 
         DressRoom = ManaReso.Get("DressRoom", Folder.Discard, true, null, true, ObjType.DressRoom);
         DressRoom.SetActive(false);
-        DontDestroyOnLoad(DressRoom);
 
         List<int> dressList = ManaData.GetDressList();
 

Assets/Script/Manage/ManaServer.cs

@@ -734,10 +734,7 @@ public class ManaServer : Regist
             {
                 if (ManaGarden.FlowerInfoDic.TryGetValue(idList[i], out flowerInfo))
                 {
-                    if (flowerInfo.Unlock == false)
-                    {
-                        flowerInfo.Unlock = true;
-                    }
+                    flowerInfo.Add();
 
                     Transform mailItem = ManaReso.Get("MailItem", Folder.UI, false, ManaReso.Get("Bd_Grid"), new Vector3(), ObjType.MailItem);
 

Assets/Script/Manage/ManaSign.cs

@@ -123,7 +123,7 @@ public class Sign
                     
                     ManaReso.Get<Image>("Bb_IconA0").Resize(true, 0.8125f, 0.8125f);
 
-                    flowerInfo.Unlock = true;
+                    flowerInfo.Add();
 
                     return;
                 }
@@ -642,10 +642,7 @@ public class Lottery
         }
         else if (Type == 3)
         {
-            if (ManaGarden.FlowerInfoDic[Value].Unlock)
-                ManaGarden.FlowerInfoDic[Value].Amount++;
-            else
-                ManaGarden.FlowerInfoDic[Value].Unlock = true;
+            ManaGarden.FlowerInfoDic[Value].Add();
 
             ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + " " + ManaGarden.FlowerInfoDic[Value].Name);
         }
@@ -672,7 +669,7 @@ public class ManaSign : Regist
 
     #endregion
 
-    public static bool ShowOfflineReward()
+    public static bool ShowOfflinePanel()
     {
         if (ManaTutorial.TutorialA)
         {
@@ -763,7 +760,6 @@ public class ManaSign : Regist
 
     public static bool ShowNotification()
     {
-        //Debug.Log(ManaServer.NotificationIndex + " " + ManaData.GetPlayerInt("NotificationIndex"));
         if (ManaServer.NotificationIndex > ManaData.GetPlayerInt("NotificationIndex") && ManaServer.NotificationReady)
         {
             ManaData.SavePlayerInt("NotificationIndex", ManaServer.NotificationIndex);
@@ -774,8 +770,6 @@ public class ManaSign : Regist
         }
         else
         {
-            //Debug.Log("Don't Show");
-
             return false;
         }
     }

Assets/Script/Manage/ManaTutorial.cs

@@ -551,8 +551,39 @@ public class ManaTutorial : Regist
         (
             () =>
             {
-                Tutorial.HightDisable(0, false);
+                Tutorial.HightDisable(0, true);
+            }
+        );
+
+        tween = ManaReso.Get("H_FlowerCard").GetTweenCG();
+
+        tween.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                Tutorial.HightScreen(ManaReso.Get("H_ArrowPos"), ManaReso.Get("H_Icon2"));
+            }
+        );
+
+        ManaReso.AddButtonEventOnetime
+        (
+            "H_Icon2",
+            () =>
+            {
+                Tutorial.HightDisable(0, true);
+
+                ManaReso.Get("H_FlowerCard").TweenBacCG();
+            }
+        );
 
+        tween = ManaReso.Get("H_FlowerCard").GetTweenCG();
+
+        tween.AddEventOnetime
+        (
+            EventType.BackwardFinish,
+            () =>
+            {
                 Tutorial.HightScreen(ManaReso.Get("G_Arrow0"), ManaReso.Get("G_Close"));
             }
         );
@@ -566,6 +597,8 @@ public class ManaTutorial : Regist
             }
         );
 
+        tween = ManaReso.Get("G_Flower").GetTweenCG();
+
         tween.AddEventOnetime
         (
             EventType.BackwardFinish,

Assets/Script/Manage/ManaUI.cs

@@ -152,7 +152,7 @@ public class ManaUI : Regist
 
                 ManaCenter.OfflineLock = false;
 
-                if (!ManaSign.ShowOfflineReward())
+                if (!ManaSign.ShowOfflinePanel())
                 {
                     ManaReso.Get("B_SignIn").TweenBacCG();
                 }
@@ -202,7 +202,7 @@ public class ManaUI : Regist
                 ManaReso.Get("B_SignIn").TweenBacCG();
                 ManaReso.Get("Bb_SignIn").TweenBacCG();
 
-                ManaSign.ShowOfflineReward();
+                ManaSign.ShowOfflinePanel();
             }
         );
 
@@ -250,7 +250,7 @@ public class ManaUI : Regist
 
                     ManaReso.Get("Bd_Mail0").TweenBacCG();
 
-                    if (!ManaSign.ShowOfflineReward())
+                    if (!ManaSign.ShowOfflinePanel())
                     {
                         ManaReso.Get("B_SignIn").TweenBacCG();
                     }
@@ -1760,6 +1760,8 @@ public class ManaUI : Regist
 
         #region H
 
+        ManaLan.Add(ManaReso.Get<Text>("H_Desc"), new LanStr("UI", "H_PlantTip"));
+
         #region H_Close
 
         ManaReso.AddButtonEvent
@@ -1788,10 +1790,28 @@ public class ManaUI : Regist
         {
             ManaReso.Get("H_Icon1").FindChild("UIFlashLight/UIFlash").SetActive(false);
             ManaReso.Get("H_Icon1").FindChild("UIFlashLight/UIParticle System").SetActive(false);
+
+            if (ManaGarden.FlowerCardMatTween != null)
+                ManaGarden.FlowerCardMatTween.Pause();
         };
 
         #endregion
 
+        #region H_Icon2
+
+        ManaReso.AddButtonEvent
+        (
+            "H_Icon2",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaGarden.PlantFlower(ManaGarden.SeleInfo);
+            }
+        );
+
+        #endregion
+
         #endregion
 
         #region I
@@ -2723,9 +2743,22 @@ public class ManaUI : Regist
                 ManaReso.Get("R_NotifyBK").TweenBacScale();
             };
 
+        tween.OnBackwardFinish +=
+            () =>
+            {
+                ManaSign.ShowOfflinePanel();
+            };
+
         ManaReso.Get("R_NotifyBK").CreateTweenScale(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
-        ManaReso.AddButtonEvent("R_Close", () => { ManaReso.Get("R_Notify").TweenBacCG(); });
+        ManaReso.AddButtonEvent
+        (
+            "R_Close",
+            () =>
+            {
+                tween = ManaReso.Get("R_Notify").TweenBacCG();
+            }
+        );
 
         #endregion
 

Assets/Script/Object/Flower.cs

@@ -35,27 +35,15 @@ public class FlowerInfo
         }
     }
     public int amount;
+    public int RemainAmount
+    {
+        get { return Amount - PlantAmt; }
+    }
+    public int PlantAmt;
 
     public bool Plant
     {
-        get { return Plant_; }
-        set
-        {
-            Plant_ = value;
-
-            if (Plant_)
-            {
-                Text.SetActive(true);
-
-                ManaLan.Add(Text, new LanStr("Object", "FlowerItemG_Lab"));
-
-                UIPartical.Begin();
-            }
-            else
-            {
-                Text.SetActive(false);
-            }
-        }
+        get { return PlantAmt > 0; }
     }
     public bool Unlock
     {
@@ -115,7 +103,6 @@ public class FlowerInfo
     }
 
     public int ID_;
-    public bool Plant_;
     public bool Unlock_;
     public string Icon_;
 
@@ -125,7 +112,6 @@ public class FlowerInfo
     public float FlowerCoinBuff;
     public Current UnlockCur;
 
-    public Slot Slot;
     public Text Text;
     public Text AmountLab;
     public Image Image;
@@ -174,7 +160,7 @@ public class FlowerInfo
                 }
                 else if (Unlock)
                 {
-                    ManaGarden.PlantFlower(this);
+                    ManaGarden.ShowPlantCard(this);
                 }
                 else
                 {
@@ -183,6 +169,14 @@ public class FlowerInfo
             }
         );
     }
+
+    public void Add()
+    {
+        if (Unlock)
+            Amount++;
+        else
+            Unlock = true;
+    }
 }
 
 public class Flower : Regist, IPointerClickHandler
@@ -653,7 +647,7 @@ public class Flower : Regist, IPointerClickHandler
 
             ManaReso.Get("G_Flower").TweenForCG();
 
-            ManaGarden.ShowRetrieveCard(FlowerInfo);
+            ManaGarden.ShowRetrieveCard(FlowerInfo, Slot);
         }
         else if (eventData.rawPointerPress.transform == GoldBk)
         {

Assets/Script/Object/Skill/Pack.cs

@@ -325,27 +325,30 @@ public class Pack : SkillRoot
             {
                 FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[int.Parse(Flowers[i])];
 
-                if (flowerInfo.Unlock == false)
-                {
-                    flowerInfo.Unlock = true;
+                flowerInfo.Add();
+                tempFlower += string.Format("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(花朵)>", flowerInfo.Name);
 
-                    tempFlower += string.Format("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(花朵)>", flowerInfo.Name);
-                }
-                else
-                {
-                    if (flowerInfo.UnlockCur == Current.Coin)
-                    {
-                        tempCoin = flowerInfo.UnlockAmt/5;
+                //if (flowerInfo.Unlock == false)
+                //{
+                //    flowerInfo.Unlock = true;
 
-                        ManaCenter.AddCoin(flowerInfo.UnlockAmt / 5, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Charge);
-                    }
-                    else if (flowerInfo.UnlockCur == Current.Diamond)
-                    {
-                        tempDiamond += flowerInfo.UnlockAmt/5;
+                //    tempFlower += string.Format("{0}{1}{2}    ", Language.GetStr("UI", "J_Info0"), "<(花朵)>", flowerInfo.Name);
+                //}
+                //else
+                //{
+                //    if (flowerInfo.UnlockCur == Current.Coin)
+                //    {
+                //        tempCoin = flowerInfo.UnlockAmt/5;
 
-                        ManaCenter.AddDiamond(flowerInfo.UnlockAmt/5, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Charge);
-                    }
-                }
+                //        ManaCenter.AddCoin(flowerInfo.UnlockAmt / 5, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Charge);
+                //    }
+                //    else if (flowerInfo.UnlockCur == Current.Diamond)
+                //    {
+                //        tempDiamond += flowerInfo.UnlockAmt/5;
+
+                //        ManaCenter.AddDiamond(flowerInfo.UnlockAmt/5, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Charge);
+                //    }
+                //}
             }
         }
 

Assets/Script/Object/Slot.cs

@@ -88,8 +88,7 @@ public class Slot : Regist
 
         Available = false;
 
-        FlowerInfo.Slot = this;
-        FlowerInfo.Plant = true;
+        FlowerInfo.PlantAmt++;
 
         Flower = ManaReso.GetFlower(flowerInfo, this, true);
 
@@ -107,7 +106,7 @@ public class Slot : Regist
 
         Available_ = true;
 
-        FlowerInfo.Plant = false;
+        FlowerInfo.PlantAmt--;
 
         ManaGarden.PlantList.Remove(this);
 

Assets/Script/Tool/DashGame/Logo.cs

@@ -32,12 +32,12 @@ public class Logo : MonoBehaviour
         ManaReso.Instance.StopAsync();
 
 
-        Complete = true;
-
         Camera.SetActive(false);
 
         ManaUI.InitialInstantiate();
 
         SceneManager.LoadScene(1);
+
+        Complete = true;
     }
 }

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

第三期.txt

@@ -1,3 +1,6 @@
+DressRoom被Destroy掉的Bug
+
+
 服务器新旧版存取档是否兼容
 
 切换到远程服务器