Skip to content

Commit 23c99d5

Browse files
author
Vulpisfoglia_BOT_rev20250407
committed
[CN UPDATE] Client:2.6.71 Data:25-11-21-15-21-44_ee1197
1 parent ea164ef commit 23c99d5

58 files changed

Lines changed: 239050 additions & 233609 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/hotfixes/AutoChessShopHotfixer.lua‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
local AutoChessShopHotfixer = Class("AutoChessShopHotfixer", HotfixBase)
2+
3+
local function CheckData(self, forChess, shopChessData, playerData, alreadyAdd, unused)
4+
local found, slot = playerData.chessSquad:TryGetValue(shopChessData.chessId)
5+
if (shopChessData.chessLevel ~= forChess.chessLevel or not found) then
6+
return
7+
end
8+
local chessType = shopChessData.chessType
9+
local backupCharId = shopChessData.backupCharId
10+
if (chessType ~= CS.Torappu.AutoChessChessType.NORMAL or CS.System.String.IsNullOrEmpty(backupCharId)) then
11+
return
12+
end
13+
if (slot.type == CS.Torappu.PlayerActivity.PlayerActAutoChessActivity.AutoChessCharType.BACK_UP) then
14+
alreadyAdd:Add(backupCharId)
15+
unused:Remove(backupCharId)
16+
return
17+
end
18+
if (alreadyAdd:Contains(backupCharId)) then
19+
return
20+
end
21+
unused:TryAdd(backupCharId, shopChessData)
22+
end
23+
24+
local function _AddUnusedBackupCharFix(self, actId, forChess, alreadyAdd)
25+
if self.m_actData == nil then
26+
return
27+
end
28+
29+
local playerData = CS.Torappu.UI.AutoChess.AutoChessUtil.GetActAutoChessPlayerData(self.m_cacheInput.actId);
30+
if playerData == nil then
31+
return
32+
end
33+
34+
local dict_creator = CS.System.Collections.Generic.Dictionary(CS.System.String, CS.Torappu.ActAutoChessData.ActAutoChessCharShopChessData)
35+
local unused = dict_creator()
36+
37+
for k, shopChessData in pairs(self.m_actData.charShopChessDatas) do
38+
CheckData(self, forChess, shopChessData, playerData, alreadyAdd, unused)
39+
end
40+
41+
for k, shopChessData in pairs(unused) do
42+
local charModel = self:_CreateBackupChar(actId, self:_AllocInstId(), forChess, shopChessData, nil)
43+
charModel.selected = false
44+
charModel.selectIndex = -1
45+
self:_AddToCharCollection(charModel, true)
46+
end
47+
end
48+
49+
function AutoChessShopHotfixer:OnInit()
50+
xlua.private_accessible(CS.Torappu.UI.AutoChess.CharSelect.AutoChessCharSelectPoolViewModel)
51+
52+
self:Fix_ex(CS.Torappu.UI.AutoChess.CharSelect.AutoChessCharSelectPoolViewModel, "_AddUnusedBackupChar", function(self, actId, forChess, alreadyAdd)
53+
local ok, ret = xpcall(_AddUnusedBackupCharFix, debug.traceback, self, actId, forChess, alreadyAdd)
54+
if not ok then
55+
LogError("[AutoChessDragStateHotfixer] fix" .. ret)
56+
end
57+
end)
58+
end
59+
60+
function AutoChessShopHotfixer:OnDispose()
61+
end
62+
63+
return AutoChessShopHotfixer

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ local list =
1010
"HotFixes/CoopBattleServerHotfixer",
1111
"HotFixes/BuffTileHotfixer",
1212
"HotFixes/HomeThemeChangeStateHotfixer",
13-
"HotFixes/AutoChessDragStateHotfixer"
13+
"HotFixes/AutoChessDragStateHotfixer",
14+
"HotFixes/AutoChessShopHotfixer"
1415
};
1516

1617
return list;

‎zh_CN/gamedata/battle/buff_template_data.json‎

Lines changed: 225 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -281707,6 +281707,149 @@
281707281707
"_cachedDeltaValueToBBKey": "",
281708281708
"_customKey": ""
281709281709
}
281710+
],
281711+
"ON_OUTPUT_DAMAGE": [
281712+
{
281713+
"$type": "Torappu.Battle.Action.Nodes+DamageScale, Assembly-CSharp",
281714+
"_filterDamageType": false,
281715+
"_damageMask": "NONE",
281716+
"_filterApplyWay": false,
281717+
"_applyWayFilter": "NONE",
281718+
"_isOneMinus": false,
281719+
"_isStackable": false,
281720+
"_isValidStackCnt": false,
281721+
"_cachedDeltaValueToBBKey": "",
281722+
"_customKey": ""
281723+
}
281724+
],
281725+
"ON_BUFF_START": [
281726+
{
281727+
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
281728+
"_conditionNode": {
281729+
"$type": "Torappu.Battle.Action.Nodes+AutochessFilterByChessLevel, Assembly-CSharp",
281730+
"_targetType": "BUFF_OWNER",
281731+
"_condType": "EQUALS",
281732+
"_levelToCompare": 1
281733+
},
281734+
"_succeedNodes": [
281735+
{
281736+
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
281737+
"_conditionNode": {
281738+
"$type": "Torappu.Battle.Action.Nodes+FilterByTargetDataLevel, Assembly-CSharp",
281739+
"_target": "BUFF_OWNER",
281740+
"_condType": "EQUALS",
281741+
"_level": 50
281742+
},
281743+
"_succeedNodes": [
281744+
{
281745+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
281746+
"_blackboardKey": "damage_scale",
281747+
"_value": 0.0,
281748+
"_copyFromKey": "damage_scale_extra",
281749+
"_assignString": false
281750+
}
281751+
],
281752+
"_failNodes": [
281753+
{
281754+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
281755+
"_blackboardKey": "damage_scale",
281756+
"_value": 0.0,
281757+
"_copyFromKey": "damage_scale_normal",
281758+
"_assignString": false
281759+
}
281760+
]
281761+
}
281762+
],
281763+
"_failNodes": [
281764+
{
281765+
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
281766+
"_conditionNode": {
281767+
"$type": "Torappu.Battle.Action.Nodes+AutochessFilterByChessLevel, Assembly-CSharp",
281768+
"_targetType": "BUFF_OWNER",
281769+
"_condType": "EQUALS",
281770+
"_levelToCompare": 2
281771+
},
281772+
"_succeedNodes": [
281773+
{
281774+
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
281775+
"_conditionNode": {
281776+
"$type": "Torappu.Battle.Action.Nodes+FilterByTargetDataLevel, Assembly-CSharp",
281777+
"_target": "BUFF_OWNER",
281778+
"_condType": "EQUALS",
281779+
"_level": 55
281780+
},
281781+
"_succeedNodes": [
281782+
{
281783+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
281784+
"_blackboardKey": "damage_scale",
281785+
"_value": 0.0,
281786+
"_copyFromKey": "damage_scale_extra",
281787+
"_assignString": false
281788+
}
281789+
],
281790+
"_failNodes": [
281791+
{
281792+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
281793+
"_blackboardKey": "damage_scale",
281794+
"_value": 0.0,
281795+
"_copyFromKey": "damage_scale_normal",
281796+
"_assignString": false
281797+
}
281798+
]
281799+
}
281800+
],
281801+
"_failNodes": [
281802+
{
281803+
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
281804+
"_conditionNode": {
281805+
"$type": "Torappu.Battle.Action.Nodes+AutochessFilterByChessLevel, Assembly-CSharp",
281806+
"_targetType": "BUFF_OWNER",
281807+
"_condType": "GE",
281808+
"_levelToCompare": 3
281809+
},
281810+
"_succeedNodes": [
281811+
{
281812+
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
281813+
"_conditionNode": {
281814+
"$type": "Torappu.Battle.Action.Nodes+FilterByTargetDataLevel, Assembly-CSharp",
281815+
"_target": "BUFF_OWNER",
281816+
"_condType": "EQUALS",
281817+
"_level": 60
281818+
},
281819+
"_succeedNodes": [
281820+
{
281821+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
281822+
"_blackboardKey": "damage_scale",
281823+
"_value": 0.0,
281824+
"_copyFromKey": "damage_scale_extra",
281825+
"_assignString": false
281826+
}
281827+
],
281828+
"_failNodes": [
281829+
{
281830+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
281831+
"_blackboardKey": "damage_scale",
281832+
"_value": 0.0,
281833+
"_copyFromKey": "damage_scale_normal",
281834+
"_assignString": false
281835+
}
281836+
]
281837+
}
281838+
],
281839+
"_failNodes": [
281840+
{
281841+
"$type": "Torappu.Battle.Action.Nodes+AssignValueToBB, Assembly-CSharp",
281842+
"_blackboardKey": "damage_scale",
281843+
"_value": 0.0,
281844+
"_copyFromKey": "damage_scale_normal",
281845+
"_assignString": false
281846+
}
281847+
]
281848+
}
281849+
]
281850+
}
281851+
]
281852+
}
281710281853
]
281711281854
}
281712281855
},
@@ -286781,16 +286924,14 @@
286781286924
"effectKey": "",
286782286925
"onEventPriority": "DEFAULT",
286783286926
"eventToActions": {
286784-
"ON_TAKE_EP_DAMAGE": [
286927+
"ON_BUFF_START": [
286785286928
{
286786-
"$type": "Torappu.Battle.Action.Nodes+EpDamageScale, Assembly-CSharp",
286787-
"_filterElementType": false,
286788-
"_elementType": "DARK",
286789-
"_filterApplyWay": false,
286790-
"_applyWayFilter": "NONE",
286791-
"_isOneMinus": false,
286792-
"_isStackable": false,
286793-
"_isValidStackCnt": false
286929+
"$type": "Torappu.Battle.Action.Nodes+CreateBuffById, Assembly-CSharp",
286930+
"_buffKey": "weak[ep][inf]",
286931+
"_buffOwner": "BUFF_OWNER",
286932+
"_isDerivedBuff": true,
286933+
"_loadFromBlackboard": false,
286934+
"_finishDerivedBuffIfParentFinish": true
286794286935
}
286795286936
]
286796286937
}
@@ -346043,70 +346184,82 @@
346043346184
"eventToActions": {
346044346185
"ON_BUFF_START": [
346045346186
{
346046-
"$type": "Torappu.Battle.Action.Nodes+AddAttractToTargetNearestTileUseAbilitySelector, Assembly-CSharp",
346047-
"_sourceType": "BUFF_SOURCE",
346048-
"_targetType": "BUFF_OWNER",
346049-
"_abilityName": "AttractCore"
346050-
},
346051-
{
346052-
"$type": "Torappu.Battle.Action.Nodes+PlayAudio, Assembly-CSharp",
346053-
"_target": "BUFF_OWNER",
346054-
"_audioSignal": "sbell2_skill3_attract_audio"
346055-
},
346056-
{
346057-
"$type": "Torappu.Battle.Action.Nodes+CreateBuff, Assembly-CSharp",
346058-
"_buff": {
346059-
"attributes": {
346060-
"abnormalFlags": [],
346061-
"abnormalImmunes": [],
346062-
"abnormalAntis": [],
346063-
"abnormalCombos": [],
346064-
"abnormalComboImmunes": [],
346065-
"attributeModifiers": []
346066-
},
346067-
"buffKey": "sbell2_s3[attract_effect]",
346068-
"loadFromDB": false,
346069-
"isDurableBuff": false,
346070-
"isDamageMissable": false,
346071-
"isSilenceable": false,
346072-
"isStunnable": false,
346073-
"isFreezable": false,
346074-
"isLevitatable": false,
346075-
"statusResistable": "AUTOMATIC",
346076-
"templateKey": "empty",
346077-
"disableOverride": false,
346078-
"overrideKey": null,
346079-
"overrideType": "DEFAULT",
346080-
"maxStackCnt": 1,
346081-
"refreshRemainingTimeWhenStackMax": false,
346082-
"clearAllStackCntWhenTimeUp": false,
346083-
"maxValidStackCnt": -1,
346084-
"independentCharacterSource": false,
346085-
"overrideEffectKey": "sbell2_skill_03_hint",
346086-
"overrideOnEventPriority": false,
346087-
"onEventPriority": "DEFAULT",
346088-
"audioSignal": null,
346089-
"lifeTimeType": "INFINITY",
346090-
"takeSnapshotWhenExtend": false,
346091-
"durationKey": null,
346092-
"lifeTime": 0.0,
346093-
"triggerLifeType": "IMMEDIATELY",
346094-
"triggerCnt": 0,
346095-
"triggerInterval": -1.0,
346096-
"waitFirstTriggerInterval": true,
346097-
"firstTriggerInterval": -1.0,
346098-
"priority": -1,
346099-
"priorityBBKeys": [],
346100-
"stripBlackboardParamsWithBuffKey": false,
346101-
"blackboard": []
346187+
"$type": "Torappu.Battle.Action.Nodes+IfElse, Assembly-CSharp",
346188+
"_conditionNode": {
346189+
"$type": "Torappu.Battle.Action.Nodes+AddAttractToTargetNearestTileUseAbilitySelector, Assembly-CSharp",
346190+
"_sourceType": "BUFF_SOURCE",
346191+
"_targetType": "BUFF_OWNER",
346192+
"_abilityName": "AttractCore"
346102346193
},
346103-
"_buffOwner": "BUFF_OWNER",
346104-
"_useSpecialBuffSource": false,
346105-
"_specialBuffSource": "BUFF_SOURCE",
346106-
"_isDerivedBuff": true,
346107-
"_finishDerivedBuffIfParentFinish": true,
346108-
"_inherateSourceProjectileFromParentBuff": false,
346109-
"_hookEffectKeyFromSourceProjectile": false
346194+
"_succeedNodes": [
346195+
{
346196+
"$type": "Torappu.Battle.Action.Nodes+PlayAudio, Assembly-CSharp",
346197+
"_target": "BUFF_OWNER",
346198+
"_audioSignal": "sbell2_skill3_attract_audio"
346199+
},
346200+
{
346201+
"$type": "Torappu.Battle.Action.Nodes+CreateBuff, Assembly-CSharp",
346202+
"_buff": {
346203+
"attributes": {
346204+
"abnormalFlags": [],
346205+
"abnormalImmunes": [],
346206+
"abnormalAntis": [],
346207+
"abnormalCombos": [],
346208+
"abnormalComboImmunes": [],
346209+
"attributeModifiers": []
346210+
},
346211+
"buffKey": "sbell2_s3[attract_effect]",
346212+
"loadFromDB": false,
346213+
"isDurableBuff": false,
346214+
"isDamageMissable": false,
346215+
"isSilenceable": false,
346216+
"isStunnable": false,
346217+
"isFreezable": false,
346218+
"isLevitatable": false,
346219+
"statusResistable": "AUTOMATIC",
346220+
"templateKey": "empty",
346221+
"disableOverride": false,
346222+
"overrideKey": null,
346223+
"overrideType": "DEFAULT",
346224+
"maxStackCnt": 1,
346225+
"refreshRemainingTimeWhenStackMax": false,
346226+
"clearAllStackCntWhenTimeUp": false,
346227+
"maxValidStackCnt": -1,
346228+
"independentCharacterSource": false,
346229+
"overrideEffectKey": "sbell2_skill_03_hint",
346230+
"overrideOnEventPriority": false,
346231+
"onEventPriority": "DEFAULT",
346232+
"audioSignal": null,
346233+
"lifeTimeType": "INFINITY",
346234+
"takeSnapshotWhenExtend": false,
346235+
"durationKey": null,
346236+
"lifeTime": 0.0,
346237+
"triggerLifeType": "IMMEDIATELY",
346238+
"triggerCnt": 0,
346239+
"triggerInterval": -1.0,
346240+
"waitFirstTriggerInterval": true,
346241+
"firstTriggerInterval": -1.0,
346242+
"priority": -1,
346243+
"priorityBBKeys": [],
346244+
"stripBlackboardParamsWithBuffKey": false,
346245+
"blackboard": []
346246+
},
346247+
"_buffOwner": "BUFF_OWNER",
346248+
"_useSpecialBuffSource": false,
346249+
"_specialBuffSource": "BUFF_SOURCE",
346250+
"_isDerivedBuff": true,
346251+
"_finishDerivedBuffIfParentFinish": true,
346252+
"_inherateSourceProjectileFromParentBuff": false,
346253+
"_hookEffectKeyFromSourceProjectile": false
346254+
}
346255+
],
346256+
"_failNodes": [
346257+
{
346258+
"$type": "Torappu.Battle.Action.Nodes+FinishBuff, Assembly-CSharp",
346259+
"_decCntIfStack": false,
346260+
"_updateOverrideMap": true
346261+
}
346262+
]
346110346263
}
346111346264
]
346112346265
}

0 commit comments

Comments
 (0)