diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index a2b4f92c..4d63e869 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -119,16 +119,16 @@ function M:init(url, isBigFull) local big_result = self._view:GetChild('big_result') if big_result ~= nil then - if isBigFull then - - else - self._full = true - big_result:AddRelation(self._view, RelationType.Size) - big_result.width = self._view.width - big_result.height = self._view.height - end - - + if isBigFull then + + else + self._full = true + big_result:AddRelation(self._view, RelationType.Size) + big_result.width = self._view.width + big_result.height = self._view.height + end + + local btn_share_copy = big_result:GetChild('btn_share_copy') if btn_share_copy then btn_share_copy.onClick:Set( @@ -321,7 +321,24 @@ function M:InitBigResult(room, fontsize) item:GetChild('txt_userid').text = player_info.userId end - -- ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) + --ImageLoad.Load(player_info.head_url, item:GetChild('head').icon) + + -- 获取头像组件 + local head_component = item:GetChild('head') + if head_component then + local icon_loader = head_component._iconObject + + -- 检查头像 URL 是否有效 + local head_url = player_info.head_url or player_info.portrait + if not head_url or head_url == "" then + -- 使用默认头像(基于 uid 生成固定路径) + local uid = player_info.userId or player_info.uid or 0 + head_url = "ui://Common/Head" .. tostring(uid % 10) + end + + -- 异步加载头像到 icon 装载器 + ImageLoad.Load(head_url, icon_loader) + end if player_info.entrust ~= nil and player_info.entrust == true then item:GetController('entrust').selectedIndex = 1 diff --git a/wb_new_ui/.objs/metas/27vd145b/93q2c0.info b/wb_new_ui/.objs/metas/27vd145b/93q2c0.info new file mode 100644 index 00000000..a1659963 --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/93q2c0.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/kpmg83.info b/wb_new_ui/.objs/metas/3n2top74/kpmg83.info new file mode 100644 index 00000000..9313c2c7 --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmg83.info @@ -0,0 +1,13 @@ +{ + "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/kpmga1.info b/wb_new_ui/.objs/metas/3n2top74/kpmga1.info new file mode 100644 index 00000000..953f551c --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmga1.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n1_i3h6": { + "hidden": true + }, + "n0_i3h6": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgdq.info b/wb_new_ui/.objs/metas/3n2top74/kpmgdq.info new file mode 100644 index 00000000..a8d6d570 --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgdq.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n47_kx91": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmglv.info b/wb_new_ui/.objs/metas/3n2top74/kpmglv.info new file mode 100644 index 00000000..9d4a0747 --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmglv.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n9": { + "hidden": true + }, + "n21_n6fs": { + "hidden": true + }, + "n7": { + "hidden": true + }, + "n5": { + "hidden": true + }, + "n20_qpk6": { + "hidden": true + }, + "n12_yyhx": { + "hidden": true + }, + "n6": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgm2.info b/wb_new_ui/.objs/metas/3n2top74/kpmgm2.info new file mode 100644 index 00000000..81ae3fda --- /dev/null +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgm2.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n7_f2pr": { + "hidden": true + }, + "n3_h1uu": { + "hidden": true + }, + "n4_h1uu": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info b/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info index 377e1385..5c73b4c2 100644 --- a/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgp4.info @@ -9,6 +9,9 @@ "n50_hkbm": { "hidden": true }, + "n85_p2ub": { + "hidden": true + }, "n47_pue4": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info b/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info index 45c41266..330183f0 100644 --- a/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info +++ b/wb_new_ui/.objs/metas/3n2top74/kpmgp5.info @@ -1,13 +1,27 @@ { "objectStatus": { - "n121_ckvb": { + "n141_ckvb": { "locked": true }, "n166_ukp7": { "hidden": true }, + "n87_q50p": { + "hidden": true + }, "n131_ckvb": { - "locked": true, + "hidden": true + }, + "n121_ckvb": { + "locked": true + }, + "n120_r1z9": { + "hidden": true + }, + "n122_ckvb": { + "locked": true + }, + "n112_rnez": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info index 13fd69a7..9d5fa472 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info @@ -1,11 +1,14 @@ { "objectStatus": { - "n79_l2u4": { - "hidden": true + "n118_nynz": { + "locked": true }, "n103_dnw9": { "hidden": true }, + "n79_l2u4": { + "hidden": true + }, "n96_dnw9": { "hidden": true }, @@ -21,9 +24,6 @@ "n89_8sat": { "hidden": true }, - "n100_dnw9": { - "hidden": true - }, "n114_itp8": { "hidden": true }, @@ -41,6 +41,9 @@ }, "n116_u50h": { "hidden": true + }, + "n100_dnw9": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info index 73dab957..30fbdf92 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmdt.info @@ -1,11 +1,5 @@ { "objectStatus": { - "n35_piv9": { - "hidden": true - }, - "n45_ona1": { - "hidden": true - }, "n51_tki6": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info index e57075c4..1e0d5ea8 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmet.info @@ -6,10 +6,13 @@ "n28_tjnv": { "hidden": true }, + "n29_tjnv": { + "hidden": true + }, "n15_tjnv": { "hidden": true }, - "n29_tjnv": { + "n5_tjnv": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info index 9e26dfee..ee2ed671 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmey.info @@ -1 +1,29 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n27_ld1z": { + "hidden": true + }, + "n23_xk2u": { + "hidden": true + }, + "n22_xk2u": { + "hidden": true + }, + "n25_xk2u": { + "hidden": true + }, + "n10_tjnv": { + "hidden": true + }, + "n24_xk2u": { + "hidden": true + }, + "n0_tjnv": { + "hidden": true + }, + "n28_frte": { + "hidden": true, + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info index d055db31..ef2725e6 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info @@ -1,13 +1,16 @@ { "objectStatus": { - "n40_ona1": { - "hidden": true + "n110_itp8": { + "locked": true }, "n36_piv9": { "hidden": true }, "n22_xtwh": { "hidden": true + }, + "n40_ona1": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info index 43591265..e7b5c6ab 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmfu.info @@ -1,10 +1,16 @@ { "objectStatus": { - "n4_hz87": { + "n8_ld1z": { + "hidden": true + }, + "n5_ik9v": { "hidden": true }, "n6_ik9v": { "hidden": true + }, + "n4_hz87": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info index b194a727..726e3700 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info @@ -1,19 +1,23 @@ { "objectStatus": { - "n50_hkbm": { - "hidden": true - }, - "n17": { + "n47_pue4": { "hidden": true }, "n104_ni5n": { "hidden": true }, - "n109_ni5n": { + "n17": { "hidden": true }, - "n47_pue4": { + "n30_lwcl": { + "hidden": true + }, + "n50_hkbm": { + "hidden": true + }, + "n26": { "hidden": true } - } + }, + "adaptiveTest": true } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf6x.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf6x.info new file mode 100644 index 00000000..b848688b --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf6x.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n76_o49p": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqf7q.info b/wb_new_ui/.objs/metas/5cdldr01/qaqf7q.info new file mode 100644 index 00000000..6b34bbff --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf7q.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n74_o49p": { + "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 new file mode 100644 index 00000000..30d8b9f4 --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqf9c.info @@ -0,0 +1,28 @@ +{ + "objectStatus": { + "n34_k3io": { + "hidden": true + }, + "n181_r1z9": { + "hidden": true + }, + "n163_o49p": { + "hidden": true + }, + "n179_kxwj": { + "hidden": true + }, + "n149_qpk6": { + "hidden": true + }, + "n170_o49p": { + "hidden": true + }, + "n194_syh3": { + "hidden": true + }, + "n35_k3io": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqfa2.info b/wb_new_ui/.objs/metas/5cdldr01/qaqfa2.info new file mode 100644 index 00000000..81ae3fda --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqfa2.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n7_f2pr": { + "hidden": true + }, + "n3_h1uu": { + "hidden": true + }, + "n4_h1uu": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info b/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info new file mode 100644 index 00000000..b060ba87 --- /dev/null +++ b/wb_new_ui/.objs/metas/5cdldr01/qaqfe0.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n0_mk2u": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qvt.info b/wb_new_ui/.objs/metas/yzaioi79/f55qvt.info new file mode 100644 index 00000000..f597808c --- /dev/null +++ b/wb_new_ui/.objs/metas/yzaioi79/f55qvt.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n21_mk2u": { + "hidden": true + }, + "n28_o49p": { + "hidden": true + }, + "n29_o49p": { + "hidden": true + }, + "n1": { + "hidden": true + }, + "n25_oynr": { + "hidden": true + }, + "n22_mk2u": { + "hidden": true + }, + "n7": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qw4.info b/wb_new_ui/.objs/metas/yzaioi79/f55qw4.info new file mode 100644 index 00000000..57952e29 --- /dev/null +++ b/wb_new_ui/.objs/metas/yzaioi79/f55qw4.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n28_e54q": { + "hidden": true + }, + "n76_o49p": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info b/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info index 76f29fd4..ff1c3273 100644 --- a/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info +++ b/wb_new_ui/.objs/metas/yzaioi79/f55qw7.info @@ -12,6 +12,9 @@ "n38_e7qn": { "hidden": true }, + "n74_o49p": { + "hidden": true + }, "n54_nu0l": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info b/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info index fbacc469..8cce1417 100644 --- a/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info +++ b/wb_new_ui/.objs/metas/yzaioi79/f55qwa.info @@ -1,39 +1,42 @@ { "objectStatus": { - "n162_o49p": { + "n174_fgao": { "hidden": true }, "n175_fgao": { "hidden": true }, - "n35_k3io": { - "hidden": true - }, - "n46_u4l2": { - "hidden": true - }, - "n34_k3io": { + "n31_h1uu": { "hidden": true }, "n163_o49p": { "hidden": true }, - "n179_kxwj": { + "n181_m093": { "hidden": true }, - "n178_cbxl": { - "hidden": true - }, - "n170_o49p": { + "n162_o49p": { "hidden": true }, "n37_kba2": { "hidden": true }, - "n31_h1uu": { + "n178_cbxl": { "hidden": true }, - "n174_fgao": { + "n179_kxwj": { + "hidden": true + }, + "n34_k3io": { + "hidden": true + }, + "n35_k3io": { + "hidden": true + }, + "n170_o49p": { + "hidden": true + }, + "n46_u4l2": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/yzaioi79/mk2u139.info b/wb_new_ui/.objs/metas/yzaioi79/mk2u139.info new file mode 100644 index 00000000..e648f289 --- /dev/null +++ b/wb_new_ui/.objs/metas/yzaioi79/mk2u139.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n1": { + "hidden": 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 8e3c2f95..3902d31e 100644 --- a/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info +++ b/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info @@ -1,23 +1,60 @@ { "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": { + "hidden": true + }, "n85_fgao": { "hidden": true }, - "n86_fgao": { + "n89_frte": { "hidden": true }, "n50_mk2u": { - "hidden": true, - "collapsed": true + "hidden": true + }, + "n27_mk2u": { + "hidden": true + }, + "n95_frte": { + "hidden": true + }, + "n79_fgao": { + "hidden": true + }, + "n35_mk2u": { + "hidden": true + }, + "n36_mk2u": { + "hidden": true + }, + "n29_mk2u": { + "hidden": true }, "n80_fgao": { "hidden": true }, - "n54_mk2u": { - "hidden": true, - "collapsed": true - }, - "n87_fgao": { + "n33_mk2u": { "hidden": true } } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 97112240..665be334 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,17 +3,21 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://3z9lj55vjokm7l", - "ui://3z9lj55vjokmky" + "ui://3n2top74kpmgp4", + "ui://3z9lj55vjokmky", + "ui://yzaioi79fgao1dn" ], "test.device": "iPhone 5", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://3z9lj55vjokmky", + "doc.activeDoc": "ui://3n2top74kpmgp4", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", + "/buttons/", + "27vd145b", "/component/", "27vd145b", "/component/create_room/", @@ -23,36 +27,24 @@ "/component/head/", "27vd145b", "/component/rule/", - "3z9lj55v", + "3n2top74", "/", - "3z9lj55v", - "/component/", - "3z9lj55v", - "/component/setting_new/", - "3z9lj55v", + "3n2top74", "/images/", - "3z9lj55v", - "/images/MMXTMui/", - "m7iejg46", + "3n2top74", + "/images/EPRXTMui/", + "3n2top74", + "/setting/", + "3n2top74", + "/setting/images/", + "3n2top74", + "/setting/images/setting/", + "yzaioi79", "/", - "m7iejg46", - "/component/", - "m7iejg46", - "/component/Btn/", - "m7iejg46", + "yzaioi79", "/images/", - "m7iejg46", - "/images/NGXiangTangMui/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/component/", - "m7iejg46", - "/mgr/component/member/", - "m7iejg46", - "/mgr/component/member/partner/", - "x3mp2cn6", - "/" + "yzaioi79", + "/images/MRXTMui/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Chat/Gcm_chat.xml b/wb_new_ui/assets/Chat/Gcm_chat.xml index a2514953..68b01537 100644 --- a/wb_new_ui/assets/Chat/Gcm_chat.xml +++ b/wb_new_ui/assets/Chat/Gcm_chat.xml @@ -4,7 +4,7 @@ -