Skip to content

Commit e29aa8c

Browse files
author
Vulpisfoglia_BOT_rev20250407
committed
[CN UPDATE] Client:2.6.91 Data:26-01-23-10-05-06_762d08
1 parent b9ca575 commit e29aa8c

100 files changed

Lines changed: 767045 additions & 297297 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎zh_CN/gamedata/[uc]lua/hotfixes/BackgroundMultiFormHotfixer.lua‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
local BackgroundMultiFormHotfixer = Class("BackgroundMultiFormHotfixer", HotfixBase)
2+
3+
4+
5+
local function ImageHandlerOnMultiFormChangedLua(self, formModel, shouldReset)
6+
if formModel == nil or formModel.formId == nil or formModel.formId == "" then
7+
return
8+
end
9+
local shouldForceReset = shouldReset or self.m_cachedFormId == nil or self.m_cachedFormId == ""
10+
11+
self:OnMultiFormChanged(formModel, shouldForceReset)
12+
end
13+
14+
local function RingStateGraphGetSegmentLua(self, stateId)
15+
if stateId == nil or self.stateId == "" then
16+
return nil
17+
end
18+
return self:GetSegment(stateId)
19+
end
20+
21+
22+
function BackgroundMultiFormHotfixer:OnInit()
23+
xlua.private_accessible(CS.Torappu.UI.Home.HomeBackgroundMultiFormImageHandler)
24+
xlua.private_accessible(CS.Torappu.UI.UIRingStateGraph)
25+
26+
self:Fix_ex(CS.Torappu.UI.Home.HomeBackgroundMultiFormImageHandler, "OnMultiFormChanged", function(self, formModel, shouldReset)
27+
local ok, errorInfo = xpcall(ImageHandlerOnMultiFormChangedLua, debug.traceback, self, formModel, shouldReset)
28+
if not ok then
29+
LogError("[BackgroundMultiFormHotfixer] fix" .. errorInfo)
30+
end
31+
end)
32+
33+
self:Fix_ex(CS.Torappu.UI.UIRingStateGraph, "GetSegment", function(self, stateId)
34+
local ok, result = xpcall(RingStateGraphGetSegmentLua, debug.traceback, self, stateId)
35+
if not ok then
36+
LogError("[BackgroundMultiFormHotfixer] fix" .. result)
37+
end
38+
return result
39+
end)
40+
end
41+
42+
function BackgroundMultiFormHotfixer:OnDispose()
43+
end
44+
45+
return BackgroundMultiFormHotfixer

‎zh_CN/gamedata/[uc]lua/hotfixes/DefinedFix.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ local list =
44

55
"HotFixes/TestStubHotfixer",
66
"HotFixes/GradingControllerHotfixer",
7-
"HotFixes/PCHotfixer"
7+
"HotFixes/PCHotfixer",
8+
"HotFixes/BackgroundMultiFormHotfixer",
89
};
910

1011
return list;

‎zh_CN/gamedata/[uc]lua/hotfixes/PCHotfixer.lua‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@ local function OnExtraInfoLua(self, code, msg)
3939
end
4040

4141
local function _StartSceneLua(self, sceneName, options)
42-
self:_StartScene(sceneName, options)
42+
if options then
43+
self:_StartScene(sceneName, options)
44+
else
45+
self:_StartScene(sceneName)
46+
end
4347
SDKHelper.instance:ClearSdkViewState()
4448
end
4549
local function InvokeLicenseLua(self, callback)
@@ -57,6 +61,20 @@ local function SDKLoginImplLua(self, nextStep)
5761
self:_SDKLoginImpl(nextStep)
5862
SDKHelper.instance:UnmaskSdkViewState(SDKHelper.SDKViewState.SDK_VIEW_LOGIN)
5963
end
64+
65+
local function OnProcessLua(self)
66+
local list = self.m_wheelHandlerList
67+
if list == nil then
68+
return
69+
end
70+
for i = list.Count - 1, 0, -1 do
71+
local handler = list[i]
72+
if handler ~= nil then
73+
list:RemoveAt(i)
74+
end
75+
end
76+
end
77+
6078
function PCHotfixer:OnInit()
6179
if CS.Torappu.DeviceInfoUtil:IsPCMode() then
6280
xlua.private_accessible(CS.HGSDK.V2.HGSDKV2LoginDialog)
@@ -113,6 +131,14 @@ function PCHotfixer:OnInit()
113131
end
114132
end)
115133
end
134+
if not CS.Torappu.DeviceInfoUtil:IsPCMode() then
135+
self:Fix_ex(CS.Torappu.Common.TorappuPCInputHelper , "OnProcess", function(self)
136+
local ok, ret = xpcall(OnProcessLua, debug.traceback, self)
137+
if not ok then
138+
LogError("[PCHotfixer] fix" .. ret)
139+
end
140+
end)
141+
end
116142
end
117143

118144
function PCHotfixer:OnDispose()

‎zh_CN/gamedata/battle/battle_misc_table.json‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,6 +2279,121 @@
22792279
"levelId": "Obt/Roguelike/RO5/DLC1/level_rogue5_6-2_dlc1",
22802280
"sceneId": "Obt/Roguelike/RO5/level_rogue5_6-2",
22812281
"hookedMapPreviewId": null
2282+
},
2283+
"Obt/Roguelike/RO5/DLC2/level_rogue5_4-1_dlc2": {
2284+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_4-1_dlc2",
2285+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_4-1",
2286+
"hookedMapPreviewId": null
2287+
},
2288+
"Obt/Roguelike/RO5/DLC2/level_rogue5_4-2_dlc2": {
2289+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_4-2_dlc2",
2290+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_4-2",
2291+
"hookedMapPreviewId": null
2292+
},
2293+
"Obt/Roguelike/RO5/DLC2/level_rogue5_4-3_dlc2": {
2294+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_4-3_dlc2",
2295+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_4-3",
2296+
"hookedMapPreviewId": null
2297+
},
2298+
"Obt/Roguelike/RO5/DLC2/level_rogue5_4-4_dlc2": {
2299+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_4-4_dlc2",
2300+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_4-4",
2301+
"hookedMapPreviewId": null
2302+
},
2303+
"Obt/Roguelike/RO5/DLC2/level_rogue5_4-5_dlc2": {
2304+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_4-5_dlc2",
2305+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_4-5",
2306+
"hookedMapPreviewId": null
2307+
},
2308+
"Obt/Roguelike/RO5/DLC2/level_rogue5_4-6_dlc2": {
2309+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_4-6_dlc2",
2310+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_4-6",
2311+
"hookedMapPreviewId": null
2312+
},
2313+
"Obt/Roguelike/RO5/DLC2/level_rogue5_5-1_dlc2": {
2314+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_5-1_dlc2",
2315+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_5-1",
2316+
"hookedMapPreviewId": null
2317+
},
2318+
"Obt/Roguelike/RO5/DLC2/level_rogue5_5-2_dlc2": {
2319+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_5-2_dlc2",
2320+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_5-2",
2321+
"hookedMapPreviewId": null
2322+
},
2323+
"Obt/Roguelike/RO5/DLC2/level_rogue5_5-3_dlc2": {
2324+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_5-3_dlc2",
2325+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_5-3",
2326+
"hookedMapPreviewId": null
2327+
},
2328+
"Obt/Roguelike/RO5/DLC2/level_rogue5_5-4_dlc2": {
2329+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_5-4_dlc2",
2330+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_5-4",
2331+
"hookedMapPreviewId": null
2332+
},
2333+
"Obt/Roguelike/RO5/DLC2/level_rogue5_5-5_dlc2": {
2334+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_5-5_dlc2",
2335+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_5-5",
2336+
"hookedMapPreviewId": null
2337+
},
2338+
"Obt/Roguelike/RO5/DLC2/level_rogue5_5-6_dlc2": {
2339+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_5-6_dlc2",
2340+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_5-6",
2341+
"hookedMapPreviewId": null
2342+
},
2343+
"Obt/Roguelike/RO5/DLC2/level_rogue5_6-1_dlc2": {
2344+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_6-1_dlc2",
2345+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_6-1",
2346+
"hookedMapPreviewId": null
2347+
},
2348+
"Obt/Roguelike/RO5/DLC2/level_rogue5_6-2_dlc2": {
2349+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_6-2_dlc2",
2350+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_6-2",
2351+
"hookedMapPreviewId": null
2352+
},
2353+
"Obt/Roguelike/RO5/DLC2/level_rogue5_7-1_dlc2": {
2354+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_7-1_dlc2",
2355+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_7-1",
2356+
"hookedMapPreviewId": null
2357+
},
2358+
"Obt/Roguelike/RO5/DLC2/level_rogue5_7-2_dlc2": {
2359+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_7-2_dlc2",
2360+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_7-2",
2361+
"hookedMapPreviewId": null
2362+
},
2363+
"Obt/Roguelike/RO5/DLC2/level_rogue5_b-4-b_dlc2": {
2364+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_b-4-b_dlc2",
2365+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_b-4-b",
2366+
"hookedMapPreviewId": null
2367+
},
2368+
"Obt/Roguelike/RO5/DLC2/level_rogue5_b-4_dlc2": {
2369+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_b-4_dlc2",
2370+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_b-4",
2371+
"hookedMapPreviewId": null
2372+
},
2373+
"Obt/Roguelike/RO5/DLC2/level_rogue5_b-5_dlc2": {
2374+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_b-5_dlc2",
2375+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_b-5",
2376+
"hookedMapPreviewId": null
2377+
},
2378+
"Obt/Roguelike/RO5/DLC2/level_rogue5_b-5-b_dlc2": {
2379+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_b-5-b_dlc2",
2380+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_b-5-b",
2381+
"hookedMapPreviewId": null
2382+
},
2383+
"Obt/Roguelike/RO5/DLC2/level_rogue5_b-6_dlc2": {
2384+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_b-6_dlc2",
2385+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_b-6",
2386+
"hookedMapPreviewId": null
2387+
},
2388+
"Obt/Roguelike/RO5/DLC2/level_rogue5_b-7_dlc2": {
2389+
"levelId": "Obt/Roguelike/RO5/DLC2/level_rogue5_b-7_dlc2",
2390+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_b-7",
2391+
"hookedMapPreviewId": null
2392+
},
2393+
"Obt/Roguelike/RO5/level_rogue5_b-10-b": {
2394+
"levelId": "Obt/Roguelike/RO5/level_rogue5_b-10-b",
2395+
"sceneId": "Obt/Roguelike/RO5/level_rogue5_b-10",
2396+
"hookedMapPreviewId": null
22822397
}
22832398
},
22842399
"effectBlacklist": {

0 commit comments

Comments
 (0)