[CN UPDATE] Client:2.3.61 Data:24-09-05-09-46-01-db17aa

Kengxxiao · Sep 9, 2024 · 308dcf6 · 308dcf6
1 parent 9a47cf1
commit 308dcf6
Show file tree

Hide file tree

Showing 40 changed files with 108,357 additions and 71 deletions.
diff --git a/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionDailyTaskItem.lua b/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionDailyTaskItem.lua
@@ -1,6 +1,6 @@
 
 
-CollectionDailyTaskItem = Class("CollectionDailyTaskItem", UIWidget);
+local CollectionDailyTaskItem = Class("CollectionDailyTaskItem", UIWidget);
 
 
 function CollectionDailyTaskItem:Refresh(actId, cfg)
@@ -56,4 +56,6 @@ function CollectionDailyTaskItem:Refresh(actId, cfg)
       self._flagText.color = CS.Torappu.ColorRes.COMMON_BLACK;
     end
   end
-end
+end
+
+return CollectionDailyTaskItem;
diff --git a/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionTaskListDlg.lua b/zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionTaskListDlg.lua
@@ -6,14 +6,51 @@
 
 
 
-local CollectionTaskListAdapter = require("Feature/Activity/Collection/CollectionTaskListAdapter")
+
+
+
+
+
+local CollectionTimedTaskItem = require("Feature/Activity/Collection/CollectionTimedTaskItem")
+local CollectionDailyTaskItem = require("Feature/Activity/Collection/CollectionDailyTaskItem")
+
+local SimpleWidget = Class("CollectionTaskListSimpleWidget", UIWidget);
 CollectionTaskListDlg = DlgMgr.DefineDialog("CollectionTaskListDlg", "Activity/Collection/task_list_dlg");
 
-function CollectionTaskListDlg:OnInit()
-  self.m_dailyItem = self:CreateWidgetByGO(CollectionDailyTaskItem, self._dailyItem);
+CollectionTaskItemType = {
+  DAILTY_TITLE = 1,
+  DAILTY_ITEM = 2,
+  TIMED_TITLE = 3,
+  TIMED_ITEM = 4,
+}
+Readonly(CollectionTaskItemType);
 
-  self.m_listAdapter = self:CreateCustomComponent(CollectionTaskListAdapter, self._listAdapter, self);
-  self.m_listAdapter.missionList = {};
+local itemSizeTable = {}
+itemSizeTable[CollectionTaskItemType.DAILTY_TITLE] = 43;
+itemSizeTable[CollectionTaskItemType.DAILTY_ITEM] = 110;
+itemSizeTable[CollectionTaskItemType.TIMED_TITLE] = 43;
+itemSizeTable[CollectionTaskItemType.TIMED_ITEM] = 131;
+
+function CollectionTaskListDlg:OnInit()
+  local viewDefineTable = {};
+  viewDefineTable[CollectionTaskItemType.DAILTY_TITLE] = {
+    prefab = self._dailyTitlePrefab,
+    cls = SimpleWidget
+  };
+  viewDefineTable[CollectionTaskItemType.DAILTY_ITEM] = {
+    prefab = self._dailyItemPrefab,
+    cls = CollectionDailyTaskItem
+  };
+  viewDefineTable[CollectionTaskItemType.TIMED_TITLE] = {
+    prefab = self._timedTitlePrefab,
+    cls = SimpleWidget
+  };
+  viewDefineTable[CollectionTaskItemType.TIMED_ITEM] = {
+    prefab = self._timedItemPrefab,
+    cls = CollectionTimedTaskItem
+  };
+
+  self.m_adapter = self:CreateCustomComponent(UIVirtualViewAdapter, self, self._recycleGroup, viewDefineTable,self._RefreshListItem)
 end
 
 function CollectionTaskListDlg:OnClose()
@@ -28,9 +65,7 @@ function CollectionTaskListDlg:Refresh(activityId, close)
   self.m_activityId = activityId;
   self.m_close = close;
 
-  local actcfg = CollectionActModel.me:GetActCfg(activityId);
-
-  self.m_dailyItem:Refresh(activityId, actcfg);
+  self.m_actCfg = CollectionActModel.me:GetActCfg(activityId);
 
 
   local missionGrp = CollectionActModel.me:GetMissionGroup(activityId);
@@ -39,13 +74,13 @@ function CollectionTaskListDlg:Refresh(activityId, close)
   end
 
 
-  local list = {};
+  self.m_missionList = {};
   for idx = 0, missionGrp.missionIds.Length -1 do
     local missionId = missionGrp.missionIds[idx];
     local missionData = CollectionActModel.me:FindMission(missionId);
 
     if missionData then
-      table.insert(list, missionData);
+      table.insert(self.m_missionList, missionData);
     end
   end
 
@@ -65,23 +100,9 @@ function CollectionTaskListDlg:Refresh(activityId, close)
     return b_finish;
   end;
 
-  table.sort(list, comp);
-  self.m_listAdapter.missionList = list;
-  self.m_listAdapter.actCfg = actcfg;
-  self.m_listAdapter:NotifyDataSourceChanged();
-
-  self:_SynTime();
-end
-
-function CollectionTaskListDlg:_SynTime()
-
-  local time = CS.Torappu.DateTimeUtil.currentTime:AddHours(-1 * CS.Torappu.SharedConsts.GAME_DAY_DIVISION_HOUR);
-  local zero = CS.System.DateTime(time.Year, time.Month, time.Day, 0, 0, 0):AddDays(1);
-  self._dailyTaskTimeLabel.text = CS.Torappu.Lua.Util.Format(CS.Torappu.StringRes.SHOP_REMAIN_COUNT, CS.Torappu.FormatUtil.FormatTimeDelta(zero - time));
-
-  local endTime = CS.Torappu.DateTimeUtil.TimeStampToDateTime(CollectionActModel.me:FindBasicInfo(self.m_activityId).endTime);
-  local timeRemain = endTime - CS.Torappu.DateTimeUtil.currentTime;
-  self._limitTaskTimeLabel.text = CS.Torappu.Lua.Util.Format(CS.Torappu.StringRes.SHOP_REMAIN_COUNT, CS.Torappu.FormatUtil.FormatTimeDelta(timeRemain));
+  table.sort(self.m_missionList, comp);
+  self:_RebuildVirtualViews();
+  self.m_adapter:NotifyRebuildAll();
 end
 
 
@@ -90,4 +111,58 @@ end
 function CollectionTaskListDlg:_CheckMissionFinished(playerMissionDict, missionId) 
   local suc, state = playerMissionDict:TryGetValue(missionId);
   return suc and state.state == CS.Torappu.MissionHoldingState.FINISHED;
+end
+
+function CollectionTaskListDlg:_RebuildVirtualViews()
+  self.m_adapter:RemoveAllViews();
+  self.m_adapter:AddView({
+    viewType = CollectionTaskItemType.DAILTY_TITLE,
+    data = nil,
+    size = itemSizeTable[CollectionTaskItemType.DAILTY_TITLE]
+  });
+  self.m_adapter:AddView({
+    viewType = CollectionTaskItemType.DAILTY_ITEM,
+    data = nil,
+    size = itemSizeTable[CollectionTaskItemType.DAILTY_ITEM]
+  });
+  self.m_adapter:AddView({
+    viewType = CollectionTaskItemType.TIMED_TITLE,
+    data = nil,
+    size = itemSizeTable[CollectionTaskItemType.TIMED_TITLE]
+  });
+
+  for idx = 1, #self.m_missionList do
+    self.m_adapter:AddView({
+      viewType = CollectionTaskItemType.TIMED_ITEM,
+      data = self.m_missionList[idx],
+      size = itemSizeTable[CollectionTaskItemType.TIMED_ITEM]
+    });
+  end
+end
+
+
+
+
+function CollectionTaskListDlg:_RefreshListItem(viewType, widget, model)
+  if viewType == CollectionTaskItemType.DAILTY_TITLE then
+    local time = CS.Torappu.DateTimeUtil.currentTime:AddHours(-1 * CS.Torappu.SharedConsts.GAME_DAY_DIVISION_HOUR);
+    local zero = CS.System.DateTime(time.Year, time.Month, time.Day, 0, 0, 0):AddDays(1);
+    widget._timeLabel.text = CS.Torappu.Lua.Util.Format(CS.Torappu.StringRes.SHOP_REMAIN_COUNT, CS.Torappu.FormatUtil.FormatTimeDelta(zero - time));
+    return;
+  elseif viewType == CollectionTaskItemType.DAILTY_ITEM then
+
+    local dailyItem = widget;
+    dailyItem:Refresh(self.m_activityId, self.m_actCfg);
+    return;
+  elseif viewType == CollectionTaskItemType.TIMED_TITLE then
+    local endTime = CS.Torappu.DateTimeUtil.TimeStampToDateTime(CollectionActModel.me:FindBasicInfo(self.m_activityId).endTime);
+    local timeRemain = endTime - CS.Torappu.DateTimeUtil.currentTime;
+    widget._timeLabel.text = CS.Torappu.Lua.Util.Format(CS.Torappu.StringRes.SHOP_REMAIN_COUNT, CS.Torappu.FormatUtil.FormatTimeDelta(timeRemain));
+    return;
+  elseif viewType == CollectionTaskItemType.TIMED_ITEM then
+
+    local timedItem = widget;
+    timedItem:Refresh(model, self.m_actCfg);
+    return;
+  end
 end