[CN UPDATE] Client:2.3.01 Data:24-07-15-10-57-16-e6a8d4

Kengxxiao · Jul 16, 2024 · dae865d · dae865d
1 parent 22457f2
commit dae865d
Show file tree

Hide file tree

Showing 103 changed files with 441,363 additions and 20,044 deletions.
diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua b/zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua
@@ -3,7 +3,8 @@ local list =
 {
 
   "HotFixes/TestStubHotfixer",
-  "HotFixes/CastSkillWithLimitTimesHotfixer"
+  "HotFixes/CastSkillWithLimitTimesHotfixer",
+  "HotFixes/RoguelikeTopicHotfixer"
 };
 
 return list;
diff --git a/zh_CN/gamedata/[uc]lua/hotfixes/RoguelikeTopicHotfixer.lua b/zh_CN/gamedata/[uc]lua/hotfixes/RoguelikeTopicHotfixer.lua
@@ -0,0 +1,60 @@
+
+local RoguelikeTopicHotfixer = Class("RoguelikeTopicHotfixer", HotfixBase)
+
+
+local function _RenderInitSquadWithDifficultyFix(self, viewModel)
+  repeat
+    if viewModel == nil or viewModel.initialRelic == nil or viewModel.initialRelic.topicId == nil then
+      break;
+    end
+    local topicId = viewModel.initialRelic.topicId;
+    if topicId ~= "rogue_4" then
+      break;
+    end
+
+    local finder = CS.Torappu.UI.UIPageFinder();
+    if finder == nil then
+      LogError("[RoguelikeTopicHotfixer] fix _RenderInitSquadWithDifficulty error: cannot get page finder.");
+      break;
+    end
+    local pageInterface = finder:Current(self);
+    if pageInterface == nil then
+      LogError("[RoguelikeTopicHotfixer] fix _RenderInitSquadWithDifficulty error: cannot find interface.");
+      break;
+    end
+
+    local page = pageInterface:GetAssetLoader();
+    if page == nil then
+      LogError("[RoguelikeTopicHotfixer] fix _RenderInitSquadWithDifficulty error: cannot get assetloader.");
+      break;
+    end
+    local atlasObject = page:LoadAsset(CS.Torappu.ResourceUrls.GetRL04DifficultyIconAtlasPath(topicId));
+    if atlasObject == nil then
+      LogError("[RoguelikeTopicHotfixer] fix _RenderInitSquadWithDifficulty error: cannot find atlas object.");
+      break;
+    end
+    if atlasObject:GetType() ~= typeof(CS.Torappu.UI.UIAtlasObject) then
+      LogError("[RoguelikeTopicHotfixer] fix _RenderInitSquadWithDifficulty error: atlas object type error.");
+      break;
+    end
+
+    self._bandRankAtlasObject = atlasObject;
+  until(true);
+
+  self:_RenderInitSquadWithDifficulty(viewModel);
+end
+
+function RoguelikeTopicHotfixer:OnInit()
+  xlua.private_accessible(CS.Torappu.UI.Roguelike.RoguelikeMenuInitSquadWithDifficultyObject);
+  self:Fix_ex(CS.Torappu.UI.Roguelike.RoguelikeMenuInitSquadWithDifficultyObject, "_RenderInitSquadWithDifficulty", function(self, viewModel)
+    local ok, errorInfo = xpcall(_RenderInitSquadWithDifficultyFix, debug.traceback, self, viewModel)
+    if not ok then
+      LogError("[RoguelikeTopicHotfixer] fix _RenderInitSquadWithDifficulty error: " .. errorInfo)
+    end
+  end)
+end
+
+function RoguelikeTopicHotfixer:OnDispose()
+end
+
+return RoguelikeTopicHotfixer;
diff --git a/zh_CN/gamedata/art/handbookpos_table.json b/zh_CN/gamedata/art/handbookpos_table.json
@@ -4982,7 +4982,8 @@
             "char_4063_quartz",
             "char_4027_heyak",
             "char_4006_melnte",
-            "char_4104_coldst"
+            "char_4104_coldst",
+            "char_4151_tinman"
           ],
           "forceId": "columbia",
           "pos": {
@@ -5327,6 +5328,11 @@
             "y": 346.41
           },
           "connectionList": [
+            {
+              "direction": 2,
+              "charId": "char_4151_tinman",
+              "forceId": null
+            },
             {
               "direction": 3,
               "charId": "char_4027_heyak",
@@ -6046,6 +6052,11 @@
               "charId": "char_264_f12yin",
               "forceId": null
             },
+            {
+              "direction": 1,
+              "charId": "char_4151_tinman",
+              "forceId": null
+            },
             {
               "direction": 5,
               "charId": "char_214_kafka",
@@ -6241,6 +6252,27 @@
             }
           ],
           "haveOutLine": true
+        },
+        {
+          "charId": "char_4151_tinman",
+          "scale": 1.0,
+          "pos": {
+            "x": 1050.0,
+            "y": 433.0127
+          },
+          "connectionList": [
+            {
+              "direction": 4,
+              "charId": "char_4027_heyak",
+              "forceId": null
+            },
+            {
+              "direction": 5,
+              "charId": "char_264_f12yin",
+              "forceId": null
+            }
+          ],
+          "haveOutLine": true
         }
       ],
       "lineList": [

diff --git a/zh_CN/gamedata/battle/battle_misc_table.json b/zh_CN/gamedata/battle/battle_misc_table.json
@@ -6225,6 +6225,28 @@
       "ulpia_skill_02_hit_01",
       "ulpia_skill_02_start_01"
     ],
+    "skchr_tinman_1": [
+      "tinman_skill_02_end_01",
+      "tinman_skill_02_heal_01",
+      "tinman_skill_02_hit_01",
+      "tinman_skill_02_range_01",
+      "tinman_skill_02_start_01",
+      "tinman_skill_02_start_02",
+      "tinman_skill_02_start_03",
+      "tinman_skill_02_start_04",
+      "tinman_skill_02_token_01",
+      "tinman_skill_02_trail_02"
+    ],
+    "skchr_tinman_2": [
+      "tinman_skill_01_end_01",
+      "tinman_skill_01_hit_01",
+      "tinman_skill_01_range_01",
+      "tinman_skill_01_start_01",
+      "tinman_skill_01_start_02",
+      "tinman_skill_01_start_03",
+      "tinman_skill_01_token_01",
+      "tinman_skill_01_trail_01"
+    ],
     "skchr_nymph_1": [
       "nymph_skill_02_buff",
       "nymph_skill_02_hit",