SL1900/StellaSora_DataLua
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update - 1.11.0.113

Browse Source 
EN: 1.11.0.113
CN: 1.11.0.114
JP: 1.11.0.118
KR: 1.11.0.118
This commit is contained in:
SL1900
2026-06-02 16:00:00 +09:00
parent 343b24c91b
commit dcc2c4a2a9
621 changed files with 518699 additions and 4157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/game/ui/phone/dating/datingctrl.lua
+29 -18
View File
@@ -355,6 +355,29 @@ function DatingCtrl:LoadEventConfig(tbEventId)
end
return tbTempEvent
end
function DatingCtrl:_TweenAffinityValue(nDelta)
if type(nDelta) ~= "number" or nDelta == 0 then
return
end
local nFrom = self.nTotalValue
self.nTotalValue = self.nTotalValue + nDelta
local nTo = self.nTotalValue
if self._twAffinity ~= nil then
self._twAffinity:Kill(true)
self._twAffinity = nil
end
local nDisplay = nFrom
self._twAffinity = DOTween.To(function()
return nDisplay
end, function(v)
nDisplay = v
NovaAPI.SetTMPText(self._mapNode.txtAffinityValue, self:ThousandsNumber(math.floor(v)))
end, nTo, 0.5)
self._twAffinity.onComplete = dotween_callback_handler(self, function()
NovaAPI.SetTMPText(self._mapNode.txtAffinityValue, self:ThousandsNumber(nTo))
self._twAffinity = nil
end)
end
function DatingCtrl:ClosePanel()
local func = function()
EventManager.Hit(EventId.ClosePanel, PanelId.Dating)
@@ -444,6 +467,10 @@ function DatingCtrl:OnDisable()
if self.goL2D ~= nil and self.goL2D.tbRenderer ~= nil then
Actor2DManager.UnSetActor2DWithRender(self.goL2D.tbRenderer)
end
if self._twAffinity ~= nil then
self._twAffinity:Kill()
self._twAffinity = nil
end
end
function DatingCtrl:OnDestroy()
end
@@ -465,15 +492,7 @@ function DatingCtrl:OnEvent_DatingEventAction(nCurIndex, sResponse, nAffinity)
self:SetEmoji(cfgData.BubbleEmoji)
self:SetBubble(cfgData.Words)
end
local twValue = DOTween.To(function()
return self.nTotalValue
end, function(v)
NovaAPI.SetTMPText(self._mapNode.txtAffinityValue, self:ThousandsNumber(math.floor(v)))
end, self.nTotalValue + nAffinity, 0.5)
local _cb = function()
self.nTotalValue = self.nTotalValue + nAffinity
end
twValue.onComplete = dotween_callback_handler(self, _cb)
self:_TweenAffinityValue(nAffinity)
end
end
function DatingCtrl:OnEvent_DatingSendGift()
@@ -497,15 +516,7 @@ function DatingCtrl:OnEvent_DatingEventFinish()
nAddValue = nAddValue + self.tbAllEvent[i].nAffinity
end
end
local twValue = DOTween.To(function()
return self.nTotalValue
end, function(v)
NovaAPI.SetTMPText(self._mapNode.txtAffinityValue, self:ThousandsNumber(math.floor(v)))
end, self.nTotalValue + nAddValue, 0.5)
local _cb = function()
self.nTotalValue = self.nTotalValue + nAddValue
end
twValue.onComplete = dotween_callback_handler(self, _cb)
self:_TweenAffinityValue(nAddValue)
self.nCurIndex = #self.tbAllEvent
end
function DatingCtrl:OnEvent_DatingSendGiftFinish(sVoiceKey, msgData)
lua/game/ui/phone/phonectrl.lua
+7 -3
View File
@@ -525,11 +525,15 @@ function PhoneCtrl:Awake()
self.nLastTog = nil
local tbParam = self:GetPanelParam()
if nil ~= tbParam and nil ~= tbParam[1] then
self._panel.nCurTog = tbParam[1]
if nil ~= tbParam[2] then
if self._panel.nCurTog == nil then
self._panel.nCurTog = tbParam[1]
end
if nil ~= tbParam[2] and self._panel.nSelectCharId == nil then
self._panel.nSelectCharId = tbParam[2]
end
self.bSetGridPos = tbParam[3]
if self._panel.nSelectCharId == nil then
self.bSetGridPos = tbParam[3]
end
end
end
function PhoneCtrl:OnEnable()