[CN UPDATE] Client:2.3.01 Data:24-07-23-15-16-02-a53606

Kengxxiao · Jul 25, 2024 · b9f6dc9 · b9f6dc9
1 parent b4326c1
commit b9f6dc9
Show file tree

Hide file tree

Showing 19 changed files with 822 additions and 38 deletions.
diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/RoguelikeTopicHotfixer.lua b/zh_CN/gamedata/[uc]lua/hotfixes/RoguelikeTopicHotfixer.lua
@@ -38,12 +38,51 @@ local function _RenderInitSquadWithDifficultyFix(self, viewModel)
       break;
     end
 
-    self._bandRankAtlasObject = atlasObject;
+    self._difficultyAtlasObject = atlasObject;
   until(true);
 
   self:_RenderInitSquadWithDifficulty(viewModel);
 end
 
+local function _TryRemoveBindingTiles(self, tiles)
+  if tiles == nil then
+    return false
+  end
+  local hasNew = false
+  local tilesCount = tiles.Count
+  local luaCreateCnt = CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff.createCnt
+  local luaS_targetTiles = CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff.s_targetTiles
+  local luaEffectHolder = CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff.effectHolder
+  for i = 0, tilesCount - 1 do
+    local tile = tiles[i]
+    if tile ~= nil then
+      if self:FilterTile(tile) then
+        flag, cnt = luaCreateCnt:TryGetValue(tile.gridPosition)
+        if flag and cnt > 0 then
+          luaCreateCnt[tile.gridPosition] = cnt - 1
+          if cnt - 1 <= 0 then
+            luaS_targetTiles:Remove(tile.gridPosition)
+            self.targetTiles:Remove(tile.gridPosition)
+            local character = tile:GetCharacter()
+            if character ~= nil then
+              self:TryRemoveBuff(character, false)
+            end
+            if not string.isNullOrEmpty(self.tileEffect) then
+              hasEffect, curTileEffect = luaEffectHolder:TryGetValue(tile)
+              if hasEffect and curTileEffect ~= nil then
+                curTileEffect:FinishMe(true)
+                luaEffectHolder:Remove(tile)
+              end
+            end
+            hasNew = true
+          end
+        end
+      end
+    end
+  end
+  return hasNew
+end
+
 function RoguelikeTopicHotfixer:OnInit()
   xlua.private_accessible(CS.Torappu.UI.Roguelike.RoguelikeMenuInitSquadWithDifficultyObject);
   self:Fix_ex(CS.Torappu.UI.Roguelike.RoguelikeMenuInitSquadWithDifficultyObject, "_RenderInitSquadWithDifficulty", function(self, viewModel)
@@ -52,6 +91,13 @@ function RoguelikeTopicHotfixer:OnInit()
       LogError("[RoguelikeTopicHotfixer] fix _RenderInitSquadWithDifficulty error: " .. errorInfo)
     end
   end)
+  xlua.private_accessible(CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff)
+  self:Fix_ex(CS.Torappu.Battle.RemovableSharedRandomTileGlobalBuff, "TryRemoveBindingTiles", function(self, tiles)
+    local ok, errorInfo = xpcall(_TryRemoveBindingTiles, debug.traceback, self, tiles)
+    if not ok then
+      LogError("[RemovableSharedRandomTileGlobalBuffHotfixer] fix" .. errorInfo)
+    end
+  end)     
 end
 
 function RoguelikeTopicHotfixer:OnDispose()

diff --git a/zh_CN/gamedata/battle/buff_template_data.json b/zh_CN/gamedata/battle/buff_template_data.json
@@ -148203,6 +148203,14 @@
           "_source": "BUFF_OWNER",
           "_finishReason": "REACH_EXIT"
         },
+        {
+          "$type": "Torappu.Battle.Action.Nodes+CheckCurrentTileKey, Assembly-CSharp",
+          "_targetType": "BUFF_OWNER",
+          "_tileKey": [
+            "tile_end"
+          ],
+          "_isExclude": false
+        },
         {
           "$type": "Torappu.Battle.Action.Nodes+LogExtraBattleInfo, Assembly-CSharp",
           "_logType": "SIMPLE",
@@ -153506,7 +153514,7 @@
           "_healTarget": "BUFF_OWNER",
           "_getMaxHpFromTarget": false,
           "_ignoreHealFree": true,
-          "_skipModifierEvent": false
+          "_skipModifierEvent": true
         }
       ]
     }

diff --git a/zh_CN/gamedata/excel/building_data.json b/zh_CN/gamedata/excel/building_data.json
@@ -78299,6 +78299,37 @@
         "canBeDestroy": false,
         "isOnly": 1,
         "quantity": 0
+      },
+      "furni_sandbox_station_01": {
+        "id": "furni_sandbox_station_01",
+        "sortId": 20005,
+        "name": "“枯荣”",
+        "iconId": "furni_sandbox_station_01",
+        "interactType": "ANIMATOR",
+        "musicId": "",
+        "type": "DECORATION",
+        "subType": "ORTHER_D",
+        "location": "FLOOR",
+        "category": "FURNITURE",
+        "validOnRotate": false,
+        "enableRotate": false,
+        "rarity": 2,
+        "themeId": "",
+        "groupId": "",
+        "width": 10,
+        "depth": 7,
+        "height": 8,
+        "comfort": 300,
+        "usage": "能够用来装扮宿舍，提高宿舍的氛围",
+        "description": "盛去荒来，焚风依旧。与沙洲同生息的，只有那些在逼仄的空间里探寻可能性的生命。",
+        "obtainApproach": "活动获得",
+        "processedProductId": "3401",
+        "processedProductCount": 0,
+        "processedByProductPercentage": 0,
+        "processedByProductGroup": [],
+        "canBeDestroy": false,
+        "isOnly": 1,
+        "quantity": 0
       }
     },
     "themes": {

diff --git a/zh_CN/gamedata/excel/data_version.txt b/zh_CN/gamedata/excel/data_version.txt
@@ -1,3 +1,3 @@
 Stream://torappu-data/v052/rel52.0
-Change:64666 on 2024/07/10
-VersionControl:52.2.0
+Change:65095 on 2024/07/18
+VersionControl:52.4.0
diff --git a/zh_CN/gamedata/excel/display_meta_table.json b/zh_CN/gamedata/excel/display_meta_table.json
@@ -742,6 +742,16 @@
         "avatarItemUsage": "用来彰显个性的图案，能够将之设置为头像。",
         "obtainApproach": "记录修复获得"
       },
+      {
+        "avatarId": "avatar_activity_DC",
+        "avatarType": "ACTIVITY",
+        "avatarIdSort": 48,
+        "avatarIdDesc": "【春分】记录修复\\n“春分”",
+        "avatarItemName": "“春分”",
+        "avatarItemDesc": "一颗石子落下悬崖，声响震耳欲聋。",
+        "avatarItemUsage": "用来彰显个性的图案，能够将之设置为头像。",
+        "obtainApproach": "记录修复获得"
+      },
       {
         "avatarId": "avatar_activity_RL4_1",
         "avatarType": "ACTIVITY",
@@ -994,6 +1004,7 @@
           "avatar_activity_EP14",
           "avatar_activity_LE",
           "avatar_activity_DV",
+          "avatar_activity_DC",
           "avatar_activity_RL4_1"
         ]
       },
@@ -1569,6 +1580,138 @@
         "rarity": 4,
         "isTimeLimit": false,
         "timeLimitInfoList": []
+      },
+      "nc_as2024_dreamer": {
+        "id": "nc_as2024_dreamer",
+        "name": "梦人",
+        "type": "ACTIVITY",
+        "sortId": 5,
+        "isSpTheme": true,
+        "defaultShowDetail": false,
+        "themeName": "梦人",
+        "themeEnName": "The Dreamer",
+        "skinStartTime": 1721894400,
+        "skinDesc": "梦境的反面，理想的终点，我们携手前行。",
+        "usageDesc": "在不变动功能的情况下，对prts进行了重新设计。",
+        "skinApproach": "音律联觉礼包购买",
+        "unlockConditionCnt": 1,
+        "unlockDescList": [
+          "在[采购中心]中购买祈望梦人组合包获得"
+        ],
+        "fixedModuleList": [
+          "module_background",
+          "module_collect",
+          "module_avatar",
+          "module_avatar_simple"
+        ],
+        "rarity": 5,
+        "isTimeLimit": true,
+        "timeLimitInfoList": [
+          {
+            "id": "nc_as2024_dreamer",
+            "availStartTime": 1721894400,
+            "availEndTime": 1723060800
+          }
+        ]
+      },
+      "nc_as2024_pilgrim": {
+        "id": "nc_as2024_pilgrim",
+        "name": "行者",
+        "type": "ACTIVITY",
+        "sortId": 6,
+        "isSpTheme": true,
+        "defaultShowDetail": false,
+        "themeName": "行者",
+        "themeEnName": "The Pilgrim",
+        "skinStartTime": 1721894400,
+        "skinDesc": "生命，岁月，历史......你不会遗忘，你始终如一。",
+        "usageDesc": "在不变动功能的情况下，对prts进行了重新设计。",
+        "skinApproach": "音律联觉礼包购买",
+        "unlockConditionCnt": 1,
+        "unlockDescList": [
+          "在[采购中心]中购买坚韧行者组合包获得"
+        ],
+        "fixedModuleList": [
+          "module_background",
+          "module_collect",
+          "module_avatar",
+          "module_avatar_simple"
+        ],
+        "rarity": 5,
+        "isTimeLimit": true,
+        "timeLimitInfoList": [
+          {
+            "id": "nc_as2024_pilgrim",
+            "availStartTime": 1721894400,
+            "availEndTime": 1723060800
+          }
+        ]
+      },
+      "nc_as2024_throne": {
+        "id": "nc_as2024_throne",
+        "name": "遗君",
+        "type": "ACTIVITY",
+        "sortId": 7,
+        "isSpTheme": true,
+        "defaultShowDetail": false,
+        "themeName": "遗君",
+        "themeEnName": "The Throne",
+        "skinStartTime": 1721894400,
+        "skinDesc": "不必迷恋荣光，也不必崇拜辉煌，我们只需握紧拳头。",
+        "usageDesc": "在不变动功能的情况下，对prts进行了重新设计。",
+        "skinApproach": "音律联觉礼包购买",
+        "unlockConditionCnt": 1,
+        "unlockDescList": [
+          "在[采购中心]中购买登阶遗君组合包获得"
+        ],
+        "fixedModuleList": [
+          "module_background",
+          "module_collect",
+          "module_avatar",
+          "module_avatar_simple"
+        ],
+        "rarity": 5,
+        "isTimeLimit": true,
+        "timeLimitInfoList": [
+          {
+            "id": "nc_as2024_throne",
+            "availStartTime": 1721894400,
+            "availEndTime": 1723060800
+          }
+        ]
+      },
+      "nc_as2024_novafive": {
+        "id": "nc_as2024_novafive",
+        "name": "☆超新星☆",
+        "type": "ACTIVITY",
+        "sortId": 8,
+        "isSpTheme": true,
+        "defaultShowDetail": false,
+        "themeName": "☆超新星☆",
+        "themeEnName": "☆Supernova☆",
+        "skinStartTime": 1721894400,
+        "skinDesc": "跟着音乐，跟着星点闪烁的灯光，一起手舞足蹈吧！",
+        "usageDesc": "在不变动功能的情况下，对prts进行了重新设计。",
+        "skinApproach": "音律联觉礼包购买",
+        "unlockConditionCnt": 1,
+        "unlockDescList": [
+          "在[采购中心]中购买☆超新星☆组合包获得"
+        ],
+        "fixedModuleList": [
+          "module_background",
+          "module_collect",
+          "module_avatar",
+          "module_avatar_simple"
+        ],
+        "rarity": 5,
+        "isTimeLimit": true,
+        "timeLimitInfoList": [
+          {
+            "id": "nc_as2024_novafive",
+            "availStartTime": 1721894400,
+            "availEndTime": 1723060800
+          }
+        ]
       }
     },
     "consts": {

diff --git a/zh_CN/gamedata/excel/gacha_table.json b/zh_CN/gamedata/excel/gacha_table.json
@@ -4480,6 +4480,26 @@
       "linkageParam": null,
       "limitParam": null
     },
+    {
+      "gachaPoolId": "NORM_52_0_4",
+      "gachaIndex": 379,
+      "openTime": 1722456000,
+      "endTime": 1723665599,
+      "gachaPoolName": "适合多种场合的强力干员",
+      "gachaPoolSummary": "结束于8月15日 03:59",
+      "gachaPoolDetail": "-",
+      "guarantee5Avail": 1,
+      "guarantee5Count": 10,
+      "LMTGSID": null,
+      "CDPrimColor": null,
+      "CDSecColor": null,
+      "freeBackColor": null,
+      "gachaRuleType": "NORMAL",
+      "dynMeta": null,
+      "linkageRuleId": null,
+      "linkageParam": null,
+      "limitParam": null
+    },
     {
       "gachaPoolId": "LIMITED_9_0_3",
       "gachaIndex": 10,
@@ -8871,6 +8891,13 @@
       "endTime": 1722455999,
       "spriteId": "picNorm_52_0_3"
     },
+    {
+      "poolId": "NORM_52_0_4",
+      "index": 379,
+      "startTime": 1722456000,
+      "endTime": 1723665599,
+      "spriteId": "picNorm_52_0_4"
+    },
     {
       "poolId": "FESCLASSIC_38_0_2",
       "index": 999,

diff --git a/zh_CN/gamedata/excel/gamedata_const.json b/zh_CN/gamedata/excel/gamedata_const.json
@@ -1640,7 +1640,7 @@
     }
   },
   "storyReviewUnlockItemLackTip": "事相碎片数量不足，请前往采购凭证区或活动期间商店获取",
-  "dataVersion": "52.2.0",
+  "dataVersion": "52.4.0",
   "resPrefVersion": "52d2d0",
   "announceWebBusType": "ak_announcement",
   "defaultMinContinuousBattleTimes": 1,

diff --git a/zh_CN/gamedata/excel/item_table.json b/zh_CN/gamedata/excel/item_table.json
@@ -2433,6 +2433,24 @@
       "buildingProductList": [],
       "voucherRelateList": null
     },
+    "voucher_skill_specialLevelMax_6": {
+      "itemId": "voucher_skill_specialLevelMax_6",
+      "name": "高级资深干员技巧集",
+      "description": "全面详实地记载了专家级技艺的集录，干员经过学习操练，可以快速积累经验，达到专家级的认定标准。",
+      "rarity": "TIER_5",
+      "iconId": "voucher_skill_specialLevelMax_6",
+      "overrideBkg": null,
+      "stackIconId": null,
+      "sortId": 50022,
+      "usage": "只限高级资深干员使用，能将1个技能直接提升至专精3级。",
+      "obtainApproach": "采购中心、活动获得",
+      "hideInItemGet": false,
+      "classifyType": "CONSUME",
+      "itemType": "VOUCHER_SKILL_SPECIALLEVELMAX_6",
+      "stageDropList": [],
+      "buildingProductList": [],
+      "voucherRelateList": null
+    },
     "voucher_skill_specialLevelMax_5": {
       "itemId": "voucher_skill_specialLevelMax_5",
       "name": "资深干员技巧集",
@@ -30240,6 +30258,7 @@
     "furni_act44d0_rise_01": 1,
     "furni_animation_monitor_01": 1,
     "furni_animation_frostnovaDevice_01": 1,
+    "furni_sandbox_station_01": 1,
     "char_002_amiya@winter#1": 1,
     "char_181_flower@daily#1": 1,
     "char_002_amiya@epoque#4": 1,