我的菜园1.0.5

Assets/Game/Main/Prefabs/WithdrawalEveryDayItem.prefab

@@ -222,6 +222,7 @@ GameObject:
   - component: {fileID: 4820329151650945109}
   - component: {fileID: 3830571633674503303}
   - component: {fileID: 7830625092607302200}
+  - component: {fileID: 7257074911161493785}
   m_Layer: 5
   m_Name: receiver_btn
   m_TagString: Untagged
@@ -339,6 +340,25 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!95 &7257074911161493785
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6988976598671568271}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: c453ddf064153a840a0558b7748ff029, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &7618304266170614699
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -6138,19 +6138,8 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 2012954741}
-        m_MethodName: JumpWithDraw
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
-      - m_Target: {fileID: 1343088502}
-        m_MethodName: GetWithDrawPageInfo
+      - m_Target: {fileID: 716226833}
+        m_MethodName: clickWithDrawBg
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -10862,7 +10851,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &407844799
 RectTransform:
   m_ObjectHideFlags: 0
@@ -15160,7 +15149,7 @@ RectTransform:
   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: 56, y: 66}
+  m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &559426349
 MonoBehaviour:
@@ -17093,7 +17082,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: 610}
+  m_AnchoredPosition: {x: 0, y: 629}
   m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &634203770
@@ -19279,6 +19268,7 @@ GameObject:
   m_Component:
   - component: {fileID: 716226832}
   - component: {fileID: 716226833}
+  - component: {fileID: 716226834}
   m_Layer: 5
   m_Name: Title
   m_TagString: Untagged
@@ -19327,11 +19317,39 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   img_icon: {fileID: 559426349}
   img_procress: {fileID: 2086066928}
-  img_btn: {fileID: 1000610429}
+  img_btn: {fileID: 243898011}
   img_withdraw: {fileID: 864805491}
   contentParent: {fileID: 1992052043}
   item_prefab: {fileID: 4313061083253950001, guid: 68900ab454c984c2d9184c156e08f810,
     type: 3}
+  cashTitleDescTv: {fileID: 1440887900}
+--- !u!114 &716226834
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 716226831}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858415f4656694ff98262751c2b91d1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tv_cash: {fileID: 200879011}
+  tv_process: {fileID: 1395310243}
+  img_procress: {fileID: 2086066928}
+  img_icon: {fileID: 559426349}
+  labels:
+  - {fileID: 21300000, guid: 47ddb0399e2684cf3884c6d6bdddf958, type: 3}
+  - {fileID: 21300000, guid: 72f865c0b00ad4541ae1a671aae1040a, type: 3}
+  - {fileID: 21300000, guid: 6cc4af9c8b9064107b6ea289c5733259, type: 3}
+  - {fileID: 21300000, guid: 9b89a9ec88f4842b3a619c1567897a5e, type: 3}
+  - {fileID: 21300000, guid: 5bfbf41c22713430fbfe0c71d1e0a026, type: 3}
+  - {fileID: 21300000, guid: f1cc32b6fcc8b4ec7a624085380dd608, type: 3}
+  - {fileID: 21300000, guid: ee2dc6b0cb7974ff5b77f2fe65a97d43, type: 3}
+  - {fileID: 21300000, guid: 8944be0946e714260912afb0aafb3ca5, type: 3}
+  - {fileID: 21300000, guid: fd5ece32e702d4c87b077c6ac5feb5fd, type: 3}
+  - {fileID: 21300000, guid: e682ab231c8d34771a60091de4631774, type: 3}
 --- !u!1 &718040249
 GameObject:
   m_ObjectHideFlags: 0
@@ -27332,8 +27350,8 @@ RectTransform:
   m_Father: {fileID: 1717678917}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.000000057908174, y: 0}
+  m_AnchorMax: {x: 0.97594327, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -32125,7 +32143,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: 267.8, y: -21.9}
+  m_AnchoredPosition: {x: 0, y: -21.9}
   m_SizeDelta: {x: 140, y: 111}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &1230170801
@@ -39634,7 +39652,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1472916196
 RectTransform:
   m_ObjectHideFlags: 0
@@ -43246,7 +43264,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: -276.1, y: -21}
+  m_AnchoredPosition: {x: -240, y: -21}
   m_SizeDelta: {x: 139, y: 110}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1599538624
@@ -48582,9 +48600,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -17}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1795153949
 MonoBehaviour:
@@ -49791,7 +49809,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: -95, y: -41}
+  m_AnchoredPosition: {x: 245, y: -41}
   m_SizeDelta: {x: 150, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &1841722934
@@ -50544,7 +50562,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1863343229
 RectTransform:
   m_ObjectHideFlags: 0
@@ -53036,7 +53054,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 12.6779175, y: 20}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1992052045
 MonoBehaviour:

Assets/Game/Main/Scripts/View/TitleControl.cs

@@ -13,6 +13,7 @@ public class TitleControl : MonoBehaviour
     private Animator m_Animator,btn_Animator;
     public Image img_withdraw;
     public GameObject contentParent, item_prefab;
+    public Text cashTitleDescTv;
     //获取首页第一个提现信息
     private void Start()
     {
@@ -33,7 +34,8 @@ public class TitleControl : MonoBehaviour
         HttpTool.Instance._Get("app/v1/wdlc/wd/first_info", null, new Action<WithDrawFirstInfoBean>((bean) =>
         {
             Debug.Log("首页提现信息");
-            setData(bean.wdlcWdDataList);
+            setNewData(bean.wdlcWdDataList);
+            //setData(bean.wdlcWdDataList);
             setAnimal(bean);
 
         }), new Action<string, string>((code, errMsg) =>
@@ -56,6 +58,18 @@ public class TitleControl : MonoBehaviour
         }
     }
 
+    private void setNewData(List<WithdrawListItem> data)
+    {
+        if(null != data)
+        {
+            if (data.Count > 0)
+            {
+                cashTitleDescTv.text = data[0].shortConditionContent;
+                GetComponent<HomeItem>().setItemData(data[0]);
+            }
+        }
+    }
+
     private void setData(List<WithdrawListItem> data)
     {
         if (null != data)

Assets/Game/Main/Scripts/View/WithdrawalEveryDayControl.cs

@@ -136,6 +136,8 @@ public class WithdrawalEveryDayControl : MonoBehaviour
 
     }
 
+    private int Onesid;
+
     /// <summary>
     /// 设置list数据
     /// </summary>
@@ -148,6 +150,7 @@ public class WithdrawalEveryDayControl : MonoBehaviour
         }
         for (int i = 0; i < taskList.Count; i++)
         {
+            Onesid = taskList[0].sid;
             GameObject game = Instantiate(itemObj, scroolViewContent.transform);
             game.name = "" + i;
             game.GetComponent<WithdrawalEveryDayItemControl>().setDateInfo(taskList[i]);
@@ -248,7 +251,8 @@ public class WithdrawalEveryDayControl : MonoBehaviour
         }
         else
         {
-            ToastPlugin.ToastHelper.ShowToast("进度未达到，快去增加进度吧！");
+            videoGetHeart(Onesid);
+            //ToastPlugin.ToastHelper.ShowToast("进度未达到，快去增加进度吧！");
         }
     }
 

Assets/Game/Main/Scripts/View/WithdrawalEveryDayItemControl.cs

@@ -13,8 +13,14 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour
     public Button receiver_btn;//btn
     public Text descript_tv;//描述
     public Sprite[] btnArraySprite;
-
+    private Animator m_Animator;
     private WithdrawalEverydayBean.TaskListItem taskItemDate;
+
+    private void Awake()
+    {
+        m_Animator = receiver_btn.GetComponent<Animator>();
+    }
+
     public void setDateInfo(WithdrawalEverydayBean.TaskListItem taskListItem)
     {
         this.taskItemDate = taskListItem;
@@ -23,9 +29,11 @@ public class WithdrawalEveryDayItemControl : MonoBehaviour
         if (taskListItem.status == 1)
         {
             receiver_btn.GetComponent<Image>().sprite = btnArraySprite[0];
+            m_Animator.Play("shake");
         }
         else {
             receiver_btn.GetComponent<Image>().sprite = btnArraySprite[1];
+            m_Animator.Play("stop");
         }
 
     }