diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua index b22c1dc3..e24ac2c4 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -68,14 +68,18 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) over0List.itemRenderer = function(index, obj) local info = data[index + 1] local playerInfo = room:GetPlayerBySeat(info.seat) + obj:GetChild('name').text = playerInfo.self_user.nick_name obj:GetChild('residue').text = #info.handCards obj:GetChild('bomb').text = info.thisboomnum obj:GetChild('piao').text = info.piao < 0 and 0 or info.piao local roundScore = info.winCardScore - + obj:GetController('winjies').selectedIndex = playerInfo.total_score >= 0 and 0 or 1 + ImageLoad.Load(playerInfo.self_user.head_url, obj:GetChild('btn_head')._iconObject) local hp_nonnegative = room:checkHpNonnegative() roundScore = roundScore or 0 + + if hp_nonnegative then local jifen = "" if roundScore > 0 then @@ -99,13 +103,7 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) end obj:GetChild("score").text = jifen .. tili .. limit - if info.seat == room.self_player.seat then - if roundScore >= 0 then - ctr_win.selectedIndex = 1 - else - ctr_win.selectedIndex = 0 - end - end + else local jifen = "" if roundScore >= 0 then @@ -128,16 +126,8 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) tili = tili .. ")" end - obj:GetChild("score").text = jifen .. tili - end - - if info.seat == room.self_player.seat then - if roundScore >= 0 then - ctr_win.selectedIndex = 1 - else - ctr_win.selectedIndex = 0 - end + end local list_residue = obj:GetChild('list_residue') diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua index e261d2be..fc1a21f1 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/changdepaohuzi/RunBeard_ResultView.lua @@ -308,8 +308,6 @@ function M:FillItemData(room, data, item) local hp_info = win_data.hp_info if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then local round_actual_hp = d2ad(hp_info.round_actual_hp) --// 本局实际输赢体力值 - self._view:GetChild('tili_score').visible = true - self._view:GetChild('tili_title').visible = true if (round_actual_hp > 0) then self._view:GetChild('tili_score').text = '积分：+' .. round_actual_hp self._view:GetChild('tili_score').grayed = false @@ -534,8 +532,6 @@ function M:FillItemData(room, data, item) local hp_info = info_list[i].hp_info if (hp_info ~= nil and room.hpOnOff == 1 or room:checkHpNonnegative()) then local round_actual_hp = d2ad(hp_info.round_actual_hp) --// 本局实际输赢体力值 - player:GetChild('tili_score').visible = true - player:GetChild('tili_title').visible = true if (round_actual_hp > 0) then player:GetChild('tili_score').text = '+' .. round_actual_hp player:GetChild('tili_score').grayed = false diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmg2.info b/wb_new_ui/.objs/metas/3n2top74/kpmg2.info new file mode 100644 index 00000000..79acdb39 --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmg2.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n10_n9qr": { + "hidden": true + }, + "n9_n9qr": { + "hidden": true + }, + "n8_n9qr": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmg83.info b/wb_new_ui/.objs/metas/3n2top74/kpmg83.info index 9313c2c7..74534a65 100644 --- a/wb_new_ui/.objs/metas/3n2top74/kpmg83.info +++ b/wb_new_ui/.objs/metas/3n2top74/kpmg83.info @@ -2,12 +2,6 @@ "objectStatus": { "n6_rfcn": { "hidden": true - }, - "n3_e54q": { - "hidden": true - }, - "n4_jdf3": { - "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmg9f.info b/wb_new_ui/.objs/metas/3n2top74/kpmg9f.info new file mode 100644 index 00000000..bd0a8e2b --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmg9f.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n63_i3h6": { + "locked": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgbf.info b/wb_new_ui/.objs/metas/3n2top74/kpmgbf.info new file mode 100644 index 00000000..a1659963 --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgbf.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_93q2": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmge.info b/wb_new_ui/.objs/metas/3n2top74/kpmge.info index 8d8d5eb9..d2bfd22c 100644 --- a/wb_new_ui/.objs/metas/3n2top74/kpmge.info +++ b/wb_new_ui/.objs/metas/3n2top74/kpmge.info @@ -1,15 +1,15 @@ { "objectStatus": { - "n8_yffn": { + "n12_yffn": { "hidden": true }, "n13_yffn": { "hidden": true }, - "n12_yffn": { + "n14_yffn": { "hidden": true }, - "n7_yffn": { + "n15_yffn": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info b/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info index 5c73b4c2..980aa0ec 100644 --- a/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info @@ -1,18 +1,27 @@ { "objectStatus": { - "n87_ni5n": { + "n47_pue4": { "hidden": true }, - "n34_hp0b": { + "n33_lwcl": { + "hidden": true + }, + "n17": { "hidden": true }, "n50_hkbm": { "hidden": true }, - "n85_p2ub": { + "n30_lwcl": { "hidden": true }, - "n47_pue4": { + "n35_h4ge": { + "hidden": true + }, + "n87_ni5n": { + "hidden": true + }, + "n26": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info b/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info index 330183f0..775d71c3 100644 --- a/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info @@ -1,25 +1,29 @@ { "objectStatus": { - "n141_ckvb": { - "locked": true - }, - "n166_ukp7": { - "hidden": true + "n155_diqo": { + "collapsed": true }, "n87_q50p": { "hidden": true }, - "n131_ckvb": { - "hidden": true + "n179_yffn": { + "collapsed": true }, - "n121_ckvb": { - "locked": true + "n131_ckvb": { + "hidden": true, + "collapsed": true }, "n120_r1z9": { "hidden": true }, + "n189_qcrm": { + "collapsed": true + }, + "n166_ukp7": { + "hidden": true + }, "n122_ckvb": { - "locked": true + "collapsed": true }, "n112_rnez": { "hidden": true diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgq4.info b/wb_new_ui/.objs/metas/3n2top74/kpmgq4.info new file mode 100644 index 00000000..c4531730 --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgq4.info @@ -0,0 +1,34 @@ +{ + "objectStatus": { + "n69_yffn": { + "hidden": true + }, + "n72_yffn": { + "hidden": true + }, + "n59_yffn": { + "hidden": true + }, + "n60_yffn": { + "hidden": true + }, + "n83_r05e": { + "hidden": true + }, + "n70_yffn": { + "hidden": true + }, + "n62_yffn": { + "hidden": true + }, + "n61_yffn": { + "hidden": true + }, + "n58_yffn": { + "hidden": true + }, + "n71_yffn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info index 30d8b9f4..0cf54c81 100644 --- a/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info @@ -6,13 +6,10 @@ "n181_r1z9": { "hidden": true }, - "n163_o49p": { - "hidden": true - }, "n179_kxwj": { "hidden": true }, - "n149_qpk6": { + "n35_k3io": { "hidden": true }, "n170_o49p": { @@ -21,7 +18,7 @@ "n194_syh3": { "hidden": true }, - "n35_k3io": { + "n163_o49p": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp35h.info b/wb_new_ui/.objs/metas/egnzysm7/ffp35h.info new file mode 100644 index 00000000..919c073e --- /dev/null +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp35h.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/egnzysm7/ffp36a.info b/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info index 56d2e4c5..48038a38 100644 --- a/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp36a.info @@ -1,76 +1,24 @@ { "objectStatus": { - "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 + "n19_pt1r": { + "hidden": true, + "collapsed": true }, "n37_n1ry": { "hidden": true }, - "n17_pt1r": { + "n69_w06x": { + "hidden": true + }, + "n68_w06x": { "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": { + "n46_n1ry": { "hidden": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp36r.info b/wb_new_ui/.objs/metas/egnzysm7/ffp36r.info new file mode 100644 index 00000000..87d5d252 --- /dev/null +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp36r.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n1": { + "hidden": true + }, + "n4_iukg": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp370.info b/wb_new_ui/.objs/metas/egnzysm7/ffp370.info new file mode 100644 index 00000000..3c9605b1 --- /dev/null +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp370.info @@ -0,0 +1,30 @@ +{ + "objectStatus": { + "n37_aen8": { + "hidden": true + }, + "n28_tjnv": { + "hidden": true + }, + "n5_tjnv": { + "hidden": true + }, + "n34_aen8": { + "hidden": true + }, + "n38_aen8": { + "hidden": true + }, + "n11_tjnv": { + "hidden": true, + "collapsed": true + }, + "n6_tjnv": { + "hidden": true + }, + "n45_mj9f": { + "hidden": true + } + }, + "adaptiveTest": true +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp37e.info b/wb_new_ui/.objs/metas/egnzysm7/ffp37e.info new file mode 100644 index 00000000..a662cdb9 --- /dev/null +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp37e.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n6_aen8": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/egnzysm7/ffp37k.info b/wb_new_ui/.objs/metas/egnzysm7/ffp37k.info new file mode 100644 index 00000000..0c833717 --- /dev/null +++ b/wb_new_ui/.objs/metas/egnzysm7/ffp37k.info @@ -0,0 +1,11 @@ +{ + "objectStatus": { + "n23_jvdt": { + "hidden": true + }, + "n25_haxf": { + "hidden": true, + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info b/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info index 3902d31e..0aa2eab6 100644 --- a/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info +++ b/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info @@ -1,61 +1,34 @@ { "objectStatus": { - "n54_mk2u": { - "hidden": true - }, - "n90_frte": { - "hidden": true - }, - "n94_frte": { - "hidden": true - }, - "n34_mk2u": { - "hidden": true - }, - "n96_frte": { - "hidden": true - }, - "n28_mk2u": { - "hidden": true - }, - "n30_mk2u": { - "hidden": true - }, - "n93_frte": { + "n79_fgao": { "hidden": true }, "n85_fgao": { "hidden": true }, - "n89_frte": { - "hidden": true - }, - "n50_mk2u": { - "hidden": true - }, - "n27_mk2u": { - "hidden": true - }, - "n95_frte": { - "hidden": true - }, - "n79_fgao": { - "hidden": true - }, "n35_mk2u": { "hidden": true }, - "n36_mk2u": { + "n30_mk2u": { "hidden": true }, "n29_mk2u": { "hidden": true }, - "n80_fgao": { + "n28_mk2u": { "hidden": true }, "n33_mk2u": { "hidden": true + }, + "n34_mk2u": { + "hidden": true + }, + "n80_fgao": { + "hidden": true + }, + "n36_mk2u": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 665be334..cdefce5f 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://3z9lj55vjokm7l", - "ui://3n2top74kpmgp4", - "ui://3z9lj55vjokmky", - "ui://yzaioi79fgao1dn" + "ui://3z9lj55vjokmft", + "ui://3z9lj55vjokmet", + "ui://3z9lj55vjokmey", + "ui://egnzysm7ffp36a", + "ui://egnzysm7ffp370", + "ui://egnzysm7ffp37k" ], - "test.device": "iPhone 5", + "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://3n2top74kpmgp4", + "doc.activeDoc": "ui://egnzysm7ffp370", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -27,24 +29,52 @@ "/component/head/", "27vd145b", "/component/rule/", + "egnzysm7", + "/", + "egnzysm7", + "/component/", + "egnzysm7", + "/component/clearing/", + "egnzysm7", + "/component/head/", + "egnzysm7", + "/font/", + "egnzysm7", + "/font/images/", + "egnzysm7", + "/font/images/head/", + "egnzysm7", + "/images/", + "egnzysm7", + "/images/EPCDXTMui/", "3n2top74", "/", "3n2top74", + "/Clearing/", + "3n2top74", + "/Clearing/Component/", + "3n2top74", + "/buttons/", + "3n2top74", "/images/", "3n2top74", "/images/EPRXTMui/", "3n2top74", "/setting/", "3n2top74", - "/setting/images/", + "/setting/component/", "3n2top74", - "/setting/images/setting/", + "/setting/images/", + "3z9lj55v", + "/", + "3z9lj55v", + "/images/", + "3z9lj55v", + "/images/MMXTMui/", "yzaioi79", "/", "yzaioi79", - "/images/", - "yzaioi79", - "/images/MRXTMui/" + "/images/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/buttons/Btn_newYellow_comfirm.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/buttons/Btn_newYellow_comfirm.xml index 094f40c4..d63a1416 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/buttons/Btn_newYellow_comfirm.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/buttons/Btn_newYellow_comfirm.xml @@ -3,7 +3,9 @@ - + + +