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/base_project/Game/View/DismissRoomWindow.lua b/lua_probject/base_project/Game/View/DismissRoomWindow.lua index f93b8ad4..02f1b597 100644 --- a/lua_probject/base_project/Game/View/DismissRoomWindow.lua +++ b/lua_probject/base_project/Game/View/DismissRoomWindow.lua @@ -50,9 +50,9 @@ function M:FillData(data) isHidden = true end if isHidden then - self._view:GetChild("tex_tip").text = string.format("[color=#ff9d02]【%s】[/color]发起了解散房间申请，是否同意？","玩家" .. data.req_p.seat) + self._view:GetChild("tex_tip").text = string.format("[color=#F58B21]【%s】[/color]发起了解散房间申请，是否同意？","玩家" .. data.req_p.seat) else - self._view:GetChild("tex_tip").text = string.format("[color=#ff9d02]【%s】[/color]发起了解散房间申请，是否同意？",data.req_p.self_user.nick_name) + self._view:GetChild("tex_tip").text = string.format("[color=#F58B21]【%s】[/color]发起了解散房间申请，是否同意？",data.req_p.self_user.nick_name) end local ctr_falg = self._view:GetController("falg") local lst_player = self._view:GetChild("lst_player") diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 5b9601fa..a7ba8b90 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -172,11 +172,11 @@ local function __fillRoomItem(self, index, item, room) local str = nil local room_item = self.roomItems[item] local play = self.curGroup:getPlay(room.pid) + printlog("s-----------s------------s",pt(room)) if not room_item then room_item = RoomItem.new(item, room.maxPlayers, self.isShowRoomItem) self.roomItems[item] = room_item end - room_item:SetPlay(play) -- local str="(人数:".. room.maxPlayers -- if room.limitInRoom then @@ -274,7 +274,8 @@ local function __fillRoomItem(self, index, item, room) for i = 1, room.maxPlayers do local p_head = room_item.heads[i] local p_item = p_head.p_item - p_item.visible = false + p_item.visible = false + end end -- desk.touchable = false diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua index 7bac0aa2..ab891e2e 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua @@ -69,8 +69,8 @@ function M:FillGameData() local games = DataManager.SelfUser.games local lst_game = self._view:GetChild("lst_game") -- local n65 = lst_game:GetChild("n65") - printlog("jefe all games") - pt(games) + -- printlog("jefe all games") + -- pt(games) -- n65.visible = false for i = 1, #games do local game = games[i] diff --git a/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua b/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua index 4085a931..aa2104a6 100644 --- a/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua +++ b/lua_probject/base_project/Game/View/NewGroup/RoomItem.lua @@ -34,7 +34,6 @@ function M:init(max) self.heads = {} for i=1,max do - --printlog("==================================",i) local p_item = item:GetChild("head"..i) local btn_head = p_item:GetChild("btn_head") self.def_icon = btn_head._iconObject.texture diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua index 0654a20b..d521bd31 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXGameController.lua @@ -154,8 +154,8 @@ function M:OnEventBuGang(evt_data) end function M:OnEventResidueCard(evt_data) - printlog("OnEventResidueCard") - pt(evt_data) + -- printlog("OnEventResidueCard") + -- pt(evt_data) if evt_data.seat ~= DataManager.CurrenRoom.self_player.seat then return end @@ -417,7 +417,7 @@ function M:OnEventHu(evt_data) win_p.card_list = cards table.sort(win_p.card_list, ViewUtil.HandCardSort) - -- 【新增代码开始】过滤 win_list 中的无效数据 + -- 过滤 win_list 中的无效数据 local filtered_win_list = {} for i = 1, #win_list do local item = win_list[i] @@ -447,8 +447,8 @@ end function M:OneventResult1(evt_data) local over = evt_data.type - printlog("OneventResult1") - pt(evt_data) + -- printlog("OneventResult1") + -- pt(evt_data) --0：小结算 1：小大结算 2：大结算 self._room._reload_flag = false self._room.playing = false diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua index 13c4fa5e..861d7d85 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua @@ -56,7 +56,10 @@ function M:FillRoomData(data) 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() + if roominfo_panel:GetChild("tex_gametype") then + roominfo_panel:GetChild("tex_gametype").text = room.room_config:GetGameName() + end + for i = 1, #room.player_list do local p = room.player_list[i] @@ -275,7 +278,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) @@ -295,7 +298,9 @@ function M:UpdateRound(round) end function M:UpdateStep(step) - self._record:GetChild("tex_step").text = "第 " .. step .. " / " .. #self._step .. "步" + if self._record:GetChild("tex_step") then + self._record:GetChild("tex_step").text = "第 " .. step .. " / " .. #self._step .. "步" + end end return M \ No newline at end of file diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua index 6b9b671a..e92c07f2 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/test.lua @@ -80,7 +80,7 @@ function LuaPrint(lua_table, limit, indent, step) return content end -function --printlog(...) +function printlog(...) if true then print(...) end diff --git a/lua_probject/main_project/main/poker/PKSettingView.lua b/lua_probject/main_project/main/poker/PKSettingView.lua index b94129ec..092576f5 100644 --- a/lua_probject/main_project/main/poker/PKSettingView.lua +++ b/lua_probject/main_project/main/poker/PKSettingView.lua @@ -21,7 +21,7 @@ function PKSettingView.new(blur_view, show_type, isjiesan,url,cardSizeHandle) self._full = true self._full_offset = false self._close_zone = true - self._anim_pop = 2 + self._anim_pop = 0 self._close_destroy = true self._show_type = show_type self.isjiesan = isjiesan diff --git a/wb_new_ui/.objs/metas/27vd145b/eeqmcgp.info b/wb_new_ui/.objs/metas/27vd145b/eeqmcgp.info new file mode 100644 index 00000000..8a160c19 --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/eeqmcgp.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n2_ovii": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/27vd145b/r0qx7i5y.info b/wb_new_ui/.objs/metas/27vd145b/r0qx7i5y.info new file mode 100644 index 00000000..cfc08412 --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/r0qx7i5y.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n2_vqon": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/7ij0e6i2/sv5g0.info b/wb_new_ui/.objs/metas/7ij0e6i2/sv5g0.info new file mode 100644 index 00000000..cfc08412 --- /dev/null +++ b/wb_new_ui/.objs/metas/7ij0e6i2/sv5g0.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n2_vqon": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info b/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info index f816c2a2..1629cbbb 100644 --- a/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info +++ b/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info @@ -1,11 +1,6 @@ { "objectStatus": { - "n166_ozsy": { - "hidden": true, - "collapsed": true - }, - "n149_udgc": { - "hidden": true, + "n146_udgc": { "collapsed": true }, "n153_udgc": { @@ -13,6 +8,20 @@ }, "n152_udgc": { "hidden": true + }, + "n149_udgc": { + "hidden": true, + "collapsed": true + }, + "n143_udgc": { + "collapsed": true + }, + "n140_udgc": { + "collapsed": true + }, + "n166_ozsy": { + "hidden": true, + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffn2.info b/wb_new_ui/.objs/metas/8wph7p8n/yffn2.info new file mode 100644 index 00000000..c8531608 --- /dev/null +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffn2.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n13_yffn": { + "hidden": true + } + } +} \ No newline at end of file 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/metas/8wph7p8n/yffnnp.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info index 53688bcf..60c3689e 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnnp.info @@ -1,10 +1,16 @@ { "objectStatus": { - "n25_ckvb": { - "collapsed": true + "n70_yffn": { + "hidden": true }, - "n4_ckvb": { - "collapsed": true + "n71_yffn": { + "hidden": true + }, + "n57_yffn": { + "locked": true + }, + "n72_yffn": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info index 66e673db..ffaafa74 100644 --- a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info +++ b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info @@ -6,25 +6,13 @@ "n106_t038": { "hidden": true }, - "n163_ozsy": { + "n74_nip5": { "hidden": true }, - "n122_c4r1": { + "n103_t038": { "collapsed": true }, - "n154_j47e": { - "collapsed": true - }, - "n146_piwz": { - "collapsed": true - }, - "n136_c4r1": { - "collapsed": true - }, - "n15_mw5l": { - "collapsed": true - }, - "n74_nip5": { + "n163_ozsy": { "hidden": true }, "n160_ozsy": { diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info index 81bedff4..e631122c 100644 --- a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info +++ b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info @@ -1,7 +1,25 @@ { "objectStatus": { + "n153_la4e": { + "collapsed": true + }, + "n130_xevg": { + "collapsed": true + }, + "n106_t038": { + "collapsed": true + }, + "n123_xevg": { + "collapsed": true + }, + "n150_la4e": { + "collapsed": true + }, "n121_xevg": { "hidden": true + }, + "n116_xevg": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lx6k641g/ajzhoe.info b/wb_new_ui/.objs/metas/lx6k641g/ajzhoe.info index 326f1b2b..8b6ae8f3 100644 --- a/wb_new_ui/.objs/metas/lx6k641g/ajzhoe.info +++ b/wb_new_ui/.objs/metas/lx6k641g/ajzhoe.info @@ -1,25 +1,28 @@ { "objectStatus": { - "n82_ajzh": { - "collapsed": true + "n97_tki6": { + "hidden": true }, - "n105_tki6": { - "collapsed": true + "n79_ajzh": { + "hidden": true }, - "n37_pue4": { - "collapsed": true + "n50_hkbm": { + "hidden": true }, - "n104_tki6": { - "collapsed": true + "n96_tki6": { + "hidden": true }, - "n95_tki6": { - "collapsed": true + "n102_tki6": { + "hidden": true }, "n116_h22d": { "hidden": true }, - "n93_tki6": { - "collapsed": true + "n88_tki6": { + "hidden": true + }, + "n103_tki6": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lx6k641g/h22ds2.info b/wb_new_ui/.objs/metas/lx6k641g/h22ds2.info new file mode 100644 index 00000000..39b8e1c5 --- /dev/null +++ b/wb_new_ui/.objs/metas/lx6k641g/h22ds2.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n5_n6cm": { + "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 831fc35b..c701c3d6 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -1,19 +1,16 @@ { "objectStatus": { - "n259_imp5": { - "collapsed": true - }, "n294_ik9v": { "collapsed": true }, - "n251_ilon": { - "hidden": true + "n259_imp5": { + "collapsed": true }, "n78_i7lq": { "hidden": true }, - "n176_mn85": { - "collapsed": true + "n251_ilon": { + "hidden": true }, "n290_ik9v": { "hidden": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info b/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info index 85e13e7d..8929a437 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info +++ b/wb_new_ui/.objs/metas/m7iejg46/e5q7hu2.info @@ -2,6 +2,15 @@ "objectStatus": { "n15_jjon": { "hidden": true + }, + "n7_e5q7": { + "hidden": true + }, + "n10_e5q7": { + "hidden": true + }, + "n30_dhos": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/parowutd/99we8.info b/wb_new_ui/.objs/metas/parowutd/99we8.info new file mode 100644 index 00000000..87425beb --- /dev/null +++ b/wb_new_ui/.objs/metas/parowutd/99we8.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n445_dsxf": { + "collapsed": true + }, + "n405_gtcb": { + "hidden": true + }, + "n409_gtcb": { + "collapsed": true + }, + "n451_8fpn": { + "collapsed": true + }, + "n5_mw5l": { + "collapsed": true + }, + "n305_bn5c": { + "collapsed": true + }, + "n428_gtcb": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/parowutd/99we9.info b/wb_new_ui/.objs/metas/parowutd/99we9.info new file mode 100644 index 00000000..cfc08412 --- /dev/null +++ b/wb_new_ui/.objs/metas/parowutd/99we9.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n2_vqon": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info b/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info index 52fe77fb..5827a5c5 100644 --- a/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info +++ b/wb_new_ui/.objs/metas/qubt49z8/mpncc1i.info @@ -1,19 +1,12 @@ { "objectStatus": { - "n46_6cpq": { - "collapsed": true - }, - "n82_e8zl": { + "n56_6cpq": { "hidden": true }, - "n9_mw5l": { - "collapsed": true - }, - "n112_i9b1": { - "collapsed": true - }, - "n162_mpnc": { - "collapsed": true + "n82_e8zl": { + "collapsed": true, + "locked": true, + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info index 0af72f2d..fa8be5ad 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7mgo.info @@ -9,24 +9,15 @@ "n106_ni5n": { "hidden": true }, - "n84_hxz4": { - "collapsed": true - }, "n107_ni5n": { "hidden": true }, "n100_piv9": { "hidden": true }, - "n55_n6fs": { - "collapsed": true - }, "n30_lwcl": { "hidden": true }, - "n114_ttbr": { - "collapsed": true - }, "n35_h4ge": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index ad1dead7..58730a7d 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,18 +2,54 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46kwi0hkb", - "ui://2d9xdj6z75efcz", - "ui://h30s8vmela4eb", - "ui://7ij0e6i2sv5gk", - "ui://7ij0e6i2sv5gh" + "ui://v0j9abjygq7mgo", + "ui://lx6k641gajzhoe", + "ui://27vd145bvg2c4", + "ui://27vd145b93q2c0", + "ui://8wph7p8nyffnmy", + "ui://hrxsdiixla4e2c", + "ui://v0j9abjygq7med", + "ui://4skil1l6piv91ny", + "ui://x3mp2cn6xvhr3r", + "ui://fnuxqeflnrnod", + "ui://egnzysm7ffp36a", + "ui://v0j9abjygq7mct", + "ui://1utjt0r2ufu92i", + "ui://ppu1wv76j4mf9j", + "ui://ypulwxjhl9mn14", + "ui://442j0uepygxga", + "ui://8wph7p8nyffnhr", + "ui://9n9stu2eprgzee", + "ui://niy3ldiwl9mn14", + "ui://m7iejg4610snh5j", + "ui://m7iejg46h46p7ish", + "ui://m7iejg46hwww2f", + "ui://8wph7p8nyffnnp", + "ui://8wph7p8nyffnc", + "ui://8wph7p8nyffnj", + "ui://8wph7p8nyffn2", + "ui://27vd145bst2l7ijp", + "ui://v0j9abjygq7m8f" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://7ij0e6i2sv5gk", + "doc.activeDoc": "ui://8wph7p8nyffnnp", "libview.twoColumn": false, - "libview.expandedNodes": [], + "libview.expandedNodes": [ + "8wph7p8n", + "/", + "8wph7p8n", + "/images/", + "8wph7p8n", + "/images/EPRFNMui/", + "8wph7p8n", + "/images/head/", + "v0j9abjy", + "/", + "v0j9abjy", + "/Main_style_2/" + ], "auxline1": true, "snapToGrid": true, "test.orientation": "landscape", diff --git a/wb_new_ui/assets/Common/MessageBox1.xml b/wb_new_ui/assets/Common/MessageBox1.xml index b49b20ce..aa9b8e71 100644 --- a/wb_new_ui/assets/Common/MessageBox1.xml +++ b/wb_new_ui/assets/Common/MessageBox1.xml @@ -6,7 +6,7 @@