diff --git a/lua_probject/base_project/Game/View/ChatView.lua b/lua_probject/base_project/Game/View/ChatView.lua index 52e382d5..9fb96e21 100644 --- a/lua_probject/base_project/Game/View/ChatView.lua +++ b/lua_probject/base_project/Game/View/ChatView.lua @@ -11,6 +11,7 @@ function ChatView.new(main_view) self.class = "ChatView" self._main_view = main_view self._blur_view = main_view._root_view + self._close_zone = true self:init("ui://Chat/Main") return self diff --git a/lua_probject/base_project/Game/View/playerDetailView.lua b/lua_probject/base_project/Game/View/playerDetailView.lua index 809716f3..d004fa64 100644 --- a/lua_probject/base_project/Game/View/playerDetailView.lua +++ b/lua_probject/base_project/Game/View/playerDetailView.lua @@ -30,7 +30,7 @@ function playerDetailView:Refalsh(player) self.player = player self.tex_name.text = player.self_user.nick_name self.tex_ip.text = "网络:" .. player.self_user.host_ip - self.tex_id.text = "编号:" .. player.self_user.account_id + self.tex_id.text = "编号:" .. "******" --player.self_user.account_id ImageLoad.Load(player.self_user.head_url, self.loader_icon) self.cMissile.selectedIndex = 1 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 f294f86c..d60cb584 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -154,6 +154,9 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v) rc:GetController('choose').selectedIndex = 0 end + table.sort(info.outCards, function(a, b) + return a % 100 < b % 100 + end) for i, v in ipairs(info.outCards) do local rc = list_residue:AddItemFromPool() rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v) @@ -188,6 +191,9 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) end end local list_residue = self._view:GetChild('list_residue') + table.sort(remaincards, function(a, b) + return a % 100 < b % 100 + end) list_residue:RemoveChildrenToPool() if remaincards then for i, v in ipairs(remaincards) do diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 1d18bd25..36627a6b 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -40,7 +40,7 @@ end function M:InitView(url) local _room = self._room - self.Fix_Msg_Chat = Fix_Msg_Chat + -- self.Fix_Msg_Chat = Fix_Msg_Chat self._flag_fanpaofa = true ViewUtil.PlayMuisc('FanPaoFa_ZP', 'extend/zipai/fanpaofa/sound/bg.mp3') diff --git a/wb_new_ui/.objs/metas/27vd145b/yffnj6.info b/wb_new_ui/.objs/metas/27vd145b/yffnj6.info new file mode 100644 index 00000000..8b436efd --- /dev/null +++ b/wb_new_ui/.objs/metas/27vd145b/yffnj6.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n6": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info index 9e26dfee..1bbfc643 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n33_e7qn": { + "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 1aae7ef5..c7a79388 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -1,16 +1,45 @@ { "objectStatus": { + "n166_ukp7": { + "hidden": true + }, + "n185_yffn": { + "collapsed": true + }, + "n115_rnez": { + "hidden": true + }, + "n113_rnez": { + "hidden": true + }, + "n93_eclw": { + "collapsed": true + }, + "n189_qcrm": { + "collapsed": true + }, + "n179_yffn": { + "collapsed": true + }, + "n131_ckvb": { + "collapsed": true, + "locked": true, + "hidden": true + }, "n87_q50p": { "hidden": true }, - "n166_ukp7": { + "n13": { + "collapsed": true + }, + "n116_rnez": { + "collapsed": true + }, + "n112_rnez": { "hidden": true }, "n155_diqo": { "collapsed": true - }, - "n131_ckvb": { - "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info index 9e26dfee..137f78a0 100644 --- a/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info +++ b/wb_new_ui/.objs/metas/l0ds4ys6/h1uu26.info @@ -1 +1,13 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n75_syh3": { + "hidden": true + }, + "n58_h1uu": { + "hidden": true + }, + "n70_zgd9": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info new file mode 100644 index 00000000..0519d129 --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n183_yfzf": { + "locked": 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 new file mode 100644 index 00000000..326f1b2b --- /dev/null +++ b/wb_new_ui/.objs/metas/lx6k641g/ajzhoe.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n82_ajzh": { + "collapsed": true + }, + "n105_tki6": { + "collapsed": true + }, + "n37_pue4": { + "collapsed": true + }, + "n104_tki6": { + "collapsed": true + }, + "n95_tki6": { + "collapsed": true + }, + "n116_h22d": { + "hidden": true + }, + "n93_tki6": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info index 253ad42c..54fe5252 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -1,11 +1,5 @@ { "objectStatus": { - "n108_go7q": { - "hidden": true - }, - "n59_v38k": { - "locked": true - }, "n85_l2u4": { "collapsed": true }, @@ -15,11 +9,11 @@ "n107_go7q": { "hidden": true }, - "n90_8sat": { - "collapsed": true + "n108_go7q": { + "hidden": true }, - "n80_l2u4": { - "collapsed": true + "n59_v38k": { + "locked": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 5bb22121..5ab926dc 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,60 +2,25 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://lkq9ne9speuq8b", - "ui://lkq9ne9speuq6p", - "ui://lkq9ne9speuq5a", - "ui://lkq9ne9speuq59", - "ui://lkq9ne9speuq9f", - "ui://lkq9ne9speuq9g", - "ui://lkq9ne9speuqcv", - "ui://lkq9ne9speuqc6", - "ui://lkq9ne9speuqao", - "ui://lkq9ne9speuq5b", - "ui://1utjt0r2ufu92i", - "ui://1utjt0r2ufu92s", - "ui://1utjt0r2ufu930" + "ui://v0j9abjygq7ms2", + "ui://v0j9abjygq7m8f", + "ui://8wph7p8nyffnmr", + "ui://2d9xdj6zl0lzb", + "ui://v0j9abjygq7mgo", + "ui://lx6k641gajzhoe", + "ui://d1qrzqprc4r116", + "ui://8wph7p8nyffn1q", + "ui://8wph7p8nyffnmy", + "ui://27vd145byffnjo" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://lkq9ne9speuq6p", + "doc.activeDoc": "ui://d1qrzqprc4r116", "libview.twoColumn": false, "libview.expandedNodes": [ - "27vd145b", - "/", - "27vd145b", - "/images/", - "lkq9ne9s", - "/", - "lkq9ne9s", - "/component/", - "lkq9ne9s", - "/component/Main/", - "lkq9ne9s", - "/component/Main/component/", - "lkq9ne9s", - "/component/option/", - "lkq9ne9s", - "/component/option/component/", - "lkq9ne9s", - "/component/option/component/choose/", - "lkq9ne9s", - "/images/", - "lkq9ne9s", - "/images/cards1/", - "yzaioi79", - "/", - "yzaioi79", - "/component/", - "yzaioi79", - "/component/HuTip/", - "m7iejg46", - "/", - "m7iejg46", - "/component/", - "m7iejg46", - "/images/" + "d1qrzqpr", + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Chat/Main.xml b/wb_new_ui/assets/Chat/Main.xml index 22884d06..4300637e 100644 --- a/wb_new_ui/assets/Chat/Main.xml +++ b/wb_new_ui/assets/Chat/Main.xml @@ -1,70 +1,79 @@ - - - - + + + + - - - - - -