添加地块种植的弹唱

Assets/AdSDK/AD/ZXHC/ZxHCSDK/common/ZXHCADManager.cs

@@ -14,9 +14,9 @@ namespace ZXHC
 #if UNITY_ANDROID
             AndroidJavaObject hcAdManager = new AndroidJavaClass("com.ym.zxhcsdk.manager.ZXHCADManager").CallStatic<AndroidJavaObject>("getInstance");
             hasInit = hcAdManager.Call<bool>("InitAd",ZXHCUtils.GetActivity(),appId, IsDebug);
-            OaidUtil.GetOaid(new Action<string>((oaid) => {
-                ZXHCUtils.SetDeviceOaid(oaid);
-            }));
+            //OaidUtil.GetOaid(new Action<string>((oaid) => {
+            //    ZXHCUtils.SetDeviceOaid(oaid);
+            //}));
             return hasInit;
 #elif UNITY_IOS
             return hasInit;

Assets/Game/Main/Resource/ui/bottomplan.meta

+fileFormatVersion: 2
+guid: 096c0ea238fe74f78a61129c94b6fdf2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Main/Resource/ui/bottomplan/做任务领钻石-3.png.meta

+fileFormatVersion: 2
+guid: 7044acc9a793d4131bb00404f3b8ae80
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Main/Resource/ui/bottomplan/图层 7.png.meta

+fileFormatVersion: 2
+guid: 14179618030d64ace927e485227dd366
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Main/Resource/ui/bottomplan/组 1.png.meta

+fileFormatVersion: 2
+guid: 8069d2ed9d4aa4586871c3bdc44aa2cf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Main/Resource/ui/main/感叹号.png.meta

+fileFormatVersion: 2
+guid: 5b40ef7c1cf104b30af1bf47eca45e01
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -16,7 +16,7 @@ public class HarvestControl : MonoBehaviour
     public Image img_left, img_right;
     public Sprite[] btnSprites;
     public Text tv_left, tv_right;
-    private int positon;
+    private int positon=1;
     private void Awake()
     {
         // mPresenter = new ClockInPresenter(this);

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

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using DG.Tweening;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PlantMakeMoney : MonoBehaviour
+{
+    //private ClockInPresenter mPresenter;
+    public Image BgImg;//背景图片，用于计算移动高度
+    private float mDefaultPosY;
+
+    public GameObject contentParent;
+    public GameObject harvestItemObj;
+    private void Awake()
+    {
+        // mPresenter = new ClockInPresenter(this);
+
+        EventCenter.AddListener(MyEventType.UpdateTaskList, OnUpdateTaskList);
+        EventCenter.AddListener(MyEventType.CLOSE_CLOCKIN_PAGE, OnClickCloseHarvestInPanel);
+    }
+
+    private void OnUpdateTaskList()
+    {
+        getTaskList();
+    }
+
+    private void OnDestroy()
+    {
+        EventCenter.RemoveListener(MyEventType.UpdateTaskList, OnUpdateTaskList);
+        EventCenter.RemoveListener(MyEventType.CLOSE_CLOCKIN_PAGE, OnClickCloseHarvestInPanel);
+    }
+
+    private void Start()
+    {
+        mDefaultPosY = transform.localPosition.y;
+        getTaskList();
+        // mPresenter.GetClockInTaskList();
+    }
+
+    private void getTaskList()
+    {
+        Debug.Log("获取任务列表");
+        HttpTool.Instance._Get("app/v1/wdlc/task/diamond_task_list", null, new Action<TaskDiamondBean>((bean) =>
+        {
+            SetTaskListInfo(bean);
+        }), new Action<string, string>((code, errMsg) =>
+        {
+            Debug.unityLogger.Log("获取任务列表 请求失败" + code + errMsg);
+        }));
+
+    }
+
+    private void SetTaskListInfo(TaskDiamondBean bean)
+    {
+        if (bean != null)
+        {
+            int num = contentParent.transform.childCount;
+            if (num > 0)
+            {
+                for (int i = 0; i < num; i++)
+                {
+                    Destroy(contentParent.transform.GetChild(i).gameObject);
+                }
+            }
+            for (int i = 0; i < bean.taskList.Count; i++)
+            {
+                GameObject itemObj = Instantiate(harvestItemObj, contentParent.transform);
+                itemObj.GetComponent<TaskItem>().setItemData(bean.taskList[i]);
+            }
+        }
+    }
+
+    //打开打卡任务面板
+    public void OnClickOpenHarvestInPanel()
+    {
+        //EventUtils.OnEvent("taskList_click", "点击每日任务");
+        EventCenter.Broadcast(MyEventType.OPEN_PANEL);
+       // EventCenter.Broadcast(MyEventType.UpdateTaskList);
+        transform.DOLocalMoveY(mDefaultPosY + BgImg.preferredHeight, 0.5f).SetEase(Ease.OutQuart);
+        //mPresenter.GetClockInTaskList();
+    }
+    //关闭打卡任务面板
+    public void OnClickCloseHarvestInPanel()
+    {
+        AudioUtils.ins.PlayBtnAudio();
+        EventCenter.Broadcast(MyEventType.CLOSE_PANEL);
+        transform.DOLocalMoveY(mDefaultPosY, 0.5f).SetEase(Ease.OutQuart);
+    }
+}

Assets/Game/Main/Scripts/View/PlantMakeMoney.cs.meta

+fileFormatVersion: 2
+guid: 0aa18d1741b0340ceb107c6f98c2baa1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Splash/Splash.cs

@@ -8,6 +8,7 @@ using Umeng;
 using UnityEngine;
 using UnityEngine.Android;
 using UnityEngine.SceneManagement;
+using ZXHC;
 
 public class Splash : MonoBehaviour
 {
@@ -27,6 +28,10 @@ public class Splash : MonoBehaviour
         getPermission();
 
         StartCoroutine(loadScene());
+        OaidUtil.GetOaid(new Action<string>((oaid) => {
+            ZXHCUtils.SetDeviceOaid(oaid);
+            EventUtils.OnEvent("app_active");
+        }));
 
     }