diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index a30b7277..af821f15 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -708,6 +708,12 @@ local function __fillPlayItem(self, index, item) item.visible = true + -- 每次渲染前，先重置按钮状态，防止复用导致的样式残留 + if pipeijoin then + pipeijoin.grayed = false + pipeijoin.touchable = true + end + -- 处理“全部”选项 (playId == 0) if playId == 0 then tex_game.text = "全 部" @@ -723,12 +729,11 @@ local function __fillPlayItem(self, index, item) btn_pin.touchable = false -- 禁止点击，防止误触 end - -- 绑定点击事件：选择全部 - pipeijoin.onClick:Set(function() - --刷新房间列表 - self:__loadPlayData() - end) - + -- 禁用“加入/匹配”按钮 (pipeijoin) + if pipeijoin then + pipeijoin.grayed = true -- 视觉上报灰 + pipeijoin.touchable = false -- 逻辑上禁止点击 + end return end -- 设置置顶控制器状态 @@ -740,21 +745,57 @@ local function __fillPlayItem(self, index, item) end end - -- 绑定置顶按钮点击事件 + -- -- 绑定置顶按钮点击事件 功能分开 + -- if btn_pin then + -- btn_pin.onClick:Set(function(context) + -- context:StopPropagation() -- 阻止事件冒泡到父容器 + -- self:_togglePinPlay(playId) + -- end) + -- end + -- 绑定置顶按钮点击事件 功能合并 if btn_pin then - btn_pin.onClick:Set(function() - self:_togglePinPlay(playId) + btn_pin.onClick:Set(function(context) + context:StopPropagation() + -- 记录当前要置顶的 playId + local targetPlayId = playId + self:_togglePinPlay(targetPlayId) + -- 在列表重排后，找到 targetPlayId 的新位置并选中它 + local lst_layer = self.lst_layer + if lst_layer and targetPlayId ~= 0 then + -- 遍历新的 playIdList，找到 targetPlayId 的索引 + for i, pid in ipairs(self.playIdList) do + if pid == targetPlayId then + -- 设置选中项（FairyGUI 索引从 0 开始） + lst_layer.selectedIndex = i - 1 + -- 手动触发 onClickItem 事件，模拟父容器被点击 + if lst_layer.onClickItem then + lst_layer.onClickItem:Call(lst_layer.selectedIndex) + end + break + end + end + end end) end - pipeijoin.onClick:Set(function() - local currentPlayID = self:GetSelectedPlayID() - if currentPlayID == 0 then - ViewUtil.ErrorTip(nil, '请选择具体玩法') - return - end - self:__startGame("", currentPlayID, false) - end) + -- 直接捕获当前行的 playId，而不是去 GetSelectedPlayID() + if pipeijoin then + -- 先清除旧的事件，防止多次绑定累积 + pipeijoin.onClick:Clear() + + pipeijoin.onClick:Set(function() + -- 直接使用当前 item 对应的 playId + local targetPlayId = playId + + if targetPlayId == 0 then + ViewUtil.ErrorTip(nil, '请选择具体玩法') + return + end + + -- 启动游戏时使用当前行的 ID + self:__startGame("", targetPlayId, false) + end) + end tex_game.text = __getLayerName(self, playId) tex_jutifenleiName.text = __getLayerName1(self, playId) @@ -1267,7 +1308,7 @@ function M:InitView(url) originalGameType = room.color end - -- 【新增逻辑】：根据 zmIndex (desktopCategorization) 调整 gameType + -- 根据 zmIndex (desktopCategorization) 调整 gameType local zmIndex = self.desktopCategorization or 0 local finalGameType = originalGameType @@ -1397,7 +1438,16 @@ function M:InitView(url) -- sgv:Show() -- end ) - + local btn_choose1 = self._view:GetChild('btn_choose1') + btn_choose1.onClick:Set( + function() + if tex_Selec_yd.selectedIndex == 1 then + tex_Selec_yd.selectedIndex = 0 + else + tex_Selec_yd.selectedIndex = 1 + end + end + ) local btn_close = self._view:GetChild('btn_close') btn_close.onClick:Set( function() diff --git a/lua_probject/extend_project/extend/zipai/runbeard/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/runbeard/EXPlayBackView.lua index a6fe3209..30eee8df 100644 --- a/lua_probject/extend_project/extend/zipai/runbeard/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/runbeard/EXPlayBackView.lua @@ -114,9 +114,9 @@ function M:FillRoomData(data) self._currentStep = 0 local room = DataManager.CurrenRoom local _player_card_info = self._player_card_info - local roominfo_panel = self._view:GetChild('roominfo_panel1') - roominfo_panel:GetChild('tex_roomid').text = room.room_id - roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName() + -- local roominfo_panel = self._view:GetChild('roominfo_panel1') + -- roominfo_panel:GetChild('tex_roomid').text = room.room_id + -- roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName() for i = 1, #room.player_list do local p = room.player_list[i] local card_info = _player_card_info[self:GetPos(p.seat)] diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info index 9d5fa472..48562da4 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info @@ -1,12 +1,12 @@ { "objectStatus": { - "n118_nynz": { - "locked": true - }, "n103_dnw9": { "hidden": true }, - "n79_l2u4": { + "n118_nynz": { + "locked": true + }, + "n89_8sat": { "hidden": true }, "n96_dnw9": { @@ -21,7 +21,13 @@ "n109_go7q": { "hidden": true }, - "n89_8sat": { + "n73_l2u4": { + "hidden": true + }, + "n90_8sat": { + "locked": true + }, + "n108_go7q": { "hidden": true }, "n114_itp8": { @@ -33,11 +39,17 @@ "n106_go7q": { "hidden": true }, - "n73_l2u4": { + "n115_itp8": { + "locked": true + }, + "n56_cnxs": { + "locked": true + }, + "n79_l2u4": { "hidden": true }, - "n108_go7q": { - "hidden": true + "n82_l2u4": { + "locked": true }, "n116_u50h": { "hidden": true diff --git a/wb_new_ui/.objs/metas/442j0uep/ygxg4.info b/wb_new_ui/.objs/metas/442j0uep/ygxg4.info new file mode 100644 index 00000000..919c073e --- /dev/null +++ b/wb_new_ui/.objs/metas/442j0uep/ygxg4.info @@ -0,0 +1,19 @@ +{ + "objectStatus": { + "n14_pt1r": { + "hidden": true + }, + "n6_fux2": { + "hidden": true + }, + "n22_ey1o": { + "hidden": true + }, + "n26_w06x": { + "hidden": true + }, + "n25_w06x": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/442j0uep/ygxga.info b/wb_new_ui/.objs/metas/442j0uep/ygxga.info new file mode 100644 index 00000000..75a4c608 --- /dev/null +++ b/wb_new_ui/.objs/metas/442j0uep/ygxga.info @@ -0,0 +1,34 @@ +{ + "objectStatus": { + "n19_pt1r": { + "hidden": true + }, + "n58_fnpw": { + "hidden": true + }, + "n4_fux2": { + "hidden": true + }, + "n54_rx2e": { + "hidden": true + }, + "n69_w06x": { + "hidden": true + }, + "n68_w06x": { + "hidden": true + }, + "n61_fnpw": { + "hidden": true + }, + "n46_n1ry": { + "hidden": true + }, + "n52_rx2e": { + "hidden": true + }, + "n12_nrno": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index aab9963d..ff14e64a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -1,37 +1,44 @@ { "objectStatus": { - "n204_jvvo": { - "hidden": true - }, - "n233_o6b1": { - "hidden": true - }, - "n191_xsk4": { - "hidden": true - }, - "n246_m0lm": { - "locked": true - }, - "n78_i7lq": { - "hidden": true - }, - "n130_w111": { - "hidden": true - }, - "n200_isix": { + "n238_dg1v": { "hidden": true }, "n88_kxzv": { "hidden": true }, - "n238_dg1v": { + "n204_jvvo": { "hidden": true }, - "n186_p0pd": { + "n270_v4di": { + "collapsed": true + }, + "n246_m0lm": { + "locked": true + }, + "n206_jvvo": { + "collapsed": true + }, + "n191_xsk4": { "hidden": true }, "n242_wqg2": { "hidden": true + }, + "n200_isix": { + "hidden": true + }, + "n130_w111": { + "hidden": true, + "collapsed": true + }, + "n78_i7lq": { + "hidden": true + }, + "n233_o6b1": { + "hidden": true + }, + "n186_p0pd": { + "hidden": true } }, "fitScreen": "FitSize" diff --git a/wb_new_ui/.objs/metas/m7iejg46/nynz7iml.info b/wb_new_ui/.objs/metas/m7iejg46/nynz7iml.info index c46cd879..48f1d8eb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/nynz7iml.info +++ b/wb_new_ui/.objs/metas/m7iejg46/nynz7iml.info @@ -1,15 +1,11 @@ { "objectStatus": { + "n112_kwi0": { + "collapsed": true + }, "n141_k5m9": { "hidden": true, "collapsed": true - }, - "n83_kwi0": { - "hidden": true, - "collapsed": true - }, - "n112_kwi0": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index c1657200..76de2f99 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,15 +2,17 @@ "libview.firstColumnWidth": 398, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://442j0uepygxga", - "ui://27vd145bpgy941", - "ui://27vd145bbt6w96", - "ui://27vd145bep9w7ik3" + "ui://m7iejg4610snh5j", + "ui://m7iejg46jiu8hef", + "ui://m7iejg46hsbhhjn", + "ui://m7iejg46kwi0hkr", + "ui://2d9xdj6zlumrgj", + "ui://5cdldr01qaqf9c" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://27vd145bpgy941", + "doc.activeDoc": "ui://m7iejg4610snh5j", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -26,6 +28,8 @@ "27vd145b", "/component/create_room/image/", "27vd145b", + "/component/dismiss_room/", + "27vd145b", "/component/head/", "27vd145b", "/component/rule/", @@ -62,16 +66,16 @@ "442j0uep", "/", "442j0uep", - "/component/", + "/images/", "442j0uep", - "/component/EPRHZMui/", + "/images/EPRBXTMui/", + "442j0uep", + "/images/EPYYXTMui/", "3n2top74", "/", "3n2top74", "/Clearing/", "3n2top74", - "/Clearing/Component/", - "3n2top74", "/buttons/", "3n2top74", "/images/", @@ -79,11 +83,15 @@ "/setting/", "niy3ldiw", "/", + "2d9xdj6z", + "/", "3z9lj55v", "/", "5cdldr01", "/", "yzaioi79", + "/", + "m7iejg46", "/" ], "auxline1": true, diff --git a/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/card_item.xml index 89fce4c5..912d6c48 100644 --- a/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/card_item.xml +++ b/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/card_item.xml @@ -1,7 +1,7 @@ - - + + @@ -12,10 +12,10 @@ - - + + - + diff --git a/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/clearing.xml index 9b7532b4..03f48e4c 100644 --- a/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_RunBeard/component/clearing/clearing.xml @@ -1,19 +1,18 @@ - - - + + + - - - - + + + + - - - + + - - + + @@ -28,31 +27,30 @@ - - - - - - - - + + + + + - + - - - + + + - - - - + + + + + + - + @@ -61,8 +59,8 @@ - - + + @@ -76,34 +74,33 @@ - + - - - + + - + - + - +