Skip to content

Commit d88645c

Browse files
author
Vulpisfoglia_BOT_rev20250407
committed
[CN UPDATE] Client:2.6.21 Data:25-08-25-23-45-59_81c7ff
1 parent 6d15dc6 commit d88645c

28 files changed

Lines changed: 222270 additions & 197410 deletions

‎zh_CN/gamedata/[uc]lua/hotfixes/CroslyHotfixer.lua‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
2+
local CroslyHotfixer = Class("CroslyHotfixer", HotfixBase)
3+
local StunMask = 524289
4+
5+
local function IsModYBuff(buff)
6+
return buff ~= nil and buff.m_data ~= nil and buff.m_data.templateKey == "crosly_e_003_t2[status-resist]"
7+
end
8+
local function IsSourceCrosly(entity)
9+
return entity ~= nil and entity.id == "char_1502_crosly"
10+
end
11+
local function IsStunBuff(buff)
12+
return (buff.abnormalFlagMask & StunMask) > 0
13+
end
14+
15+
local function IsDurationBuff(buff)
16+
return CS.Torappu.MathUtil.GT(buff.m_lifeTime, CS.Torappu.FP.Zero)
17+
end
18+
19+
local function _OnOtherResistableBuffStart(buff)
20+
if IsModYBuff(buff) then
21+
local mainBuff = buff.context.mainBuff.value
22+
if mainBuff ~= nil and IsSourceCrosly(mainBuff.source) and IsStunBuff(mainBuff) and IsDurationBuff(mainBuff) then
23+
local hasValue, multiValue = buff.blackboard:TryGetFloat("one_minus_status_resistance")
24+
if hasValue then
25+
mainBuff.m_lifeTime = CS.Torappu.FP.FromFloat(mainBuff.m_lifeTime:AsFloat() * (1 + multiValue))
26+
mainBuff.m_remainingTime = mainBuff.m_lifeTime
27+
end
28+
end
29+
end
30+
buff:OnOtherResistableBuffStart()
31+
end
32+
33+
function CroslyHotfixer:OnInit()
34+
if HOTFIX_ENABLE then
35+
xlua.private_accessible(CS.Torappu.Battle.Buff)
36+
self:Fix_ex(CS.Torappu.Battle.Buff, "OnOtherResistableBuffStart", function(buff)
37+
local ok, res = xpcall(_OnOtherResistableBuffStart, debug.traceback, buff)
38+
if not ok then
39+
LogError("[CroslyHotfixer] fix" .. res)
40+
end
41+
end)
42+
end
43+
end
44+
45+
return CroslyHotfixer

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ local list =
44

55
"HotFixes/TestStubHotfixer",
66
"HotFixes/DurbusAbilityHotfixer",
7+
"HotFixes/CroslyHotfixer",
78
};
89

910
return list;

‎zh_CN/gamedata/battle/buff_template_data.json‎

Lines changed: 117 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -78131,6 +78131,111 @@
7813178131
]
7813278132
}
7813378133
},
78134+
"enemy_dqwlpl_on_eat": {
78135+
"templateKey": "enemy_dqwlpl_on_eat",
78136+
"effectKey": "",
78137+
"onEventPriority": "DEFAULT",
78138+
"eventToActions": {
78139+
"ON_BUFF_START": [
78140+
{
78141+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
78142+
"_blackboardKey": "one",
78143+
"_value": 1.0,
78144+
"_copyFromKey": null,
78145+
"_assignString": false
78146+
},
78147+
{
78148+
"$type": "Torappu.Battle.Action.Nodes+CheckUnitAlive, Assembly-CSharp",
78149+
"_ownerType": "TARGET"
78150+
},
78151+
{
78152+
"$type": "Torappu.Battle.Action.Nodes+CreateBuff, Assembly-CSharp",
78153+
"_buff": {
78154+
"attributes": {
78155+
"abnormalFlags": [],
78156+
"abnormalImmunes": [],
78157+
"abnormalAntis": [],
78158+
"abnormalCombos": [],
78159+
"abnormalComboImmunes": [],
78160+
"attributeModifiers": []
78161+
},
78162+
"buffKey": "enemy_trwlpl_eat_success",
78163+
"loadFromDB": false,
78164+
"isDurableBuff": false,
78165+
"isDamageMissable": false,
78166+
"isSilenceable": false,
78167+
"isStunnable": false,
78168+
"isFreezable": false,
78169+
"isLevitatable": false,
78170+
"statusResistable": "AUTOMATIC",
78171+
"templateKey": "empty",
78172+
"disableOverride": true,
78173+
"overrideKey": null,
78174+
"overrideType": "UNIQUE",
78175+
"maxStackCnt": 1,
78176+
"refreshRemainingTimeWhenStackMax": false,
78177+
"clearAllStackCntWhenTimeUp": false,
78178+
"maxValidStackCnt": -1,
78179+
"independentCharacterSource": false,
78180+
"overrideEffectKey": null,
78181+
"overrideOnEventPriority": false,
78182+
"onEventPriority": "DEFAULT",
78183+
"audioSignal": null,
78184+
"lifeTimeType": "LIMITED",
78185+
"takeSnapshotWhenExtend": false,
78186+
"durationKey": "none",
78187+
"lifeTime": 3.0,
78188+
"triggerLifeType": "IMMEDIATELY",
78189+
"triggerCnt": 0,
78190+
"triggerInterval": -1.0,
78191+
"waitFirstTriggerInterval": true,
78192+
"firstTriggerInterval": -1.0,
78193+
"priority": -1,
78194+
"priorityBBKeys": [],
78195+
"stripBlackboardParamsWithBuffKey": false,
78196+
"blackboard": []
78197+
},
78198+
"_buffOwner": "BUFF_SOURCE",
78199+
"_isDerivedBuff": false,
78200+
"_finishDerivedBuffIfParentFinish": false,
78201+
"_inherateSourceProjectileFromParentBuff": false,
78202+
"_hookEffectKeyFromSourceProjectile": false
78203+
},
78204+
{
78205+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
78206+
"_blackboardKey": "cnt",
78207+
"_value": 0.0,
78208+
"_copyFromKey": null,
78209+
"_assignString": false
78210+
},
78211+
{
78212+
"$type": "Torappu.Battle.Action.Nodes+InstantKill, Assembly-CSharp",
78213+
"_targetType": "BUFF_OWNER",
78214+
"_killSource": false,
78215+
"_noSource": false,
78216+
"_withdrawIfRallyPoint": false,
78217+
"_resultIfInRallyPointMode": false,
78218+
"_skipReborn": true,
78219+
"_noReason": false,
78220+
"_markReachExit": false,
78221+
"_switchState": false
78222+
},
78223+
{
78224+
"$type": "Torappu.Battle.Action.Nodes+AlwaysNext, Assembly-CSharp"
78225+
},
78226+
{
78227+
"$type": "Torappu.Battle.Action.Nodes+AssignBuffBlackboard, Assembly-CSharp",
78228+
"_targetType": "BUFF_SOURCE",
78229+
"_blackboardKey": "cnt",
78230+
"_valueKey": "cnt",
78231+
"_buffKey": "enemy_trwlpl_food",
78232+
"_buffKeyAssignFrom": null,
78233+
"_assignString": false,
78234+
"_defaultValue": 0.0
78235+
}
78236+
]
78237+
}
78238+
},
7813478239
"enemy_dqxjl[crack]": {
7813578240
"templateKey": "enemy_dqxjl[crack]",
7813678241
"effectKey": "",
@@ -345952,6 +346057,18 @@
345952346057
"_castDirectly": false,
345953346058
"_checkAbilityIsReady": true
345954346059
},
346060+
{
346061+
"$type": "Torappu.Battle.Action.Nodes+UpdateAbilityCoolDown, Assembly-CSharp",
346062+
"_ownerType": "BUFF_OWNER",
346063+
"_abilityName": "PrismAttack",
346064+
"_loadFromBlackboard": false,
346065+
"_coolDownKey": "",
346066+
"_useNewPeriod": false,
346067+
"_newPeriod": 0.0,
346068+
"_loadAbilityFromBlackboard": false,
346069+
"_waitFirstPeriod": true,
346070+
"_useAbilityBlackboard": false
346071+
},
345955346072
{
345956346073
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
345957346074
"_conditionNode": {
@@ -372855,65 +372972,6 @@
372855372972
"_target1": "MAINBUFF_SOURCE",
372856372973
"_target2": "BUFF_SOURCE",
372857372974
"_equalIfBothNull": false
372858-
},
372859-
{
372860-
"$type": "Torappu.Battle.Action.Nodes+AttachAsDerivedBuffToMainBuff, Assembly-CSharp",
372861-
"_source": "BUFF_SOURCE",
372862-
"_target": "BUFF_OWNER",
372863-
"_finishDerivedBuffIfParentFinish": true,
372864-
"_buff": {
372865-
"attributes": {
372866-
"abnormalFlags": [],
372867-
"abnormalImmunes": [],
372868-
"abnormalAntis": [],
372869-
"abnormalCombos": [],
372870-
"abnormalComboImmunes": [],
372871-
"attributeModifiers": [
372872-
{
372873-
"attributeType": "ONE_MINUS_STATUS_RESISTANCE",
372874-
"formulaItem": "ADDITION",
372875-
"value": 0.0,
372876-
"loadFromBlackboard": true,
372877-
"fetchBaseValueFromSourceEntity": false
372878-
}
372879-
]
372880-
},
372881-
"buffKey": "crosly_e_003_t2[status-resist][core]",
372882-
"loadFromDB": false,
372883-
"isDurableBuff": false,
372884-
"isDamageMissable": false,
372885-
"isSilenceable": false,
372886-
"isStunnable": false,
372887-
"isFreezable": false,
372888-
"isLevitatable": false,
372889-
"statusResistable": "AUTOMATIC",
372890-
"templateKey": "empty",
372891-
"disableOverride": false,
372892-
"overrideKey": null,
372893-
"overrideType": "UNIQUE",
372894-
"maxStackCnt": 1,
372895-
"refreshRemainingTimeWhenStackMax": false,
372896-
"clearAllStackCntWhenTimeUp": false,
372897-
"maxValidStackCnt": -1,
372898-
"independentCharacterSource": false,
372899-
"overrideEffectKey": null,
372900-
"overrideOnEventPriority": false,
372901-
"onEventPriority": "DEFAULT",
372902-
"audioSignal": null,
372903-
"lifeTimeType": "INFINITY",
372904-
"takeSnapshotWhenExtend": false,
372905-
"durationKey": null,
372906-
"lifeTime": 0.0,
372907-
"triggerLifeType": "IMMEDIATELY",
372908-
"triggerCnt": 0,
372909-
"triggerInterval": -1.0,
372910-
"waitFirstTriggerInterval": true,
372911-
"firstTriggerInterval": -1.0,
372912-
"priority": -1,
372913-
"priorityBBKeys": [],
372914-
"stripBlackboardParamsWithBuffKey": false,
372915-
"blackboard": []
372916-
}
372917372975
}
372918372976
],
372919372977
"ON_BUFF_TRIGGER": [

0 commit comments

Comments
 (0)