diff --git a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua index 504017b9..8aaf92a0 100644 --- a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua +++ b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua @@ -428,7 +428,7 @@ function M:EventInit() end) self._view:AddChild(tip_qishou) tip_qishou:Center() - self._com_qishou = tip_qishou + self._com_qishou = tip_qishou end) _gamectr:AddEventListener(CS_GameEvent.EvnetQSAction, function(...) @@ -766,17 +766,54 @@ function M:__QsHu(data) local pNode = info._mask_liangpai self.QSHList={} coroutine.start(function() + -- 获取父节点的中心坐标,作为基准点 + local centerX = pNode.width * 0.5 + local centerY = pNode.height * 0.5 + + -- 计算所有提示框的总宽度,以便整体居中显示 + local totalWidth = 0 + local tipsTemp = {} -- 临时存储创建的对象,用于第二次遍历设置位置 + + -- 第一次遍历:创建对象并计算总宽度 for i, v in pairs(types) do local show_tip = UIPackage.CreateObject("Extend_MJ_ChangSha", "Tip_qishou") show_tip:GetChild("icon").url = "ui://Extend_MJ_ChangSha/qs" .. i show_tip:GetChild("num").text = v + + -- 先添加到父节点,确保 width/height 可用(如果UI包中已定义大小则可直接用,否则需添加后获取) pNode:AddChild(show_tip) - show_tip:Center() - table.insert(self.QSHList,show_tip) - --coroutine.wait(4) - --show_tip:Dispose() + + table.insert(tipsTemp, {obj = show_tip, type = i, value = v}) + totalWidth = totalWidth + show_tip.width end - end) + + -- 定义间距 + local spacing = 10 -- 两个提示框之间的间隙 + + -- 计算起始 X 坐标,使整排提示框在父节点中水平居中 + -- 起始X = 中心X - (总宽度 + 总间距) / 2 + local totalSpacing = spacing * (#tipsTemp - 1) + local startX = centerX - (totalWidth + totalSpacing) * 0.5 + + local currentX = startX + + -- 第二次遍历:设置每个提示框的具体位置 + for k, data in ipairs(tipsTemp) do + local show_tip = data.obj + + -- 设置 Y 轴位置:保持在父节点垂直居中 (或者你可以固定一个值,如 centerY - show_tip.height * 0.5) + show_tip.y = centerY - show_tip.height * 0.5 + + -- 设置 X 轴位置:从 startX 开始,依次累加宽度和间距 + show_tip.x = currentX + + -- 更新下一个对象的 X 坐标 + currentX = currentX + show_tip.width + spacing + + -- 加入销毁列表 + table.insert(self.QSHList, show_tip) + end + end) table.sort(allShowCards, ViewUtil.HandCardSort) info:UpdateHandCard(false, false, allShowCards) coroutine.start(function() diff --git a/fk101/wb_new_ui/.objs/fonts.json b/fk101/wb_new_ui/.objs/fonts.json index e484e366..9f6d8931 100644 --- a/fk101/wb_new_ui/.objs/fonts.json +++ b/fk101/wb_new_ui/.objs/fonts.json @@ -80,5 +80,7 @@ ui://4skil1l6vmtu1kv ui://4skil1l6vmtu1l8 ui://4skil1l6piv91ln ui://4skil1l6jsw9117 +ui://5cdldr01qaqf72 +ui://5cdldr01qaqf9d ui://35sf1c1fr05e8v ui://m7iejg46gjxx7iab diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info index 71b90956..2a3d234c 100644 --- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info +++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n34_hp0b": { + "hidden": true + }, "n104_ni5n": { "hidden": true }, diff --git a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info index d5857d84..56d2e4c5 100644 --- a/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info +++ b/fk101/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info @@ -1,7 +1,75 @@ { "objectStatus": { - "n45_n1ry": { - "locked": true, + "n16_pt1r": { + "hidden": true + }, + "n33_n1ry": { + "hidden": true + }, + "n63_fnpw": { + "hidden": true + }, + "n62_fnpw": { + "hidden": true + }, + "n46_n1ry": { + "hidden": true + }, + "n35_n1ry": { + "hidden": true + }, + "n54_rx2e": { + "hidden": true + }, + "n14_pt1r": { + "hidden": true + }, + "n52_rx2e": { + "hidden": true + }, + "n73_p9qe": { + "hidden": true + }, + "n61_fnpw": { + "hidden": true + }, + "n37_n1ry": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + }, + "n51_fmkv": { + "collapsed": true + }, + "n77_p9qe": { + "hidden": true + }, + "n15_pt1r": { + "hidden": true + }, + "n58_fnpw": { + "hidden": true + }, + "n4_fux2": { + "hidden": true + }, + "n32_n1ry": { + "hidden": true + }, + "n56_fnpw": { + "hidden": true + }, + "n31_n1ry": { + "hidden": true + }, + "n43_n1ry": { + "hidden": true + }, + "n12_nrno": { + "hidden": true + }, + "n59_fnpw": { "hidden": true } } diff --git a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info index 55e072ab..f00d12a3 100644 --- a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info +++ b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn14.info @@ -1,13 +1,77 @@ { "objectStatus": { - "n4_fux2": { + "n16_pt1r": { "hidden": true }, - "n76_p9qe": { + "n33_n1ry": { + "hidden": true + }, + "n63_fnpw": { + "hidden": true + }, + "n19_pt1r": { + "hidden": true + }, + "n46_n1ry": { + "hidden": true + }, + "n35_n1ry": { + "hidden": true + }, + "n62_fnpw": { + "hidden": true + }, + "n54_rx2e": { + "hidden": true + }, + "n14_pt1r": { + "hidden": true + }, + "n52_rx2e": { + "hidden": true + }, + "n73_p9qe": { + "hidden": true + }, + "n61_fnpw": { + "hidden": true + }, + "n37_n1ry": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + }, + "n77_p9qe": { + "hidden": true + }, + "n15_pt1r": { "hidden": true }, "n58_fnpw": { + "hidden": true, "collapsed": true + }, + "n4_fux2": { + "hidden": true + }, + "n32_n1ry": { + "hidden": true + }, + "n56_fnpw": { + "hidden": true + }, + "n31_n1ry": { + "hidden": true + }, + "n43_n1ry": { + "hidden": true + }, + "n12_nrno": { + "hidden": true + }, + "n59_fnpw": { + "hidden": true } }, "adaptiveTest": true, diff --git a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info index f3b771c7..9e26dfee 100644 --- a/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info +++ b/fk101/wb_new_ui/.objs/metas/niy3ldiw/l9mn17.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n13_n1ry": { - "collapsed": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index c873bca7..085bd2e3 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "doc.openedDocs": [ "ui://niy3ldiwl9mn14" ], @@ -14,19 +15,177 @@ "/", "niy3ldiw", "/component/", +======= + "libview.firstColumnWidth": 356, + "libview.iconScale": 0, + "doc.openedDocs": [ + "ui://egnzysm7ffp36a", + "ui://egnzysm7ffp35h", + "ui://egnzysm7ffp36i", + "ui://egnzysm7ffp36o", + "ui://egnzysm7ffp370", + "ui://442j0uepygxga", + "ui://2zlli80mr6cyce9", + "ui://3z9lj55vjokmky", + "ui://v0j9abjygq7mgo", + "ui://4skil1l6by4o1i2", + "ui://27vd145bpgy941", + "ui://27vd145bko559b", + "ui://27vd145beeqmcgu", + "ui://27vd145beeqmcgv", + "ui://27vd145bhxjc1ub", + "ui://l0ds4ys6h1uu2p", + "ui://l0ds4ys6h1uu26", + "ui://l0ds4ys6e54q2t", + "ui://z1qthxavlrfi0", + "ui://0khx14are0py2", + "ui://3z9lj55vjokm7l", + "ui://3n2top74kpmgp5", + "ui://c7j2rnvqtpf08x", + "ui://fnuxqeflkllg1x", + "ui://egnzysm7ffp3b2", + "ui://v2hilfzbgq7me6", + "ui://ypulwxjhl9mn37", + "ui://k15boclkl9mn37", + "ui://oubpz2r2ofil8x", + "ui://442j0uepdafga8", + "ui://3n2top74kpmgmh", + "ui://9n9stu2eprgzf0", + "ui://awernf6xbazq90", + "ui://qpsoxvaiprgzf0", + "ui://b8jloj2qprgzf0", + "ui://3op8sm5eu86s3p", + "ui://niy3ldiwl9mn37", + "ui://niy3ldiwl9mn34", + "ui://niy3ldiwl9mn31", + "ui://27vd145be54q3v", + "ui://niy3ldiwl9mn2s", + "ui://3z9lj55vjokmwr", + "ui://v0j9abjygq7ms2", + "ui://v6yvqp7wf55qwa", + "ui://35sf1c1fr05e8u", + "ui://35sf1c1fr05e9m", + "ui://35sf1c1fr05eae", + "ui://yzaioi79f55qwa", + "ui://c7j2rnvqtpf093", + "ui://c7j2rnvqtpf0w", + "ui://3n2top74kpmgbc", + "ui://3z9lj55vjokm8k", + "ui://3z9lj55vjokm8x", + "ui://3z9lj55vjokm8q", + "ui://3z9lj55vjokm8p", + "ui://c7j2rnvqtpf06k", + "ui://c7j2rnvqtpf08t", + "ui://c7j2rnvqtpf06p", + "ui://c7j2rnvqtpf08q", + "ui://3z9lj55vjokm8j", + "ui://v2hilfzbgq7mh7", + "ui://oubpz2r2i2djgl", + "ui://3n2top74kpmgp4", + "ui://m7iejg46tqi8hwa", + "ui://27vd145bp2bz6s", + "ui://27vd145bhxjc7i4q", + "ui://27vd145b7jqkcdl", + "ui://27vd145blwcl28", + "ui://27vd145bimywcd5", + "ui://27vd145bofsx1e", + "ui://27vd145bep9w7ik3", + "ui://27vd145bcvc87i5t", + "ui://27vd145bzwbu1a", + "ui://27vd145bhznkce2", + "ui://27vd145blprqce1", + "ui://27vd145bh1uu30", + "ui://27vd145bnosez", + "ui://27vd145bcjli6", + "ui://m7iejg46kwi0hlb", + "ui://m7iejg46jr1l7i3c", + "ui://3n2top74kpmgoa", + "ui://3n2top74kpmgog", + "ui://9n9stu2eprgzgj", + "ui://awernf6xbazqbp", + "ui://b8jloj2qprgzgj", + "ui://2d9xdj6zl0lzb", + "ui://2d9xdj6zl0lzo", + "ui://lx6k641gajzhoe", + "ui://5cdldr01qaqfdr", + "ui://yzaioi79wyal8n", + "ui://v6yvqp7wwyal8n", + "ui://35sf1c1fr05ed8", + "ui://qpsoxvaiprgzgj", + "ui://3z9lj55vjokm8c", + "ui://v0j9abjygq7m8f", + "ui://4skil1l6ms5spy", + "ui://4skil1l6r6qo1kc", + "ui://5cdldr01qaqf9c", + "ui://5cdldr01qaqfa4", + "ui://5cdldr01qaqfaw", + "ui://5cdldr01qaqf2c", + "ui://niy3ldiwl9mn14", + "ui://niy3ldiwl9mn18", + "ui://27vd145baen8chp", + "ui://niy3ldiwl9mny", + "ui://niy3ldiwl9mnz", + "ui://niy3ldiwl9mn17" + ], + "auxline1": true, + "canvasColor": 10066329, + "auxline2": true, + "doc.activeDoc": "ui://3z9lj55vjokm7l", + "libview.twoColumn": false, + "libview.expandedNodes": [ + "0khx14ar", + "/", + "3z9lj55v", + "/", + "3z9lj55v", + "/Main_style_2/", + "3z9lj55v", + "/Main_style_2/turn/", + "3z9lj55v", + "/component/", + "3z9lj55v", + "/component/setting/", + "3z9lj55v", + "/component/setting/changeBG/", + "3z9lj55v", + "/image/", + "3z9lj55v", + "/images/", + "3z9lj55v", + "/images/bg/", +>>>>>>> ae897002583aa634896fa8de54f38d314f563b1a "5cdldr01", "/", "5cdldr01", "/component/", "5cdldr01", "/component/clearing/", +<<<<<<< HEAD +======= + "5cdldr01", + "/component/clearing/image/", + "5cdldr01", + "/images/", +>>>>>>> ae897002583aa634896fa8de54f38d314f563b1a "v6yvqp7w", "/", "v6yvqp7w", "/component/", "v6yvqp7w", +<<<<<<< HEAD "/component/clearing/" ], "libview.firstColumnWidth": 413, "libview.twoColumn": false +======= + "/component/clearing/", + "m7iejg46", + "/" + ], + "snapToGrid": true, + "backgroundColor": 6710886, + "libview.currentGroup": "", + "gridSize": 30, + "gridColor": 80 +>>>>>>> ae897002583aa634896fa8de54f38d314f563b1a } \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml index 2634d09f..4f9c2d35 100644 --- a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml +++ b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml @@ -1,16 +1,16 @@ - + - - + +