diff --git a/Data/_unsorted/AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1.json b/Data/_unsorted/AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1.json
index 647e3fa9..1c94cf70 100644
--- a/Data/_unsorted/AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1.json
+++ b/Data/_unsorted/AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1.json
@@ -146,8 +146,7 @@
           "Target": "Self"
         },
         {
-          "$type": "SetDisorderTagToAttackData",
-          "DisorderTag": "AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1",
+          "$type": "HotFixAction1",
           "Predicates": [
             {
               "$type": "ByOr",
@@ -200,7 +199,8 @@
                 }
               ]
             }
-          ]
+          ],
+          "Tag": "AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1"
         }
       ],
       "OnBuffDamageHitOther": [
@@ -229,8 +229,8 @@
               ]
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1"
+              "$type": "ByHitPartName",
+              "PartName": "AbyssS2ThirdLoop_Burnice_PartnerSkill_Level1"
             }
           ],
           "PropertyKey": "Actor_DisorderDamageRatio",
diff --git a/Data/_unsorted/NangongYu_MathSkill.json b/Data/_unsorted/NangongYu_MathSkill.json
index 67a0e16a..8be261a4 100644
--- a/Data/_unsorted/NangongYu_MathSkill.json
+++ b/Data/_unsorted/NangongYu_MathSkill.json
@@ -501,8 +501,7 @@
           "Target": "Self"
         },
         {
-          "$type": "SetDisorderTagToAttackData",
-          "DisorderTag": "NGYMATH",
+          "$type": "HotFixAction1",
           "Predicates": [
             {
               "$type": "ByAnimEventIDs",
@@ -533,7 +532,8 @@
               "IsStunDestroyed": true,
               "Target": "Other"
             }
-          ]
+          ],
+          "Tag": "NGYMATH"
         }
       ],
       "OnBuffDamageHitOther": [
@@ -552,8 +552,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYMATH"
+              "$type": "ByHitPartName",
+              "PartName": "NGYMATH"
             },
             {
               "$type": "ByHasBuffGroup",
@@ -607,8 +607,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYMATH"
+              "$type": "ByHitPartName",
+              "PartName": "NGYMATH"
             },
             {
               "$type": "ByHasBuffGroup",
@@ -674,8 +674,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYMATH"
+              "$type": "ByHitPartName",
+              "PartName": "NGYMATH"
             },
             {
               "$type": "ByHasBuffGroup",
@@ -735,8 +735,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYMATH"
+              "$type": "ByHitPartName",
+              "PartName": "NGYMATH"
             },
             {
               "$type": "ByHasBuffGroup",
@@ -848,8 +848,7 @@
           "Target": "Self"
         },
         {
-          "$type": "SetDisorderTagToAttackData",
-          "DisorderTag": "NGYMATH",
+          "$type": "HotFixAction1",
           "Predicates": [
             {
               "$type": "ByAnimEventIDs",
@@ -880,7 +879,8 @@
               "IsStunDestroyed": true,
               "Target": "Other"
             }
-          ]
+          ],
+          "Tag": "NGYMATH"
         }
       ],
       "OnBuffDamageHitOther": [
@@ -899,8 +899,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYMATH"
+              "$type": "ByHitPartName",
+              "PartName": "NGYMATH"
             },
             {
               "$type": "ByHasBuffGroup",
@@ -956,8 +956,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYMATH"
+              "$type": "ByHitPartName",
+              "PartName": "NGYMATH"
             },
             {
               "$type": "ByHasBuffGroup",
@@ -1017,8 +1017,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYMATH"
+              "$type": "ByHitPartName",
+              "PartName": "NGYMATH"
             },
             {
               "$type": "ByHasBuffGroup",
diff --git a/Data/_unsorted/NangongYu_Talent_02.json b/Data/_unsorted/NangongYu_Talent_02.json
index 8ded2c0c..5653ca1f 100644
--- a/Data/_unsorted/NangongYu_Talent_02.json
+++ b/Data/_unsorted/NangongYu_Talent_02.json
@@ -292,8 +292,7 @@
           "Target": "Self"
         },
         {
-          "$type": "SetDisorderTagToAttackData",
-          "DisorderTag": "NGYTALENT02",
+          "$type": "HotFixAction1",
           "Predicates": [
             {
               "$type": "ByAnimEventIDs",
@@ -324,7 +323,8 @@
               "IsStunDestroyed": true,
               "Target": "Other"
             }
-          ]
+          ],
+          "Tag": "NGYTALENT02"
         }
       ],
       "OnBuffDamageHitOther": [
@@ -343,8 +343,8 @@
               "SourceType": "AnimEvent"
             },
             {
-              "$type": "ByDisorderTag",
-              "DisorderTag": "NGYTALENT02"
+              "$type": "ByHitPartName",
+              "PartName": "NGYTALENT02"
             },
             {
               "$type": "ByHasBuffGroup",
diff --git a/Data/_unsorted/NangongYu_TutorialAbility.json b/Data/_unsorted/NangongYu_TutorialAbility.json
index 16f201b8..b1b0ac20 100644
--- a/Data/_unsorted/NangongYu_TutorialAbility.json
+++ b/Data/_unsorted/NangongYu_TutorialAbility.json
@@ -77,8 +77,8 @@
             "SourceType": "AnimEvent"
           },
           {
-            "$type": "ByDisorderTag",
-            "DisorderTag": "NGYMATH"
+            "$type": "ByHitPartName",
+            "PartName": "NGYMATH"
           },
           {
             "$type": "ByHasBuffGroup",