Update - 2.1.0.147

EN: 2.1.0.147
CN: 2.1.0.147
JP: 2.1.0.149
KR: 2.1.0.154
This commit is contained in:
SL1900
2026-11-13 12:00:00 +09:00
parent c84dd6f891
commit da1d2be9fc
822 changed files with 1752348 additions and 1554 deletions
@@ -272,6 +272,9 @@ function DormContactBtnListCtrl:ExitCharActive()
NovaAPI.DispatchEventWithData("DORM_LUA_INTERACTIVE_WITH_ACTOR_CALLBACK", nil, {0})
end
function DormContactBtnListCtrl:CheckHasBtn()
if self.mapCurCharInfo ~= nil then
return false
end
if next(self.mapListBtn) ~= nil then
return true
end
@@ -336,12 +339,6 @@ function DormContactBtnListCtrl:OnBtnClick_Interactive1()
}, callback)
end
function DormContactBtnListCtrl:OnBtnClick_Interactive2()
local nDayCount = PlayerData.PlayerDormData:GetCharGiftCountDay(self.mapCurCharInfo.nDataId)
if nDayCount < 1 then
local tips = ConfigTable.GetUIText("Dorm_GiftCountMaxHint")
EventManager.Hit(EventId.OpenMessageBox, tips)
return
end
self._mapNode.rtGiftRoot.gameObject:SetActive(true)
self._mapNode.rtCharInteractiveHide:SetActive(false)
self._mapNode.rtGiftRoot:OpenGiftChoose(self.mapCurCharInfo.nDataId, self)
@@ -72,6 +72,7 @@ function DormInteractiveGiftCtrl:OpenGiftChoose(nCharId, parent)
self.curFavourLevel = affinityData.Level
self.curFavourExp = affinityData.Exp
self.nMaxSendGiftCount = PlayerData.PlayerDormData:GetCharGiftCountDay(nCharId)
self.nMaxSendGiftCfgCount = tonumber(ConfigTable.GetConfigNumber("AffinityGiftSendCount"))
local mapCharDesc = ConfigTable.GetData("CharacterDes", self.nCharId)
if mapCharDesc ~= nil then
self.PreferenceData = {
@@ -146,7 +147,7 @@ function DormInteractiveGiftCtrl:RefreshItemGrid(grid)
local imgAffinityLevel = grid.transform:Find("btnGrid/AnimRoot/tc_item_02/imgAffinityGiftLevel"):GetComponent("Image")
local level = mapItem.favourLevel
self:SetAtlasSprite(imgAffinityLevel, "11_ico", "zs_present_heart_" .. level)
if self.tbChooseItem ~= nil and self.tbChooseItem.nIdx == nIndex then
if self.tbChooseItem ~= nil and self.tbChooseItem[nIndex] ~= nil then
self.tbGridCtrl[nInstanceID]:SetMultiSelected_Blue(true)
end
end
@@ -267,7 +268,7 @@ function DormInteractiveGiftCtrl:GetGiftFavourLevel(tags)
return 2
end
function DormInteractiveGiftCtrl:SetDaySendCount()
local nCount = 0
local nCount = self.nMaxSendGiftCfgCount - self.nMaxSendGiftCount
if self.tbChooseItem ~= nil then
for nIndex, v in pairs(self.tbChooseItem) do
if v ~= nil then
@@ -275,7 +276,7 @@ function DormInteractiveGiftCtrl:SetDaySendCount()
end
end
end
NovaAPI.SetTMPText(self._mapNode.txtGiftCount, orderedFormat(ConfigTable.GetUIText("Phone_Gift_Send_Day_Count_1"), nCount, self.nMaxSendGiftCount))
NovaAPI.SetTMPText(self._mapNode.txtGiftCount, orderedFormat(ConfigTable.GetUIText("Phone_Gift_Send_Day_Count_1"), nCount, self.nMaxSendGiftCfgCount))
end
function DormInteractiveGiftCtrl:Exit()
if self.tbGridCtrl then