加入种植引导 刷新任务接口

Assets/AdSDK/InitProject/InitScene.unity

@@ -136,7 +136,7 @@ PrefabInstance:
     - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
         type: 3}
       propertyPath: IS_TEST
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2853166085728200634, guid: 1053be02c113a7a45adf322c929b0cb6,
         type: 3}

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -13768,7 +13768,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 646408898}
-  m_RootOrder: 2
+  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}
@@ -14285,7 +14285,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 646408898}
-  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}
@@ -18556,6 +18556,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 633442740}
+  - {fileID: 1521926632}
   - {fileID: 506249889}
   - {fileID: 488649218}
   - {fileID: 1700590388}
@@ -42033,6 +42034,100 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1521551612}
   m_CullTransparentMesh: 0
+--- !u!1 &1521926631
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1521926632}
+  - component: {fileID: 1521926635}
+  - component: {fileID: 1521926634}
+  - component: {fileID: 1521926633}
+  m_Layer: 5
+  m_Name: plantHand
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1521926632
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1521926631}
+  m_LocalRotation: {x: -0, y: -0, z: 0.53142816, w: 0.8471034}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 646408898}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 64.204}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -160, y: -30}
+  m_SizeDelta: {x: 140, y: 140}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!95 &1521926633
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1521926631}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 532f0e55e970ecb41a4f1fbe54da826e, 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!114 &1521926634
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1521926631}
+  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: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b21fc9e114e59c34eb5afe1ef0984505, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1521926635
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1521926631}
+  m_CullTransparentMesh: 0
 --- !u!1 &1527901731
 GameObject:
   m_ObjectHideFlags: 0
@@ -47828,7 +47923,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 646408898}
-  m_RootOrder: 3
+  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}
@@ -55560,6 +55655,7 @@ MonoBehaviour:
   hand_5: {fileID: 1359973897}
   hand_6: {fileID: 1575014088}
   hand_7: {fileID: 154575108}
+  plantHand: {fileID: 1521926631}
   Car4Parent: {fileID: 377542755}
   Car4Bottom: {fileID: 46128299}
   Car4Obj: {fileID: 1741054207}

Assets/Game/Main/Scripts/Item/HarvestItem.cs

@@ -94,6 +94,7 @@ public class HarvestItem : MonoBehaviour
                         EventCenter.Broadcast(MyEventType.UPDATE_HARVEST_DATA);
                         EventCenter.Broadcast(MyEventType.FlyHongbao);
                         EventCenter.Broadcast(MyEventType.RefreshHomeInfo);
+                        EventCenter.Broadcast(MyEventType.UPDATE_HARVEST_DATA, 2);
 
                     }), new Action<string, string>((code, errMsg) =>
                     {

Assets/Game/Main/Scripts/Item/PlantMakeMoneyItem.cs

@@ -35,6 +35,14 @@ public class PlantMakeMoneyItem : MonoBehaviour
 
     public void clickPlant()
     {
+        if (PlayerDataControl.Instance.IsNewUser) {
+
+            if (item.id != 1)
+            {
+                ToastPlugin.ToastHelper.ShowToast("请根据引导种植");
+                return;
+            }
+        }
         Debug.Log("点击的Id" + item.id+item.name);
         EventCenter.Broadcast(MyEventType.CloseMakeMoney);
         EventCenter.Broadcast(MyEventType.PLANT_LAND_DATA, plandId+"="+item.id);

Assets/Game/Main/Scripts/Item/TaskItem.cs

@@ -208,8 +208,7 @@ public class TaskItem : MonoBehaviour
                 EventCenter.Broadcast(MyEventType.FlyDiamond);
                 EventCenter.Broadcast(MyEventType.UpdateTaskList);
                 EventCenter.Broadcast(MyEventType.RefreshHomeInfo);
-
-
+                EventCenter.Broadcast(MyEventType.UPDATE_HARVEST_DATA, 1);
             }), new Action<string, string>((code, errMsg) =>
             {
 

Assets/Game/Main/Scripts/Utils/Guide.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class Guide : MonoBehaviour
 {
-    public GameObject ObjStep1, ObjStep2, ObjStep3, ObjStep4, ObjStep5, ObjStep6, ObjStep7, hand_1, hand_2, hand_3, hand_4, hand_5, hand_6, hand_7;
+    public GameObject ObjStep1, ObjStep2, ObjStep3, ObjStep4, ObjStep5, ObjStep6, ObjStep7, hand_1, hand_2, hand_3, hand_4, hand_5, hand_6, hand_7, plantHand;
     public GameObject Car4Parent,Car4Bottom;
     public GameObject Car4Obj;
     public GameObject flyBox;
@@ -55,6 +55,7 @@ public class Guide : MonoBehaviour
                 Debug.Log("点击第0步");
                 ObjStep1.SetActive(true);
                 hand_1.SetActive(true);
+                plantHand.SetActive(true);
             }
         }
 
@@ -102,6 +103,7 @@ public class Guide : MonoBehaviour
             {
                 PlayerPrefs.SetInt(step4Key, 1);
                 step4.SetActive(true);
+                plantHand.SetActive(false);
             }
         }
         //if (PlayerPrefs.GetInt(step4Key, 0) == 0)