diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index eb3a0f81..b9a1897f 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -379,4 +379,113 @@ function printlog(...) if debug_print then print(...) end -end \ No newline at end of file +end + +function TableToString(t, indent, visited) + if type(t) ~= "table" then + if type(t) == "string" then + return '"' .. t:gsub('["\\]', '\\%0') .. '"' + elseif type(t) == "number" or type(t) == "boolean" then + return tostring(t) + elseif type(t) == "function" then + -- 尝试获取函数名 + local info = debug.getinfo(t, "n") + if info and info.name and info.name ~= "" then + return '""' + else + return '""' + end + else + return '"<' .. type(t) .. '>"' + end + end + + visited = visited or {} + if visited[t] then + return '""' + end + visited[t] = true + + indent = indent or "" + local nextIndent = indent .. " " + + -- 更准确的数组检测 + local isArray = true + local maxIndex = 0 + for k in pairs(t) do + if type(k) ~= "number" or k < 1 or k ~= math.floor(k) then + isArray = false + break + end + if k > maxIndex then + maxIndex = k + end + end + + -- 检查连续性 + if isArray and maxIndex > 0 then + for i = 1, maxIndex do + if t[i] == nil then + isArray = false + break + end + end + end + + local result = "" + + if isArray then + result = result .. "[" + local parts = {} + for i = 1, maxIndex do + parts[i] = TableToString(t[i], nextIndent, visited) + end + result = result .. table.concat(parts, ",") + result = result .. "]" + else + result = result .. "{\n" + local parts = {} + local count = 0 + + for k, v in pairs(t) do + count = count + 1 + local key + if type(k) == "string" and string.match(k, "^[a-zA-Z_][a-zA-Z0-9_]*$") then + key = '"' .. k .. '"' -- 即使是标识符也加双引号，保持JSON格式 + else + key = '"' .. tostring(k):gsub('["\\]', '\\%0') .. '"' + end + + local valueStr + if type(v) == "function" then + -- 对函数进行特殊处理，只显示方法名 + local info = debug.getinfo(v, "n") + if info and info.name and info.name ~= "" then + valueStr = '""' + else + valueStr = '""' + end + else + valueStr = TableToString(v, nextIndent, visited) + end + + parts[count] = nextIndent .. key .. ": " .. valueStr + end + + -- 按键名排序，使输出更一致 + table.sort(parts, function(a, b) + local keyA = a:match('^%s*"([^"]+)"') + local keyB = b:match('^%s*"([^"]+)"') + return (keyA or "") < (keyB or "") + end) + + result = result .. table.concat(parts, ",\n") + if count > 0 then + result = result .. "\n" .. indent + end + result = result .. "}" + end + + visited[t] = nil + return result +end diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index 72d03a3e..7d0bb1dd 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -6,11 +6,14 @@ "n84_rbpg": { "hidden": true }, - "n55_rx2e": { - "collapsed": true - }, "n4_fux2": { "hidden": true + }, + "n33_n1ry": { + "locked": true + }, + "n43_n1ry": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu930.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu930.info new file mode 100644 index 00000000..60d25656 --- /dev/null +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu930.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n3_tjnv": { + "hidden": true + }, + "n2_tjnv": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu93k.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu93k.info new file mode 100644 index 00000000..6e8d18ce --- /dev/null +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu93k.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n7_tjnv": { + "hidden": true + }, + "n19_aen8": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info new file mode 100644 index 00000000..ad079af9 --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n76_oqog": { + "collapsed": true + }, + "n77_oqog": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/big_zipai_result_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/big_zipai_result_item.xml index 50713824..b5d01440 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/big_zipai_result_item.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/big_zipai_result_item.xml @@ -1,32 +1,30 @@ - + - + - - - - + + - + - + - - + + @@ -34,11 +32,8 @@ - - - - + @@ -46,18 +41,21 @@ - + - + - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml index bbd873c9..e8d0a7b6 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml @@ -1,21 +1,21 @@ - - - + + + - + - + - - - - - - - + + + + + + + diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml index 681a95d8..550affde 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml @@ -1,20 +1,20 @@ - - + + - + - - + + @@ -22,15 +22,15 @@ - - - - - + + + + + - +