diff --git a/.gitignore b/.gitignore index ecf65d5d..2196c4be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /wb_unity_pro_2/ /wb_unity_pro/ -wb_unity_pro_2/ \ No newline at end of file +wb_unity_pro_2/ +/wb_unity_pro_3/ +wb_unity_pro_3/ \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua index 1c36e2bf..9985c8ce 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua @@ -105,7 +105,7 @@ function M:GetFilter() filter = filter + tem end end - return btn_all.selected and 251 or filter + return btn_all.selected and 1 or filter end -- 显示原因文本 diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index 9ffecc0b..95472dbb 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -302,7 +302,10 @@ function M:InitBigResult(room, fontsize) local item = player_list:AddItemFromPool() item:GetChild('txt_name').text = player_info.nick - item:GetChild('txt_userid').text = player_info.userId + if item:GetChild('txt_userid') then + item:GetChild('txt_userid').text = player_info.userId + end + local head = item:GetChild('head'):GetChild('n4') ImageLoad.Load(player_info.head_url, head) 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 88a07ea2..9f7bca0b 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -53,7 +53,8 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) self.xiPaiCtr.selectedIndex = 0 local _gamectr = ControllerManager.GetController(GameController) _gamectr:PlayerReady() - self:DestroyWithCallback() + self:Close() + --ViewUtil.ErrorTip(1000000, "申请洗牌成功") end local _gamectr = ControllerManager.GetController(GameController) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua index 7794beb7..9f5f4b27 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXPlayBackView.lua @@ -114,7 +114,7 @@ function M:FillRoomData(data) self._currentStep = 0 local room = DataManager.CurrenRoom local _player_card_info = self._player_card_info - local roominfo_panel = self._view:GetChild('roominfo_panel1') + local roominfo_panel = self._view:GetChild('roominfo_panel') roominfo_panel:GetChild('tex_roomid').text = room.room_id roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName() for i = 1, #room.player_list do @@ -634,7 +634,6 @@ function M:OnUpdate() if (self._currentStep == #self.cmdList and self._playFoward) then self:ChangePlayState(false) --显示结算 - self:ShowBackResult(1) ViewUtil.ErrorTip(nil, '当前已是录像结尾了，再次点击播放按钮可重新播放') return elseif (self._currentStep == 0 and not self._playFoward) then diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua index 7c60dc88..965f9728 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -197,7 +197,6 @@ function M:AddClearItem(room, data, total_data, over) if data ~= nil and data.liuju == true then self:FillLiuJuItemData(room, data,list_view1) if over == 1 then - printlog("result32222222ss") self:FillItemData2(room, total_data, list_view2) end else @@ -329,7 +328,7 @@ function M:FillLiuJuItemData(room, data,item) hand_card = PendulumRule.GetHandCard(data.info_list[i].hand_card, 3) for k = 1, #hand_card do local cards = card_list:AddItemFromPool() - cards:GetController('c1').selectedIndex = 2 + cards:GetController('c1').selectedIndex = 2 cards:GetChild('card_huxi').text = hand_card[k].hu_xi for j = 1, #hand_card[k] do cards:GetChild('card_' .. (j)).icon = @@ -752,7 +751,7 @@ function M:FillItemData(room, data, item) end end - --[[ if #win_data.hand_card > 0 then + if #win_data.hand_card > 0 then for i = 1, #win_data.hand_card, 4 do local cards = card_list:AddItemFromPool() cards:GetChild('card_type').text = '散' @@ -769,7 +768,7 @@ function M:FillItemData(room, data, item) end end end - end]] + end end item:RemoveChildrenToPool() for i = 1, #info_list do @@ -973,7 +972,7 @@ function M:FillItemData2(room, data, list) local round = room.room_config.round self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list) - self:SetGSListlineGap(1) + self:SetGSListlineGap(0) -- room.room_config.isNonnegative = 0 self:InitBigResult(room, 30) diff --git a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info index 2c2377e1..66e673db 100644 --- a/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info +++ b/wb_new_ui/.objs/metas/d1qrzqpr/c4r116.info @@ -1,19 +1,19 @@ { "objectStatus": { - "n158_ug6y": { + "n100_t038": { "hidden": true }, "n106_t038": { "hidden": true }, - "n154_j47e": { - "collapsed": true + "n163_ozsy": { + "hidden": true }, "n122_c4r1": { "collapsed": true }, - "n103_t038": { - "hidden": true + "n154_j47e": { + "collapsed": true }, "n146_piwz": { "collapsed": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info index a25ae142..3569889d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info @@ -3,6 +3,9 @@ "n147_10tp2": { "hidden": true }, + "n175_upe1": { + "hidden": true + }, "n165_umid": { "collapsed": true }, @@ -10,6 +13,7 @@ "hidden": true }, "n156_10tp2": { + "hidden": true, "collapsed": true } } diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info index b9cea015..23a4762c 100644 --- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info +++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qwa.info @@ -16,9 +16,6 @@ "n152_8th3": { "hidden": true }, - "n150_8th3": { - "collapsed": true - }, "n170_o49p": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 247db340..c34010d4 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 522, + "libview.firstColumnWidth": 297, "expanded_nodes": [ "27vd145b", "/", @@ -31,6 +31,16 @@ "ui://m7iejg46ilon7ibc", "ui://m7iejg46imp57ihp", "ui://9n9stu2eprgzf0", + "ui://ppu1wv76j4mf9j", + "ui://ppu1wv76j4mf9d", + "ui://ppu1wv76j4mf9e", + "ui://ppu1wv76j4mf9k", + "ui://v6yvqp7wf55qwa", + "ui://v6yvqp7waen81bs", + "ui://v6yvqp7waen81b0", + "ui://v6yvqp7waen81bf", + "ui://v6yvqp7wf55qvt", + "ui://v6yvqp7wf55qwb", "ui://9n9stu2ethxkcis", "ui://v0j9abjygq7ms2", "ui://v0j9abjygq7m8f", @@ -58,15 +68,21 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://9n9stu2eprgzf0", + "doc.activeDoc": "ui://ppu1wv76j4mf9k", "libview.twoColumn": false, "libview.expandedNodes": [ "s63l0suw", "/", - "9n9stu2e", + "ppu1wv76", "/", - "9n9stu2e", - "/component/" + "ppu1wv76", + "/component/", + "ppu1wv76", + "/component/Main/", + "ppu1wv76", + "/component/clearing/", + "m7iejg46", + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml index 53e50281..e492aa97 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/card_item.xml @@ -1,23 +1,23 @@ - + - + - + - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml index 8d4cd370..6bead898 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml @@ -1,8 +1,8 @@ - + - + @@ -33,11 +33,11 @@ - + - + @@ -46,7 +46,7 @@ - + @@ -55,13 +55,13 @@ - + - + - + @@ -144,7 +144,7 @@