From 2cf6776b2228c5777071b4f139a8e4292c7114c3 Mon Sep 17 00:00:00 2001 From: mxj <2116869896@qq.com> Date: Wed, 27 May 2026 14:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=91=E5=BE=97=E5=BF=AB?= =?UTF-8?q?=E6=89=8B=E7=89=8C=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=85=A8=E9=83=A8=E7=8E=A9=E6=B3=95ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Common/BaseView.lua | 12 ++- .../extend/majiang/hechi/EXPlayBackView.lua | 2 +- wb_new_ui/.objs/metas/8wph7p8n/yffn8s.info | 6 ++ wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info | 15 +-- wb_new_ui/.objs/workspace.json | 45 +++++++-- .../Common/component/RoomInfoPanel1.xml | 6 +- .../RunFast_Main_New_2.xml | 78 +++++++-------- .../Extend_Poker_RunFastNew/clearing_new.xml | 15 +-- .../image/Frame 1338.png | Bin 0 -> 30249 bytes .../image/Frame 1339.png | Bin 0 -> 34437 bytes .../image/Frame 1347.png | Bin 0 -> 20015 bytes .../image/Frame 1348.png | Bin 0 -> 18908 bytes .../image/Frame 1349.png | Bin 0 -> 18451 bytes .../Extend_Poker_RunFastNew/package.xml | 5 + .../Main_Majiang/Main_style_2/Main_2_s2.xml | 28 +++--- .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 241424 -> 241424 bytes .../ui/Extend_Poker_RunFastNew_atlas0.png | Bin 1906094 -> 2079055 bytes .../ui/Extend_Poker_RunFastNew_atlas0_1.png | Bin 2329014 -> 1873879 bytes .../ui/Extend_Poker_RunFastNew_atlas10.png | Bin 0 -> 59287 bytes ... Extend_Poker_RunFastNew_atlas10.png.meta} | 2 +- .../Extend_Poker_RunFastNew_atlas_fwnygz.png | Bin 7046612 -> 0 bytes .../Extend_Poker_RunFastNew_atlas_fwnyh0.png | Bin 1424752 -> 0 bytes .../Extend_Poker_RunFastNew_atlas_m9jahw.png | Bin 293493 -> 0 bytes .../Extend_Poker_RunFastNew_atlas_yffnkq.png | Bin 0 -> 16715 bytes ...nd_Poker_RunFastNew_atlas_yffnkq.png.meta} | 2 +- .../Extend_Poker_RunFastNew_atlas_yffnmk.png | Bin 0 -> 2859416 bytes ...nd_Poker_RunFastNew_atlas_yffnmk.png.meta} | 2 +- .../Extend_Poker_RunFastNew_atlas_yffnml.png | Bin 0 -> 1971006 bytes ...end_Poker_RunFastNew_atlas_yffnml.png.meta | 92 ++++++++++++++++++ .../Extend_Poker_RunFastNew_atlas_yffnmn.png | Bin 0 -> 2000819 bytes ...end_Poker_RunFastNew_atlas_yffnmn.png.meta | 92 ++++++++++++++++++ .../ui/Extend_Poker_RunFastNew_fui.bytes | Bin 141856 -> 224286 bytes ...mp3 => Extend_Poker_RunFastNew_yffnb2.mp3} | Bin ...> Extend_Poker_RunFastNew_yffnb2.mp3.meta} | 2 +- ...mp3 => Extend_Poker_RunFastNew_yffnb5.mp3} | Bin ...> Extend_Poker_RunFastNew_yffnb5.mp3.meta} | 2 +- ...mp3 => Extend_Poker_RunFastNew_yffnbr.mp3} | Bin ...> Extend_Poker_RunFastNew_yffnbr.mp3.meta} | 2 +- 38 files changed, 316 insertions(+), 92 deletions(-) create mode 100644 wb_new_ui/assets/Extend_Poker_RunFastNew/image/Frame 1338.png create mode 100644 wb_new_ui/assets/Extend_Poker_RunFastNew/image/Frame 1339.png create mode 100644 wb_new_ui/assets/Extend_Poker_RunFastNew/image/Frame 1347.png create mode 100644 wb_new_ui/assets/Extend_Poker_RunFastNew/image/Frame 1348.png create mode 100644 wb_new_ui/assets/Extend_Poker_RunFastNew/image/Frame 1349.png create mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas10.png rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_atlas_m9jahw.png.meta => Extend_Poker_RunFastNew_atlas10.png.meta} (98%) delete mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png delete mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png delete mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png create mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_yffnkq.png rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_atlas_fwnygz.png.meta => Extend_Poker_RunFastNew_atlas_yffnkq.png.meta} (98%) create mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_yffnmk.png rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_atlas_fwnyh0.png.meta => Extend_Poker_RunFastNew_atlas_yffnmk.png.meta} (98%) create mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_yffnml.png create mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_yffnml.png.meta create mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_yffnmn.png create mode 100644 wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_yffnmn.png.meta rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_prgz94.mp3 => Extend_Poker_RunFastNew_yffnb2.mp3} (100%) rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_prgz94.mp3.meta => Extend_Poker_RunFastNew_yffnb2.mp3.meta} (91%) rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_prgz97.mp3 => Extend_Poker_RunFastNew_yffnb5.mp3} (100%) rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_prgz97.mp3.meta => Extend_Poker_RunFastNew_yffnb5.mp3.meta} (91%) rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_prgz9s.mp3 => Extend_Poker_RunFastNew_yffnbr.mp3} (100%) rename wb_unity_pro/Assets/ART/extend/poker/runfast/ui/{Extend_Poker_RunFastNew_prgz9s.mp3.meta => Extend_Poker_RunFastNew_yffnbr.mp3.meta} (91%) diff --git a/lua_probject/base_project/Game/View/Common/BaseView.lua b/lua_probject/base_project/Game/View/Common/BaseView.lua index 3a84e41c..622dba80 100644 --- a/lua_probject/base_project/Game/View/Common/BaseView.lua +++ b/lua_probject/base_project/Game/View/Common/BaseView.lua @@ -32,9 +32,19 @@ local view_url = { --@param #string url function M:InitView(url) self._root_view = UIPackage.CreateObjectFromURL(self._full and view_url[2] or view_url[1]) + -- 检查根视图是否创建成功 + if not self._root_view then + error("BaseView: Failed to create root view. Check if 'Common' package is loaded.") + return + end local contentPane = self._root_view:GetChild("contentPane") self._view = UIPackage.CreateObjectFromURL(url) - printlog(self._view) + -- 3. 关键修复：检查 _view 是否创建成功 + if not self._view then + error(string.format("BaseView: Failed to create view from URL: %s. Check if the package is loaded and URL is correct.", url)) + return + end + self._close_destroy = true -- self._view.fairyBatching = true self._view:AddRelation(contentPane, RelationType.Size) diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua index 13c4fa5e..915b34e1 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua @@ -275,7 +275,7 @@ function M:CopyLastStep(index) end function M:UpdateLeftCard(num) - self._tex_LeftCard.text = "剩余 "..num.." 张牌" + self._tex_LeftCard.text = num end function M:UpdateCardBox(seat) diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffn8s.info b/wb_new_ui/.objs/metas/8wph7p8n/yffn8s.info index 3587a727..1d9185c1 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffn8s.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffn8s.info @@ -1,7 +1,13 @@ { "objectStatus": { + "n63_i3h6": { + "collapsed": true + }, "n77_n9qr": { "hidden": true + }, + "n51_g618": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index c18476a9..b82249bf 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -1,19 +1,15 @@ { "objectStatus": { - "n121_ckvb": { - "locked": true + "n166_ukp7": { + "hidden": true }, "n87_q50p": { "hidden": true }, - "n86_q50p": { - "locked": true - }, - "n122_ckvb": { - "locked": true + "n186_yffn": { + "hidden": true }, "n131_ckvb": { - "locked": true, "hidden": true }, "n13": { @@ -25,9 +21,6 @@ "n189_qcrm": { "collapsed": true }, - "n166_ukp7": { - "hidden": true - }, "n113_rnez": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 27816b4d..1472e782 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,22 +2,47 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://h30s8vmela4eb", - "ui://7ij0e6i2sv5gk", - "ui://m7iejg46kwi0hkb", - "ui://2d9xdj6z75efcz", - "ui://2d9xdj6z97mlcin", - "ui://qubt49z8mpncc1i", - "ui://d1qrzqprc4r116", - "ui://parowutd99we8", - "ui://parowutd99we7" + "ui://v0j9abjygq7m8f", + "ui://v0j9abjygq7m8k", + "ui://v0j9abjygq7m8i", + "ui://8wph7p8nyffnmy", + "ui://8wph7p8nyffnnx", + "ui://8wph7p8nyffn9p", + "ui://8wph7p8nyffn8s", + "ui://8wph7p8nyffn2g", + "ui://8wph7p8nyffnnp", + "ui://8wph7p8nyffnno", + "ui://27vd145bst2l7ijp", + "ui://8wph7p8nyffn8t", + "ui://8wph7p8nyffn2h", + "ui://8wph7p8nyffn77", + "ui://8wph7p8nyffn78", + "ui://8wph7p8nyffnet", + "ui://8wph7p8nyffneu", + "ui://27vd145bmljn7ijt", + "ui://27vd145byffnj6", + "ui://27vd145byffnj9" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://7ij0e6i2sv5gk", + "doc.activeDoc": "ui://8wph7p8nyffnnx", "libview.twoColumn": false, "libview.expandedNodes": [ + "27vd145b", + "/", + "27vd145b", + "/images/", + "8wph7p8n", + "/", + "8wph7p8n", + "/component/", + "8wph7p8n", + "/component/head/", + "9n9stu2e", + "/", + "7ij0e6i2", + "/", "96mvx2ml", "/" ], diff --git a/wb_new_ui/assets/Common/component/RoomInfoPanel1.xml b/wb_new_ui/assets/Common/component/RoomInfoPanel1.xml index f402a652..5b865043 100644 --- a/wb_new_ui/assets/Common/component/RoomInfoPanel1.xml +++ b/wb_new_ui/assets/Common/component/RoomInfoPanel1.xml @@ -1,11 +1,11 @@ - + - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml index 524c8483..3ef7b174 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml @@ -2,7 +2,7 @@ - + @@ -27,16 +27,6 @@ - - - - - - - - - - @@ -47,23 +37,23 @@ - + -