OSPRODWin2.1.0_R9429485_S9429485_D9429485

2025-07-23 10:01:48 +02:00 · 2025-07-23 10:01:48 +02:00 · a817059c8e
commit a817059c8e
parent 0ca80ea361
45 changed files with 1835 additions and 1352 deletions
--- a/Data/JsonBytes/Audio/AudioResourceData.json
+++ b/Data/JsonBytes/Audio/AudioResourceData.json
--- a/Data/_unsorted/Floor_100101.json
+++ b/Data/_unsorted/Floor_100101.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 100101,
-    "FloorMD5": "fbd015f50bc91ebecc68b054333af3f7",
-    "FloorVersion": 1751960235,
+    "FloorMD5": "90773808be50f7c9ce610164d8ba0b79",
+    "FloorVersion": 1753092229,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Floor_100201.json
+++ b/Data/_unsorted/Floor_100201.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 100201,
-    "FloorMD5": "acfe45d5806767b7a67eb1b64c911a3b",
-    "FloorVersion": 1751960235,
+    "FloorMD5": "75fd450e09dae06928ab28081edaebbe",
+    "FloorVersion": 1753092229,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Floor_100301.json
+++ b/Data/_unsorted/Floor_100301.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 100301,
-    "FloorMD5": "eb8d96e0bd3eeb0e491ee3dbfe178462",
-    "FloorVersion": 1751960235,
+    "FloorMD5": "7e12a5ce8b2ab7c18f0b574e093dc23a",
+    "FloorVersion": 1753092229,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Floor_100701.json
+++ b/Data/_unsorted/Floor_100701.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 100701,
-    "FloorMD5": "c08ef162f56017b34a287b841af34255",
-    "FloorVersion": 1751960235,
+    "FloorMD5": "605bfb60354ae47e19c67b11c004a102",
+    "FloorVersion": 1753092229,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Floor_100801.json
+++ b/Data/_unsorted/Floor_100801.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 100801,
-    "FloorMD5": "cb6f87d325ddd505253bdd45c02db1f5",
-    "FloorVersion": 1752206652,
+    "FloorMD5": "c63ab96bcb626fd225445a8799f6741f",
+    "FloorVersion": 1753092229,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Floor_100901.json
+++ b/Data/_unsorted/Floor_100901.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 100901,
-    "FloorMD5": "ca82c45edf2e95aa6dd2f22a0431c23e",
-    "FloorVersion": 1751960235,
+    "FloorMD5": "52257b02b5baf33ba9bc792e2bc927c2",
+    "FloorVersion": 1753092229,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Floor_101101.json
+++ b/Data/_unsorted/Floor_101101.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 101101,
-    "FloorMD5": "c42066f0ad70b61afe3944877629da6a",
-    "FloorVersion": 1752048319,
+    "FloorMD5": "9d92af2750b1e2d87d74441ecd80fe73",
+    "FloorVersion": 1752750374,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Floor_101201.json
+++ b/Data/_unsorted/Floor_101201.json
@ -3,8 +3,8 @@
  "Floor": {
    "$type": "ConfigFloor",
    "FloorID": 101201,
-    "FloorMD5": "b7c7c2ac3612cf31188adcb6e02ebab9",
-    "FloorVersion": 1751977812,
+    "FloorMD5": "74a0aaa6110e81f3090add1153d4cc9c",
+    "FloorVersion": 1753085032,
    "GameplayExternalData": {
      "$type": "ConfigFloorExternalDataCollection",
      "BattleRegionMap": {
--- a/Data/_unsorted/Group_101200030.json
+++ b/Data/_unsorted/Group_101200030.json
@ -27,12 +27,12 @@
                },
                "xzPoints": [
                  {
-                    "x": -20.61999,
-                    "y": 5.590003
+                    "x": -22.04664,
+                    "y": 6.411485
                  },
                  {
-                    "x": -17.61999,
-                    "y": -10.66
+                    "x": -21.49245,
+                    "y": -4.884004
                  },
                  {
                    "x": -16.61999,
@ -43,88 +43,56 @@
                    "y": -19.41
                  },
                  {
-                    "x": -8.869987,
-                    "y": -19.66
+                    "x": -1.713867,
+                    "y": -22.57848
                  },
                  {
-                    "x": -4.619987,
-                    "y": -21.41
+                    "x": 4.811913,
+                    "y": -23.16237
                  },
                  {
-                    "x": -1.619987,
-                    "y": -21.41
+                    "x": 13.87052,
+                    "y": -21.45489
                  },
                  {
-                    "x": 7.130013,
-                    "y": -20.91
+                    "x": 24.8172,
+                    "y": -11.45548
                  },
                  {
-                    "x": 8.880013,
-                    "y": -20.66
+                    "x": 26.28345,
+                    "y": -4.519516
                  },
                  {
-                    "x": 9.630013,
-                    "y": -20.41
+                    "x": 26.85585,
+                    "y": 2.273056
                  },
                  {
-                    "x": 10.13001,
-                    "y": -19.91
+                    "x": 25.49675,
+                    "y": 8.166653
                  },
                  {
-                    "x": 20.63001,
-                    "y": -3.409997
+                    "x": 20.75169,
+                    "y": 17.76146
                  },
                  {
-                    "x": 22.13001,
-                    "y": -0.409997
+                    "x": 13.48337,
+                    "y": 24.3396
                  },
                  {
-                    "x": 22.38001,
-                    "y": 0.340003
+                    "x": 7.154518,
+                    "y": 26.10232
                  },
                  {
-                    "x": 22.38001,
-                    "y": 4.340003
+                    "x": -1.071007,
+                    "y": 26.19826
                  },
                  {
-                    "x": 14.88001,
-                    "y": 18.84
+                    "x": -11.72243,
+                    "y": 21.88199
                  },
                  {
-                    "x": 12.63001,
-                    "y": 21.34
-                  },
-                  {
-                    "x": 12.38001,
-                    "y": 21.59
-                  },
-                  {
-                    "x": 4.630013,
-                    "y": 26.34
-                  },
-                  {
-                    "x": 1.130013,
-                    "y": 26.34
-                  },
-                  {
-                    "x": -15.61999,
-                    "y": 16.09
-                  },
-                  {
-                    "x": -16.61999,
-                    "y": 15.34
-                  },
-                  {
-                    "x": -18.11999,
-                    "y": 13.84
-                  },
-                  {
-                    "x": -18.61999,
-                    "y": 12.84
-                  },
-                  {
-                    "x": -20.61999,
-                    "y": 7.590003
+                    "x": -17.38747,
+                    "y": 16.64378
                  }
                ]
              }
@ -141,7 +109,7 @@
                  "y": 16.97032,
                  "z": 0
                },
-                "Height": 0,
+                "Height": 64.33603,
                "IsHeightValid": false,
                "Start": {
                  "x": -63.64645,
--- a/Data/_unsorted/MazingerGoldenBomb_MuteStunAbnormalHit.json
+++ b/Data/_unsorted/MazingerGoldenBomb_MuteStunAbnormalHit.json
@ -116,18 +116,47 @@
      "ModifierStacking": "Unique",
      "OnElementAbnormalTriggeredPre": [
        {
-          "$type": "ModifyAttackDataAction",
-          "Predicates": [
+          "$type": "BranchOperator",
+          "Conditions": [
            {
-              "$type": "ByElementAbnormalAddBuff",
-              "BuffGroupList": [
-                "Frozen"
-              ]
+              "$type": "ByEntityTemplateID",
+              "EntityType": "Avatar",
+              "Target": "Other",
+              "TemplateID": 1091
            }
          ],
-          "PropertyKey": "Actor_OverrideByCustomBuffID",
-          "PropertyValue": 16,
-          "Target": "Self"
+          "FailureActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 16,
+              "Target": "Self"
+            }
+          ],
+          "SuccessActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 1016,
+              "Target": "Self"
+            }
+          ]
        }
      ],
      "Properties": {
--- a/Data/_unsorted/Monster_EtherBarrier_Common.json
+++ b/Data/_unsorted/Monster_EtherBarrier_Common.json
@ -644,18 +644,47 @@
      ],
      "OnElementAbnormalTriggeredPre": [
        {
-          "$type": "ModifyAttackDataAction",
-          "Predicates": [
+          "$type": "BranchOperator",
+          "Conditions": [
            {
-              "$type": "ByElementAbnormalAddBuff",
-              "BuffGroupList": [
-                "Frozen"
-              ]
+              "$type": "ByEntityTemplateID",
+              "EntityType": "Avatar",
+              "Target": "Other",
+              "TemplateID": 1091
            }
          ],
-          "PropertyKey": "Actor_OverrideByCustomBuffID",
-          "PropertyValue": 16,
-          "Target": "Self"
+          "FailureActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 16,
+              "Target": "Self"
+            }
+          ],
+          "SuccessActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 1016,
+              "Target": "Self"
+            }
+          ]
        }
      ],
      "OnRemoved": [
--- a/Data/_unsorted/Monster_EtherBarrier_Extra.json
+++ b/Data/_unsorted/Monster_EtherBarrier_Extra.json
@ -635,18 +635,47 @@
      ],
      "OnElementAbnormalTriggeredPre": [
        {
-          "$type": "ModifyAttackDataAction",
-          "Predicates": [
+          "$type": "BranchOperator",
+          "Conditions": [
            {
-              "$type": "ByElementAbnormalAddBuff",
-              "BuffGroupList": [
-                "Frozen"
-              ]
+              "$type": "ByEntityTemplateID",
+              "EntityType": "Avatar",
+              "Target": "Other",
+              "TemplateID": 1091
            }
          ],
-          "PropertyKey": "Actor_OverrideByCustomBuffID",
-          "PropertyValue": 16,
-          "Target": "Self"
+          "FailureActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 16,
+              "Target": "Self"
+            }
+          ],
+          "SuccessActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 1016,
+              "Target": "Self"
+            }
+          ]
        }
      ],
      "OnRemoved": [
--- a/Data/_unsorted/Monster_EtherBarrier_Level.json
+++ b/Data/_unsorted/Monster_EtherBarrier_Level.json
@ -467,18 +467,47 @@
      ],
      "OnElementAbnormalTriggeredPre": [
        {
-          "$type": "ModifyAttackDataAction",
-          "Predicates": [
+          "$type": "BranchOperator",
+          "Conditions": [
            {
-              "$type": "ByElementAbnormalAddBuff",
-              "BuffGroupList": [
-                "Frozen"
-              ]
+              "$type": "ByEntityTemplateID",
+              "EntityType": "Avatar",
+              "Target": "Other",
+              "TemplateID": 1091
            }
          ],
-          "PropertyKey": "Actor_OverrideByCustomBuffID",
-          "PropertyValue": 16,
-          "Target": "Self"
+          "FailureActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 16,
+              "Target": "Self"
+            }
+          ],
+          "SuccessActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 1016,
+              "Target": "Self"
+            }
+          ]
        }
      ],
      "OnRemoved": [
--- a/Data/_unsorted/Monster_MentorMevorakh_MuteStunAbnormalHit.json
+++ b/Data/_unsorted/Monster_MentorMevorakh_MuteStunAbnormalHit.json
@ -350,18 +350,47 @@
      "ModifierStacking": "Unique",
      "OnElementAbnormalTriggeredPre": [
        {
-          "$type": "ModifyAttackDataAction",
-          "Predicates": [
+          "$type": "BranchOperator",
+          "Conditions": [
            {
-              "$type": "ByElementAbnormalAddBuff",
-              "BuffGroupList": [
-                "Frozen"
-              ]
+              "$type": "ByEntityTemplateID",
+              "EntityType": "Avatar",
+              "Target": "Other",
+              "TemplateID": 1091
            }
          ],
-          "PropertyKey": "Actor_OverrideByCustomBuffID",
-          "PropertyValue": 16,
-          "Target": "Self"
+          "FailureActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 16,
+              "Target": "Self"
+            }
+          ],
+          "SuccessActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 1016,
+              "Target": "Self"
+            }
+          ]
        }
      ],
      "Properties": {
--- a/Data/_unsorted/NamelessOne_EtherBarrier_Manager.json
+++ b/Data/_unsorted/NamelessOne_EtherBarrier_Manager.json
@ -254,18 +254,47 @@
      ],
      "OnElementAbnormalTriggeredPre": [
        {
-          "$type": "ModifyAttackDataAction",
-          "Predicates": [
+          "$type": "BranchOperator",
+          "Conditions": [
            {
-              "$type": "ByElementAbnormalAddBuff",
-              "BuffGroupList": [
-                "Frozen"
-              ]
+              "$type": "ByEntityTemplateID",
+              "EntityType": "Avatar",
+              "Target": "Other",
+              "TemplateID": 1091
            }
          ],
-          "PropertyKey": "Actor_OverrideByCustomBuffID",
-          "PropertyValue": 16,
-          "Target": "Self"
+          "FailureActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 16,
+              "Target": "Self"
+            }
+          ],
+          "SuccessActions": [
+            {
+              "$type": "ModifyAttackDataAction",
+              "Predicates": [
+                {
+                  "$type": "ByElementAbnormalAddBuff",
+                  "BuffIDList": [
+                    1
+                  ]
+                }
+              ],
+              "PropertyKey": "Actor_OverrideByCustomBuffID",
+              "PropertyValue": 1016,
+              "Target": "Self"
+            }
+          ]
        }
      ],
      "OnRemoved": [
--- a/FileCfg/15923914389158720465.json
+++ b/FileCfg/15923914389158720465.json
@ -1,5 +1,5 @@
 {
-  "FAAFMJIGLEF": 1950,
+  "FAAFMJIGLEF": 1949,
  "INEDFKIIELD": 6,
  "ICGOAJGAOGC": 3,
  "PPJFGGIFFDO": 7200,
@ -18,7 +18,7 @@
  "EEFMMJKGJNH": 50,
  "KAHNCDDBJLC": [
    549,
-    1950
+    1949
  ],
  "MCKBMDBDIBJ": 20,
  "KLDJHLICNPO": [
--- a/FileCfg/9799352662332638841.json
+++ b/FileCfg/9799352662332638841.json
@ -443,7 +443,7 @@
    {
      "CJHNGFMGKGE": 101101005,
      "BPHEKKCJJLA": 101101005,
-      "LCJCJNDIMGP": "34940011",
+      "LCJCJNDIMGP": "34940011|1040140836",
      "OMFPKNEOOPG": 0,
      "ONMOLIPAMAD": 1,
      "EKLOJPKJNNK": 101101,
--- a/FileCfg/BigSceneQuestTemplateTb.json
+++ b/FileCfg/BigSceneQuestTemplateTb.json
@ -4594,7 +4594,7 @@
        101100018,
        101100061
      ],
-      "EJJGKAMLENK": "",
+      "EJJGKAMLENK": "101100017:202",
      "IINFNIBHEAM": 1,
      "EEIBAPMOMMJ": "",
      "MDOACACNHEI": "",
@ -4856,7 +4856,7 @@
        101100030,
        101100034
      ],
-      "EJJGKAMLENK": "",
+      "EJJGKAMLENK": "101100028:201",
      "IINFNIBHEAM": 1,
      "EEIBAPMOMMJ": "",
      "MDOACACNHEI": "",
@ -4975,7 +4975,7 @@
        101100098,
        101100027
      ],
-      "EJJGKAMLENK": "",
+      "EJJGKAMLENK": "101100032:201",
      "IINFNIBHEAM": 1,
      "EEIBAPMOMMJ": "",
      "MDOACACNHEI": "",
--- a/FileCfg/ConditionConfigTemplateTb.json
+++ b/FileCfg/ConditionConfigTemplateTb.json
--- a/FileCfg/ItemTemplateTb.json
+++ b/FileCfg/ItemTemplateTb.json
--- a/FileCfg/LevelConditionsTemplateTb.json
+++ b/FileCfg/LevelConditionsTemplateTb.json
@ -2225,6 +2225,78 @@
      "FNNGMNFEGAB": "",
      "CEBFHHFJOHC": []
    },
+    {
+      "CJHNGFMGKGE": 1040060015,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060016,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060017,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060018,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060019,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060020,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060021,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060022,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060023,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060024,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060025,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
+    {
+      "CJHNGFMGKGE": 1040060026,
+      "GNJIDFFAGCP": -1,
+      "FNNGMNFEGAB": "",
+      "CEBFHHFJOHC": []
+    },
    {
      "CJHNGFMGKGE": 1040140523,
      "GNJIDFFAGCP": -1,
--- a/FileCfg/MainCityObjectTemplateTb.json
+++ b/FileCfg/MainCityObjectTemplateTb.json
--- a/FileCfg/NPCSubTemplateTb.json
+++ b/FileCfg/NPCSubTemplateTb.json
@ -1316,7 +1316,7 @@
      "CJHNGFMGKGE": 100172252,
      "LNCODBGHFKM": "NPCName_100172251",
      "HOPOEJFJHHE": 17225,
-      "NHFGHKDMAMC": false,
+      "NHFGHKDMAMC": true,
      "DCOKGCOKFNJ": true,
      "PDNKINGKLBM": true,
      "NADNAHIJPCG": 0,
--- a/FileCfg/OptionalItemGiftConfigTemplateTb.json
+++ b/FileCfg/OptionalItemGiftConfigTemplateTb.json
@ -107,6 +107,18 @@
        211020210,
        211020211
      ]
+    },
+    {
+      "EGDBEJFIMCP": 3000105,
+      "EHGFHDPKIOP": [],
+      "MHPFFMKNEHG": [
+        212010016,
+        212010011,
+        212010012,
+        212010013,
+        212010014,
+        212010015
+      ]
    }
  ]
 }
--- a/FileCfg/UnlockConfigTemplateTb.json
+++ b/FileCfg/UnlockConfigTemplateTb.json
@ -8181,7 +8181,8 @@
    {
      "CJHNGFMGKGE": 30067,
      "FEGGPJHEHCC": [
-        42005121
+        42005121,
+        42005122
      ],
      "CEFFEFGHLEK": 0,
      "APMEIJIGKEN": 0,
@ -8193,7 +8194,7 @@
      "HJJBJGIIMGM": 0,
      "LNCODBGHFKM": "",
      "KPBMNNMEACG": "",
-      "FGLKBPKFDHH": 1,
+      "FGLKBPKFDHH": 2,
      "FJPPOINBLNI": 7,
      "KIAEKIMPPJG": false,
      "MDPICOCIBMD": 0,
--- a/TextMap/TextMapOverwriteTemplateTb.json
+++ b/TextMap/TextMapOverwriteTemplateTb.json
@ -176,6 +176,10 @@
  "Activity_Chat_EndlessSummer_600013820_02": "是阿帝，它就在这儿！但它好像失去意识了…我先检查一下它的状态！",
  "Activity_Chat_EndlessSummer_600013827_05": "绳匠，有些日子没见了。我给六课的成员集体申请了休假，难得晴朗的夏夜，这里很适合好好地卸下工作上的疲劳。",
  "Activity_Chat_Summer_35260009_10": "发消息叫来了爱丽丝，表示已经帮她找到了自信重塑训练的老师。",
+  "Activity_Chat_Summer_35260015_06": "可不是么，我刚刷完，最近的报道都是讲她的。",
+  "Activity_Chat_Summer_35260015_07": "娱记小瓜：新艾利都贵族继承人爆发激烈冲突。",
+  "Activity_Chat_Summer_35260015_09": "据内部人士透露：泰姆菲尔德家族将与蒙特夫家合作研究新技术，据说能辅助探测外星生命。",
+  "Activity_Chat_Summer_35260015_Name_02": "阴谋论爱好者",
  "Activity_Chat_Summer_600013611_06": "对对对，太简单了",
  "Activity_Chat_Summer_600013611_07": "柚叶用肘部轻轻碰了你一下。",
  "Activity_Chat_Summer_600013614_00": "众人慌忙将「人鱼」捞上船，没想到，居然是一个很熟悉的身影。",
@ -292,6 +296,7 @@
  "BangbooAutoBattle_NoFightServer": "战斗服不可用",
  "Bangboo_TalentSkill_Des_54018_04": "<color=#FFFFFF>[额外能力]</color>\n队伍中存在1名或以上<color=#FFFFFF>[怪啖屋]</color>阵营的角色时触发：\n角色接触<color=#FFFFFF>[幻泡]</color>时，回复的生命值提升35%；\n角色接触<color=#FFFFFF>[星莹]</color>时，回复的能量值提升35%。",
  "Bangboo_TalentSkill_Des_54018_05": "<color=#FFFFFF>[额外能力]</color>\n队伍中存在1名或以上<color=#FFFFFF>[怪啖屋]</color>阵营的角色时触发：\n角色接触<color=#FFFFFF>[幻泡]</color>时，回复的生命值提升40%；\n角色接触<color=#FFFFFF>[星莹]</color>时，回复的能量值提升40%。",
+  "BigSceneMapDes_410010112": "【材料实验室】\n由辉晶美克主导，建立在空洞内以太稳定区域的先进实验室，曾以工作人员能长期驻扎在空洞内而闻名，并多次接待外界访客。后来实验室以维护成本高昂对外宣称关闭，但事实似乎并非如此…",
  "BigScene_Suburbs_1_4_AreaName": "[空洞]旧建筑群",
  "BigScene_Suburbs_1_5_AreaName": "[空洞]材料实验室",
  "BranchRelic_13500111_des": "比利在<color=#FFFFFF>[普通攻击]</color>中进入蹲姿射击时，触发<color=#FFFFFF>[核心被动：稳定据枪]</color>并维持增益效果1.5秒后，将进入<color=#FFFFFF>[星徽降临]</color>状态，期间攻击命中敌人时<color=#2BAD00>无视目标30%</color><color=#F0D12B>物理伤害抗性</color>，同时<color=#2BAD00>持续获得喧响值</color>，<color=#2BAD00>从20点/秒逐渐提升至50点/秒</color>，在3秒后达到最大值，直到自身被击退或被击飞。",
@ -311,6 +316,7 @@
  "CS_22_03_030": "嗯，没想到事情比想象中的还要麻烦",
  "CS_22_03_040": "嗯，没想到事情比想象中的还要麻烦",
  "CallingCard_3302005_des": "「鏖战试炼：荣耀」特定分数纪念名片。",
+  "Choice_1341044_des": "女王大人还没出道时自制的专辑，叫<color=#FFAF2C>「水瓶座」</color>！",
  "Device_Interact_Empty_FakeTreasure": "可疑的小卡格车",
  "Device_TreasureCarTower": "可疑的小卡格车",
  "EndlessSummerActivity_1001978460": "在110秒内抵达终点",
@ -490,6 +496,8 @@
  "LockTip_903501": "完成关卡「彩虹彼端」与「派对终局」",
  "LockTip_903601": "完成关卡「彩虹彼端」与「派对终局」",
  "Main_Chat_Chapter120_809223007_04": "铃，我会和Fairy试着破解，你们先在周围的建筑附近找找认证卡吧。",
+  "Main_Chat_Chapter120_809443001_09": "（把最近观察到的情况告诉了福福：铃去找福福的时候好几次都专门买了零食，无论怎么看铃都更像是有求于人的一方。）",
+  "Main_Chat_Chapter120_809443001_11": "看来{M#铃}{F#我哥}{M#她}{F#他}早有防备",
  "Main_Chat_Chapter120_809443003_35": "对，小时候我们是一起拜入山门的，不过和资质平平的我不一样，她从小就优秀得多。",
  "Main_GalGame_Chapter120_11200010_033": "你说福福师姐啊。唉，昨天她算数课挂科的事穿帮了，被师父连夜喊回去补课，是赶不上这顿好的喽。",
  "MemoryName_10118": "无条件信任",
@ -539,6 +547,7 @@
  "PartnerTalk_Chat_PartnerAlice_330371002_49_1": "呼…有些意犹未尽呢。",
  "PartnerTalk_Chat_PartnerYuzuha_330410501_23": "不过柚叶和真斗的偏科方向不一样，如果遇到久攻不下的难题就由我们两个根据具体情况，分别对你们进行辅导。",
  "PartnerTalk_Chat_PartnerYuzuha_330410501_50": "不过求助于哲，应该是可以的吧？\n嗯…没错，哲是朋友，这是朋友之间的互相帮助！",
+  "PartnerTalk_Chat_PartnerYuzuha_330411206_26": "你你你你！怎么连哲也跟着柚叶学坏了！",
  "PartnerTalk_GalGame_PartnerAlice_10043601_030": "和爱丽丝一起来到二楼的房间里，开始观看《波特山》。名为「伐木工」的杀人魔神出鬼没，一个接一个地结果掉被困在山里的角色们…\n即便知道所有情节的发展，再看一次还是觉得恐怖氛围拉满。",
  "PartnerTalk_GalGame_PartnerYuzuha_10043501_019": "和柚叶一起看完了电影。不同于平时懒洋洋的样子，她看电影的时候显得很认真。\n进入影片的生命中，和其间角色一起愤怒、欢笑、流泪…也许这就是电影的真谛吧。",
  "PartnerTalk_OngoingMainCity_PartnerAlice_511401001_02": "{M#哲}{F#铃}…？再继续发呆的话，我就要把你的发型梳成对称的了哦？",
@ -744,6 +753,7 @@
  "SkillContext5": "连续攻击命中敌人200次，每次命中之间的间隔不得超过5秒即可触发「极限连段」，同时命中多个敌人时仅触发一次，后续每100次连续攻击可以重复触发，受到攻击并被打断动作时将重新计数；每次触发获得210分",
  "SkinResource_4120112": "完成活动「仲夏游梦绮谭」下的任务「仲夏的秘藏」后解锁",
  "SkinResource_4120212": "完成活动「仲夏游梦绮谭」下的任务「仲夏的秘藏」后解锁",
+  "Skin_3114011_story": "尽管并非完全对称，来自挚友的礼物却意外地让少女没那么抗拒。\n少女推开紧闭的门扉，行走在骤雨停歇后的粉色沙滩上，有点冰凉的海浪刚好能没过脚踝。已再没有什么未知能让她感到恐惧。",
  "Stylish_SkillName6": "浮空连段",
  "Stylish_SkillName7": "多重命中",
  "TarotCard_1000979_ExtraDes": "[剑尖的鼠尾草]：<color=#FFFFFF>[终结技：星芒终章]</color>的终结一击命中敌人时，触发<color=#F0D12B>[极性强击]</color>；全队角色造成的<color=#F0D12B>[强击]</color>伤害提升15%；<color=#F0D12B>物理异常状态</color>下的敌人被结算的<color=#FFFFFF>[紊乱]</color>伤害提升15%；进入战场时，爱丽丝立刻获得1000点喧响值，在勘域模式中此效果180秒内最多触发一次。",
@ -805,7 +815,7 @@
  "Title_20900003": "「不幸的幸运儿」",
  "Title_20900004": "「余音或序曲」",
  "UIText_45884": "玩家可以通过升级商店等级来提升邦布的出战上限（1级时上限为1只邦布，5级时上限为5只邦布），最高可同时上阵5只邦布。同时，部分羁绊会在战斗中额外召唤作战单位。",
-  "UIText_45886": "金币是用于购买邦布、升级商店等级和刷新商店的基础资源。_x000A_每回合，玩家会获得固定的基础收入，并且每拥有10金币将额外获得2点利息金币（利息上限为6点）。",
+  "UIText_45886": "金币是用于购买邦布、升级商店等级和刷新商店的基础资源。每回合，玩家会获得固定的基础收入，并且每拥有10金币将额外获得2点利息金币（利息上限为6点）。",
  "UIText_45906": "最终得分",
  "UIText_45915": "数据统计",
  "UIText_45916": "羁绊",
--- a/TextMap/TextMap_CHTOverwriteTemplateTb.json
+++ b/TextMap/TextMap_CHTOverwriteTemplateTb.json
--- a/TextMap/TextMap_DEOverwriteTemplateTb.json
+++ b/TextMap/TextMap_DEOverwriteTemplateTb.json
--- a/TextMap/TextMap_ENOverwriteTemplateTb.json
+++ b/TextMap/TextMap_ENOverwriteTemplateTb.json
--- a/TextMap/TextMap_ESOverwriteTemplateTb.json
+++ b/TextMap/TextMap_ESOverwriteTemplateTb.json
--- a/TextMap/TextMap_FROverwriteTemplateTb.json
+++ b/TextMap/TextMap_FROverwriteTemplateTb.json
--- a/TextMap/TextMap_IDOverwriteTemplateTb.json
+++ b/TextMap/TextMap_IDOverwriteTemplateTb.json
--- a/TextMap/TextMap_JAOverwriteTemplateTb.json
+++ b/TextMap/TextMap_JAOverwriteTemplateTb.json
--- a/TextMap/TextMap_KOOverwriteTemplateTb.json
+++ b/TextMap/TextMap_KOOverwriteTemplateTb.json
--- a/TextMap/TextMap_Login_CHTTemplateTb.json
+++ b/TextMap/TextMap_Login_CHTTemplateTb.json
@ -245,7 +245,7 @@
  "Setting_Button_19": "等級獎勵",
  "Setting_Button_20": "獎勵預覽",
  "Setting_Button_21": "領取獎勵",
-  "Setting_Button_22": "確認陣容",
+  "Setting_Button_22": "",
  "Setting_Button_23": "查看獎勵",
  "Setting_Button_24": "切換清單",
  "Setting_Button_R3_01": "查看詳情",
--- a/TextMap/TextMap_Login_DETemplateTb.json
+++ b/TextMap/TextMap_Login_DETemplateTb.json
@ -245,7 +245,7 @@
  "Setting_Button_19": "Stufenbelohnungen",
  "Setting_Button_20": "Belohnungsvorschau",
  "Setting_Button_21": "Einsammeln",
-  "Setting_Button_22": "Bestätigen",
+  "Setting_Button_22": "Aufstellung bestätigen",
  "Setting_Button_23": "Belohnungen ansehen",
  "Setting_Button_24": "Liste wechseln",
  "Setting_Button_R3_01": "Details ansehen",
--- a/TextMap/TextMap_Login_ENTemplateTb.json
+++ b/TextMap/TextMap_Login_ENTemplateTb.json
@ -245,7 +245,7 @@
  "Setting_Button_19": "Level Rewards",
  "Setting_Button_20": "Reward Preview",
  "Setting_Button_21": "Claim",
-  "Setting_Button_22": "Confirm",
+  "Setting_Button_22": "Confirm Lineup",
  "Setting_Button_23": "View Rewards",
  "Setting_Button_24": "Switch List",
  "Setting_Button_R3_01": "Check Details",
--- a/TextMap/TextMap_Login_ESTemplateTb.json
+++ b/TextMap/TextMap_Login_ESTemplateTb.json
@ -245,7 +245,7 @@
  "Setting_Button_19": "Recompensa de nivel",
  "Setting_Button_20": "Ver recompensas",
  "Setting_Button_21": "Reclamo de recompensas",
-  "Setting_Button_22": "Confirmar",
+  "Setting_Button_22": "Confirmar equipo",
  "Setting_Button_23": "Ver recompensas",
  "Setting_Button_24": "Lista de cambios",
  "Setting_Button_R3_01": "Ver detalles",
--- a/TextMap/TextMap_Login_FRTemplateTb.json
+++ b/TextMap/TextMap_Login_FRTemplateTb.json
@ -245,7 +245,7 @@
  "Setting_Button_19": "Récompenses de niveau",
  "Setting_Button_20": "Aperçu des récompenses",
  "Setting_Button_21": "Récupérer",
-  "Setting_Button_22": "Confirmer",
+  "Setting_Button_22": "",
  "Setting_Button_23": "Voir les récompenses",
  "Setting_Button_24": "Liste d'échange",
  "Setting_Button_R3_01": "Voir les détails",
--- a/TextMap/TextMap_Login_RUTemplateTb.json
+++ b/TextMap/TextMap_Login_RUTemplateTb.json
@ -245,7 +245,7 @@
  "Setting_Button_19": "Награды за уровень",
  "Setting_Button_20": "Список наград",
  "Setting_Button_21": "Получить",
-  "Setting_Button_22": "Подтвердить",
+  "Setting_Button_22": "Подтвердить состав",
  "Setting_Button_23": "Просмотр наград",
  "Setting_Button_24": "Переключиться на список",
  "Setting_Button_R3_01": "Посмотреть подробности",
--- a/TextMap/TextMap_PTOverwriteTemplateTb.json
+++ b/TextMap/TextMap_PTOverwriteTemplateTb.json
--- a/TextMap/TextMap_RUOverwriteTemplateTb.json
+++ b/TextMap/TextMap_RUOverwriteTemplateTb.json
--- a/TextMap/TextMap_THOverwriteTemplateTb.json
+++ b/TextMap/TextMap_THOverwriteTemplateTb.json
--- a/TextMap/TextMap_VIOverwriteTemplateTb.json
+++ b/TextMap/TextMap_VIOverwriteTemplateTb.json