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/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/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/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/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 1472e782..ce18e0a8 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,50 +2,32 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://v0j9abjygq7m8f", - "ui://v0j9abjygq7m8k", - "ui://v0j9abjygq7m8i", + "ui://v0j9abjygq7mgo", + "ui://lx6k641gajzhoe", + "ui://27vd145bvg2c4", + "ui://27vd145b93q2c0", "ui://8wph7p8nyffnmy", - "ui://8wph7p8nyffnnx", - "ui://8wph7p8nyffn9p", - "ui://8wph7p8nyffn8s", - "ui://8wph7p8nyffn2g", - "ui://8wph7p8nyffnnp", - "ui://8wph7p8nyffnno", + "ui://27vd145bcvc87i5t", + "ui://m7iejg4610snh5j", + "ui://m7iejg46e5q7hu2", + "ui://27vd145bpgy941", + "ui://27vd145boviihyy", + "ui://27vd145bbt6w96", + "ui://27vd145beeqmcgp", + "ui://m7iejg46a81d7ii7", + "ui://m7iejg46e5q7hu9", + "ui://27vd145bdo2f1z", "ui://27vd145bst2l7ijp", - "ui://8wph7p8nyffn8t", - "ui://8wph7p8nyffn2h", - "ui://8wph7p8nyffn77", - "ui://8wph7p8nyffn78", - "ui://8wph7p8nyffnet", - "ui://8wph7p8nyffneu", "ui://27vd145bmljn7ijt", - "ui://27vd145byffnj6", - "ui://27vd145byffnj9" + "ui://8wph7p8nyffn8s", + "ui://8wph7p8nyffn2h" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://8wph7p8nyffnnx", + "doc.activeDoc": "ui://8wph7p8nyffnmy", "libview.twoColumn": false, - "libview.expandedNodes": [ - "27vd145b", - "/", - "27vd145b", - "/images/", - "8wph7p8n", - "/", - "8wph7p8n", - "/component/", - "8wph7p8n", - "/component/head/", - "9n9stu2e", - "/", - "7ij0e6i2", - "/", - "96mvx2ml", - "/" - ], + "libview.expandedNodes": [], "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 @@