From 7a6ab4aebd0a001f5cf4be8b9f652b363e595a81 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 07 十一月 2025 19:16:48 +0800
Subject: [PATCH] 236 子 【福利内容】每日任务/每周任务/章节奖励 / 【福利内容】每日任务/每周任务/章节奖励 1.日常任务改奖励物品 2.领取后的才有蒙版 3.底图调整
---
Main/System/DayMission/DayMissionCell.cs | 29 ++++++++++++++++++++++++-----
Main/System/DayMission/DayMissionWin.cs | 11 -----------
Main/Config/Configs/DailyTaskConfig.cs | 6 +++---
3 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/Main/Config/Configs/DailyTaskConfig.cs b/Main/Config/Configs/DailyTaskConfig.cs
index 4482cd1..0a3dac1 100644
--- a/Main/Config/Configs/DailyTaskConfig.cs
+++ b/Main/Config/Configs/DailyTaskConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2025骞�11鏈�3鏃�
+// [ Date ]: Friday, November 7, 2025
//--------------------------------------------------------
using System.Collections.Generic;
@@ -20,7 +20,7 @@
public int TaskType;
public int[] TaskConds;
public int NeedValue;
- public int AwardLiveness;
+ public int[][] AwardItemList;
public string Title;
public int GuideID;
@@ -54,7 +54,7 @@
int.TryParse(tables[3],out NeedValue);
- int.TryParse(tables[4],out AwardLiveness);
+ AwardItemList = JsonMapper.ToObject<int[][]>(tables[4].Replace("(", "[").Replace(")", "]"));
Title = tables[5];
diff --git a/Main/System/DayMission/DayMissionCell.cs b/Main/System/DayMission/DayMissionCell.cs
index de1928b..e99d6a6 100644
--- a/Main/System/DayMission/DayMissionCell.cs
+++ b/Main/System/DayMission/DayMissionCell.cs
@@ -5,8 +5,9 @@
public class DayMissionCell : CellView
{
+ [SerializeField] ItemCell[] itemCells;
+ [SerializeField] Transform[] gotRects;
[SerializeField] Text titleText;
- [SerializeField] Text valueText;
[SerializeField] Image processImg;
[SerializeField] Text processText;
[SerializeField] Button getBtn;
@@ -20,7 +21,6 @@
int id = DayMissionManager.Instance.dailyIDList[index];
var config = DailyTaskConfig.Get(id);
titleText.text = string.Format(config.Title, config.NeedValue);
- valueText.text = config.AwardLiveness.ToString();
var process = DayMissionManager.Instance.GetDailyTaskProcess(id);
processImg.fillAmount = (float)process / config.NeedValue;
processText.text = Math.Min(process, config.NeedValue) + "/" + config.NeedValue;
@@ -31,8 +31,8 @@
getBtn.SetActive(false);
gotoBtn.SetActive(true);
gotRect.SetActive(false);
- mask.SetActive(true);
- gotoBtn.AddListener(()=>
+ mask.SetActive(false);
+ gotoBtn.AddListener(() =>
{
RightFuncInHome.RemoveListenWindow();
UIManager.Instance.CloseWindow<DayMissionBaseWin>();
@@ -45,7 +45,7 @@
gotoBtn.SetActive(false);
gotRect.SetActive(false);
mask.SetActive(false);
- getBtn.AddListener(()=>
+ getBtn.AddListener(() =>
{
var pack = new CA504_tagCMPlayerGetReward();
pack.RewardType = 1;
@@ -60,6 +60,25 @@
gotRect.SetActive(true);
mask.SetActive(true);
}
+
+ for (int i = 0; i < itemCells.Length; i++)
+ {
+ if (i < config.AwardItemList.Length)
+ {
+ itemCells[i].SetActive(true);
+ int itemID = config.AwardItemList[i][0];
+ itemCells[i].Init(new ItemCellModel(config.AwardItemList[i][0], false, config.AwardItemList[i][1]));
+ itemCells[i].button.AddListener(() =>
+ {
+ ItemTipUtility.Show(itemID);
+ });
+ gotRects[i].SetActive(state == 2);
+ }
+ else
+ {
+ itemCells[i].SetActive(false);
+ }
+ }
}
diff --git a/Main/System/DayMission/DayMissionWin.cs b/Main/System/DayMission/DayMissionWin.cs
index d0f6830..e1163d9 100644
--- a/Main/System/DayMission/DayMissionWin.cs
+++ b/Main/System/DayMission/DayMissionWin.cs
@@ -13,11 +13,8 @@
[SerializeField] Text[] targetActivityText;
[SerializeField] ScrollerController scroller;
- int beforeActivity; //鐢ㄤ簬鏄剧ず娲昏穬濂栧姳
-
protected override void OnPreOpen()
{
- beforeActivity = DayMissionManager.Instance.activityTotal;
scroller.OnRefreshCell += OnRefreshCell;
DayMissionManager.Instance.OnDayMissionEvent += OnDayMissionEvent;
@@ -86,15 +83,7 @@
DayMissionManager.Instance.SortDailyTask();
Display();
scroller.m_Scorller.RefreshActiveCellViews();
- if (DayMissionManager.Instance.activityTotal != beforeActivity)
- {
- List<Item> showItems = new List<Item>();
- Item tempItem = new Item(GeneralDefine.activityItemID, DayMissionManager.Instance.activityTotal - beforeActivity);
- showItems.Add(tempItem);
- ItemLogicUtility.Instance.ShowGetItem(showItems);
- beforeActivity = DayMissionManager.Instance.activityTotal;
- }
}
void ShowAward(int id)
--
Gitblit v1.8.0