diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua index 97afc0a2..13c4fa5e 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXPlayBackView.lua @@ -21,11 +21,13 @@ end function M:InitView(url) local room = self._room UIPackage.AddPackage("extend/majiang/hechi/ui/Extend_MJ_HeChi") - MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num) + --MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num) + MJPlayBackView.InitView(self,"ui://Main_Majiang/Main_2_s2") local _cardbox = self._view:GetChild("cardbox") --self._view:GetChild("panel_record"):GetChild("btn_LastStep").enabled = false self._ctr_cardbox = _cardbox:GetController("c1") - self._tex_round = self._view:GetChild("tex_round") + self._tex_round1 = self._view:GetChild("tex_round1") + self._tex_round2 = self._view:GetChild("tex_round2") self._tex_LeftCard = self._view:GetChild("remaining_card") self._anchor = self._view:GetChild("mask_tips") self._eventmap = {} @@ -288,7 +290,8 @@ function M:UpdateCardBox(seat) end function M:UpdateRound(round) - self._tex_round.text = "第 "..round.."/"..self._room.room_config.round.." 局" + self._tex_round1.text = round + self._tex_round2.text = self._room.room_config.round end function M:UpdateStep(step) diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index f31709eb..dc8d4448 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -53,6 +53,7 @@ ui://h30s8vmela4e6 ui://eyxz924gffp34g ui://4wmd3o8gvlhjde ui://z3z0ysurvlhj7t +ui://7ij0e6i2sv5g3 ui://96mvx2mlvlhjcsv ui://boq0ohepvlhjd0 ui://v0j9abjygq7m7 diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info b/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info index e5ec0083..6b0aed9a 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info @@ -1,4 +1,8 @@ { - "adaptiveTest": true, + "objectStatus": { + "n63_10xl7": { + "hidden": true + } + }, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info index 574ccbdb..3c83daed 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info @@ -3,8 +3,17 @@ "n0_naup": { "hidden": true }, + "n4_naup": { + "hidden": true + }, "n2_naup": { "hidden": true + }, + "n5_naup": { + "hidden": true + }, + "n6_naup": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4e9.info b/wb_new_ui/.objs/metas/h30s8vme/la4e9.info new file mode 100644 index 00000000..cfc08412 --- /dev/null +++ b/wb_new_ui/.objs/metas/h30s8vme/la4e9.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n2_vqon": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info index 7f0d22d0..81bedff4 100644 --- a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info +++ b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info @@ -1,19 +1,7 @@ { "objectStatus": { - "n146_unv6": { - "collapsed": true - }, - "n131_xevg": { - "collapsed": true - }, "n121_xevg": { "hidden": true - }, - "n112_i9b1": { - "collapsed": true - }, - "n139_7upk": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info index c0e420a8..c3398239 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkb.info @@ -4,6 +4,5 @@ "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info index 1c9b4d09..34092f09 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info @@ -1,16 +1,22 @@ { "objectStatus": { - "n141_u26u": { + "n145_10tp2": { "hidden": true }, - "n145_10tp2": { + "n123_j06m": { "hidden": true }, "n156_10tp2": { "hidden": true }, + "n122_cioe": { + "hidden": true + }, "n175_upe1": { "hidden": true + }, + "n141_u26u": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info index 9e26dfee..94ef5c85 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i82.info @@ -1 +1,37 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n118_l7wn": { + "hidden": true + }, + "n112_l7wn": { + "hidden": true + }, + "n117_l7wn": { + "hidden": true + }, + "n114_l7wn": { + "hidden": true + }, + "n113_l7wn": { + "hidden": true + }, + "n116_l7wn": { + "hidden": true + }, + "n115_l7wn": { + "hidden": true + }, + "n111_l7wn": { + "hidden": true + }, + "n96_l7wn": { + "locked": true + }, + "n63_omkm": { + "locked": true + }, + "n119_l7wn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info b/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info index ff3594d8..9ca21216 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info +++ b/wb_new_ui/.objs/metas/m7iejg46/mkdvhdu.info @@ -4,7 +4,8 @@ "hidden": true }, "n10_zplu": { - "hidden": true + "hidden": true, + "collapsed": true }, "n6_e8zl": { "hidden": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info index 40801f9b..313e4c55 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info +++ b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info @@ -1,18 +1,21 @@ { "objectStatus": { - "n146_r4s4": { - "collapsed": true + "n198_r0qx": { + "hidden": true }, "n131_kwi0": { + "hidden": true, "collapsed": true }, - "n198_r0qx": { + "n199_t7dq": { + "hidden": true + }, + "n162_g21o": { "hidden": true }, "n147_r4s4": { "collapsed": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info b/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info index 9e26dfee..01a6c101 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info +++ b/wb_new_ui/.objs/metas/m7iejg46/mpllhv5.info @@ -1 +1,16 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n108_mpll": { + "hidden": true + }, + "n99_kwi0": { + "hidden": true + }, + "n107_mpll": { + "hidden": true + }, + "n106_mpll": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info b/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info index 9fec2107..aea58fad 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ruljhmp.info @@ -1,8 +1,5 @@ { "objectStatus": { - "n60_nld2": { - "hidden": true - }, "n24_ewd0": { "collapsed": true } diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info index 0aa4358b..91ab105d 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -12,15 +12,9 @@ "n114_itp8": { "hidden": true }, - "n82_l2u4": { - "collapsed": true - }, "n107_go7q": { "hidden": true }, - "n71_l2u4": { - "locked": true - }, "n123_dzuu": { "collapsed": true } diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info index d233973f..1587d416 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8u.info @@ -6,9 +6,6 @@ "n6": { "hidden": true }, - "n33_e7qn": { - "collapsed": true - }, "n50_hez8": { "locked": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index ee8f6773..cb9de7af 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -7,36 +7,104 @@ "ui://v0j9abjygq7ms2", "ui://v0j9abjygq7m7m", "ui://v0j9abjygq7mgx", + "ui://v0j9abjygq7mei", "ui://v0j9abjygq7m8f", + "ui://v0j9abjygq7m8l", + "ui://v0j9abjyrdg6t9", + "ui://27vd145byffnj6", "ui://27vd145bhez87j20", "ui://v0j9abjygq7med", "ui://m7iejg4610snh5j", "ui://m7iejg46e5q7hu2", "ui://2d9xdj6zl0lzb", + "ui://27vd145bg24i7ijv", "ui://m7iejg46kwi0hkb", + "ui://m7iejg4610xl7i1w", + "ui://m7iejg46mpllhv2", + "ui://m7iejg46kwi0hkl", + "ui://m7iejg46mpllhv5", + "ui://m7iejg46kwi0hkg", + "ui://m7iejg46mkdvhdu", + "ui://m7iejg46r4s4hry", + "ui://m7iejg46jj657i2h", + "ui://m7iejg46mpllhv7", + "ui://m7iejg46k46xhuk", + "ui://m7iejg46kwi0hjx", "ui://2d9xdj6z75efcz", + "ui://m7iejg46l7wn7i82", + "ui://27vd145bcjli6", + "ui://2d9xdj6z97mlcin", "ui://h30s8vmela4eb", + "ui://h30s8vmela4e9", + "ui://h30s8vmela4e8", + "ui://h30s8vmela4e7", + "ui://h30s8vmela4e5", "ui://z3z0ysurygxgd", "ui://96mvx2ml10kys6", + "ui://7ij0e6i2sv5gk", + "ui://7ij0e6i2sv5gh", + "ui://d1qrzqprc4r116", + "ui://27vd145bh1uu3i", "ui://96mvx2mlocbrsh", "ui://96mvx2ml10kys0", "ui://z3z0ysurr28252", "ui://442j0uepygxgd", "ui://2d9xdj6zomkm7cna", "ui://2d9xdj6zxbqujn", + "ui://2d9xdj6zab5pcji", + "ui://m7iejg46ruljhmp", "ui://27vd145bst2l7ijp", "ui://2d9xdj6znaupko", + "ui://2d9xdj6znaupkn", + "ui://2d9xdj6znaupk8", "ui://27vd145bhez87j27", - "ui://v0j9abjygq7m8u" + "ui://v0j9abjygq7m8u", + "ui://v0j9abjygq7m8r" ], - "test.device": "iPhone XR", + "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://96mvx2ml10kys6", + "doc.activeDoc": "ui://m7iejg46mpllhv5", "libview.twoColumn": false, "libview.expandedNodes": [ - "96mvx2ml", - "/" + "h30s8vme", + "/", + "h30s8vme", + "/component/", + "h30s8vme", + "/component/create_room/", + "h30s8vme", + "/component/create_room/image/", + "h30s8vme", + "/mgr/", + "h30s8vme", + "/mgr/imgs/", + "h30s8vme", + "/mgr/imgs/game/", + "d1qrzqpr", + "/", + "2d9xdj6z", + "/", + "2d9xdj6z", + "/component/", + "2d9xdj6z", + "/component/games/", + "2d9xdj6z", + "/component/user_info/", + "2d9xdj6z", + "/images/", + "2d9xdj6z", + "/images/LobbyMui/", + "2d9xdj6z", + "/mgr/", + "2d9xdj6z", + "/mgr/imgs/", + "m7iejg46", + "/", + "m7iejg46", + "/NGMui/", + "m7iejg46", + "/mgr/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/buttons/Btn_Check.xml b/wb_new_ui/assets/Common/buttons/Btn_Check.xml index 37541702..b6aab01a 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_Check.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_Check.xml @@ -6,5 +6,5 @@ -