From 35fc8c330879bd03f1f4be60aa3807b2202fa7a2 Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Wed, 11 Feb 2026 21:26:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/View/ResultView.lua | 36 +++++----- .../extend/zipai/fanpaofa/EXMainView.lua | 18 ++++- .../zipai/fanpaofa/PlayerSelfCardInfoView.lua | 68 +++++++++--------- wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info | 10 ++- wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info | 7 ++ .../buttons/Btn_ShowResult.xml | 9 +++ .../component/Main/new_ui/zailaiyiju_img.png | Bin 11875 -> 58941 bytes .../clearing/big_zipai_result_item.xml | 54 +++++++------- .../component/clearing/card_item.xml | 12 ++-- .../component/clearing/clearing.xml | 13 ++-- .../clearing/descript_item_zipai.xml | 6 +- .../component/clearing/image/bti_win.png | Bin 0 -> 57766 bytes .../component/clearing/image/btn_Shader.png | Bin 0 -> 54349 bytes .../component/clearing/image/btn_exit.png | Bin 0 -> 60338 bytes .../component/clearing/image/fight.png | Bin 0 -> 7469 bytes .../component/clearing/image/jfd.png | Bin 1950 -> 1544 bytes .../clearing/image/shengli_zipai.png | Bin 62323 -> 52730 bytes .../component/clearing/image/shibai_zipai.png | Bin 45221 -> 44080 bytes .../component/clearing/image/zipai_di.png | Bin 3985 -> 136738 bytes .../component/clearing/image/zipai_di_win.png | Bin 0 -> 163796 bytes .../clearing/image/zipai_shuoming_di.png | Bin 12115 -> 152318 bytes .../component/clearing/image/分享.png | Bin 8312 -> 0 bytes .../component/clearing/image/大赢家.png | Bin 10720 -> 0 bytes .../component/clearing/image/战绩.png | Bin 7663 -> 0 bytes .../component/clearing/image/退出.png | Bin 8639 -> 0 bytes .../component/clearing/result_zipai_head.xml | 6 +- .../component/clearing/result_zipai_main.xml | 56 +++++++-------- .../assets/Extend_Poker_FanPaoFa/package.xml | 12 ++-- .../ui/Extend_Poker_FanPaoFa_atlas0.png | Bin 557022 -> 1483562 bytes .../ui/Extend_Poker_FanPaoFa_atlas0_1.png | Bin 1887197 -> 1502739 bytes .../ui/Extend_Poker_FanPaoFa_atlas0_2.png | Bin 3957709 -> 4093652 bytes .../ui/Extend_Poker_FanPaoFa_fui.bytes | Bin 141719 -> 142212 bytes 32 files changed, 174 insertions(+), 133 deletions(-) create mode 100644 wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info create mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml create mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/bti_win.png create mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/btn_Shader.png create mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/btn_exit.png create mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/fight.png create mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/zipai_di_win.png delete mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/分享.png delete mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/大赢家.png delete mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/战绩.png delete mode 100644 wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/退出.png diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index 6056d7cb..e385ef84 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -261,10 +261,10 @@ function M:InitBigResult(room, fontsize) local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '') big_result:GetChild('txt_play').text = str_roominfo - -- if room.hpOnOff == 1 and room.score_times ~= 1 then - big_result:GetChild('txt_time').text = '倍数：' .. tostring(room.score_times) - big_result:GetController('time').selectedIndex = 1 - -- end + -- if room.hpOnOff == 1 and room.score_times ~= 1 then + big_result:GetChild('txt_time').text = '倍数：' .. tostring(room.score_times) + big_result:GetController('time').selectedIndex = 1 + -- end local maxScore = 0 local isWin = false @@ -305,8 +305,8 @@ function M:InitBigResult(room, fontsize) if item:GetChild('txt_userid') then item:GetChild('txt_userid').text = player_info.userId end - - ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) + + -- ImageLoad.Load(player_info.head_url, item:GetChild('head')._iconObject) if player_info.entrust ~= nil and player_info.entrust == true then item:GetController('entrust').selectedIndex = 1 @@ -354,18 +354,18 @@ function M:InitBigResult(room, fontsize) pitem:GetChild('txt_key').text = player_info.param[i].key pitem:GetChild('txt_value').text = player_info.param[i].value - if fontsize ~= nil and fontsize > 0 then - pitem:GetChild('txt_key').textFormat.size = fontsize - pitem:GetChild('txt_value').textFormat.size = fontsize - else - if big then - pitem:GetChild('txt_key').textFormat.size = 30 - pitem:GetChild('txt_value').textFormat.size = 12 - else - pitem:GetChild('txt_key').textFormat.size = 24 - pitem:GetChild('txt_value').textFormat.size = 8 - end - end + -- if fontsize ~= nil and fontsize > 0 then + -- pitem:GetChild('txt_key').textFormat.size = fontsize + -- pitem:GetChild('txt_value').textFormat.size = fontsize + -- else + -- if big then + -- pitem:GetChild('txt_key').textFormat.size = 30 + -- pitem:GetChild('txt_value').textFormat.size = 12 + -- else + -- pitem:GetChild('txt_key').textFormat.size = 24 + -- pitem:GetChild('txt_value').textFormat.size = 8 + -- end + -- end end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 24c801db..4f23d041 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -562,7 +562,24 @@ function M:EventInit() ) end ) + local func = _gamectr:PopEvent() + if (func ~= nil) then + if self._flag_fanpaofa then + self._popEvent = false + end + local result, resultInfo = pcall(func) + if result then + else + printlog("game_error", resultInfo) + printlog("game_error_tra", debug.traceback()) + self._gamectr = ControllerManager.GetController(GameController) + if self._gamectr then + self._gamectr:ResetConnect() + end + end + --func() + end _gamectr:AddEventListener( GameEvent.ZPResult1, function(...) @@ -638,7 +655,6 @@ function M:EventInit() GameEvent.ZPResult2, function(...) -- self._popEvent = true - print("结算监听======22222222222222222") self._left_time = 0 local arg = { ... } local total_result = arg[2] diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index 634ba2b2..06b6dd2a 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -400,41 +400,41 @@ function M:UpdateFzList(fz_list, ispaly, seat, flag_pengPao) end function M:playAnim(fzitem, fzcards, size, i, ispaly, flag_pengPao) - print("lingmeng playAnim", fzitem, fzcards, size, i, ispaly, flag_pengPao) - if (ispaly == nil) then - ispaly = false - end - if (ispaly and i == size and not flag_pengPao) then - local fristCard = self.card_list[1].btn_card - print("lingmeng btn_card", self.card_list[1].index_X) - -- self._area_handcard_list:AddChild(fzcards) - fzcards:SetPivot(0.5, 0.5) - fzcards.rotation = 180 - fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) - --[[ - fzcards:TweenMove( - self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - - self._area_handcard_list.xy, 0.2) - fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) - --]] - fzcards:RemoveFromParent() - fzcards.xy = Vector2.zero - fzcards.rotation = 0 - fzcards:SetScale(1, 1) - fzitem:AddChild(fzcards) - self._area_fz_list:AddChildAt(fzitem, 0) - --[[ - coroutine.start( - function() - coroutine.wait(0.21) + -- print("lingmeng playAnim", fzitem, fzcards, size, i, ispaly, flag_pengPao) + -- if (ispaly == nil) then + -- ispaly = false + -- end + -- if (ispaly and i == size and not flag_pengPao) then + -- local fristCard = self.card_list[1].btn_card + -- print("lingmeng btn_card", self.card_list[1].index_X) + -- -- self._area_handcard_list:AddChild(fzcards) + -- fzcards:SetPivot(0.5, 0.5) + -- fzcards.rotation = 180 + -- fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) + -- --[[ + -- fzcards:TweenMove( + -- self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - + -- self._area_handcard_list.xy, 0.2) + -- fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) + -- --]] + -- fzcards:RemoveFromParent() + -- fzcards.xy = Vector2.zero + -- fzcards.rotation = 0 + -- fzcards:SetScale(1, 1) + -- fzitem:AddChild(fzcards) + -- self._area_fz_list:AddChildAt(fzitem, 0) + -- --[[ + -- coroutine.start( + -- function() + -- coroutine.wait(0.21) - end - ) - --]] - else - fzitem:AddChild(fzcards) - self._area_fz_list:AddChildAt(fzitem, 0) - end + -- end + -- ) + -- --]] + -- else + -- fzitem:AddChild(fzcards) + -- self._area_fz_list:AddChildAt(fzitem, 0) + -- end end --出牌提示动画 diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index d04551a1..17ce7d71 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -1,10 +1,16 @@ { "objectStatus": { + "n84_rbpg": { + "hidden": true + }, + "n51_fmkv": { + "collapsed": true + }, "n85_rbpg": { "hidden": true }, - "n84_rbpg": { - "hidden": true + "n19_pt1r": { + "collapsed": true }, "n4_fux2": { "hidden": true diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info new file mode 100644 index 00000000..816f7036 --- /dev/null +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n19_of6w": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml new file mode 100644 index 00000000..f936b351 --- /dev/null +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/buttons/Btn_ShowResult.xml @@ -0,0 +1,9 @@ + + + + + + + +