[CN UPDATE] Client:2.4.41 Data:25-02-14-16-11-02-89657b

Kengxxiao · Feb 14, 2025 · 481431a · 481431a
1 parent bcb6634
commit 481431a
Show file tree

Hide file tree

Showing 4 changed files with 517 additions and 12 deletions.
diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/EtlchiHotfixer.lua b/zh_CN/gamedata/[uc]lua/hotfixes/EtlchiHotfixer.lua
@@ -7,12 +7,12 @@ local function _GetNearestEndPointTile(self, sourcePos, motionMode, avoidCheckRe
   return self:GetNearestEndPointTile(sourcePos, motionMode, avoidCheckReachable)
 end
 
-local function _EnsureDmgOrHealExecute(self, blackboard, sourceType, snapshot)
+local function _FilterLevelId(self, blackboard, sourceType, snapshot)
   local snapshotModifier = snapshot.modifier
   local snapshotSource = snapshot.source
   local localSnapshot = snapshot
   local isEntlec = blackboard:GetFloatOrDefault("is_entlec", 0)
-  if not snapshotModifier.isCancelled and snapshotModifier.damageType == CS.Torappu.Battle.DamageType.PURE and isEntlec > 0.5 then
+  if not snapshotModifier.isCancelled and snapshotModifier.damageType == CS.Torappu.Battle.DamageType.PURE and isEntlec > 0.5 and snapshotModifier:CheckSharedFlag(CS.Torappu.Battle.Modifier.SharedFlagIndex.DAMAGE_WITHOUT_MODIFY) and snapshotModifier.source == nil then
     snapshotModifier.value = blackboard:GetFpOrDefault("value", snapshotModifier.value)
     localSnapshot.modifier = snapshotModifier
     snapshot = localSnapshot
@@ -27,11 +27,11 @@ function EtlchiHotfixer:OnInit()
     local ok, endPos, route = xpcall(_GetNearestEndPointTile, debug.traceback, self, sourcePos, motionMode, avoidCheckReachable)
     return endPos, route
   end)
-  xlua.private_accessible(CS.Torappu.Battle.Action.Nodes.EnsureDmgOrHeal)
-  self:Fix_ex(CS.Torappu.Battle.Action.Nodes.EnsureDmgOrHeal, "Execute", function(self, blackboard, sourceType, snapshot)
-    local ok, res, snapshot = xpcall(_EnsureDmgOrHealExecute, debug.traceback, self, blackboard, sourceType, snapshot)
+  xlua.private_accessible(CS.Torappu.Battle.Action.Nodes.FilterLevelId)
+  self:Fix_ex(CS.Torappu.Battle.Action.Nodes.FilterLevelId, "Execute", function(self, blackboard, sourceType, snapshot)
+    local ok, res, snapshot = xpcall(_FilterLevelId, debug.traceback, self, blackboard, sourceType, snapshot)
     if not ok then
-      LogError("[_EnsureDmgOrHealExecute] fix" .. res)
+      LogError("[_FilterLevelId] fix" .. res)
     end
     return res, snapshot
   end)

diff --git a/zh_CN/gamedata/battle/buff_template_data.json b/zh_CN/gamedata/battle/buff_template_data.json
@@ -139764,7 +139764,8 @@
             "_checkTileKey": true,
             "_tileKeys": [
               "tile_passable_wall",
-              "tile_stairs"
+              "tile_stairs",
+              "tile_passable_wall_forbidden"
             ]
           },
           "_succeedNodes": null,
@@ -256538,8 +256539,8 @@
           "_filterModifierCancelled": false
         },
         {
-          "$type": "Torappu.Battle.Action.Nodes+EnsureDmgOrHeal, Assembly-CSharp",
-          "_key": null
+          "$type": "Torappu.Battle.Action.Nodes+FilterLevelId, Assembly-CSharp",
+          "_levelIds": []
         }
       ]
     }
@@ -257105,7 +257106,7 @@
           "_damageType": "PURE",
           "_damageKey": "value",
           "_ignoreForSp": true,
-          "_damageWithoutModify": false,
+          "_damageWithoutModify": true,
           "_attackType": "NORMAL",
           "_isEnvDamage": false,
           "_isUndeadable": false,