Skip to content

Commit dcc057f

Browse files
author
Vulpisfoglia_BOT_rev20250407
committed
[CN UPDATE] Client:2.6.41 Data:25-09-02-13-38-25_e2b043
1 parent d88645c commit dcc057f

103 files changed

Lines changed: 568594 additions & 424661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

zh_CN/gamedata/[uc]lua/GlobalConfig.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GlobalConfig =
22
{
3-
CUR_FUNC_VER = "V064",
3+
CUR_FUNC_VER = "V065",
44
}
55

66

zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionTaskListDlg.lua

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ function CollectionTaskListDlg:Refresh(activityId, close)
7272
if not suc then
7373
return;
7474
end
75+
self.m_constDailyTaskDisabled = false;
7576
self.m_constDailyTaskItemOpenDayTs = 0;
7677
if itemsInCfg.consts ~= nil then
78+
self.m_constDailyTaskDisabled = itemsInCfg.consts.dailyTaskDisabled;
7779
self.m_constDailyTaskItemOpenDayTs = itemsInCfg.consts.dailyTaskStartTime;
7880
end
7981

@@ -111,7 +113,7 @@ function CollectionTaskListDlg:Refresh(activityId, close)
111113
end;
112114

113115
table.sort(self.m_missionList, comp);
114-
self:_RebuildVirtualViews();
116+
self:_RebuildVirtualViews(self.m_constDailyTaskDisabled);
115117
self.m_adapter:NotifyRebuildAll();
116118
end
117119

@@ -123,18 +125,23 @@ function CollectionTaskListDlg:_CheckMissionFinished(playerMissionDict, missionI
123125
return suc and state.state == CS.Torappu.MissionHoldingState.FINISHED;
124126
end
125127

126-
function CollectionTaskListDlg:_RebuildVirtualViews()
128+
129+
function CollectionTaskListDlg:_RebuildVirtualViews(dailyTaskDisabled)
127130
self.m_adapter:RemoveAllViews();
128-
self.m_adapter:AddView({
129-
viewType = CollectionTaskItemType.DAILTY_TITLE,
130-
data = {},
131-
size = itemSizeTable[CollectionTaskItemType.DAILTY_TITLE]
132-
});
133-
self.m_adapter:AddView({
134-
viewType = CollectionTaskItemType.DAILTY_ITEM,
135-
data = {},
136-
size = itemSizeTable[CollectionTaskItemType.DAILTY_ITEM]
137-
});
131+
132+
if not dailyTaskDisabled then
133+
self.m_adapter:AddView({
134+
viewType = CollectionTaskItemType.DAILTY_TITLE,
135+
data = {},
136+
size = itemSizeTable[CollectionTaskItemType.DAILTY_TITLE]
137+
});
138+
self.m_adapter:AddView({
139+
viewType = CollectionTaskItemType.DAILTY_ITEM,
140+
data = {},
141+
size = itemSizeTable[CollectionTaskItemType.DAILTY_ITEM]
142+
});
143+
end
144+
138145
self.m_adapter:AddView({
139146
viewType = CollectionTaskItemType.TIMED_TITLE,
140147
data = {},

zh_CN/gamedata/[uc]lua/feature/activity/collection/CollectionTimedTaskItem.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ function CollectionTimedTaskItem:Refresh( missionData, cfg )
5353
if self.m_finish then
5454
self._flagText.text = "completed";
5555
self._flagText.color = cfg.baseColor
56-
56+
57+
self._flagIcon.color = CS.UnityEngine.Color.white;
5758
self._prgBG.color = CS.UnityEngine.Color.white;
5859
self._prgCntLabel.color = cfg.baseColor;
5960
self._statusLabel.text = CS.Torappu.StringRes.ACTIVITY_3D5_HELP_STATUS_DESC1;
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
2+
local Act45SideHotfixer = Class("Act45SideHotfixer", HotfixBase)
3+
4+
local function Act45SideConfirmMailsFix(self)
5+
if self.m_cachedActId == nil then
6+
return;
7+
end
8+
9+
local suc, playerActData = CS.Torappu.PlayerData.instance.data.activity.act45sideActivityList:TryGetValue(self.m_cachedActId);
10+
if not suc then
11+
return;
12+
end
13+
14+
if playerActData.mailState == nil then
15+
return;
16+
end
17+
18+
local hasMail = false;
19+
local State = CS.Torappu.PlayerActivity.PlayerAct45SideActivity.State;
20+
for id, state in pairs(playerActData.mailState) do
21+
if state == State.UNLOCK then
22+
hasMail = true;
23+
break;
24+
end
25+
end
26+
27+
if not hasMail then
28+
return;
29+
end
30+
31+
self:_ConfirmMails()
32+
end
33+
34+
local function Act45SideConfirmCharsFix(self)
35+
if self.m_cachedActId == nil then
36+
return;
37+
end
38+
39+
local suc, playerActData = CS.Torappu.PlayerData.instance.data.activity.act45sideActivityList:TryGetValue(self.m_cachedActId);
40+
if not suc then
41+
return;
42+
end
43+
44+
if playerActData.charState == nil then
45+
return;
46+
end
47+
48+
local hasChar = false;
49+
local State = CS.Torappu.PlayerActivity.PlayerAct45SideActivity.State;
50+
for id, state in pairs(playerActData.charState) do
51+
if state == State.UNLOCK then
52+
hasChar = true;
53+
break;
54+
end
55+
end
56+
57+
if not hasChar then
58+
return;
59+
end
60+
61+
self:_ConfirmChars()
62+
end
63+
64+
local function StoryReviewActivityDetailItemFix(self, storyModel, outOfTime)
65+
self:ApplyData(storyModel, outOfTime)
66+
local oldBrief = self._storyInfo.text;
67+
self._storyInfo.text = CS.Torappu.AVGTextManager.instance:Translate(oldBrief);
68+
end
69+
70+
function Act45SideHotfixer:OnInit()
71+
xlua.private_accessible(CS.Torappu.Activity.Act45Side.Act45SideCharUnlockDialog)
72+
xlua.private_accessible(CS.Torappu.Activity.Act45Side.Act45SideMailDialog)
73+
xlua.private_accessible(CS.Torappu.UI.StoryReview.StoryReviewActivityDetailItemView)
74+
75+
self:Fix_ex(CS.Torappu.Activity.Act45Side.Act45SideCharUnlockDialog, "_ConfirmChars", Act45SideConfirmCharsFix)
76+
self:Fix_ex(CS.Torappu.Activity.Act45Side.Act45SideMailDialog, "_ConfirmMails", Act45SideConfirmMailsFix)
77+
self:Fix_ex(CS.Torappu.UI.StoryReview.StoryReviewActivityDetailItemView, "ApplyData", StoryReviewActivityDetailItemFix)
78+
end
79+
80+
function Act45SideHotfixer:OnDispose()
81+
end
82+
83+
return Act45SideHotfixer

zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ local list =
33
{
44

55
"HotFixes/TestStubHotfixer",
6-
"HotFixes/DurbusAbilityHotfixer",
6+
"HotFixes/Act45SideHotfixer",
77
"HotFixes/CroslyHotfixer",
88
};
99

10-
return list;
10+
return list;

0 commit comments

Comments
 (0)