Skip to content

Commit e4b550f

Browse files
author
Vulpisfoglia_BOT_rev20250407
committed
[CN UPDATE] Client:2.7.21 Data:26-04-03-04-44-31_c79db9
1 parent bd7225a commit e4b550f

162 files changed

Lines changed: 612441 additions & 519247 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 = "V071",
3+
CUR_FUNC_VER = "V072",
44
}
55

66

‎zh_CN/gamedata/[uc]lua/feature/activity/blessonly/BlessOnlyBlessCollectionView.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ function BlessOnlyBlessCollectionView:OnViewModelUpdate(data)
4848
return;
4949
end
5050

51-
self.m_avatarView:Render(data.avatarInfo);
51+
self.m_avatarView:Render(data.avatarQuery);
5252

5353
if self._crossAppShareAvatarContent ~= nil then
5454
local avatarModel = CS.Torappu.UI.CrossAppShare.CrossAppShareAvatarModel();
55-
avatarModel:InitModel(true, data.avatarInfo);
55+
avatarModel:InitModel(true, data.avatarQuery);
5656
self._crossAppShareAvatarContent.dynAssetModel = avatarModel;
5757
end
5858

‎zh_CN/gamedata/[uc]lua/feature/activity/blessonly/BlessOnlyBlessListHorizontalItem.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ function BlessOnlyBlessListHorizontalItem:Render(data, illustLoader)
3939
local blessingGroupRenderData = self._blessingAtlasObject:GetSpriteByName(data.openPacketModel.blessingGroup);
4040
self._blessingGroupImg:SetSprite(blessingGroupRenderData);
4141

42-
self.m_avatarView:Render(data.avatarInfo);
42+
self.m_avatarView:RenderByPlayerAvatarQuery(data.avatarQuery);
4343

4444
if self._crossAppShareAvatarContent ~= nil then
4545
local avatarModel = CS.Torappu.UI.CrossAppShare.CrossAppShareAvatarModel();
46-
avatarModel:InitModel(true, data.avatarInfo);
46+
avatarModel:InitModel(true, data.avatarQuery);
4747
self._crossAppShareAvatarContent.dynAssetModel = avatarModel;
4848
end
4949

‎zh_CN/gamedata/[uc]lua/feature/activity/blessonly/BlessOnlyViewModel.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ function BlessOnlyViewModel:LoadData(actId)
242242
self.playerNameId = status.nickNumber;
243243
self.playerLevel = status.level;
244244
self.playerId = CS.U8.SDK.U8SDKInterface.Instance.uid;
245-
self.avatarInfo = status.avatar;
245+
self.avatarQuery = luaUtils.GetAvatarQueryFromPlayerStatus(status);
246246

247247

248248
local apSupplyDict = actGameData.apSupplyOutOfDateDict;

‎zh_CN/gamedata/[uc]lua/feature/activity/checkinaccess/CheckinAccessUrlView.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function CheckinAccessUrlView:OnViewModelUpdate(data)
1111
if data == nil then
1212
return;
1313
end
14-
luaUtils.SetActiveIfNecessary(data.showUrlBtn);
14+
self:SetVisible(data.showUrlBtn);
1515
if not data.showUrlBtn then
1616
return;
1717
end

‎zh_CN/gamedata/[uc]lua/feature/activity/checkinvideo/CheckinVideoDefine.lua‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ CheckinVideoItemStatus = {
44
RECEIVED = 2,
55
}
66

7+
CheckinVideoDailyInfoResType = {
8+
NO_RES = 0,
9+
VIDEO_RES = 1,
10+
PIC_RES = 2,
11+
}
12+
713
CheckinVideoServiceCode = {
814
GET_REWARD = "/activity/getActivityCheckInVideoReward"
915
}

‎zh_CN/gamedata/[uc]lua/feature/activity/checkinvideo/CheckinVideoDlg.lua‎

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function CheckinVideoDlg:OnInit()
2525
infoView.onReceiveBtnClicked = Event.Create(self, self._EventOnReceiveBtnClicked);
2626
infoView.onReplayBtnClicked = Event.Create(self, self._EventOnReplayBtnClicked);
2727
infoView.onShareBtnClicked = Event.Create(self, self._EventOnShareBtnClicked);
28+
infoView.onSecondBtnClicked = Event.Create(self, self._EventOnSecondBtnClicked);
2829

2930
self:CreateWidgetByGO(CheckinVideoProgressGroupView, self._progressView);
3031

@@ -37,6 +38,9 @@ function CheckinVideoDlg:_EventOnNextBtnClicked()
3738
return;
3839
end
3940
local count = #viewModel.itemList;
41+
if count <= 1 then
42+
return;
43+
end
4044
viewModel.isEnter = false;
4145
viewModel.currFocusItem = viewModel.currFocusItem + 1;
4246
viewModel.isNext = true;
@@ -52,6 +56,9 @@ function CheckinVideoDlg:_EventOnPrevBtnClicked()
5256
return;
5357
end
5458
local count = #viewModel.itemList;
59+
if count <= 1 then
60+
return;
61+
end
5562
viewModel.isEnter = false;
5663
viewModel.currFocusItem = viewModel.currFocusItem - 1;
5764
viewModel.isNext = false;
@@ -73,6 +80,16 @@ function CheckinVideoDlg:_EventOnReceiveBtnClicked()
7380
if currSelect == nil or currSelect.status ~= CheckinVideoItemStatus.CAN_RECEIVE then
7481
return;
7582
end
83+
84+
local btnType = "";
85+
if currSelect.resType == CheckinVideoDailyInfoResType.NO_RES then
86+
btnType = CS.Torappu.EventTrack.EventLogTrace.EventLogCheckinVideoTraceContext.MAIN_BTN_TYPE_REWARD_GET;
87+
else
88+
btnType = CS.Torappu.EventTrack.EventLogTrace.EventLogCheckinVideoTraceContext.MAIN_BTN_TYPE_PLAY;
89+
end
90+
CS.Torappu.GameAnalytics.RecordCheckinVideoReceiveBtnClicked(viewModel.actId,
91+
CS.Torappu.EventTrack.EventLogTrace.EventLogCheckinVideoTraceContext.BTN_MAIN, viewModel.currFocusItem, btnType);
92+
7693
currSelect.status = CheckinVideoItemStatus.RECEIVED;
7794
UISender.me:SendRequest(CheckinVideoServiceCode.GET_REWARD,
7895
{
@@ -96,7 +113,7 @@ function CheckinVideoDlg:_HandleGetRewardResponse(response)
96113
viewModel:NotifyUpdate();
97114
local handler = CS.Torappu.UI.LuaUIMisc.ShowGainedItems(response.items, CS.Torappu.UI.UIGainItemFloatPanel.Style.DEFAULT,
98115
function()
99-
self:_PlayVideo(response.index + 1);
116+
self:_ShowItemResInfo(response.index + 1);
100117
end);
101118
self:_AddDisposableObj(handler);
102119
end
@@ -106,11 +123,15 @@ function CheckinVideoDlg:_EventOnReplayBtnClicked()
106123
if viewModel == nil or viewModel.currFocusItem == nil then
107124
return;
108125
end
109-
self:_PlayVideo(viewModel.currFocusItem);
126+
127+
CS.Torappu.GameAnalytics.RecordCheckinVideoBaseBtnClicked(viewModel.actId,
128+
CS.Torappu.EventTrack.EventLogTrace.EventLogCheckinVideoTraceContext.BTN_REPLAY, viewModel.currFocusItem);
129+
130+
self:_ShowItemResInfo(viewModel.currFocusItem);
110131
end
111132

112133

113-
function CheckinVideoDlg:_PlayVideo(index)
134+
function CheckinVideoDlg:_ShowItemResInfo(index)
114135
if index == nil then
115136
return;
116137
end
@@ -119,12 +140,32 @@ function CheckinVideoDlg:_PlayVideo(index)
119140
return;
120141
end
121142
local itemModel = viewModel.itemList[index];
122-
if itemModel == nil or itemModel.status ~= CheckinVideoItemStatus.RECEIVED or
123-
string.isNullOrEmpty(itemModel.videoId) then
143+
if itemModel == nil or itemModel.status ~= CheckinVideoItemStatus.RECEIVED then
124144
return;
125145
end
146+
if itemModel.resType == CheckinVideoDailyInfoResType.VIDEO_RES then
147+
luaUtils.OpenWebVideoPlayer(itemModel.videoId);
148+
elseif itemModel.resType == CheckinVideoDailyInfoResType.PIC_RES then
149+
150+
end
151+
end
126152

127-
luaUtils.OpenWebVideoPlayer(itemModel.videoId);
153+
function CheckinVideoDlg:_EventOnSecondBtnClicked()
154+
local viewModel = self.m_viewModel;
155+
if viewModel == nil or viewModel.currFocusItem == nil then
156+
return;
157+
end
158+
local currSelect = viewModel.itemList[viewModel.currFocusItem];
159+
if currSelect == nil or currSelect.status ~= CheckinVideoItemStatus.RECEIVED or currSelect.hasSecondBtn ~= true or currSelect.secondBtnLink == nil then
160+
return;
161+
end
162+
163+
CS.Torappu.GameAnalytics.RecordCheckinVideoBaseBtnClicked(viewModel.actId,
164+
CS.Torappu.EventTrack.EventLogTrace.EventLogCheckinVideoTraceContext.BTN_JUMP, viewModel.currFocusItem);
165+
166+
luaUtils.OpenUrl(currSelect.secondBtnLink);
167+
CheckinVideoUtil.SetSecondBtnNewChecked(viewModel.actId, viewModel.currFocusItem);
168+
viewModel:NotifyUpdate();
128169
end
129170

130171
function CheckinVideoDlg:_EventOnShareBtnClicked()
@@ -134,7 +175,7 @@ function CheckinVideoDlg:_EventOnShareBtnClicked()
134175
return;
135176
end
136177
local currSelect = viewModel.itemList[viewModel.currFocusItem];
137-
if currSelect == nil or currSelect.status ~= CheckinVideoItemStatus.RECEIVED or
178+
if currSelect == nil or currSelect.status ~= CheckinVideoItemStatus.RECEIVED or currSelect.hasShareBtn ~= true or
138179
currSelect.shareImgList == nil then
139180
return;
140181
end
@@ -173,6 +214,10 @@ function CheckinVideoDlg:_EventOnShareBtnClicked()
173214
if inputParam == nil then
174215
return;
175216
end
217+
218+
CS.Torappu.GameAnalytics.RecordCheckinVideoBaseBtnClicked(viewModel.actId,
219+
CS.Torappu.EventTrack.EventLogTrace.EventLogCheckinVideoTraceContext.BTN_SHARE, viewModel.currFocusItem);
220+
176221
inputParam.remakePrefabPath = CS.Torappu.ResourceUrls.GetCheckinVideoRemakePrefabPath(viewModel.actId);
177222
inputParam.additionModel = nil;
178223
inputParam.modelCollector = simpleShareModel;

‎zh_CN/gamedata/[uc]lua/feature/activity/checkinvideo/CheckinVideoDynImageView.lua‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
local CheckinVideoDynImageView = Class("CheckinVideoDynImageView", UIWidget);
3+
4+
5+
function CheckinVideoDynImageView:Render(iconId, hubPath)
6+
if not string.isNullOrEmpty(iconId) and self._imgIcon ~= nil then
7+
self._imgIcon.sprite = self:LoadSpriteFromAutoPackHub(hubPath, iconId);
8+
end
9+
end
10+
11+
return CheckinVideoDynImageView;

0 commit comments

Comments
 (0)