修改任务 首页ui

Assets/Game/Main/Resource/ui/top/底-15.png.meta

+fileFormatVersion: 2
+guid: 67435b91064cb41df8416e1ff6553152
+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/top/未标题-1.png.meta

+fileFormatVersion: 2
+guid: 508e80bd33bd14cf3a423bdd1327fdb6
+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/top/进度条-10.png.meta

+fileFormatVersion: 2
+guid: 6e24a5bcd74dc41a5a5dd3e619e0fccc
+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/top/进度条-11.png.meta

+fileFormatVersion: 2
+guid: 84befd131b2ab460bae5de5a3b58b3c4
+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

@@ -12,36 +12,80 @@ public class HarvestControl : MonoBehaviour
     private float mDefaultPosY;
 
     public GameObject contentParent;
-    public GameObject harvestItemObj;
+    public GameObject harvestItemObj,taskItemObj;
+    public Image img_left, img_right;
+    public Sprite[] btnSprites;
+    public Text tv_left, tv_right;
+    private int positon;
     private void Awake()
     {
         // mPresenter = new ClockInPresenter(this);
         Debug.Log("s奖励列表");
-       EventCenter.AddListener(MyEventType.UPDATE_HARVEST_DATA, OnUpdateTaskList);
+       EventCenter.AddListener<int>(MyEventType.UPDATE_HARVEST_DATA, OnUpdateTaskList);
        EventCenter.AddListener(MyEventType.CLOSE_CLOCKIN_PAGE, OnClickCloseHarvestInPanel);
     }
 
-    private void OnUpdateTaskList()
+    private void OnUpdateTaskList(int p)
     {
-        getTaskList();
+        //getHarvestTaskList();
+        if (p == 1)
+        {
+            getDiamandTaskList();
+        }
+        else
+        {
+            getHarvestTaskList();
+        }
     }
 
     private void OnDestroy()
     {
-        EventCenter.RemoveListener(MyEventType.UPDATE_HARVEST_DATA, OnUpdateTaskList);
+        EventCenter.RemoveListener<int>(MyEventType.UPDATE_HARVEST_DATA, OnUpdateTaskList);
         EventCenter.RemoveListener(MyEventType.CLOSE_CLOCKIN_PAGE, OnClickCloseHarvestInPanel);
     }
 
     private void Start()
     {
         mDefaultPosY = transform.localPosition.y;
-        getTaskList();
+        // getHarvestTaskList();
+        getDiamandTaskList();
        // mPresenter.GetClockInTaskList();
     }
+    private void getDiamandTaskList()
+    {
+        Debug.Log("获取任务列表");
+        HttpTool.Instance._Get("app/v1/wdlc/task/diamond_task_list", null, new Action<TaskDiamondBean>((bean) =>
+        {
+            SetListInfo(bean);
+        }), new Action<string, string>((code, errMsg) =>
+        {
+            Debug.unityLogger.Log("获取任务列表 请求失败" + code + errMsg);
+        }));
+    }
+
+    private void SetListInfo(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(taskItemObj, contentParent.transform);
+                itemObj.GetComponent<TaskItem>().setItemData(bean.taskList[i]);
+            }
+        }
+    }
 
-    private void getTaskList()
+    private void getHarvestTaskList()
     {
-        Debug.Log("获取奖励列表");
+        Debug.Log("获取收获奖励列表");
         HttpTool.Instance._Get("app/v1/wdlc/reward/gain_reward_list", null, new Action<List<TaskListBean>>((bean) =>
         {
             SetTaskListInfo(bean);
@@ -66,7 +110,7 @@ public class HarvestControl : MonoBehaviour
             }
             for(int i = 0; i < bean.Count; i++)
             {
-                GameObject itemObj = Instantiate(harvestItemObj,contentParent.transform);
+                GameObject itemObj = Instantiate(harvestItemObj, contentParent.transform);
                 itemObj.GetComponent<HarvestItem>().setHarvestItemData(bean[i]);
             }
         }
@@ -78,7 +122,7 @@ public class HarvestControl : MonoBehaviour
         Debug.Log("打开收获奖励");
         EventUtils.OnEvent("reapRewards_click", "点击收获奖励");
         EventCenter.Broadcast(MyEventType.OPEN_PANEL);
-        EventCenter.Broadcast(MyEventType.UPDATE_HARVEST_DATA);
+        EventCenter.Broadcast(MyEventType.UPDATE_HARVEST_DATA,positon);
         transform.DOLocalMoveY(mDefaultPosY + BgImg.preferredHeight, 0.5f).SetEase(Ease.OutQuart);
         //mPresenter.GetClockInTaskList();
     }
@@ -90,4 +134,24 @@ public class HarvestControl : MonoBehaviour
         EventCenter.Broadcast(MyEventType.CLOSE_PANEL);
         transform.DOLocalMoveY(mDefaultPosY, 0.5f).SetEase(Ease.OutQuart);
     }
+    //点击每日任务
+    public void clickDiamandTask()
+    {
+        getDiamandTaskList();
+        img_left.sprite = btnSprites[1];
+        img_right.sprite = btnSprites[0];
+        tv_left.text = "<color=#2C1F76>每日任务</color>";
+        tv_right.text = "<color=#935B2F>收获任务</color>";
+        positon = 1;
+    }
+    //点击收获任务
+    public void clickHavestTask()
+    {
+        getHarvestTaskList();
+        img_left.sprite = btnSprites[0];
+        tv_left.text = "<color=#935B2F>每日任务</color>";
+        tv_right.text = "<color=#2C1F76>收获任务</color>";
+        img_right.sprite = btnSprites[1];
+        positon = 2;
+    }
 }