From 92b0f00b4fcb0de1b6c6ffd0c984ea8ca418b3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Wed, 3 Sep 2025 22:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=91=E5=BE=97=E5=BF=AB=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E4=BA=BA=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/FamilyView.lua | 114 +++++------------- .../Main_New/PlayerHead_2.xml | 2 +- .../ui/Extend_Poker_RunFastNew_fui.bytes | Bin 167758 -> 167758 bytes 3 files changed, 32 insertions(+), 84 deletions(-) diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index de9a019a..32e6fca8 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -588,39 +588,20 @@ function M:UpdateFamilyRoom(fgCtr, id) --list_gamePlay:SetVirtual() self._view:GetChild('n364').text = string.format("已开启%s桌游戏", self._group.room_num) local playList = self._group.playList - --初始化玩法列表,用于房间使用 - local playGameInfoTable = {} - for i = 1, #playList do - playGameInfoTable[playList[i].id] = { - gameId = playList[i].gameId, - config = playList[i].config, - name = playList[i].name, - gameName = playList[i].game_name, - } - end local roomList = self._group.rooms local roomCtr = ControllerManager.GetController(RoomController) + --先对房间进行一波分类 + local readyRoom = {} + local startRoom = {} + for k, v in pairs(roomList) do + table.insert(v.status == 0 and readyRoom or startRoom, v) + end + local all_num = #playList + #roomList list_room.itemRenderer = function(index, obj) - if index < #roomList then + if index < #readyRoom then local newIndex = index + 1 - local playInfo = playGameInfoTable[roomList[newIndex].pid] - local gameId = playInfo.gameId - local config = ExtendManager.GetExtendConfig(gameId) - local mode = config:GetGameInfo() - local gamePlay = mode:LoadConfigToDetail(playInfo.config, playInfo.hpData) - obj:GetChild('Label_gameRule').title = gamePlay - local roomName = playGameInfoTable[roomList[newIndex].pid].name - roomName = Utils.TextOmit(roomName, 6, "") - obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc - obj:GetChild('game_type').text = string.format("(%s)%s", playGameInfoTable[roomList[newIndex].pid].gameName, - roomName, - roomList[newIndex].id) - obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1 - obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2 - -- if self._group.isWatch == 1 then - -- 允许观战 - obj:GetController('type').selectedIndex = self._group.isWatch or 1 - -- end + local playInfo = self._group:getPlay(roomList[newIndex].pid) + local plist = roomList[newIndex].plist local insertName = "" for i = 1, #plist do @@ -682,8 +663,10 @@ function M:UpdateFamilyRoom(fgCtr, id) -- self._gamectr = ControllerManager.GetController(GameController) -- self._gamectr:WitnessGame(DataManager.SelfUser.account_id, id, roomList[newIndex].id) end) + elseif index >= all_num - #startRoom then + else - local newIndex = index - #roomList + 1 + local newIndex = index - #readyRoom + 1 local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(playList[newIndex].config, playList[newIndex].hpData) @@ -730,59 +713,6 @@ function M:UpdateFamilyRoom(fgCtr, id) end) end end - --[[ - list_gamePlay.itemRenderer = function(index, obj) - if index == 0 then - obj:GetController('type').selectedIndex = 0 - obj:GetChild('num').text = string.format("%d/7", #playList) - obj:GetChild('btn_addPlay').onClick:Set(function() - local tem = GroupGameSettingView.new(self.blur_view, id, 0, nil, function(play) - local group = DataManager.groups:get(id) - group:addPlay(play) - -- self:FillView() - self:UpdateFamilyRoom(fgCtr, id) - printlog("刷新玩法===>>>>") - group.update_play = true - end) - tem:Show() - end) - return - end - obj:GetChild('text_title').text = playList[index].game_name - local mode = ExtendManager.GetExtendConfig(playList[index].gameId):GetGameInfo() - local pId = playList[index].id - obj:GetChild('Label_details'):GetChild('title').text = mode:LoadConfigToDetail(playList[index].config) - obj:GetChild('text_playName').text = playList[index].name - obj:GetController('type').selectedIndex = 1 - obj:GetChild('btn_del').onClick:Set(function() - ViewUtil.ShowTwoChooose("是否要删除该玩法", function() - fgCtr:FG_DelPlay(id, playList[index].id, function(res) - if res.ReturnCode ~= 0 then - local msg = Table_Error_code_Map[res.ReturnCode] or {} - msg = msg.note or "操作失败" - ViewUtil.ShowBannerOnScreenCenter(msg) - return - end - - self:UpdateFamilyRoom(fgCtr, id) - end) - end) - end) - obj:GetChild("btn_edit").onClick:Set(function() - local tem = GroupGameSettingView.new(self.blur_view, id, pId, nil, function(play) - local group = DataManager.groups:get(id) - group:addPlay(play) - -- self:FillView() - self:UpdateFamilyRoom(fgCtr, id) - printlog("刷新玩法===>>>>") - group.update_play = true - end) - tem:Show() - end) - end - list_gamePlay.numItems = #playList + 1 - ]] - local all_num = #playList + #roomList -- print("=================================================list_room", list_room, list_room.numItems, all_num) print("游戏中的房间") pt(roomList) @@ -795,6 +725,24 @@ function M:UpdateFamilyRoom(fgCtr, id) end end +function M:FillSameRoomInfo(newIndex, obj, playInfo) + local gameId = playInfo.gameId + local config = ExtendManager.GetExtendConfig(gameId) + local mode = config:GetGameInfo() + local gamePlay = mode:LoadConfigToDetail(playInfo.config, playInfo.hpData) + obj:GetChild('Label_gameRule').title = gamePlay + local roomName = playInfo.name + roomName = Utils.TextOmit(roomName, 6, "") + obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc + obj:GetChild('game_type').text = string.format("(%s)%s", playInfo.game_name, roomName, roomList[newIndex].id) + obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1 + obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2 + -- if self._group.isWatch == 1 then + -- 允许观战 + obj:GetController('type').selectedIndex = self._group.isWatch or 1 + -- end +end + function M:ReflashFamilyList() local list_family = self._view:GetChild('list_family') list_family.numItems = #DataManager.groups.groupList diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml index 4c2b6d1c..3493446f 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml @@ -39,7 +39,7 @@ - + diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes index 5c1648a8c04cf2a0f9217b1f74ef93037817d93a..ab16416c5f087de69a415e12357c8a11531e34af 100644 GIT binary patch delta 5390 zcmbVQ30PFemacOzO|$RH-qu^jEk4d(Np-r%qM=;yt?r12EBLNs6V<@%*dR89C9qUBkxevb>-C)s*#^d# zC$(c(ENIY8GuUn;`g_0FGxh+2SU)83Vm0t82()3mcC1cK&>D zE%Y{FpRld?tyiwNjn!g6pCwR-+W4`!_fsp=3nHs$pRU&~fd+%j(Gt&TO~lXGcKkt` z0y{7~#S?FZYM>FzQeuXF&X_5)qK`Fw^667ZpIxkpKFxAmy;-_4pI8>pMzZlNou!+z zFDRhhY!6=X&J_2ueHi95Q@x*LI(7i-eInsYJbK*Qj>)1wF-fogbrxgr5pNF#4F>qS z!$C|-^HF;I3;S1`>l+FGhC6-z#Y5~XZ1F9$Jxm>su%nELFZFu;G<;O;jmgDooZ;sz ze$D=j&KdpT81C^KDjsJi@V;LfoWw^ZPU=%kVE@kkf)6qhEWaTi-?Hy$3L|iMzhGXz z6;#;TH%5J$6ld63)cB7T&#`l;pP;prWi9MHMcF~dp_r4IBwk<_@bgTqVtL*cCZpjG3@q>nFJ={eEOu(QDFJt5(+9t!u)zfIfDA zWk1o(Bv}ZInJ>nwC|6wjvm?d?I;+}9h^R?*6R)v$oF6zryw2>f{;!d|4j|F^z=s1I z@NST^#ecAJ8uo4S$m65HnK$nSOAP7nVsV32GA4BVR*~7_Y{G6*s#o>T6aU5jbu5cUg=4x?nNH*RNE`>j(1n?q?! zad;0r1oi;!om^2BW{06+p5i0+7*oTt;R)`2r?A*#R>S4PeNH9n5aqWv>2s;_7U=GY$9m)jl%E8HG6 zM6{pS%Ed!;JIOyVB38>&4uM6*nvICW25uI0k=dqfg={jIh%nK^rF3R9k0a1 z-rz%?UdB~|FU}j5t@4AuUBUZP z@R{a}Z2Cb!mn@KE*{UGuPw(%G} z9gz*;d|5DfnY|Pt1R|*G%@O(FfqF3zuWeG{AQN|7HPR6VVExDx>N5}@kIaHWU1=DM zrK7SSlGlfUr`bsn2CxvY(QUMF1za0rg8GC;RTK;%r_H0YRM9=-!NKiBqq89f$B)T^ zp>k?WDBH1km|o-L1Q3(LFc^+Q5|=$k+XGm8$V?e97p) z`*KPe1WBlU7=(w0Sz=X^iI@y2_HoZ6}ddA%1A1GhXtB_~)fND@?U2eGX({eX+~$l!5m$(jfcI+5i8P z0fn-u3{YtZ$F}o!I3qLee^&;C$5b}{$1-5kvkd4v@ocVp7volE$&BlOo>|EX>uRw& zt3>q$OokkMk~Kw@%kI-E=4R6>z9HL_+5HugeU{xtvS!^Ri?b#tD5)eurCrCVrFNy# z&9;kNi356*yaJ1Dys>|dRw3H7oE}6g64BzJoCON84$Mu1yf?{}iM1|woD%$H3OH

IHiV`8X{<%eH{FVIjyQ)QcAL4llk7;dW3&(qa}&(t*_a;2uG%5X4z4 za4>@s(oUgULQ27Sm5it2wt@^O#YY7#s%bEtl5nc<_mWUt^qVBSX3zdh5;oFcY28V9 zQ(@*58!F79;vN%M8!F6ucr>Tn1ZGfKsVhl?x4LH!GkeUw7!OWasAOQPY8K3fGCV(Z z0nEX~(h!(Sr*^Qp`5#3nXXa3$`%~#zBL0Ld=^pTYyFQ&71{Lfy3wSr9=H_?pVrCOnD-d>Xw BJV@mO|T zGw+It`EyG3b!r!tOJ>cYr*Krarg9@#!Xmx?rH5Ys$_uzQ4SaA8vDRLo;5zC@ z0@PqwgF9WLlN#K;>V#M!lE{hv=&D6GVKBTf7Y6Y{93F0P#oC4_y0~9%_{j6HFs9r3 zOR|pZX>E&DpB+>A3loJz4EwCN0D)Mv-5sKFDLsR6)AmTJw&&mK*h*CVlC5787>y)tqiYYn@e?cR{1xL<)blS-0%MF#)z=!liMR z^&}d?KBb>Ty?N*k@WSCE)OhsLbcomW`$1c0=Qt?u}`jp}@xquP(;xzHDD+G5rH2?vKBbs&$Q>`_ElXeDHW5Gl-LqJ1;h)dsZp0H-p1a#*2t4)w8HuC)r#! zhhnmbwtz8;Y>vu>w|hW&D89&oPVq1jDT%C za=6jr&+$f_Jkp3SkLt$lylAvCecE@o`QtGLxr~>MHDbH*MqEo}TaH+^385d2-T13i zBTh;;;;R`(JTp_q67^NKv*P1}ETi6eayP!o8*=2hBwFsXlp)D8ACAbGl8*qcx>LN-a`bdFZ=y=&rjZ+47D z&=`7w+rII zf|27T;`mBpUS4$(-W5&hjGs9V`@kSrPQ1}{1^&Q8FTfW(^b$1up8Va*J>(MEe%d$H7HELaO_l=;pKz=+z@He$pQw;=OA0c>yzvMJPP^l%qXkovVrN#WxMe_^iO_}?4 LsdQX2@E>BU%hlx&Ng6q+gVib|6 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 M$zHxPOjwxm-;1qp6aWAK