Skip to content

Commit

Permalink
[CN UPDATE] Client:2.4.41 Data:25-02-12-10-23-22-1b0fcf
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelinaBot_v2 committed Feb 14, 2025
1 parent 75f2755 commit bcb6634
Show file tree
Hide file tree
Showing 51 changed files with 146,078 additions and 84,342 deletions.
3 changes: 2 additions & 1 deletion zh_CN/gamedata/[uc]lua/hotfixes/EtlchiHotfixer.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ local function _EnsureDmgOrHealExecute(self, blackboard, sourceType, snapshot)
local snapshotModifier = snapshot.modifier
local snapshotSource = snapshot.source
local localSnapshot = snapshot
if not snapshotModifier.isCancelled and snapshotModifier.damageType == CS.Torappu.Battle.DamageType.PURE and snapshotSource ~= nil and string.find(snapshotSource.name, "entlec") ~= nil then
local isEntlec = blackboard:GetFloatOrDefault("is_entlec", 0)
if not snapshotModifier.isCancelled and snapshotModifier.damageType == CS.Torappu.Battle.DamageType.PURE and isEntlec > 0.5 then
snapshotModifier.value = blackboard:GetFpOrDefault("value", snapshotModifier.value)
localSnapshot.modifier = snapshotModifier
snapshot = localSnapshot
Expand Down
86 changes: 85 additions & 1 deletion zh_CN/gamedata/art/handbookpos_table.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"char_4146_nymph",
"char_4147_mitm",
"char_1502_crosly",
"char_4010_etlchi",
"char_003_kalts"
],
"forceId": "rhodes",
Expand Down Expand Up @@ -2401,6 +2402,11 @@
"y": -1125.833
},
"connectionList": [
{
"direction": 1,
"charId": "char_4010_etlchi",
"forceId": null
},
{
"direction": 2,
"charId": "char_4146_nymph",
Expand Down Expand Up @@ -2724,6 +2730,11 @@
"direction": 4,
"charId": "char_4146_nymph",
"forceId": null
},
{
"direction": 5,
"charId": "char_4010_etlchi",
"forceId": null
}
],
"haveOutLine": true
Expand Down Expand Up @@ -2864,6 +2875,11 @@
"direction": 3,
"charId": "char_4071_peper",
"forceId": null
},
{
"direction": 4,
"charId": "char_4010_etlchi",
"forceId": null
}
],
"haveOutLine": true
Expand Down Expand Up @@ -2969,6 +2985,11 @@
"y": -1039.23047
},
"connectionList": [
{
"direction": 0,
"charId": "char_4010_etlchi",
"forceId": null
},
{
"direction": 1,
"charId": "char_4071_peper",
Expand Down Expand Up @@ -3085,6 +3106,37 @@
"connectionList": [],
"haveOutLine": true
},
{
"charId": "char_4010_etlchi",
"scale": 1.0,
"pos": {
"x": -1350.0,
"y": -952.6279
},
"connectionList": [
{
"direction": 1,
"charId": "char_4131_odda",
"forceId": null
},
{
"direction": 2,
"charId": "char_4071_peper",
"forceId": null
},
{
"direction": 3,
"charId": "char_4146_nymph",
"forceId": null
},
{
"direction": 4,
"charId": "char_1027_greyy2",
"forceId": null
}
],
"haveOutLine": true
},
{
"charId": "char_003_kalts",
"scale": 1.2,
Expand Down Expand Up @@ -8394,7 +8446,8 @@
"char_4107_vrdant",
"char_4114_harold",
"char_1019_siege2",
"char_4162_cathy"
"char_4162_cathy",
"char_4173_nowell"
],
"forceId": "victoria",
"pos": {
Expand Down Expand Up @@ -9453,6 +9506,11 @@
"charId": "char_4017_puzzle",
"forceId": null
},
{
"direction": 3,
"charId": "char_4173_nowell",
"forceId": null
},
{
"direction": 4,
"charId": "char_4114_harold",
Expand Down Expand Up @@ -9484,6 +9542,11 @@
"charId": "char_4107_vrdant",
"forceId": null
},
{
"direction": 2,
"charId": "char_4173_nowell",
"forceId": null
},
{
"direction": 5,
"charId": "char_377_gdglow",
Expand Down Expand Up @@ -9538,6 +9601,27 @@
}
],
"haveOutLine": true
},
{
"charId": "char_4173_nowell",
"scale": 1.0,
"pos": {
"x": 750.0,
"y": 433.0127
},
"connectionList": [
{
"direction": 0,
"charId": "char_4107_vrdant",
"forceId": null
},
{
"direction": 5,
"charId": "char_4114_harold",
"forceId": null
}
],
"haveOutLine": true
}
],
"lineList": [
Expand Down
46 changes: 46 additions & 0 deletions zh_CN/gamedata/battle/battle_misc_table.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7212,6 +7212,14 @@
"blaze2_skill_02_hit_plot",
"blaze2_skill_02_start"
],
"skchr_nowell_2": [
"nowell_skill_01_buff_01"
],
"skchr_nowell_1": [
"nowell_skill_02_hit_01",
"nowell_skill_02_start_01",
"nowell_skill_02_start_02"
],
"skchr_surfer_1": [
"surfer_skill_02_buff_01",
"surfer_skill_02_hit_01",
Expand All @@ -7223,6 +7231,44 @@
"skchr_surfer_2": [
"surfer_skill_01_buff_01"
],
"skchr_etlchi_1": [
"etlchi_skill_02_buff_01",
"etlchi_skill_02_hit_01",
"etlchi_skill_02_range_01",
"etlchi_skill_03_buff_01",
"etlchi_skill_03_ghosting_01",
"etlchi_skill_03_ghosting_01_end",
"etlchi_skill_03_ghosting_02",
"etlchi_skill_03_hit_01",
"etlchi_skill_03_line_01",
"etlchi_skill_03_line_01_end",
"etlchi_skill_03_range_01",
"etlchi_skill_03_start_01",
"etlchi_skill_03_start_02"
],
"skchr_etlchi_2": [
"etlchi_skill_01_hit_01",
"etlchi_skill_01_range_01",
"etlchi_skill_01_start_01",
"etlchi_skill_03_buff_01",
"etlchi_skill_03_ghosting_01",
"etlchi_skill_03_ghosting_01_end",
"etlchi_skill_03_ghosting_02",
"etlchi_skill_03_hit_01",
"etlchi_skill_03_line_01",
"etlchi_skill_03_line_01_end",
"etlchi_skill_03_range_01",
"etlchi_skill_03_start_01",
"etlchi_skill_03_start_02"
],
"skchr_etlchi_3": [
"etlchi_skill_01_hit_01",
"etlchi_skill_01_range_01",
"etlchi_skill_01_start_01",
"etlchi_skill_02_buff_01",
"etlchi_skill_02_hit_01",
"etlchi_skill_02_range_01"
],
"skchr_blaze2_1": [
"blaze2_skill_02_buff",
"blaze2_skill_02_buff_02",
Expand Down
Loading

0 comments on commit bcb6634

Please sign in to comment.