Skip to content

Commit bd7225a

Browse files
author
Vulpisfoglia_BOT_rev20250407
committed
[CN UPDATE] Client:2.7.11 Data:26-03-31-05-42-28_7d7f67
1 parent 86b6e74 commit bd7225a

67 files changed

Lines changed: 275116 additions & 247123 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/feature/FeatureModule.lua‎

Lines changed: 96 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,96 @@
1-
require "Feature/ResDefines"
2-
require "Feature/AudioConsts"
3-
require "Feature/Supportor/SupportorModule"
4-
5-
require "Feature/Main/MainDlg"
6-
require "Feature/Main/TestDlg"
7-
8-
require "Feature/Activity/Collection/CollectionItem"
9-
require "Feature/Activity/Collection/CollectionMainDlg"
10-
require "Feature/Activity/Collection/CollectionTaskListDlg"
11-
require "Feature/Activity/Collection/CollectionActModel"
12-
require "Feature/Activity/Collection/CollectionDailyTaskItem"
13-
require "Feature/Activity/Collection/CollectionTimedTaskItem"
14-
require "Feature/Activity/LoginOnly/LoginOnlyDefine"
15-
require "Feature/Activity/LoginOnly/LoginOnlyDlg"
16-
require "Feature/Activity/LoginOnly/NoEntryLoginOnlyDlg"
17-
18-
require "Feature/Activity/PrayOnly/PrayOnlyDefine"
19-
require "Feature/Activity/PrayOnly/PrayOnlyMainDlg"
20-
require "Feature/Activity/PrayOnly/PrayOnlyActDefines"
21-
22-
require "Feature/Activity/ActFlip/ActFlipMainDlg"
23-
24-
require "Feature/Activity/CheckinAccess/CheckinAccessDefine"
25-
require "Feature/Activity/CheckinAccess/CheckinAccessMainDlg"
26-
27-
require "Feature/Activity/LuaActivityUtil"
28-
29-
require "Feature/Activity/Act3D5/Act3D5Dlg"
30-
require "Feature/Activity/Act4D5/Act4D5Dlg"
31-
require "Feature/Activity/Act6D8/Act6D8Dlg"
32-
require "Feature/Activity/Act9D1D2/Act9D1D2Dlg"
33-
require "Feature/Activity/Act9D4/Act9D4Dlg"
34-
require "Feature/Activity/Act14D0D2/Act14D0D2Dlg"
35-
require "Feature/Activity/Act16D5D1/Act16D5D1Dlg"
36-
37-
require "Feature/Activity/GridGacha/GridGachaDefine"
38-
require "Feature/Activity/GridGacha/GridGachaMainDlg"
39-
40-
require "Feature/Activity/GridGachaV2/GridGachaV2Define"
41-
require "Feature/Activity/GridGachaV2/GridGachaV2MainDlg"
42-
43-
require "Feature/Activity/FloatParade/FloatParadeProbDetailPanel"
44-
require "Feature/Activity/FloatParade/FloatParadeRulePanel"
45-
require "Feature/Activity/FloatParade/FloatParadeRewardRulePanel"
46-
require "Feature/Activity/FloatParade/FloatParadeRecycleDayListAdapter"
47-
require "Feature/Activity/FloatParade/FloatParadeTacticTab"
48-
require "Feature/Activity/FloatParade/FloatParadeMainDlg"
49-
50-
require "Feature/Activity/CheckinAllPlayer/CheckinAllPlayerMainDlg"
51-
require "Feature/Activity/CheckinVs/CheckinVsMainDlg"
52-
53-
require "Feature/Activity/TeamQuest/TeamQuestMainDlg"
54-
require "Feature/Activity/TeamQuest/TeamQuestDefine"
55-
56-
require "Feature/Activity/MainlineBuff/MainlineBuffDefine"
57-
require "Feature/Activity/MainlineBuff/MainlineBuffMainDlg"
58-
59-
require "Feature/Wardrobe/WardrobeModule"
60-
61-
require "Feature/Operation/Returning/ReturnDefine";
62-
require "Feature/Operation/Returning/ReturnMainDlg";
63-
require "Feature/Operation/Returning/ReturnMainDlgViewModel";
64-
require "Feature/Operation/Returning/ReturnMissionListDlg";
65-
require "Feature/Operation/Returning/ReturnModel";
66-
require "Feature/Operation/Returning/ReturnPageDlg";
67-
require "Feature/Operation/Returning/ReturnPointDetailDlg";
68-
require "Feature/Operation/Returning/ReturnWelcomeDlg";
69-
require "Feature/Operation/Returning/ReturnWelcomeRewardDetailDlg";
70-
require "Feature/Operation/Returning/ReturnNoticeDlg";
71-
require "Feature/Operation/Returning/ReturnPanelTrackPoint";
72-
73-
74-
require "Feature/Activity/SwitchOnly/SwitchOnlyDefine"
75-
require "Feature/Activity/SwitchOnly/SwitchOnlyDlg"
76-
require "Feature/Activity/SwitchOnly/SwitchOnlyItemView"
77-
78-
require "Feature/Activity/UniqueOnly/UniqueOnlyDefine"
79-
require "Feature/Activity/UniqueOnly/UniqueOnlyDlg"
80-
require "Feature/Activity/UniqueOnly/UniqueOnlyUtil"
81-
82-
require "Feature/Activity/MainlineBp/MainlineBpDefine";
83-
require "Feature/Activity/MainlineBp/MainlineBpUtil";
84-
require "Feature/Activity/MainlineBp/MainlineBpMainDlg";
85-
86-
require "Feature/Activity/CheckinVideo/CheckinVideoDefine";
87-
require "Feature/Activity/CheckinVideo/CheckinVideoUtil";
88-
require "Feature/Activity/CheckinVideo/CheckinVideoDlg";
89-
90-
require "Feature/Activity/BlessOnly/BlessOnlyDefine"
91-
require "Feature/Activity/BlessOnly/BlessOnlyUtil"
92-
require "Feature/Activity/BlessOnly/BlessOnlyMainDlg"
93-
94-
require "Feature/Activity/RecruitOnly/RecruitOnlyDlg"
95-
require "Feature/Activity/RecruitOnly/RecruitOnlyUtil"
1+
require "Feature/ResDefines"
2+
require "Feature/AudioConsts"
3+
require "Feature/Supportor/SupportorModule"
4+
5+
require "Feature/Main/MainDlg"
6+
require "Feature/Main/TestDlg"
7+
8+
require "Feature/Activity/Collection/CollectionItem"
9+
require "Feature/Activity/Collection/CollectionMainDlg"
10+
require "Feature/Activity/Collection/CollectionTaskListDlg"
11+
require "Feature/Activity/Collection/CollectionActModel"
12+
require "Feature/Activity/Collection/CollectionDailyTaskItem"
13+
require "Feature/Activity/Collection/CollectionTimedTaskItem"
14+
require "Feature/Activity/LoginOnly/LoginOnlyDefine"
15+
require "Feature/Activity/LoginOnly/LoginOnlyDlg"
16+
require "Feature/Activity/LoginOnly/NoEntryLoginOnlyDlg"
17+
18+
require "Feature/Activity/PrayOnly/PrayOnlyDefine"
19+
require "Feature/Activity/PrayOnly/PrayOnlyMainDlg"
20+
require "Feature/Activity/PrayOnly/PrayOnlyActDefines"
21+
22+
require "Feature/Activity/ActFlip/ActFlipMainDlg"
23+
24+
require "Feature/Activity/CheckinAccess/CheckinAccessDefine"
25+
require "Feature/Activity/CheckinAccess/CheckinAccessMainDlg"
26+
27+
require "Feature/Activity/LuaActivityUtil"
28+
29+
require "Feature/Activity/Act3D5/Act3D5Dlg"
30+
require "Feature/Activity/Act4D5/Act4D5Dlg"
31+
require "Feature/Activity/Act6D8/Act6D8Dlg"
32+
require "Feature/Activity/Act9D1D2/Act9D1D2Dlg"
33+
require "Feature/Activity/Act9D4/Act9D4Dlg"
34+
require "Feature/Activity/Act14D0D2/Act14D0D2Dlg"
35+
require "Feature/Activity/Act16D5D1/Act16D5D1Dlg"
36+
37+
require "Feature/Activity/GridGacha/GridGachaDefine"
38+
require "Feature/Activity/GridGacha/GridGachaMainDlg"
39+
40+
require "Feature/Activity/GridGachaV2/GridGachaV2Define"
41+
require "Feature/Activity/GridGachaV2/GridGachaV2MainDlg"
42+
43+
require "Feature/Activity/FloatParade/FloatParadeProbDetailPanel"
44+
require "Feature/Activity/FloatParade/FloatParadeRulePanel"
45+
require "Feature/Activity/FloatParade/FloatParadeRewardRulePanel"
46+
require "Feature/Activity/FloatParade/FloatParadeRecycleDayListAdapter"
47+
require "Feature/Activity/FloatParade/FloatParadeTacticTab"
48+
require "Feature/Activity/FloatParade/FloatParadeMainDlg"
49+
50+
require "Feature/Activity/CheckinAllPlayer/CheckinAllPlayerMainDlg"
51+
require "Feature/Activity/CheckinVs/CheckinVsMainDlg"
52+
53+
require "Feature/Activity/TeamQuest/TeamQuestMainDlg"
54+
require "Feature/Activity/TeamQuest/TeamQuestDefine"
55+
56+
require "Feature/Activity/MainlineBuff/MainlineBuffDefine"
57+
require "Feature/Activity/MainlineBuff/MainlineBuffMainDlg"
58+
59+
require "Feature/Wardrobe/WardrobeModule"
60+
61+
require "Feature/Operation/Returning/ReturnDefine";
62+
require "Feature/Operation/Returning/ReturnMainDlg";
63+
require "Feature/Operation/Returning/ReturnMainDlgViewModel";
64+
require "Feature/Operation/Returning/ReturnMissionListDlg";
65+
require "Feature/Operation/Returning/ReturnModel";
66+
require "Feature/Operation/Returning/ReturnPageDlg";
67+
require "Feature/Operation/Returning/ReturnPointDetailDlg";
68+
require "Feature/Operation/Returning/ReturnWelcomeDlg";
69+
require "Feature/Operation/Returning/ReturnWelcomeRewardDetailDlg";
70+
require "Feature/Operation/Returning/ReturnNoticeDlg";
71+
require "Feature/Operation/Returning/ReturnPanelTrackPoint";
72+
73+
require "Feature/Operation/ActFun/ActFunModule"
74+
75+
require "Feature/Activity/SwitchOnly/SwitchOnlyDefine"
76+
require "Feature/Activity/SwitchOnly/SwitchOnlyDlg"
77+
require "Feature/Activity/SwitchOnly/SwitchOnlyItemView"
78+
79+
require "Feature/Activity/UniqueOnly/UniqueOnlyDefine"
80+
require "Feature/Activity/UniqueOnly/UniqueOnlyDlg"
81+
require "Feature/Activity/UniqueOnly/UniqueOnlyUtil"
82+
83+
require "Feature/Activity/MainlineBp/MainlineBpDefine";
84+
require "Feature/Activity/MainlineBp/MainlineBpUtil";
85+
require "Feature/Activity/MainlineBp/MainlineBpMainDlg";
86+
87+
require "Feature/Activity/CheckinVideo/CheckinVideoDefine";
88+
require "Feature/Activity/CheckinVideo/CheckinVideoUtil";
89+
require "Feature/Activity/CheckinVideo/CheckinVideoDlg";
90+
91+
require "Feature/Activity/BlessOnly/BlessOnlyDefine"
92+
require "Feature/Activity/BlessOnly/BlessOnlyUtil"
93+
require "Feature/Activity/BlessOnly/BlessOnlyMainDlg"
94+
95+
require "Feature/Activity/RecruitOnly/RecruitOnlyDlg"
96+
require "Feature/Activity/RecruitOnly/RecruitOnlyUtil"

‎zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFun7MainDlg.lua‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
local luaUtils = CS.Torappu.Lua.Util;
2+
3+
4+
5+
6+
7+
8+
9+
10+
11+
12+
13+
ActFun7MainDlg = DlgMgr.DefineDialog("ActFun7MainDlg", "Activity/ActFun/Actfun7/actfun7_dlg", DlgBase)
14+
ActFun7MainDlg.DLG_NAME = "fun7"
15+
16+
local Act7FunMainView = require("Feature/Operation/ActFun/Act7fun/Entry/Act7FunMainView")
17+
local Act7FunMainViewModel = require("Feature/Operation/ActFun/Act7fun/Entry/Act7FunMainViewModel")
18+
19+
function ActFun7MainDlg:OnInit()
20+
self:_InitGameData();
21+
self:_InitBGM();
22+
self:_InitMainView();
23+
end
24+
25+
function ActFun7MainDlg:OnResume()
26+
self:_Refresh();
27+
end
28+
29+
function ActFun7MainDlg:_InitBGM()
30+
local config = CS.Torappu.UI.UIMusicManager.ChunkConfig();
31+
config.signal = CS.Torappu.Audio.Consts.ACTIVITY_LOADED;
32+
config.subSignal = self._subsignal;
33+
CS.Torappu.UI.UIMusicManager.ModifyMusicChunk(self.m_parent:GetInstanceID(), config);
34+
CS.Torappu.UI.UIMusicManager.SyncPlayingMusic();
35+
end
36+
37+
function ActFun7MainDlg:_InitGameData()
38+
self.m_viewModel = self:CreateViewModel(Act7FunMainViewModel)
39+
self.m_viewModel:InitData();
40+
end
41+
42+
function ActFun7MainDlg:_Refresh()
43+
if self.m_viewModel == nil then
44+
return;
45+
end
46+
self.m_viewModel:RefreshData();
47+
48+
if self.m_activeView == nil then
49+
return;
50+
end
51+
self.m_activeView:RefreshView();
52+
end
53+
54+
function ActFun7MainDlg:_InitMainView()
55+
if self.m_viewModel == nil then
56+
return;
57+
end
58+
if self.m_activeView ~= nil then
59+
return;
60+
end
61+
if self.m_viewModel.useWinStyle then
62+
self.m_activeView = self:CreateWidgetByPrefab(Act7FunMainView, self._winStyleView, self._viewContainer);
63+
else
64+
self.m_activeView = self:CreateWidgetByPrefab(Act7FunMainView, self._unityStyleView, self._viewContainer);
65+
end
66+
self.m_activeView:OnInitWithDlg(self, self.m_viewModel);
67+
end
68+
69+
function ActFun7MainDlg:EventOnAvgBtnClick()
70+
CS.Torappu.Lua.LuaActivityEntry.StartStoryWithSyncMusic(self._avgStoryId);
71+
end
72+
73+
function ActFun7MainDlg:EventOnCollectionBtnClick()
74+
local funMainDlg = self.m_parent;
75+
funMainDlg:SetRecentPlayedAct(ActFun7MainDlg.DLG_NAME);
76+
funMainDlg:GetGroup():SwitchChildDlg(ActFunCollectionDlg);
77+
end
78+
79+
function ActFun7MainDlg:EventOnCloseClick()
80+
self:Close();
81+
end
82+
83+
function ActFun7MainDlg:EventOnStageClick(stageId)
84+
if self.m_viewModel == nil then
85+
return;
86+
end
87+
local stageModel = self.m_viewModel.stageModels[stageId];
88+
if not stageModel.isUnlocked then
89+
local toastText = CS.Torappu.I18N.I18nUtils.GetText(CS.Torappu.TextRes.COMMON_MISSION_LOCKED_TOAST);
90+
luaUtils.TextToast(toastText);
91+
return;
92+
end
93+
CS.Torappu.LocalTrackStore.instance:ConsumeTrack(CS.Torappu.Activity.Act7fun.Act7FunUtils.ACT7FUN_NEW_STAGE_TRACK_TYPE, stageId);
94+
self:_StartAct7FunBattle(self._aprilFoolId, stageId);
95+
end
96+
97+
98+
function ActFun7MainDlg:_StartAct7FunBattle(actId, stageId)
99+
local startServiceConfig = CS.Torappu.Activity.Act7fun.Act7FunBattleStartConfig(stageId)
100+
local finishServiceConfig = CS.Torappu.Activity.Act7fun.Act7FunBattleFinishServerConfig(
101+
CS.Torappu.Activity.Act7fun.Act7FunService.FUN_BATTLE_FINISH)
102+
local suc, stageData = CS.Torappu.ActivityDB.data.actFunData.stages:TryGetValue(stageId)
103+
if not suc then
104+
return
105+
end
106+
local battleInfo = CS.Torappu.Battle.BattleStageInfo.CreateWithAprilFoolStage(stageData)
107+
if battleInfo == nil then
108+
return
109+
end
110+
111+
local actMeta = CS.Torappu.Battle.BattleActivityMeta()
112+
actMeta.activityId = actId
113+
actMeta.backAsHomeAct = true
114+
actMeta.overrideBattleFinish = true
115+
116+
local bundle = CS.Torappu.DataBundle()
117+
bundle:SetString(ActFunMainDlgGroup.KEY_INITDLG, ActFun7MainDlg.DLG_NAME)
118+
actMeta.meta = bundle
119+
120+
local gameModeMeta = {
121+
isDeterministic = false,
122+
modeType = CS.Torappu.Battle.GameModeMeta.GameModeType.ACT_7_FUN
123+
}
124+
local gameTagMeta = {
125+
gameTag = CS.Torappu.Battle.GameTagMeta.ACTFUN
126+
}
127+
128+
local param = {
129+
stageId = stageId,
130+
isPractise = false,
131+
isAutoBattle = false,
132+
assistIsFriend = false,
133+
assistIsPredefined = true,
134+
squadForRequest = nil,
135+
assistFriend = nil,
136+
squadLocal = nil,
137+
isHandBookStage = false,
138+
runeList = nil,
139+
customizeStartService = startServiceConfig,
140+
customizedFinishService = finishServiceConfig,
141+
sysMenuStyle = CS.Torappu.Battle.UI.BattleSysMenuStyle.NO_REWARD,
142+
overrideStageInfo = battleInfo,
143+
actMeta = actMeta,
144+
gameModeMeta = gameModeMeta,
145+
isOverrideBGM = true,
146+
gameTagMeta = gameTagMeta,
147+
}
148+
CS.Torappu.BattleStartController.StartBattle(param)
149+
end

‎zh_CN/gamedata/[uc]lua/feature/operation/actfun/ActFunCollectionDlg.lua‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ local luaUtils = CS.Torappu.Lua.Util;
1515

1616

1717

18+
1819
ActFunCollectionDlg = DlgMgr.DefineDialog("ActFunCollectionDlg", "Activity/ActFun/actfun_collection_dlg", DlgBase)
1920
local AprilFoolCollectionItem = require("Feature/Operation/ActFun/ActFunCollectionItem");
2021

@@ -25,6 +26,7 @@ function ActFunCollectionDlg:OnInit()
2526
self:_BindAndRenderItem(self._layout4Item, self:_CheckCollection2023Completed(), ActFun4MainDlg)
2627
self:_BindAndRenderItem(self._layout5Item, self:_CheckCollection2024Completed(), ActFun5MainDlg)
2728
self:_BindAndRenderItem(self._layout6Item, self:_CheckCollection2025Completed(), ActFun6MainDlg)
29+
self:_BindAndRenderItem(self._layout7Item, self:_CheckCollection2026Completed(), ActFun7MainDlg)
2830
end
2931

3032
function ActFunCollectionDlg:_BindAndRenderItem(layoutItem, isActCompleted, cls)
@@ -105,6 +107,27 @@ function ActFunCollectionDlg:_CheckCollection2025Completed()
105107
return true
106108
end
107109

110+
function ActFunCollectionDlg:_CheckCollection2026Completed()
111+
local playerData = CS.Torappu.PlayerData.instance.data.playerAprilFool;
112+
if playerData == nil or playerData.actFun7 == nil or playerData.actFun7.stages == nil then
113+
return false
114+
end
115+
local gameData = CS.Torappu.ActivityDB.data.actFunData;
116+
if gameData == nil or gameData.act7FunData == nil or gameData.act7FunData.stageRewardList == nil then
117+
return false
118+
end
119+
local stageRewardList = gameData.act7FunData.stageRewardList
120+
121+
for i = 0, stageRewardList.Count - 1 do
122+
local stageId = stageRewardList[i]
123+
local res, stageState = playerData.actFun7.stages:TryGetValue(stageId)
124+
if not res or stageState:GetHashCode() < CS.Torappu.PlayerBattleRank.PASS:GetHashCode() then
125+
return false
126+
end
127+
end
128+
return true
129+
end
130+
108131
function ActFunCollectionDlg:_CheckStageCompeleted(stageId)
109132
local success, stageData = CS.Torappu.PlayerData.instance.data.dungeon.stages:TryGetValue(stageId)
110133
if success and stageData ~= nil then

0 commit comments

Comments
 (0)